diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 238ba161b58f..d1086658a077 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -47,6 +47,9 @@
/nixos/doc/manual/man-nixos-option.xml @nbp
/nixos/modules/installer/tools/nixos-option.sh @nbp
+# NixOS integration test driver
+/nixos/lib/test-driver @tfc
+
# New NixOS modules
/nixos/modules/module-list.nix @Infinisil
@@ -167,3 +170,8 @@
/nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz
/nixos/modules/services/monitoring/prometheus/exporters.xml @WilliButz
/nixos/tests/prometheus-exporters.nix @WilliButz
+
+# PHP
+/pkgs/development/interpreters/php @etu
+/pkgs/top-level/php-packages.nix @etu
+/pkgs/build-support/build-pecl.nix @etu
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 4577cea2225d..706952b208db 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -6,9 +6,8 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
## Opening issues
* Make sure you have a [GitHub account](https://github.com/signup/free)
-* [Submit an issue](https://github.com/NixOS/nixpkgs/issues) - assuming one does not already exist.
- * Clearly describe the issue including steps to reproduce when it is a bug.
- * Include information what version of nixpkgs and Nix are you using (nixos-version or git revision).
+* Make sure there is no open issue on the topic
+* [Submit a new issue](https://github.com/NixOS/nixpkgs/issues/new/choose) by choosing the kind of topic and fill out the template
## Submitting changes
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 89c751f4db76..b923902cf929 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,7 +12,7 @@
- [ ] macOS
- [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
-- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
+- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
- [ ] Ensured that relevant documentation is up to date
diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000000..bf47ba3c25b4
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,32 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 180
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: false
+# Issues with these labels will never be considered stale
+exemptLabels:
+ - 1.severity: security
+# Label to use when marking an issue as stale
+staleLabel: 2.status: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+ Thank you for your contributions.
+
+ This has been automatically marked as stale because it has had no
+ activity for 180 days.
+
+ If this is still important to you, we ask that you leave a
+ comment below. Your comment can be as simple as "still important
+ to me". This lets people see that at least one person still cares
+ about this. Someone will have to do this at most twice a year if
+ there is no other activity.
+
+ Here are suggestions that might help resolve this more quickly:
+
+ 1. Search for maintainers and people that previously touched the
+ related code and @ mention them in a comment.
+ 2. Ask on the [NixOS Discourse](https://discourse.nixos.org/).
+ 3. Ask on the [#nixos channel](irc://irc.freenode.net/#nixos) on
+ [irc.freenode.net](https://freenode.net).
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
diff --git a/doc/builders/fetchers.xml b/doc/builders/fetchers.xml
index ff3988334916..f07c310dcdf1 100644
--- a/doc/builders/fetchers.xml
+++ b/doc/builders/fetchers.xml
@@ -105,6 +105,17 @@ stdenv.mkDerivation {
+
+
+ fetchFromGitiles
+
+
+
+ This is used with Gitiles repositories. The arguments expected
+ are similar to fetchgit.
+
+
+
fetchFromBitbucket
diff --git a/doc/builders/images/dockertools.xml b/doc/builders/images/dockertools.xml
index 2243453c3e97..e7f37fdaaf00 100644
--- a/doc/builders/images/dockertools.xml
+++ b/doc/builders/images/dockertools.xml
@@ -8,12 +8,6 @@
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
diff --git a/doc/builders/trivial-builders.xml b/doc/builders/trivial-builders.xml
index df0e38da1aa2..94948c57b91f 100644
--- a/doc/builders/trivial-builders.xml
+++ b/doc/builders/trivial-builders.xml
@@ -7,7 +7,7 @@
Nixpkgs provides a couple of functions that help with building derivations. The most important one, stdenv.mkDerivation , has already been documented above. The following functions wrap stdenv.mkDerivation , making it easier to use in certain cases.
-
+
runCommand
@@ -40,7 +40,7 @@
-
+
runCommandCC
@@ -50,7 +50,20 @@
-
+
+
+ runCommandLocal
+
+
+
+ Variant of runCommand that forces the derivation to be built locally, it is not substituted. This is intended for very cheap commands (<1s execution time). It saves on the network roundrip and can speed up a build.
+
+
+ This sets allowSubstitutes to false , so only use runCommandLocal if you are certain the user will always have a builder for the system of the derivation. This should be true for most trivial use cases (e.g. just copying some files to a different location or adding symlinks), because there the system is usually the same as builtins.currentSystem .
+
+
+
+
writeTextFile , writeText , writeTextDir , writeScript , writeScriptBin
@@ -63,7 +76,7 @@
-
+
symlinkJoin
diff --git a/doc/contributing/coding-conventions.xml b/doc/contributing/coding-conventions.xml
index 799f1479467a..fcb6501f6159 100644
--- a/doc/contributing/coding-conventions.xml
+++ b/doc/contributing/coding-conventions.xml
@@ -620,6 +620,16 @@ args.stdenv.mkDerivation (args // {
+
+
+ If it’s an icon theme :
+
+
+
+ data/icons
+
+
+
If it’s related to SGML/XML processing :
@@ -652,6 +662,17 @@ args.stdenv.mkDerivation (args // {
+
+
+ If it’s a theme for a desktop environment ,
+ a window manager or a display manager :
+
+
+
+ data/themes
+
+
+
diff --git a/doc/contributing/reviewing-contributions.xml b/doc/contributing/reviewing-contributions.xml
index ed8f379c460e..fe79d8d992b1 100644
--- a/doc/contributing/reviewing-contributions.xml
+++ b/doc/contributing/reviewing-contributions.xml
@@ -141,10 +141,10 @@
- The nix-review tool can be used to review a pull request content in a single command. PRNUMBER should be replaced by the number at the end of the pull request title. You can also provide the full github pull request url.
+ The nixpkgs-review tool can be used to review a pull request content in a single command. PRNUMBER should be replaced by the number at the end of the pull request title. You can also provide the full github pull request url.
-$ nix-shell -p nix-review --run "nix-review pr PRNUMBER"
+$ nix-shell -p nixpkgs-review --run "nixpkgs-review pr PRNUMBER"
diff --git a/doc/contributing/submitting-changes.xml b/doc/contributing/submitting-changes.xml
index f09711624117..f283ae1e6851 100644
--- a/doc/contributing/submitting-changes.xml
+++ b/doc/contributing/submitting-changes.xml
@@ -228,6 +228,33 @@ Additional information.
+
+ Submitting security fixes
+
+
+ Security fixes are submitted in the same way as other changes and thus the same guidelines apply.
+
+
+
+ If the security fix comes in the form of a patch and a CVE is available, then the name of the patch should be the CVE identifier, so e.g. CVE-2019-13636.patch in the case of a patch that is included in the Nixpkgs tree. If a patch is fetched the name needs to be set as well, e.g.:
+
+
+
+ (fetchpatch {
+ name = "CVE-2019-11068.patch";
+ url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch";
+ sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8";
+ })
+
+
+
+ If a security fix applies to both master and a stable release then, similar to regular changes, they are preferably delivered via master first and cherry-picked to the release branch.
+
+
+
+ Critical security fixes may by-pass the staging branches and be delivered directly to release branches such as master and release-* .
+
+
Pull Request Template
@@ -290,20 +317,25 @@ Additional information.
- Tested compilation of all pkgs that depend on this change using nix-review
+ Tested compilation of all pkgs that depend on this change using nixpkgs-review
- If you are updating a package's version, you can use nix-review to make sure all packages that depend on the updated package still compile correctly. The nix-review utility can look for and build all dependencies either based on uncommited changes with the wip option or specifying a github pull request number.
+ If you are updating a package's version, you can use nixpkgs-review to make sure all packages that depend on the updated package still compile correctly. The nixpkgs-review utility can look for and build all dependencies either based on uncommited changes with the wip option or specifying a github pull request number.
review changes from pull request number 12345:
-nix-shell -p nix-review --run "nix-review pr 12345"
+ nix run nixpkgs.nixpkgs-review -c nixpkgs-review pr 12345
review uncommitted changes:
-nix-shell -p nix-review --run "nix-review wip"
+ nix run nixpkgs.nixpkgs-review -c nixpkgs-review wip
+
+
+
+ review changes from last commit:
+ nix run nixpkgs.nixpkgs-review -c nixpkgs-review rev HEAD
@@ -376,7 +408,7 @@ Additional information.
Master branch
- The master branch is the main development branch.
+ The master branch is the main development branch.
It should only see non-breaking commits that do not cause mass rebuilds.
@@ -384,8 +416,8 @@ Additional information.
Staging branch
- The staging branch is a development branch where mass-rebuilds go.
- It should only see non-breaking mass-rebuild commits.
+ The staging branch is a development branch where mass-rebuilds go.
+ It should only see non-breaking mass-rebuild commits.
That means it is not to be used for testing, and changes must have been well tested already.
If the branch is already in a broken state, please refrain from adding extra new breakages.
@@ -394,10 +426,10 @@ Additional information.
Staging-next branch
- The staging-next branch is for stabilizing mass-rebuilds submitted to the staging branch prior to merging them into master .
- Mass-rebuilds should go via the staging branch.
+ The staging-next branch is for stabilizing mass-rebuilds submitted to the staging branch prior to merging them into master .
+ Mass-rebuilds should go via the staging branch.
It should only see non-breaking commits that are fixing issues blocking it from being merged into the master branch.
-
+
If the branch is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days and then merge into master.
@@ -409,7 +441,7 @@ Additional information.
- If you're cherry-picking a commit to a stable release branch, always use git cherry-pick -xe and ensure the message contains a clear description about why this needs to be included in the stable branch.
+ If you're cherry-picking a commit to a stable release branch (“backporting”), always use git cherry-pick -xe and ensure the message contains a clear description about why this needs to be included in the stable branch.
An example of a cherry-picked commit would look like this:
diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md
index f268c5525660..9a5df2523a25 100644
--- a/doc/languages-frameworks/android.section.md
+++ b/doc/languages-frameworks/android.section.md
@@ -95,7 +95,7 @@ $ nix-build
The Android SDK gets deployed with all desired plugin versions.
-We can also deploy subsets of the Android SDK. For example, to only the the
+We can also deploy subsets of the Android SDK. For example, to only the
`platform-tools` package, you can evaluate the following expression:
```nix
diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml
index 74c595cc89b4..278535237c2c 100644
--- a/doc/languages-frameworks/beam.xml
+++ b/doc/languages-frameworks/beam.xml
@@ -26,7 +26,7 @@
- packages : a set of package sets, each compiled with a specific Erlang/OTP version, e.g. beam.packages.erlangR19 .
+ packages : a set of package builders (Mix and rebar3), each compiled with a specific Erlang/OTP version, e.g. beam.packages.erlangR19 .
@@ -36,15 +36,11 @@
- To create a package set built with a custom Erlang version, use the lambda, beam.packagesWith , which accepts an Erlang/OTP derivation and produces a package set similar to beam.packages.erlang .
+ To create a package builder built with a custom Erlang version, use the lambda, beam.packagesWith , which accepts an Erlang/OTP derivation and produces a package builder similar to beam.packages.erlang .
- Many Erlang/OTP distributions available in beam.interpreters have versions with ODBC and/or Java enabled. For example, there's beam.interpreters.erlangR19_odbc_javac , which corresponds to beam.interpreters.erlangR19 .
-
-
-
- We also provide the lambda, beam.packages.erlang.callPackage , which simplifies writing BEAM package definitions by injecting all packages from beam.packages.erlang into the top-level context.
+ Many Erlang/OTP distributions available in beam.interpreters have versions with ODBC and/or Java enabled or without wx (no observer support). For example, there's beam.interpreters.erlangR22_odbc_javac , which corresponds to beam.interpreters.erlangR22 and beam.interpreters.erlangR22_nox , which corresponds to beam.interpreters.erlangR22 .
@@ -55,7 +51,7 @@
Rebar3
- We provide a version of Rebar3, which is the normal, unmodified Rebar3, under rebar3 . We also provide a helper to fetch Rebar3 dependencies from a lockfile under fetchRebar3Deps .
+ We provide a version of Rebar3, under rebar3 . We also provide a helper to fetch Rebar3 dependencies from a lockfile under fetchRebar3Deps .
@@ -72,32 +68,14 @@
How to Install BEAM Packages
- BEAM packages are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. They are installable using the beam.packages.erlang attribute set (aliased as beamPackages ), which points to packages built by the default Erlang/OTP version in Nixpkgs, as defined by beam.interpreters.erlang . To list the available packages in beamPackages , use the following command:
+ BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users.
+ To install any of those builders into your profile, refer to them by their attribute path beamPackages.rebar3 :
-
-$ nix-env -f "<nixpkgs>" -qaP -A beamPackages
-beamPackages.esqlite esqlite-0.2.1
-beamPackages.goldrush goldrush-0.1.7
-beamPackages.ibrowse ibrowse-4.2.2
-beamPackages.jiffy jiffy-0.14.5
-beamPackages.lager lager-3.0.2
-beamPackages.meck meck-0.8.3
-beamPackages.rebar3-pc pc-1.1.0
-
-
-
- To install any of those packages into your profile, refer to them by their attribute path (first column):
-
-
-
-$ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse
-
-
-
- The attribute path of any BEAM package corresponds to the name of that particular package in Hex or its OTP Application/Release name.
-
-
+
+ $ nix-env -f "<nixpkgs>" -iA beamPackages.rebar3
+
+
Packaging BEAM Applications
@@ -109,35 +87,7 @@ beamPackages.rebar3-pc pc-1.1.0
Rebar3 Packages
- The Nix function, buildRebar3 , defined in beam.packages.erlang.buildRebar3 and aliased at the top level, can be used to build a derivation that understands how to build a Rebar3 project. For example, we can build hex2nix as follows:
-
-
-
-{ stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }:
-
-buildRebar3 rec {
- name = "hex2nix";
- version = "0.0.1";
-
- src = fetchFromGitHub {
- owner = "ericbmerritt";
- repo = "hex2nix";
- rev = "${version}";
- sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg";
- };
-
- beamDeps = [ ibrowse jsx erlware_commons ];
-}
-
-
-
- Such derivations are callable with beam.packages.erlang.callPackage (see ). To call this package using the normal callPackage , refer to dependency packages via beamPackages , e.g. beamPackages.ibrowse .
-
-
-
- Notably, buildRebar3 includes beamDeps , while stdenv.mkDerivation does not. BEAM dependencies added there will be correctly handled by the system.
+ The Nix function, buildRebar3 , defined in beam.packages.erlang.buildRebar3 and aliased at the top level, can be used to build a derivation that understands how to build a Rebar3 project.
@@ -152,30 +102,6 @@ buildRebar3 rec {
Erlang.mk functions similarly to Rebar3, except we use buildErlangMk instead of buildRebar3 .
-
-{ buildErlangMk, fetchHex, cowlib, ranch }:
-
-buildErlangMk {
- name = "cowboy";
- version = "1.0.4";
-
- src = fetchHex {
- pkg = "cowboy";
- version = "1.0.4";
- sha256 = "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac";
- };
-
- beamDeps = [ cowlib ranch ];
-
- meta = {
- description = ''
- Small, fast, modular HTTP server written in Erlang
- '';
- license = stdenv.lib.licenses.isc;
- homepage = https://github.com/ninenines/cowboy;
- };
-}
-
@@ -185,57 +111,9 @@ buildErlangMk {
Mix functions similarly to Rebar3, except we use buildMix instead of buildRebar3 .
-
-{ buildMix, fetchHex, plug, absinthe }:
-
-buildMix {
- name = "absinthe_plug";
- version = "1.0.0";
-
- src = fetchHex {
- pkg = "absinthe_plug";
- version = "1.0.0";
- sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
- };
-
- beamDeps = [ plug absinthe ];
-
- meta = {
- description = ''
- A plug for Absinthe, an experimental GraphQL toolkit
- '';
- license = stdenv.lib.licenses.bsd3;
- homepage = https://github.com/CargoSense/absinthe_plug;
- };
-}
-
-
Alternatively, we can use buildHex as a shortcut:
-
-
-{ buildHex, buildMix, plug, absinthe }:
-
-buildHex {
- name = "absinthe_plug";
- version = "1.0.0";
-
- sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
-
- builder = buildMix;
-
- beamDeps = [ plug absinthe ];
-
- meta = {
- description = ''
- A plug for Absinthe, an experimental GraphQL toolkit
- '';
- license = stdenv.lib.licenses.bsd3;
- homepage = https://github.com/CargoSense/absinthe_plug;
- };
-}
-
@@ -243,66 +121,13 @@ buildHex {
How to Develop
-
- Accessing an Environment
-
-
- Often, we simply want to access a valid environment that contains a specific package and its dependencies. We can accomplish that with the env attribute of a derivation. For example, let's say we want to access an Erlang REPL with ibrowse loaded up. We could do the following:
-
-
-
-$ nix-shell -A beamPackages.ibrowse.env --run "erl"
-Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false]
-
-Eshell V7.0 (abort with ^G)
-1> m(ibrowse).
-Module: ibrowse
-MD5: 3b3e0137d0cbb28070146978a3392945
-Compiled: January 10 2016, 23:34
-Object file: /nix/store/g1rlf65rdgjs4abbyj4grp37ry7ywivj-ibrowse-4.2.2/lib/erlang/lib/ibrowse-4.2.2/ebin/ibrowse.beam
-Compiler options: [{outdir,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/ebin"},
-debug_info,debug_info,nowarn_shadow_vars,
-warn_unused_import,warn_unused_vars,warnings_as_errors,
-{i,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/include"}]
-Exports:
-add_config/1 send_req_direct/7
-all_trace_off/0 set_dest/3
-code_change/3 set_max_attempts/3
-get_config_value/1 set_max_pipeline_size/3
-get_config_value/2 set_max_sessions/3
-get_metrics/0 show_dest_status/0
-get_metrics/2 show_dest_status/1
-handle_call/3 show_dest_status/2
-handle_cast/2 spawn_link_worker_process/1
-handle_info/2 spawn_link_worker_process/2
-init/1 spawn_worker_process/1
-module_info/0 spawn_worker_process/2
-module_info/1 start/0
-rescan_config/0 start_link/0
-rescan_config/1 stop/0
-send_req/3 stop_worker_process/1
-send_req/4 stream_close/1
-send_req/5 stream_next/1
-send_req/6 terminate/2
-send_req_direct/4 trace_off/0
-send_req_direct/5 trace_off/2
-send_req_direct/6 trace_on/0
-trace_on/2
-ok
-2>
-
-
-
- Notice the -A beamPackages.ibrowse.env . That is the key to this functionality.
-
-
-
Creating a Shell
-
- Getting access to an environment often isn't enough to do real development. Usually, we need to create a shell.nix file and do our development inside of the environment specified therein. This file looks a lot like the packaging described above, except that src points to the project root and we call the package directly.
-
+
+ Usually, we need to create a shell.nix file and do our development inside of the environment specified therein. Just install your version of erlang and other interpreter, and then user your normal build tools.
+ As an example with elixir:
+
{ pkgs ? import "<nixpkgs"> {} }:
@@ -311,114 +136,24 @@ with pkgs;
let
- f = { buildRebar3, ibrowse, jsx, erlware_commons }:
- buildRebar3 {
- name = "hex2nix";
- version = "0.1.0";
- src = ./.;
- beamDeps = [ ibrowse jsx erlware_commons ];
- };
- drv = beamPackages.callPackage f {};
+ elixir = beam.packages.erlangR22.elixir_1_9;
in
+mkShell {
+ buildInputs = [ elixir ];
- drv
+ ERL_INCLUDE_PATH="${erlang}/lib/erlang/usr/include";
+}
Building in a Shell (for Mix Projects)
-
- We can leverage the support of the derivation, irrespective of the build derivation, by calling the commands themselves.
-
-
-
-# =============================================================================
-# Variables
-# =============================================================================
-
-NIX_TEMPLATES := "$(CURDIR)/nix-templates"
-
-TARGET := "$(PREFIX)"
-
-PROJECT_NAME := thorndyke
-
-NIXPKGS=../nixpkgs
-NIX_PATH=nixpkgs=$(NIXPKGS)
-NIX_SHELL=nix-shell -I "$(NIX_PATH)" --pure
-# =============================================================================
-# Rules
-# =============================================================================
-.PHONY= all test clean repl shell build test analyze configure install \
- test-nix-install publish plt analyze
-
-all: build
-
-guard-%:
- @ if [ "${${*}}" == "" ]; then \
- echo "Environment variable $* not set"; \
- exit 1; \
- fi
-
-clean:
- rm -rf _build
- rm -rf .cache
-
-repl:
- $(NIX_SHELL) --run "iex -pa './_build/prod/lib/*/ebin'"
-
-shell:
- $(NIX_SHELL)
-
-configure:
- $(NIX_SHELL) --command 'eval "$$configurePhase"'
-
-build: configure
- $(NIX_SHELL) --command 'eval "$$buildPhase"'
-
-install:
- $(NIX_SHELL) --command 'eval "$$installPhase"'
-
-test:
- $(NIX_SHELL) --command 'mix test --no-start --no-deps-check'
-
-plt:
- $(NIX_SHELL) --run "mix dialyzer.plt --no-deps-check"
-
-analyze: build plt
- $(NIX_SHELL) --run "mix dialyzer --no-compile"
-
-
-
Using a shell.nix as described (see ) should just work. Aside from test , plt , and analyze , the Make targets work just fine for all of the build derivations.
+ linkend="creating-a-shell"/>) should just work.
-
-
- Generating Packages from Hex with hex2nix
-
-
- Updating the Hex package set requires hex2nix. Given the path to the Erlang modules (usually pkgs/development/erlang-modules ), it will dump a file called hex-packages.nix , containing all the packages that use a recognized build system in Hex. It can't be determined, however, whether every package is buildable.
-
-
-
- To make life easier for our users, try to build every Hex package and remove those that fail. To do that, simply run the following command in the root of your nixpkgs repository:
-
-
-
-$ nix-build -A beamPackages
-
-
-
- That will attempt to build every package in beamPackages . Then manually remove those that fail. Hopefully, someone will improve hex2nix in the future to automate the process.
-
-
diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml
index 3d69d77a1c84..bb68d026ae23 100644
--- a/doc/languages-frameworks/gnome.xml
+++ b/doc/languages-frameworks/gnome.xml
@@ -74,7 +74,7 @@
preFixup = ''
for f in $(find $out/bin/ $out/libexec/ -type f -executable); do
wrapProgram "$f" \
- --prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \
+ --prefix GIO_EXTRA_MODULES : "${getLib dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$out/share" \
--prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/${name}" \
--prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
@@ -102,7 +102,7 @@ preFixup = ''
- gnome3.dconf.lib is a dependency of wrapGAppsHook , which then also adds it to the GIO_EXTRA_MODULES variable.
+ dconf.lib is a dependency of wrapGAppsHook , which then also adds it to the GIO_EXTRA_MODULES variable.
@@ -199,9 +199,9 @@ python3.pkgs.buildPythonApplication {
dontWrapGApps = true;
# Arguments to be passed to `makeWrapper`, only used by buildPython*
- makeWrapperArgs = [
- "\${gappsWrapperArgs[@]}"
- ];
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
}
And for a QT app like:
@@ -219,9 +219,9 @@ mkDerivation {
dontWrapGApps = true;
# Arguments to be passed to `makeWrapper`, only used by qt5’s mkDerivation
- qtWrapperArgs = [
- "\${gappsWrapperArgs[@]}"
- ];
+ preFixup = ''
+ qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
}
diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index 288a90298631..bd1ee8eba275 100644
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@@ -26,7 +26,7 @@
buildGoModule
pet = buildGoModule rec {
- name = "pet-${version}";
+ pname = "pet";
version = "0.3.4";
src = fetchFromGitHub {
@@ -79,7 +79,7 @@ pet = buildGoModule rec {
buildGoPackage
deis = buildGoPackage rec {
- name = "deis-${version}";
+ pname = "deis";
version = "1.13.0";
goPackagePath = "github.com/deis/deis";
diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index 1e677450aa19..be5c7b7c8d16 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -25,14 +25,14 @@ avoided that by keeping all Haskell-related packages in a separate attribute
set called `haskellPackages`, which the following command will list:
```
$ nix-env -f "" -qaP -A haskellPackages
-haskellPackages.a50 a50-0.5
-haskellPackages.abacate haskell-abacate-0.0.0.0
-haskellPackages.abcBridge haskell-abcBridge-0.12
-haskellPackages.afv afv-0.1.1
-haskellPackages.alex alex-3.1.4
-haskellPackages.Allure Allure-0.4.101.1
-haskellPackages.alms alms-0.6.7
-[... some 8000 entries omitted ...]
+haskellPackages.a50 a50-0.5
+haskellPackages.AAI AAI-0.2.0.1
+haskellPackages.abacate abacate-0.0.0.0
+haskellPackages.abc-puzzle abc-puzzle-0.2.1
+haskellPackages.abcBridge abcBridge-0.15
+haskellPackages.abcnotation abcnotation-1.9.0
+haskellPackages.abeson abeson-0.1.0.1
+[... some 14000 entries omitted ...]
```
To install any of those packages into your profile, refer to them by their
@@ -101,19 +101,21 @@ to compile your Haskell packages with any GHC version you please. The following
command displays the complete list of available compilers:
```
$ nix-env -f "" -qaP -A haskell.compiler
-haskell.compiler.ghc6104 ghc-6.10.4
-haskell.compiler.ghc6123 ghc-6.12.3
-haskell.compiler.ghc704 ghc-7.0.4
-haskell.compiler.ghc722 ghc-7.2.2
-haskell.compiler.ghc742 ghc-7.4.2
-haskell.compiler.ghc763 ghc-7.6.3
-haskell.compiler.ghc784 ghc-7.8.4
-haskell.compiler.ghc7102 ghc-7.10.2
-haskell.compiler.ghcHEAD ghc-7.11.20150402
-haskell.compiler.ghcNokinds ghc-nokinds-7.11.20150704
-haskell.compiler.ghcjs ghcjs-0.1.0
-haskell.compiler.jhc jhc-0.8.2
-haskell.compiler.uhc uhc-1.1.9.0
+haskell.compiler.ghc822 ghc-8.2.2
+haskell.compiler.integer-simple.ghc822 ghc-8.2.2
+haskell.compiler.ghc822Binary ghc-8.2.2-binary
+haskell.compiler.ghc844 ghc-8.4.4
+haskell.compiler.ghc863Binary ghc-8.6.3-binary
+haskell.compiler.ghc864 ghc-8.6.4
+haskell.compiler.integer-simple.ghc864 ghc-8.6.4
+haskell.compiler.ghc865 ghc-8.6.5
+haskell.compiler.integer-simple.ghc865 ghc-8.6.5
+haskell.compiler.ghc881 ghc-8.8.1
+haskell.compiler.integer-simple.ghc881 ghc-8.8.1
+haskell.compiler.ghcHEAD ghc-8.9.20190601
+haskell.compiler.integer-simple.ghcHEAD ghc-8.9.20190601
+haskell.compiler.ghcjs84 ghcjs-8.4.0.1
+haskell.compiler.ghcjs ghcjs-8.6.0.1
```
We have no package sets for `jhc` or `uhc` yet, unfortunately, but for every
@@ -398,7 +400,9 @@ nix:
For more on how to write a `shell.nix` file see the below section. You'll need
to express a derivation. Note that Nixpkgs ships with a convenience wrapper
function around `mkDerivation` called `haskell.lib.buildStackProject` to help you
-create this derivation in exactly the way Stack expects. All of the same inputs
+create this derivation in exactly the way Stack expects. However for this to work
+you need to disable the sandbox, which you can do by using `--option sandbox relaxed`
+or `--option sandbox false` to the Nix command. All of the same inputs
as `mkDerivation` can be provided. For example, to build a Stack project that
including packages that link against a version of the R library compiled with
special options turned on:
diff --git a/doc/languages-frameworks/ios.section.md b/doc/languages-frameworks/ios.section.md
index 6684b809ffe6..5a81795c004a 100644
--- a/doc/languages-frameworks/ios.section.md
+++ b/doc/languages-frameworks/ios.section.md
@@ -1,7 +1,7 @@
---
title: iOS
author: Sander van der Burg
-date: 2018-11-18
+date: 2019-11-10
---
# iOS
@@ -217,3 +217,13 @@ xcode.simulateApp {
By providing the result of an `xcode.buildApp {}` function and configuring the
app bundle id, the app gets deployed automatically and started.
+
+Troubleshooting
+---------------
+In some rare cases, it may happen that after a failure, changes are not picked
+up. Most likely, this is caused by a derived data cache that Xcode maintains.
+To wipe it you can run:
+
+```bash
+$ rm -rf ~/Library/Developer/Xcode/DerivedData
+```
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 02bff8666e29..9cb0e1eecc16 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -144,6 +144,24 @@ What's happening here?
2. Then we create a Python 3.5 environment with the `withPackages` function.
3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set.
+To combine this with `mkShell` you can:
+
+```nix
+with import {};
+
+let
+ pythonEnv = python35.withPackages (ps: [
+ ps.numpy
+ ps.toolz
+ ]);
+in mkShell {
+ buildInputs = [
+ pythonEnv
+ hello
+ ];
+}
+```
+
##### Execute command with `--run`
A convenient option with `nix-shell` is the `--run`
option, with which you can execute a command in the `nix-shell`. We can
@@ -1016,7 +1034,10 @@ Create this `default.nix` file, together with a `requirements.txt` and simply ex
```nix
with import {};
-with python27Packages;
+
+let
+ pythonPackages = python27Packages;
+in
stdenv.mkDerivation {
name = "impurePythonEnv";
@@ -1026,9 +1047,8 @@ stdenv.mkDerivation {
buildInputs = [
# these packages are required for virtualenv and pip to work:
#
- python27Full
- python27Packages.virtualenv
- python27Packages.pip
+ pythonPackages.virtualenv
+ pythonPackages.pip
# the following packages are related to the dependencies of your python
# project.
# In this particular example the python modules listed in the
@@ -1041,14 +1061,13 @@ stdenv.mkDerivation {
libxml2
libxslt
libzip
- stdenv
zlib
];
shellHook = ''
# set SOURCE_DATE_EPOCH so that we can use python wheels
SOURCE_DATE_EPOCH=$(date +%s)
- virtualenv --no-setuptools venv
+ virtualenv --python=${pythonPackages.python.interpreter} --no-setuptools venv
export PATH=$PWD/venv/bin:$PATH
pip install -r requirements.txt
'';
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 8b9aa5dc1685..709a0d504cf7 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -203,7 +203,7 @@ argument and returns a set that contains all attribute that should be
overwritten.
For more complicated cases, such as when parts of the crate's
-derivation depend on the the crate's version, the `attrs` argument of
+derivation depend on the crate's version, the `attrs` argument of
the override above can be read, as in the following example, which
patches the derivation:
diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml
index 7876cc213b66..8fa8f963b2f6 100644
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -59,6 +59,97 @@ nix-repl> texlive.collection-
+
+ Custom packages
+
+ You may find that you need to use an external TeX package. A derivation for such package has to provide contents of the "texmf" directory in its output and provide the tlType attribute. Here is a (very verbose) example:
+ {};
+
+let
+ foiltex_run = stdenvNoCC.mkDerivation {
+ pname = "latex-foiltex";
+ version = "2.1.4b";
+ passthru.tlType = "run";
+
+ srcs = [
+ (fetchurl {
+ url = "http://mirrors.ctan.org/macros/latex/contrib/foiltex/foiltex.dtx";
+ sha256 = "07frz0krpz7kkcwlayrwrj2a2pixmv0icbngyw92srp9fp23cqpz";
+ })
+ (fetchurl {
+ url = "http://mirrors.ctan.org/macros/latex/contrib/foiltex/foiltex.ins";
+ sha256 = "09wkyidxk3n3zvqxfs61wlypmbhi1pxmjdi1kns9n2ky8ykbff99";
+ })
+ ];
+
+ unpackPhase = ''
+ runHook preUnpack
+
+ for _src in $srcs; do
+ cp "$_src" $(stripHash "$_src")
+ done
+
+ runHook postUnpack
+ '';
+
+ nativeBuildInputs = [ texlive.combined.scheme-small ];
+
+ dontConfigure = true;
+
+ buildPhase = ''
+ runHook preBuild
+
+ # Generate the style files
+ latex foiltex.ins
+
+ runHook postBuild
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ path="$out/tex/latex/foiltex"
+ mkdir -p "$path"
+ cp *.{cls,def,clo} "$path/"
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "A LaTeX2e class for overhead transparencies";
+ license = licenses.unfreeRedistributable;
+ maintainers = with maintainers; [ veprbl ];
+ platforms = platforms.all;
+ };
+ };
+ foiltex = { pkgs = [ foiltex_run ]; };
+
+ latex_with_foiltex = texlive.combine {
+ inherit (texlive) scheme-small;
+ inherit foiltex;
+ };
+in
+ runCommand "test.pdf" {
+ nativeBuildInputs = [ latex_with_foiltex ];
+ } ''
+cat >test.tex <
+
+
+
Known problems
diff --git a/doc/stdenv/cross-compilation.xml b/doc/stdenv/cross-compilation.xml
index 93fe9095ce2f..bea56a0c2fc1 100644
--- a/doc/stdenv/cross-compilation.xml
+++ b/doc/stdenv/cross-compilation.xml
@@ -244,7 +244,7 @@
- Many packages assume that an unprefixed ar is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed `ar`.
+ Many packages assume that an unprefixed ar is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed ar .
@@ -348,12 +348,12 @@ nix-build '<nixpkgs>' --arg crossSystem '{ config = "<arch>-<os&g
- In each stage, pkgsBuildHost refers the the previous stage, pkgsBuildBuild refers to the one before that, and pkgsHostTarget refers to the current one, and pkgsTargetTarget refers to the next one. When there is no previous or next stage, they instead refer to the current stage. Note how all the invariants regarding the mapping between dependency and depending packages' build host and target platforms are preserved. pkgsBuildTarget and pkgsHostHost are more complex in that the stage fitting the requirements isn't always a fixed chain of "prevs" and "nexts" away (modulo the "saturating" self-references at the ends). We just special case each instead. All the primary edges are implemented is in pkgs/stdenv/booter.nix , and secondarily aliases in pkgs/top-level/stage.nix .
+ In each stage, pkgsBuildHost refers to the previous stage, pkgsBuildBuild refers to the one before that, and pkgsHostTarget refers to the current one, and pkgsTargetTarget refers to the next one. When there is no previous or next stage, they instead refer to the current stage. Note how all the invariants regarding the mapping between dependency and depending packages' build host and target platforms are preserved. pkgsBuildTarget and pkgsHostHost are more complex in that the stage fitting the requirements isn't always a fixed chain of "prevs" and "nexts" away (modulo the "saturating" self-references at the ends). We just special case each instead. All the primary edges are implemented is in pkgs/stdenv/booter.nix , and secondarily aliases in pkgs/top-level/stage.nix .
- Note the native stages are bootstrapped in legacy ways that predate the current cross implementation. This is why the the bootstrapping stages leading up to the final stages are ignored inthe previous paragraph.
+ Note the native stages are bootstrapped in legacy ways that predate the current cross implementation. This is why the bootstrapping stages leading up to the final stages are ignored inthe previous paragraph.
diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml
index 0b59f90eb490..1e97bf6157bb 100644
--- a/doc/stdenv/stdenv.xml
+++ b/doc/stdenv/stdenv.xml
@@ -1123,6 +1123,16 @@ preBuild = ''
Variables controlling the install phase
+
+
+ dontInstall
+
+
+
+ Set to true to skip the install phase.
+
+
+
makeFlags / makeFlagsArray / makefile
@@ -1717,7 +1727,7 @@ someVar=$(stripHash $name)
- The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of envBuildBuildHooks `, envBuildHostHooks `, envBuildTargetHooks `, envHostHostHooks `, envHostTargetHooks `, or envTargetTargetHooks `. These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis).
+ The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of envBuildBuildHooks , envBuildHostHooks , envBuildTargetHooks , envHostHostHooks , envHostTargetHooks , or envTargetTargetHooks . These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis).
diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml
index a68ae739f52e..f4d6e9110064 100644
--- a/doc/using/configuration.xml
+++ b/doc/using/configuration.xml
@@ -141,11 +141,10 @@
For a more useful example, try the following. This configuration only allows unfree packages named flash player and visual studio code:
{
- allowUnfreePredicate = (pkg: builtins.elem
- (builtins.parseDrvName pkg.name).name [
- "flashplayer"
- "vscode"
- ]);
+ allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+ "flashplayer"
+ "vscode"
+ ];
}
@@ -217,7 +216,7 @@
The following configuration example only allows insecure packages with very short names:
{
- allowInsecurePredicate = (pkg: (builtins.stringLength (builtins.parseDrvName pkg.name).name) <= 5);
+ allowInsecurePredicate = pkg: builtins.stringLength (lib.getName pkg) <= 5;
}
diff --git a/lib/default.nix b/lib/default.nix
index 74d508ec1d6e..8af531525860 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -84,7 +84,8 @@ let
hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape
escapeShellArg escapeShellArgs replaceChars lowerChars
upperChars toLower toUpper addContextFrom splitString
- removePrefix removeSuffix versionOlder versionAtLeast getVersion
+ removePrefix removeSuffix versionOlder versionAtLeast
+ getName getVersion
nameFromURL enableFeature enableFeatureAs withFeature
withFeatureAs fixedWidthString fixedWidthNumber isStorePath
toInt readPathsFromFile fileContents;
diff --git a/lib/strings.nix b/lib/strings.nix
index ae0d74c6721d..6dbb3d3a3e8b 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -472,6 +472,23 @@ rec {
*/
versionAtLeast = v1: v2: !versionOlder v1 v2;
+ /* This function takes an argument that's either a derivation or a
+ derivation's "name" attribute and extracts the name part from that
+ argument.
+
+ Example:
+ getName "youtube-dl-2016.01.01"
+ => "youtube-dl"
+ getName pkgs.youtube-dl
+ => "youtube-dl"
+ */
+ getName = x:
+ let
+ parse = drv: (builtins.parseDrvName drv).name;
+ in if isString x
+ then parse x
+ else x.pname or (parse x.name);
+
/* This function takes an argument that's either a derivation or a
derivation's "name" attribute and extracts the version part from that
argument.
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 0c0cdf1f11b1..026117cc34fd 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -37,6 +37,7 @@ rec {
else if final.isAndroid then "bionic"
else if final.isLinux /* default */ then "glibc"
else if final.isMsp430 then "newlib"
+ else if final.isVc4 then "newlib"
else if final.isAvr then "avrlibc"
else if final.isNetBSD then "nblibc"
# TODO(@Ericson2314) think more about other operating systems
@@ -79,6 +80,7 @@ rec {
else if final.isAarch64 then "arm64"
else if final.isx86_32 then "x86"
else if final.isx86_64 then "ia64"
+ else if final.isMips then "mips"
else final.parsed.cpu.name;
qemuArch =
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 58cff18e6488..700c895b3aba 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -26,7 +26,7 @@ let
"riscv32-linux" "riscv64-linux"
- "aarch64-none" "avr-none" "arm-none" "i686-none" "x86_64-none" "powerpc-none" "msp430-none" "riscv64-none" "riscv32-none"
+ "aarch64-none" "avr-none" "arm-none" "i686-none" "x86_64-none" "powerpc-none" "msp430-none" "riscv64-none" "riscv32-none" "vc4-none"
];
allParsed = map parse.mkSystemFromString all;
@@ -45,6 +45,7 @@ in {
x86_64 = filterDoubles predicates.isx86_64;
mips = filterDoubles predicates.isMips;
riscv = filterDoubles predicates.isRiscV;
+ vc4 = filterDoubles predicates.isVc4;
cygwin = filterDoubles predicates.isCygwin;
darwin = filterDoubles predicates.isDarwin;
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 511ae1979485..cb8bc3de6c48 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -118,6 +118,12 @@ rec {
config = "avr";
};
+ vc4 = {
+ config = "vc4-elf";
+ libc = "newlib";
+ platform = {};
+ };
+
arm-embedded = {
config = "arm-none-eabi";
libc = "newlib";
@@ -207,7 +213,7 @@ rec {
# 32 bit mingw-w64
mingw32 = {
- config = "i686-pc-mingw32";
+ config = "i686-w64-mingw32";
libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
platform = {};
};
@@ -215,7 +221,7 @@ rec {
# 64 bit mingw-w64
mingwW64 = {
# That's the triplet they use in the mingw-w64 docs.
- config = "x86_64-pc-mingw32";
+ config = "x86_64-w64-mingw32";
libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
platform = {};
};
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 8a983b3d3637..d1980c6dff81 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -21,6 +21,7 @@ rec {
isSparc = { cpu = { family = "sparc"; }; };
isWasm = { cpu = { family = "wasm"; }; };
isMsp430 = { cpu = { family = "msp430"; }; };
+ isVc4 = { cpu = { family = "vc4"; }; };
isAvr = { cpu = { family = "avr"; }; };
isAlpha = { cpu = { family = "alpha"; }; };
isJavaScript = { cpu = cpuTypes.js; };
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 5e12df32ffdd..6a02dbb51528 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -112,6 +112,8 @@ rec {
msp430 = { bits = 16; significantByte = littleEndian; family = "msp430"; };
avr = { bits = 8; family = "avr"; };
+ vc4 = { bits = 32; significantByte = littleEndian; family = "vc4"; };
+
js = { bits = 32; significantByte = littleEndian; family = "js"; };
};
@@ -208,6 +210,9 @@ rec {
vendors = setTypes types.openVendor {
apple = {};
pc = {};
+ # Actually matters, unlocking some MinGW-w64-specific options in GCC. See
+ # bottom of https://sourceforge.net/p/mingw-w64/wiki2/Unicode%20apps/
+ w64 = {};
none = {};
unknown = {};
@@ -327,6 +332,7 @@ rec {
}
];
};
+ gnuabi64 = { abi = "64"; };
musleabi = { float = "soft"; };
musleabihf = { float = "hard"; };
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 13a2713896ab..dc0db933330c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -189,6 +189,12 @@
githubId = 1250775;
name = "Adolfo E. García Castro";
};
+ adsr = {
+ email = "as@php.net";
+ github = "adsr";
+ githubId = 315003;
+ name = "Adam Saponara";
+ };
aepsil0n = {
email = "eduard.bopp@aepsil0n.de";
github = "aepsil0n";
@@ -310,6 +316,7 @@
alexbakker = {
email = "ab@alexbakker.me";
github = "alexbakker";
+ githubId = 2387841;
name = "Alexander Bakker";
};
alexchapman = {
@@ -563,6 +570,12 @@
githubId = 718812;
name = "Antoine R. Dumont";
};
+ arianvp = {
+ email = "arian.vanputten@gmail.com";
+ github = "arianvp";
+ githubId = 628387;
+ name = "Arian van Putten";
+ };
aristid = {
email = "aristidb@gmail.com";
github = "aristidb";
@@ -719,6 +732,16 @@
githubId = 135230;
name = "Aycan iRiCAN";
};
+ b4dm4n = {
+ email = "fabianm88@gmail.com";
+ github = "B4dM4n";
+ githubId = 448169;
+ name = "Fabian Möller";
+ keys = [{
+ longkeyid = "rsa4096/0x754B5C0963C42C5";
+ fingerprint = "6309 E212 29D4 DA30 AF24 BDED 754B 5C09 63C4 2C50";
+ }];
+ };
babariviere = {
email = "babathriviere@gmail.com";
github = "babariviere";
@@ -922,6 +945,12 @@
githubId = 5718007;
name = "Bastian Köcher";
};
+ blitz = {
+ email = "js@alien8.de";
+ github = "blitz";
+ githubId = 37907;
+ name = "Julian Stecklina";
+ };
bluescreen303 = {
email = "mathijs@bluescreen303.nl";
github = "bluescreen303";
@@ -1082,6 +1111,12 @@
githubId = 5555066;
name = "Andrew Cann";
};
+ cap = {
+ name = "cap";
+ email = "nixos_xasenw9@digitalpostkasten.de";
+ github = "scaredmushroom";
+ githubId = 45340040;
+ };
carlosdagos = {
email = "m@cdagostino.io";
github = "carlosdagos";
@@ -1377,6 +1412,12 @@
githubId = 1740337;
name = "Chris Ostrouchov";
};
+ contrun = {
+ email = "uuuuuu@protonmail.com";
+ github = "contrun";
+ githubId = 32609395;
+ name = "B YI";
+ };
couchemar = {
email = "couchemar@yandex.ru";
github = "couchemar";
@@ -1389,6 +1430,12 @@
githubId = 411324;
name = "Carles Pagès";
};
+ craigem = {
+ email = "craige@mcwhirter.io";
+ github = "craigem";
+ githubId = 6470493;
+ name = "Craige McWhirter";
+ };
cransom = {
email = "cransom@hubns.net";
github = "cransom";
@@ -1432,7 +1479,7 @@
};
cypherpunk2140 = {
email = "stefan.mihaila@pm.me";
- github = "cypherpunk2140";
+ github = "stefan-mihaila";
githubId = 2217136;
name = "Ștefan D. Mihăilă";
keys = [
@@ -1444,6 +1491,16 @@
}
];
};
+ d-goldin = {
+ email = "dgoldin+github@protonmail.ch";
+ github = "d-goldin";
+ githubId = 43349662;
+ name = "Dima";
+ keys = [{
+ longkeyid = "rsa4096/BAB1D15FB7B4D4CE";
+ fingerprint = "1C4E F4FE 7F8E D8B7 1E88 CCDF BAB1 D15F B7B4 D4CE";
+ }];
+ };
dadada = {
name = "dadada";
email = "dadada@dadada.li";
@@ -1740,6 +1797,12 @@
githubId = 875324;
name = "David Johnson";
};
+ dmrauh = {
+ email = "dmrauh@posteo.de";
+ github = "dmrauh";
+ githubId = 37698547;
+ name = "Dominik Michael Rauh";
+ };
dmvianna = {
email = "dmlvianna@gmail.com";
github = "dmvianna";
@@ -1942,7 +2005,7 @@
name = "Edward Tjörnhammar";
};
eelco = {
- email = "eelco.dolstra@logicblox.com";
+ email = "edolstra+nixpkgs@gmail.com";
github = "edolstra";
githubId = 1148549;
name = "Eelco Dolstra";
@@ -2025,6 +2088,12 @@
githubId = 1365692;
name = "Will Fancher";
};
+ elyhaka = {
+ email = "elyhaka@protonmail.com";
+ github = "Elyhaka";
+ githubId = 57923898;
+ name = "Elyhaka";
+ };
emmanuelrosa = {
email = "emmanuel_rosa@aol.com";
github = "emmanuelrosa";
@@ -2064,6 +2133,12 @@
email = "mpcervin@uncg.edu";
name = "Mabry Cervin";
};
+ equirosa = {
+ email = "eduardo@eduardoquiros.com";
+ github = "equirosa";
+ githubId = 39096810;
+ name = "Eduardo Quiros";
+ };
eqyiel = {
email = "ruben@maher.fyi";
github = "eqyiel";
@@ -2120,6 +2195,12 @@
githubId = 1583484;
name = "Andrey Golovizin";
};
+ ersin = {
+ email = "me@ersinakinci.com";
+ github = "earksiinni";
+ githubId = 5427394;
+ name = "Ersin Akinci";
+ };
ertes = {
email = "esz@posteo.de";
github = "ertes";
@@ -2245,12 +2326,32 @@
githubId = 8182846;
name = "Francesco Gazzetta";
};
+ filalex77 = {
+ email = "brightone@protonmail.com";
+ github = "filalex77";
+ githubId = 12615679;
+ name = "Oleksii Filonenko";
+ keys = [{
+ longkeyid = "rsa3072/0xA1BC8428323ECFE8";
+ fingerprint = "F549 3B7F 9372 5578 FDD3 D0B8 A1BC 8428 323E CFE8";
+ }];
+ };
FireyFly = {
email = "nix@firefly.nu";
github = "FireyFly";
githubId = 415760;
name = "Jonas Höglund";
};
+ Flakebi = {
+ email = "flakebi@t-online.de";
+ github = "Flakebi";
+ githubId = 6499211;
+ name = "Sebastian Neubauer";
+ keys = [{
+ longkeyid = "rsa4096/0xECC755EE583C1672";
+ fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672";
+ }];
+ };
flexw = {
email = "felix.weilbach@t-online.de";
github = "FlexW";
@@ -2408,6 +2509,12 @@
githubId = 40521440;
name = "Haruka Akiyama";
};
+ fuzen = {
+ email = "me@fuzen.cafe";
+ github = "fuzen-py";
+ githubId = 17859309;
+ name = "Fuzen";
+ };
fuzzy-id = {
email = "hacking+nixos@babibo.de";
name = "Thomas Bach";
@@ -2430,6 +2537,12 @@
githubId = 7047019;
name = "Florent Becker";
};
+ gamb = {
+ email = "adam.gamble@pm.me";
+ github = "gamb";
+ githubId = 293586;
+ name = "Adam Gamble";
+ };
garbas = {
email = "rok@garbas.si";
github = "garbas";
@@ -2449,6 +2562,7 @@
gazally = {
email = "gazally@runbox.com";
github = "gazally";
+ githubId = 16470252;
name = "Gemini Lasswell";
};
gebner = {
@@ -2593,6 +2707,12 @@
githubId = 9705357;
name = "Guillaume Bouchard";
};
+ GuillaumeDesforges = {
+ email = "aceus02@gmail.com";
+ github = "GuillaumeDesforges";
+ githubId = 1882000;
+ name = "Guillaume Desforges";
+ };
guillaumekoenig = {
email = "guillaume.edward.koenig@gmail.com";
github = "guillaumekoenig";
@@ -2767,6 +2887,12 @@
githubId = 69209;
name = "Ian Duncan";
};
+ ianmjones = {
+ email = "ian@ianmjones.com";
+ github = "ianmjones";
+ githubId = 4710;
+ name = "Ian M. Jones";
+ };
ianwookim = {
email = "ianwookim@gmail.com";
github = "wavewave";
@@ -2856,6 +2982,15 @@
githubId = 137306;
name = "Michele Catalano";
};
+ isgy = {
+ email = "isgy@teiyg.com";
+ github = "isgy";
+ githubId = 13622947;
+ keys = [{
+ longkeyid = "rsa4096/0xD3E1B013B4631293";
+ fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293";
+ }];
+ };
ivan = {
email = "ivan@ludios.org";
github = "ivan";
@@ -2907,7 +3042,8 @@
jacg = {
name = "Jacek Generowicz";
email = "jacg@my-post-office.net";
- githubId = "2570854";
+ github = "jacg";
+ githubId = 2570854;
};
jasoncarr = {
email = "jcarr250@gmail.com";
@@ -3010,6 +3146,7 @@
jdanek = {
email = "jdanek@redhat.com";
github = "jdanekrh";
+ githubId = 17877663;
keys = [{
longkeyid = "ed25519/0x69275CADF15D872E";
fingerprint = "D4A6 F051 AD58 2E7C BCED 5439 6927 5CAD F15D 872E";
@@ -3110,6 +3247,11 @@
githubId = 184898;
name = "Jirka Marsik";
};
+ jitwit = {
+ email = "jrn@bluefarm.ca";
+ github = "jitwit";
+ name = "jitwit";
+ };
jlesquembre = {
email = "jl@lafuente.me";
github = "jlesquembre";
@@ -3122,6 +3264,12 @@
githubId = 2195834;
name = "Jaakko Luttinen";
};
+ jm2dev = {
+ email = "jomarcar@gmail.com";
+ github = "jm2dev";
+ githubId = 474643;
+ name = "José Miguel Martínez Carrasco";
+ };
jmagnusj = {
email = "jmagnusj@gmail.com";
github = "magnusjonsson";
@@ -3169,6 +3317,7 @@
joesalisbury = {
email = "salisbury.joseph@gmail.com";
github = "JosephSalisbury";
+ githubId = 297653;
name = "Joe Salisbury";
};
johanot = {
@@ -3322,6 +3471,12 @@
github = "juliendehos";
name = "Julien Dehos";
};
+ jumper149 = {
+ email = "felixspringer149@gmail.com";
+ github = "jumper149";
+ githubId = 39434424;
+ name = "Felix Springer";
+ };
justinwoo = {
email = "moomoowoo@gmail.com";
github = "justinwoo";
@@ -3445,6 +3600,7 @@
kim0 = {
email = "email.ahmedkamal@googlemail.com";
github = "kim0";
+ githubId = 59667;
name = "Ahmed Kamal";
};
kimburgess = {
@@ -3468,6 +3624,7 @@
kirikaza = {
email = "k@kirikaza.ru";
github = "kirikaza";
+ githubId = 804677;
name = "Kirill Kazakov";
};
kisonecat = {
@@ -3502,6 +3659,12 @@
github = "klntsky";
githubId = 18447310;
};
+ kmcopper = {
+ email = "kmcopper@danwin1210.me";
+ name = "Kyle Copperfield";
+ github = "kmcopper";
+ githubId = 57132115;
+ };
kmeakin = {
email = "karlwfmeakin@gmail.com";
name = "Karl Meakin";
@@ -3594,6 +3757,7 @@
ktor = {
email = "kruszewsky@gmail.com";
github = "ktor";
+ githubId = 99639;
name = "Pawel Kruszewski";
};
ktosiek = {
@@ -3608,6 +3772,18 @@
githubId = 449813;
name = "Roman Kuznetsov";
};
+ kylesferrazza = {
+ name = "Kyle Sferrazza";
+ email = "kyle.sferrazza@gmail.com";
+
+ github = "kylesferrazza";
+ githubId = 6677292;
+
+ keys = [{
+ longkeyid = "rsa4096/81A1540948162372";
+ fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372";
+ }];
+ };
kylewlacy = {
email = "kylelacy+nix@pm.me";
github = "kylewlacy";
@@ -3638,8 +3814,15 @@
};
lattfein = {
email = "lattfein@gmail.com";
- github = "lattfein";
- githubId = 53550838;
+ # Their GitHub account was deleted.
+ #
+ # See: https://github.com/NixOS/nixpkgs/pull/69007 where this
+ # was added but is now owned by a ghost.
+ #
+ # Possibly the username lattfein (currently github ID 56827487) is
+ # owned by the same person, but we should confirm before adding
+ # the GitHub name or ID back.
+ # github = "lattfein";
name = "Koki Yasuno";
};
layus = {
@@ -3745,6 +3928,7 @@
lightbulbjim = {
email = "chris@killred.net";
github = "lightbulbjim";
+ githubId = 4312404;
name = "Chris Rendle-Short";
};
lightdiscord = {
@@ -3858,6 +4042,22 @@
github = "lovek323";
name = "Jason O'Conal";
};
+ lovesegfault = {
+ email = "meurerbernardo@gmail.com";
+ github = "lovesegfault";
+ githubId = 7243783;
+ name = "Bernardo Meurer";
+ keys = [
+ {
+ longkeyid = "rsa2048/0xE421C74191EA186C";
+ fingerprint = "5894 12CE 19DF 582A E10A 3320 E421 C741 91EA 186C";
+ }
+ {
+ longkeyid = "rsa2048/0x4A6D87A0E7475769";
+ fingerprint = "56A8 E164 E834 290C 4AC0 EE3E 4A6D 87A0 E747 5769";
+ }
+ ];
+ };
lowfatcomputing = {
email = "andreas.wagner@lowfatcomputing.org";
github = "lowfatcomputing";
@@ -4019,6 +4219,12 @@
github = "marcweber";
githubId = 34086;
name = "Marc Weber";
+ };
+ marcus7070 = {
+ email = "marcus@geosol.com.au";
+ github = "marcus7070";
+ githubId = 50230945;
+ name = "Marcus Boyd";
};
marenz = {
email = "marenz@arkom.men";
@@ -4358,6 +4564,12 @@
githubId = 16974598;
name = "Mike Playle";
};
+ mkaito = {
+ email = "chris@mkaito.net";
+ github = "mkaito";
+ githubId = 20434;
+ name = "Christian Höppner";
+ };
mkazulak = {
email = "kazulakm@gmail.com";
github = "mulderr";
@@ -4379,6 +4591,16 @@
githubId = 22477669;
name = "Mark K Gardner";
};
+ mkg20001 = {
+ email = "mkg20001+nix@gmail.com";
+ github = "mkg20001";
+ githubId = 7735145;
+ name = "Maciej Krüger";
+ keys = [{
+ longkeyid = "rsa4096/0x0D948CE19CF49C5F";
+ fingerprint = "E90C BA34 55B3 6236 740C 038F 0D94 8CE1 9CF4 9C5F";
+ }];
+ };
mlieberman85 = {
email = "mlieberman85@gmail.com";
github = "mlieberman85";
@@ -4397,6 +4619,12 @@
githubId = 117842;
name = "Henri Bourcereau";
};
+ mmilata = {
+ email = "martin@martinmilata.cz";
+ github = "mmilata";
+ gitHubId = 85857;
+ name = "Martin Milata";
+ };
mmlb = {
email = "me.mmlb@mmlb.me";
github = "mmlb";
@@ -4454,6 +4682,10 @@
github = "moredread";
githubId = 100848;
name = "André-Patrick Bubel";
+ keys = [{
+ longkeyid = "rsa8192/0x118CE7C424B45728";
+ fingerprint = "4412 38AD CAD3 228D 876C 5455 118C E7C4 24B4 5728";
+ }];
};
moretea = {
email = "maarten@moretea.nl";
@@ -4507,6 +4739,12 @@
githubId = 2881922;
name = "Francis St-Amour";
};
+ mtrsk = {
+ email = "marcos.schonfinkel@protonmail.com";
+ github = "mtrsk";
+ githubId = 16356569;
+ name = "Marcos Benevides";
+ };
mredaelli = {
email = "massimo@typish.io";
github = "mredaelli";
@@ -4544,6 +4782,12 @@
githubId = 437005;
name = "Mikkel Christiansen";
};
+ mschuwalow = {
+ github = "mschuwalow";
+ githubId = 16665913;
+ name = "Maxim Schuwalow";
+ email = "maxim.schuwalow@gmail.com";
+ };
msiedlarek = {
email = "mikolaj@siedlarek.pl";
github = "msiedlarek";
@@ -4790,6 +5034,12 @@
githubId = 2946283;
name = "Brian Cohen";
};
+ novoxudonoser = {
+ email = "radnovox@gmail.com";
+ github = "novoxudonoser";
+ githubId = 6052922;
+ name = "Kirill Struokov";
+ };
np = {
email = "np.nix@nicolaspouillard.fr";
github = "np";
@@ -5010,6 +5260,12 @@
githubId = 20792;
name = "Sebastian Galkin";
};
+ pashashocky = {
+ email = "pashashocky@gmail.com";
+ github = "pashashocky";
+ githubId = 673857;
+ name = "Pash Shocky";
+ };
pashev = {
email = "pashev.igor@gmail.com";
github = "ip1981";
@@ -5950,6 +6206,16 @@
githubId = 307899;
name = "Gurkan Gur";
};
+ servalcatty = {
+ email = "servalcat@pm.me";
+ github = "servalcatty";
+ githubid = 51969817;
+ name = "Serval";
+ keys = [{
+ longkeyid = "rsa4096/0x4A2AAAA382F8294C";
+ fingerprint = "A317 37B3 693C 921B 480C C629 4A2A AAA3 82F8 294C";
+ }];
+ };
sfrijters = {
email = "sfrijters@gmail.com";
github = "sfrijters";
@@ -5975,7 +6241,7 @@
name = "Shahrukh Khan";
};
shanemikel = {
- email = "shanemikel1@gmail.com";
+ email = "shanepearlman@pm.me";
github = "shanemikel";
githubId = 6720672;
name = "Shane Pearlman";
@@ -6164,6 +6430,12 @@
githubId = 1437166;
name = "Xia Bin";
};
+ softinio = {
+ email = "code@softinio.com";
+ github = "softinio";
+ githubId = 3371635;
+ name = "Salar Rahmanian";
+ };
solson = {
email = "scott@solson.me";
github = "solson";
@@ -6491,6 +6763,12 @@
githubId = 506181;
name = "Peter Marheine";
};
+ tasmo = {
+ email = "tasmo@tasmo.de";
+ github = "tasmo";
+ githubId = 102685;
+ name = "Thomas Friese";
+ };
tavyc = {
email = "octavian.cerna@gmail.com";
github = "tavyc";
@@ -6590,6 +6868,12 @@
githubId = 42933;
name = "Andrew Childs";
};
+ thefenriswolf = {
+ email = "stefan.rohrbacher97@gmail.com";
+ github = "thefenriswolf";
+ githubId = 8547242;
+ name = "Stefan Rohrbacher";
+ };
thesola10 = {
email = "thesola10@bobile.fr";
github = "thesola10";
@@ -6677,6 +6961,16 @@
githubId = 13026;
name = "Jonathan Rudenberg";
};
+ tkerber = {
+ email = "tk@drwx.org";
+ github = "tkerber";
+ githubId = 5722198;
+ name = "Thomas Kerber";
+ keys = [ {
+ longkeyid = "rsa4096/0x8489B911F9ED617B";
+ fingerprint = "556A 403F B0A2 D423 F656 3424 8489 B911 F9ED 617B";
+ } ];
+ };
tmplt = {
email = "tmplt@dragons.rocks";
github = "tmplt";
@@ -6760,6 +7054,12 @@
githubId = 1312290;
name = "Trevor Joynson";
};
+ tricktron = {
+ email = "tgagnaux@gmail.com";
+ github = "tricktron";
+ githubId = 16036882;
+ name = "Thibault Gagnaux";
+ };
trino = {
email = "muehlhans.hubert@ekodia.de";
github = "hmuehlhans";
@@ -7093,6 +7393,12 @@
email = "kirill.wedens@gmail.com";
name = "wedens";
};
+ WhittlesJr = {
+ email = "alex.joseph.whitt@gmail.com";
+ github = "WhittlesJr";
+ githubId = 19174984;
+ name = "Alex Whitt";
+ };
willibutz = {
email = "willibutz@posteo.de";
github = "willibutz";
@@ -7308,14 +7614,24 @@
githubId = 1866448;
name = "Eric Bailey";
};
+ Yumasi = {
+ email = "gpagnoux@gmail.com";
+ github = "Yumasi";
+ githubId = 24368641;
+ name = "Guillaume Pagnoux";
+ keys = [{
+ longkeyid = "rsa4096/0xEC5065899AEAAF4C";
+ fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C";
+ }];
+ };
yvt = {
email = "i@yvt.jp";
github = "yvt";
githubId = 5253988;
name = "yvt";
};
- z77z = {
- email = "maggesi@math.unifi.it";
+ maggesi = {
+ email = "marco.maggesi@gmail.com";
github = "maggesi";
githubId = 1809783;
name = "Marco Maggesi";
@@ -7359,6 +7675,12 @@
email = "zef@zef.me";
name = "Zef Hemel";
};
+ zfnmxt = {
+ name = "zfnmxt";
+ email = "zfnmxt@zfnmxt.com";
+ github = "zfnmxt";
+ githubId = 37446532;
+ };
zgrannan = {
email = "zgrannan@gmail.com";
github = "zgrannan";
@@ -7431,6 +7753,12 @@
githubId = 1986844;
name = "Daniel Wheeler";
};
+ misuzu = {
+ email = "bakalolka@gmail.com";
+ github = "misuzu";
+ githubId = 248143;
+ name = "misuzu";
+ };
zokrezyl = {
email = "zokrezyl@gmail.com";
github = "zokrezyl";
@@ -7443,4 +7771,16 @@
githubId = 50867187;
name = "Rakesh Gupta";
};
+ mlatus = {
+ email = "wqseleven@gmail.com";
+ github = "Ninlives";
+ githubId = 17873203;
+ name = "mlatus";
+ };
+ waiting-for-dev = {
+ email = "marc@lamarciana.com";
+ github = "waiting-for-dev";
+ githubId = 52650;
+ name = "Marc Busqué";
+ };
}
diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
index 04723cb8a366..bbc3004b1c4e 100755
--- a/maintainers/scripts/update.nix
+++ b/maintainers/scripts/update.nix
@@ -105,7 +105,7 @@ let
to run all update scripts for all packages that lists \`garbas\` as a maintainer
and have \`updateScript\` defined, or:
- % nix-shell maintainers/scripts/update.nix --argstr package garbas
+ % nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus
to run update script for specific package, or
@@ -126,7 +126,7 @@ let
packageData = package: {
name = package.name;
- pname = (builtins.parseDrvName package.name).name;
+ pname = pkgs.lib.getName package;
updateScript = map builtins.toString (pkgs.lib.toList package.updateScript);
};
diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml
index 5bf0635cc1aa..df9ff2615e1a 100644
--- a/nixos/doc/manual/configuration/abstractions.xml
+++ b/nixos/doc/manual/configuration/abstractions.xml
@@ -11,50 +11,46 @@
{
=
- [ { hostName = "example.org";
- documentRoot = "/webroot";
+ { "blog.example.org" = {
+ documentRoot = "/webroot/blog.example.org";
adminAddr = "alice@example.org";
- enableUserDir = true;
- }
- { hostName = "example.org";
- documentRoot = "/webroot";
+ forceSSL = true;
+ enableACME = true;
+ enablePHP = true;
+ };
+ "wiki.example.org" = {
+ documentRoot = "/webroot/wiki.example.org";
adminAddr = "alice@example.org";
- enableUserDir = true;
- enableSSL = true;
- sslServerCert = "/root/ssl-example-org.crt";
- sslServerKey = "/root/ssl-example-org.key";
- }
- ];
+ forceSSL = true;
+ enableACME = true;
+ enablePHP = true;
+ };
+ };
}
It defines two virtual hosts with nearly identical configuration; the only
- difference is that the second one has SSL enabled. To prevent this
+ difference is the document root directories. To prevent this
duplication, we can use a let :
let
- exampleOrgCommon =
- { hostName = "example.org";
- documentRoot = "/webroot";
- adminAddr = "alice@example.org";
- enableUserDir = true;
+ commonConfig =
+ { adminAddr = "alice@example.org";
+ forceSSL = true;
+ enableACME = true;
};
in
{
=
- [ exampleOrgCommon
- (exampleOrgCommon // {
- enableSSL = true;
- sslServerCert = "/root/ssl-example-org.crt";
- sslServerKey = "/root/ssl-example-org.key";
- })
- ];
+ { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; });
+ "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; });
+ };
}
- The let exampleOrgCommon = ...
- defines a variable named exampleOrgCommon . The
+ The let commonConfig = ...
+ defines a variable named commonConfig . The
// operator merges two attribute sets, so the
configuration of the second virtual host is the set
- exampleOrgCommon extended with the SSL options.
+ commonConfig extended with the document root option.
@@ -63,13 +59,13 @@ in
{
=
- let exampleOrgCommon = ... ; in
- [ exampleOrgCommon
- (exampleOrgCommon // { ... })
- ];
+ let commonConfig = ... ; in
+ { "blog.example.org" = (commonConfig // { ... })
+ "wiki.example.org" = (commonConfig // { ... })
+ };
}
- but not { let exampleOrgCommon = ... ; in
+ but not { let commonConfig = ... ; in
... ; } since attributes (as opposed to
attribute values) are not expressions.
@@ -77,80 +73,29 @@ in
Functions provide another method of abstraction. For
instance, suppose that we want to generate lots of different virtual hosts,
- all with identical configuration except for the host name. This can be done
+ all with identical configuration except for the document root. This can be done
as follows:
{
=
let
- makeVirtualHost = name:
- { hostName = name;
- documentRoot = "/webroot";
+ makeVirtualHost = webroot:
+ { documentRoot = webroot;
adminAddr = "alice@example.org";
+ forceSSL = true;
+ enableACME = true;
};
in
- [ (makeVirtualHost "example.org")
- (makeVirtualHost "example.com")
- (makeVirtualHost "example.gov")
- (makeVirtualHost "example.nl")
- ];
+ { "example.org" = (makeVirtualHost "/webroot/example.org");
+ "example.com" = (makeVirtualHost "/webroot/example.com");
+ "example.gov" = (makeVirtualHost "/webroot/example.gov");
+ "example.nl" = (makeVirtualHost "/webroot/example.nl");
+ };
}
Here, makeVirtualHost is a function that takes a single
- argument name and returns the configuration for a virtual
+ argument webroot and returns the configuration for a virtual
host. That function is then called for several names to produce the list of
virtual host configurations.
-
-
- We can further improve on this by using the function map ,
- which applies another function to every element in a list:
-
-{
- =
- let
- makeVirtualHost = ... ;
- in map makeVirtualHost
- [ "example.org" "example.com" "example.gov" "example.nl" ];
-}
-
- (The function map is called a higher-order
- function because it takes another function as an argument.)
-
-
-
- What if you need more than one argument, for instance, if we want to use a
- different documentRoot for each virtual host? Then we can
- make makeVirtualHost a function that takes a
- set as its argument, like this:
-
-{
- =
- let
- makeVirtualHost = { name, root }:
- { hostName = name;
- documentRoot = root;
- adminAddr = "alice@example.org";
- };
- in map makeVirtualHost
- [ { name = "example.org"; root = "/sites/example.org"; }
- { name = "example.com"; root = "/sites/example.com"; }
- { name = "example.gov"; root = "/sites/example.gov"; }
- { name = "example.nl"; root = "/sites/example.nl"; }
- ];
-}
-
- But in this case (where every root is a subdirectory of
- /sites named after the virtual host), it would have been
- shorter to define makeVirtualHost as
-
-makeVirtualHost = name:
- { hostName = name;
- documentRoot = "/sites/${name}";
- adminAddr = "alice@example.org";
- };
-
- Here, the construct ${... }
- allows the result of an expression to be spliced into a string.
-
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index eadafb94b8f6..7ccb5b3664ea 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -27,7 +27,7 @@
{ = true;
= "alice@example.org";
- = "/webroot";
+ services.httpd.virtualHosts.localhost.documentRoot = "/webroot";
}
defines a configuration with three option definitions that together enable
@@ -50,7 +50,11 @@
httpd = {
enable = true;
adminAddr = "alice@example.org";
- documentRoot = "/webroot";
+ virtualHosts = {
+ localhost = {
+ documentRoot = "/webroot";
+ };
+ };
};
};
}
diff --git a/nixos/doc/manual/configuration/profiles/graphical.xml b/nixos/doc/manual/configuration/profiles/graphical.xml
index 73e3abc59d0c..cc6d0825d241 100644
--- a/nixos/doc/manual/configuration/profiles/graphical.xml
+++ b/nixos/doc/manual/configuration/profiles/graphical.xml
@@ -13,9 +13,7 @@
It sets ,
,
- (
-
- without Qt4 Support), and
+ , and
to true. It also
includes glxinfo and firefox in the system packages list.
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index f6f659b02afa..55ad9fe6e653 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -39,7 +39,7 @@
can select an alternative one by picking one of the following lines:
= true;
- = true;
+ = true;
@@ -83,8 +83,7 @@
desktop environment. If you wanted no desktop environment and i3 as your your
window manager, you'd define:
- = "none";
- = "i3";
+ = "none+i3";
And, finally, to enable auto-login for a user johndoe :
diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index 6ac99c6b2bee..027828bb936d 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -7,9 +7,8 @@
To enable the Xfce Desktop Environment, set
- services.xserver.desktopManager = {
- xfce.enable = true;
- default = "xfce";
+ = true;
+ = "xfce";
};
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index eee81bf64263..56ebf4816306 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -99,7 +99,7 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
As an example, we will take the case of display managers. There is a central
display manager module for generic display manager options and a module file
- per display manager backend (slim, sddm, gdm ...).
+ per display manager backend (sddm, gdm ...).
@@ -146,7 +146,7 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
/>), and to extend
it in each backend module
( ,
+ linkend='ex-option-declaration-eot-backend-gdm' />,
).
@@ -167,11 +167,11 @@ services.xserver.displayManager.enable = mkOption {
};
-
- Extending services.xserver.displayManager.enable in the slim module
+
+ Extending services.xserver.displayManager.enable in the gdm module
services.xserver.displayManager.enable = mkOption {
- type = with types; nullOr (enum [ "slim" ]);
+ type = with types; nullOr (enum [ "gdm" ]);
};
diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index 1cdec64f69b0..9371af9984d1 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -45,12 +45,12 @@
git tag -a -s -m "Release 17.09-beta" 17.09-beta
- && git push --tags
+ && git push origin 17.09-beta
- From the master branch run git checkout -B
+ From the master branch run git checkout -b
release-17.09 .
@@ -157,7 +157,7 @@
Release Nix (currently only Eelco Dolstra can do that).
-
+
Make sure fallback is updated.
@@ -169,8 +169,8 @@
- Change stableBranch to true and wait for channel to
- update.
+ Change stableBranch to true in Hydra and wait for
+ the channel to update.
@@ -193,9 +193,11 @@
- Update http://nixos.org/nixos/download.html and
- http://nixos.org/nixos/manual in
- https://github.com/NixOS/nixos-org-configurations
+ Update the
+ NIXOS_SERIES
+ in the
+ nixos-homepage
+ repository.
@@ -212,7 +214,8 @@
- Send an email to nix-dev to announce the release with above information.
+ Create a new topic on the
+ Discourse instance to announce the release with the above information.
Best to check how previous email was formulated to see what needs to be
included.
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
index ea3ba0e4bf78..31216874c706 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
@@ -2,7 +2,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
- xml:id="sec-running-nixos-tests">
+ xml:id="sec-running-nixos-tests-interactively">
Running Tests interactively
diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml
index 13ae1ed93699..e9257c907daf 100644
--- a/nixos/doc/manual/development/running-nixos-tests.xml
+++ b/nixos/doc/manual/development/running-nixos-tests.xml
@@ -2,7 +2,7 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
- xml:id="sec-running-nixos-tests-interactively">
+ xml:id="sec-running-nixos-tests">
Running Tests
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
index 24efd2e3273a..e5a887c18c77 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.xml
+++ b/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -419,4 +419,23 @@ machine.wait_for_unit("xautolock.service", "x-session-user")
wait_for_unit , start_job and
stop_job .
+
+
+ For faster dev cycles it's also possible to disable the code-linters (this shouldn't
+ be commited though):
+
+import ./make-test-python.nix {
+ skipLint = true;
+ machine =
+ { config, pkgs, ... }:
+ { configuration…
+ };
+
+ testScript =
+ ''
+ Python code…
+ '';
+}
+
+
diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
index 5c86eacfbf45..0ba909fa953f 100644
--- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml
+++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
@@ -47,6 +47,11 @@
acceleration
+
+
+ Click on Settings / Display / Screen and select VBoxVGA as Graphics Controller
+
+
Save the settings, start the virtual machine, and continue installation
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 8ff920eb5a88..4041b4ad163a 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -380,7 +380,10 @@
If you need to configure networking for your machine the configuration
- options are described in .
+ options are described in . In particular,
+ while wifi is supported on the installation image, it is not enabled by
+ default in the configuration generated by
+ nixos-generate-config .
Another critical option is fileSystems , specifying the
@@ -392,11 +395,11 @@
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.) Additionally, you may want to look at
+ generally should not modify it.) Additionally, you may want to look at
Hardware
configuration for known-hardware at this point or after
installation.
-
+
@@ -418,11 +421,11 @@
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 .
+ This will install your system based on the configuration you provided.
+ If anything fails due to a configuration problem or any other issue
+ (such as a network outage while downloading binaries from the NixOS
+ binary cache), you can re-run nixos-install after
+ fixing your configuration.nix .
As the last step, nixos-install will ask you to set the
@@ -475,7 +478,7 @@ Retype new UNIX password: ***
shows what packages are available, and
$ nix-env -f '<nixpkgs>' -iA w3m
- install the w3m browser.
+ installs the w3m browser.
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index beabf020c92a..b82f31256099 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -119,4 +119,13 @@ Defined by:
bug, please report to Nicolas Pierron.
+
+ See also
+
+
+ configuration.nix
+ 5
+
+
+
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index c697b7ee0472..495dbc8859b1 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -494,6 +494,20 @@
+
+
+
+ --use-remote-sudo
+
+
+
+ When set, nixos-rebuild prefixes remote commands that run on
+ the --build-host and --target-host
+ systems with sudo . Setting this option allows
+ deploying as a non-root user.
+
+
+
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 8bd353a34304..4102fe206e19 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -543,7 +543,7 @@
The networking.useDHCP option is unsupported in combination with
- networking.useNetworkd in anticipation of defaulting to it by default.
+ networking.useNetworkd in anticipation of defaulting to it.
It has to be set to false and enabled per
interface with networking.interfaces.<name>.useDHCP = true;
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 72766f16eb9f..1c1c8908064a 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -55,6 +55,19 @@
and adding a --all option which prints all options and their values.
+
+
+ services.xserver.desktopManager.default and services.xserver.windowManager.default options were replaced by a single option to improve support for upstream session files. If you used something like:
+
+services.xserver.desktopManager.default = "xfce";
+services.xserver.windowManager.default = "icewm";
+
+ you should change it to:
+
+services.xserver.displayManager.defaultSession = "xfce+icewm";
+
+
+
@@ -71,7 +84,17 @@
-
+
+ The kubernetes kube-proxy now supports a new hostname configuration
+ services.kubernetes.proxy.hostname which has to
+ be set if the hostname of the node should be non default.
+
+
+
+
+ UPower's configuration is now managed by NixOS and can be customized
+ via services.upower .
+
@@ -117,18 +140,213 @@
- The 99-main.network file was removed. Maching all
- network interfaces caused many breakages, see
- #18962
- and #71106.
+ The 99-main.network file was removed. Maching all
+ network interfaces caused many breakages, see
+ #18962
+ and #71106.
- We already don't support the global networking.useDHCP,
- networking.defaultGateway and
- networking.defaultGateway6 options
- if networking.useNetworkd is enabled,
- but direct users to configure the per-device
- networking.interfaces.<name>.… options.
+ We already don't support the global networking.useDHCP,
+ networking.defaultGateway and
+ networking.defaultGateway6 options
+ if networking.useNetworkd is enabled,
+ but direct users to configure the per-device
+ networking.interfaces.<name>.… options.
+
+
+
+
+ The stdenv now runs all bash with set -u , to catch the use of undefined variables.
+ Before, it itself used set -u but was careful to unset it so other packages' code ran as before.
+ Now, all bash code is held to the same high standard, and the rather complex stateful manipulation of the options can be discarded.
+
+
+
+
+ The SLIM Display Manager has been removed, as it has been unmaintained since 2013.
+ Consider migrating to a different display manager such as LightDM (current default in NixOS),
+ SDDM, GDM, or using the startx module which uses Xinitrc.
+
+
+
+
+ The BEAM package set has been deleted. You will only find there the different interpreters.
+ You should now use the different build tools coming with the languages with sandbox mode disabled.
+
+
+
+
+ There is now only one Xfce package-set and module. This means attributes, xfce4-14
+ xfce4-12 , and xfceUnstable all now point to the latest Xfce 4.14
+ packages. And in future NixOS releases will be the latest released version of Xfce available at the
+ time during the releases development (if viable).
+
+
+
+
+ The phpfpm module now sets
+ PrivateTmp=true in its systemd units for better process isolation.
+ If you rely on /tmp being shared with other services, explicitly override this by
+ setting serviceConfig.PrivateTmp to false for each phpfpm unit.
+
+
+
+
+ KDE’s old multimedia framework Phonon no longer supports Qt 4. For that reason, Plasma desktop also does not have enableQt4Support option any more.
+
+
+
+
+ The BeeGFS module has been removed.
+
+
+
+
+ The osquery module has been removed.
+
+
+
+
+ Going forward, ~/bin in the users home directory will no longer be in PATH by default.
+ If you depend on this you should set the option environment.homeBinInPath to true .
+ The aforementioned option was added this release.
+
+
+
+
+ The buildRustCrate infrastructure now produces lib outputs in addition to the out output.
+ This has led to drastically reduced closed sizes for some rust crates since development dependencies are now in the lib output.
+
+
+
+
+ Pango was upgraded to 1.44, which no longer uses freetype for font loading. This means that type1
+ and bitmap fonts are no longer supported in applications relying on Pango for font rendering
+ (notably, GTK application). See
+ upstream issue for more information.
+
+
+
+
+ The packages openobex and obexftp
+ are no longer installed when enabling Bluetooth via
+ hardware.bluetooth.enable .
+
+
+
+
+ The dump1090 derivation has been changed to use FlightAware's dump1090
+ as its upstream. However, this version does not have an internal webserver anymore. The
+ assets in the share/dump1090 directory of the derivation can be used
+ in conjunction with an external webserver to replace this functionality.
+
+
+
+
+ The fourStore and fourStoreEndpoint modules have been removed.
+
+
+
+
+ Polkit no longer has the user of uid 0 (root) as an admin identity.
+ We now follow the upstream default of only having every member of the wheel
+ group admin privileged. Before it was root and members of wheel.
+ The positive outcome of this is pkexec GUI popups or terminal prompts
+ will no longer require the user to choose between two essentially equivalent
+ choices (whether to perform the action as themselves with wheel permissions, or as the root user).
+
+
+
+
+ NixOS containers no longer build NixOS manual by default. This saves evaluation time,
+ especially if there are many declarative containers defined. Note that this is already done
+ when <nixos/modules/profiles/minimal.nix> module is included
+ in container config.
+
+
+
+
+ Virtual console options have been reorganized and can be found under
+ a single top-level attribute: console .
+ The full set of changes is as follows:
+
+
+
+
+ i18n.consoleFont renamed to
+ console.font
+
+
+
+
+ i18n.consoleKeyMap renamed to
+ console.keyMap
+
+
+
+
+ i18n.consoleColors renamed to
+ console.colors
+
+
+
+
+ i18n.consolePackages renamed to
+ console.packages
+
+
+
+
+ i18n.consoleUseXkbConfig renamed to
+ console.useXkbConfig
+
+
+
+
+ boot.earlyVconsoleSetup renamed to
+ console.earlySetup
+
+
+
+
+ boot.extraTTYs renamed to
+ console.extraTTYs
+
+
+
+
+
+
+ The awstats module has been rewritten
+ to serve stats via static html pages, updated on a timer, over nginx,
+ instead of dynamic cgi pages over apache.
+
+
+ Minor changes will be required to migrate existing configurations. Details of the
+ required changes can seen by looking through the awstats
+ module.
+
+
+
+
+ The httpd module no longer provides options to support serving web content without defining a virtual host. As a
+ result of this the services.httpd.logPerVirtualHost
+ option now defaults to true instead of false . Please update your
+ configuration to make use of services.httpd.virtualHosts.
+
+
+ The services.httpd.virtualHosts.<name>
+ option has changed type from a list of submodules to an attribute set of submodules, better matching
+ services.nginx.virtualHosts.<name>.
+
+
+ This change comes with the addition of the following options which mimic the functionality of their nginx counterparts:
+ services.httpd.virtualHosts.<name>.addSSL,
+ services.httpd.virtualHosts.<name>.forceSSL,
+ services.httpd.virtualHosts.<name>.onlySSL,
+ services.httpd.virtualHosts.<name>.enableACME,
+ services.httpd.virtualHosts.<name>.acmeRoot, and
+ services.httpd.virtualHosts.<name>.useACMEHost.
@@ -145,6 +363,18 @@
SD images are now compressed by default using bzip2 .
+
+
+ The nginx web server previously started its master process as root
+ privileged, then ran worker processes as a less privileged identity user.
+ This was changed to start all of nginx as a less privileged user (defined by
+ services.nginx.user and
+ services.nginx.group ). As a consequence, all files that
+ are needed for nginx to run (included configuration fragments, SSL
+ certificates and keys, etc.) must now be readable by this less privileged
+ user/group.
+
+
OpenSSH has been upgraded from 7.9 to 8.1, improving security and adding features
@@ -153,6 +383,12 @@
release announcement for more information.
+
+
+ PRETTY_NAME in /etc/os-release
+ now uses the short rather than full version string.
+
+
diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index 932adcd97967..f46d3990c06b 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -4,8 +4,11 @@
# generated image is sized to only fit its contents, with the expectation
# that a script resizes the filesystem at boot time.
{ pkgs
+, lib
# List of derivations to be included
, storePaths
+# Whether or not to compress the resulting image with zstd
+, compressImage ? false, zstd
# Shell commands to populate the ./files directory.
# All files in that directory are copied to the root of the FS.
, populateImageCommands ? ""
@@ -20,18 +23,20 @@
let
sdClosureInfo = pkgs.buildPackages.closureInfo { rootPaths = storePaths; };
in
-
pkgs.stdenv.mkDerivation {
- name = "ext4-fs.img";
+ name = "ext4-fs.img${lib.optionalString compressImage ".zst"}";
- nativeBuildInputs = [e2fsprogs.bin libfaketime perl lkl];
+ nativeBuildInputs = [ e2fsprogs.bin libfaketime perl lkl ]
+ ++ lib.optional compressImage zstd;
buildCommand =
''
+ ${if compressImage then "img=temp.img" else "img=$out"}
(
mkdir -p ./files
${populateImageCommands}
)
+
# Add the closures of the top-level store objects.
storePaths=$(cat ${sdClosureInfo}/store-paths)
@@ -42,28 +47,26 @@ pkgs.stdenv.mkDerivation {
bytes=$((2 * 4096 * $numInodes + 4096 * $numDataBlocks))
echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)"
- truncate -s $bytes $out
- faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $out
+ truncate -s $bytes $img
+ faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $img
# Also include a manifest of the closures in a format suitable for nix-store --load-db.
cp ${sdClosureInfo}/registration nix-path-registration
- cptofs -t ext4 -i $out nix-path-registration /
+ cptofs -t ext4 -i $img nix-path-registration /
# Create nix/store before copying paths
faketime -f "1970-01-01 00:00:01" mkdir -p nix/store
- cptofs -t ext4 -i $out nix /
+ cptofs -t ext4 -i $img nix /
echo "copying store paths to image..."
- cptofs -t ext4 -i $out $storePaths /nix/store/
+ cptofs -t ext4 -i $img $storePaths /nix/store/
- (
echo "copying files to image..."
- cd ./files
- cptofs -t ext4 -i $out ./* /
- )
+ cptofs -t ext4 -i $img ./files/* /
+
# I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build.
- if ! fsck.ext4 -n -f $out; then
+ if ! fsck.ext4 -n -f $img; then
echo "--- Fsck failed for EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---"
cat errorlog
return 1
@@ -71,9 +74,9 @@ pkgs.stdenv.mkDerivation {
(
# Resizes **snugly** to its actual limits (or closer to)
- free=$(dumpe2fs $out | grep '^Free blocks:')
- blocksize=$(dumpe2fs $out | grep '^Block size:')
- blocks=$(dumpe2fs $out | grep '^Block count:')
+ free=$(dumpe2fs $img | grep '^Free blocks:')
+ blocksize=$(dumpe2fs $img | grep '^Block size:')
+ blocks=$(dumpe2fs $img | grep '^Block count:')
blocks=$((''${blocks##*:})) # format the number.
blocksize=$((''${blocksize##*:})) # format the number.
# System can't boot with 0 blocks free.
@@ -82,10 +85,15 @@ pkgs.stdenv.mkDerivation {
size=$(( blocks - ''${free##*:} + fudge ))
echo "Resizing from $blocks blocks to $size blocks. (~ $((size*blocksize/1024/1024))MiB)"
- EXT2FS_NO_MTAB_OK=yes resize2fs $out -f $size
+ EXT2FS_NO_MTAB_OK=yes resize2fs $img -f $size
)
# And a final fsck, because of the previous truncating.
- fsck.ext4 -n -f $out
+ fsck.ext4 -n -f $img
+
+ if [ ${builtins.toString compressImage} ]; then
+ echo "Compressing image"
+ zstd -v --no-progress ./$img -o $out
+ fi
'';
}
diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix
index 35c8b543dece..eee8f612410d 100644
--- a/nixos/lib/make-options-doc/default.nix
+++ b/nixos/lib/make-options-doc/default.nix
@@ -86,7 +86,7 @@ let
optionsList = lib.sort optionLess optionsListDesc;
# Convert the list of options into an XML file.
- optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList);
+ optionsXML = pkgs.writeText "options.xml" (builtins.toXML optionsList);
optionsNix = builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList);
diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 45b7e229a5c6..7e575189209a 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -1,12 +1,12 @@
#! /somewhere/python3
-
-from contextlib import contextmanager
+from contextlib import contextmanager, _GeneratorContextManager
from xml.sax.saxutils import XMLGenerator
import _thread
import atexit
import os
+import ptpython.repl
import pty
-import queue
+from queue import Queue, Empty
import re
import shutil
import socket
@@ -15,7 +15,9 @@ import sys
import tempfile
import time
import unicodedata
-import ptpython.repl
+from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List
+import shlex
+import pathlib
CHAR_TO_KEY = {
"A": "shift-a",
@@ -80,12 +82,22 @@ CHAR_TO_KEY = {
")": "shift-0x0B",
}
+# Forward references
+nr_tests: int
+nr_succeeded: int
+log: "Logger"
+machines: "List[Machine]"
-def eprint(*args, **kwargs):
+
+def eprint(*args: object, **kwargs: Any) -> None:
print(*args, file=sys.stderr, **kwargs)
-def create_vlan(vlan_nr):
+def make_command(args: list) -> str:
+ return " ".join(map(shlex.quote, (map(str, args))))
+
+
+def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]:
global log
log.log("starting VDE switch for network {}".format(vlan_nr))
vde_socket = os.path.abspath("./vde{}.ctl".format(vlan_nr))
@@ -109,7 +121,7 @@ def create_vlan(vlan_nr):
return (vlan_nr, vde_socket, vde_process, fd)
-def retry(fn):
+def retry(fn: Callable) -> None:
"""Call the given function repeatedly, with 1 second intervals,
until it returns True or a timeout is reached.
"""
@@ -124,52 +136,52 @@ def retry(fn):
class Logger:
- def __init__(self):
+ def __init__(self) -> None:
self.logfile = os.environ.get("LOGFILE", "/dev/null")
self.logfile_handle = open(self.logfile, "wb")
self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8")
- self.queue = queue.Queue(1000)
+ self.queue: "Queue[Dict[str, str]]" = Queue(1000)
self.xml.startDocument()
self.xml.startElement("logfile", attrs={})
- def close(self):
+ def close(self) -> None:
self.xml.endElement("logfile")
self.xml.endDocument()
self.logfile_handle.close()
- def sanitise(self, message):
+ def sanitise(self, message: str) -> str:
return "".join(ch for ch in message if unicodedata.category(ch)[0] != "C")
- def maybe_prefix(self, message, attributes):
+ def maybe_prefix(self, message: str, attributes: Dict[str, str]) -> str:
if "machine" in attributes:
return "{}: {}".format(attributes["machine"], message)
return message
- def log_line(self, message, attributes):
+ def log_line(self, message: str, attributes: Dict[str, str]) -> None:
self.xml.startElement("line", attributes)
self.xml.characters(message)
self.xml.endElement("line")
- def log(self, message, attributes={}):
+ def log(self, message: str, attributes: Dict[str, str] = {}) -> None:
eprint(self.maybe_prefix(message, attributes))
self.drain_log_queue()
self.log_line(message, attributes)
- def enqueue(self, message):
+ def enqueue(self, message: Dict[str, str]) -> None:
self.queue.put(message)
- def drain_log_queue(self):
+ def drain_log_queue(self) -> None:
try:
while True:
item = self.queue.get_nowait()
attributes = {"machine": item["machine"], "type": "serial"}
self.log_line(self.sanitise(item["msg"]), attributes)
- except queue.Empty:
+ except Empty:
pass
@contextmanager
- def nested(self, message, attributes={}):
+ def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
eprint(self.maybe_prefix(message, attributes))
self.xml.startElement("nest", attrs={})
@@ -188,41 +200,39 @@ class Logger:
class Machine:
- def __init__(self, args):
+ def __init__(self, args: Dict[str, Any]) -> None:
if "name" in args:
self.name = args["name"]
else:
self.name = "machine"
- try:
- cmd = args["startCommand"]
- self.name = re.search("run-(.+)-vm$", cmd).group(1)
- except KeyError:
- pass
- except AttributeError:
- pass
+ cmd = args.get("startCommand", None)
+ if cmd:
+ match = re.search("run-(.+)-vm$", cmd)
+ if match:
+ self.name = match.group(1)
self.script = args.get("startCommand", self.create_startcommand(args))
tmp_dir = os.environ.get("TMPDIR", tempfile.gettempdir())
- def create_dir(name):
+ def create_dir(name: str) -> str:
path = os.path.join(tmp_dir, name)
os.makedirs(path, mode=0o700, exist_ok=True)
return path
self.state_dir = create_dir("vm-state-{}".format(self.name))
- self.shared_dir = create_dir("xchg-shared")
+ self.shared_dir = create_dir("{}/xchg".format(self.state_dir))
self.booted = False
self.connected = False
- self.pid = None
+ self.pid: Optional[int] = None
self.socket = None
- self.monitor = None
- self.logger = args["log"]
+ self.monitor: Optional[socket.socket] = None
+ self.logger: Logger = args["log"]
self.allow_reboot = args.get("allowReboot", False)
@staticmethod
- def create_startcommand(args):
+ def create_startcommand(args: Dict[str, str]) -> str:
net_backend = "-netdev user,id=net0"
net_frontend = "-device virtio-net-pci,netdev=net0"
@@ -272,31 +282,43 @@ class Machine:
return start_command
- def is_up(self):
+ def is_up(self) -> bool:
return self.booted and self.connected
- def log(self, msg):
+ def log(self, msg: str) -> None:
self.logger.log(msg, {"machine": self.name})
- def nested(self, msg, attrs={}):
+ def nested(self, msg: str, attrs: Dict[str, str] = {}) -> _GeneratorContextManager:
my_attrs = {"machine": self.name}
my_attrs.update(attrs)
return self.logger.nested(msg, my_attrs)
- def wait_for_monitor_prompt(self):
+ def wait_for_monitor_prompt(self) -> str:
+ assert self.monitor is not None
+ answer = ""
while True:
- answer = self.monitor.recv(1024).decode()
+ undecoded_answer = self.monitor.recv(1024)
+ if not undecoded_answer:
+ break
+ answer += undecoded_answer.decode()
if answer.endswith("(qemu) "):
- return answer
+ break
+ return answer
- def send_monitor_command(self, command):
+ def send_monitor_command(self, command: str) -> str:
message = ("{}\n".format(command)).encode()
self.log("sending monitor command: {}".format(command))
+ assert self.monitor is not None
self.monitor.send(message)
return self.wait_for_monitor_prompt()
- def wait_for_unit(self, unit, user=None):
- while True:
+ def wait_for_unit(self, unit: str, user: Optional[str] = None) -> None:
+ """Wait for a systemd unit to get into "active" state.
+ Throws exceptions on "failed" and "inactive" states as well as
+ after timing out.
+ """
+
+ def check_active(_: Any) -> bool:
info = self.get_unit_info(unit, user)
state = info["ActiveState"]
if state == "failed":
@@ -305,25 +327,32 @@ class Machine:
if state == "inactive":
status, jobs = self.systemctl("list-jobs --full 2>&1", user)
if "No jobs" in jobs:
- info = self.get_unit_info(unit)
+ info = self.get_unit_info(unit, user)
if info["ActiveState"] == state:
raise Exception(
(
'unit "{}" is inactive and there ' "are no pending jobs"
).format(unit)
)
- if state == "active":
- return True
- def get_unit_info(self, unit, user=None):
+ return state == "active"
+
+ retry(check_active)
+
+ def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]:
status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user)
if status != 0:
- return None
+ raise Exception(
+ 'retrieving systemctl info for unit "{}" {} failed with exit code {}'.format(
+ unit, "" if user is None else 'under user "{}"'.format(user), status
+ )
+ )
line_pattern = re.compile(r"^([^=]+)=(.*)$")
- def tuple_from_line(line):
+ def tuple_from_line(line: str) -> Tuple[str, str]:
match = line_pattern.match(line)
+ assert match is not None
return match[1], match[2]
return dict(
@@ -332,7 +361,7 @@ class Machine:
if line_pattern.match(line)
)
- def systemctl(self, q, user=None):
+ def systemctl(self, q: str, user: Optional[str] = None) -> Tuple[int, str]:
if user is not None:
q = q.replace("'", "\\'")
return self.execute(
@@ -344,7 +373,19 @@ class Machine:
)
return self.execute("systemctl {}".format(q))
- def execute(self, command):
+ def require_unit_state(self, unit: str, require_state: str = "active") -> None:
+ with self.nested(
+ "checking if unit ‘{}’ has reached state '{}'".format(unit, require_state)
+ ):
+ info = self.get_unit_info(unit)
+ state = info["ActiveState"]
+ if state != require_state:
+ raise Exception(
+ "Expected unit ‘{}’ to to be in state ".format(unit)
+ + "'active' but it is in state ‘{}’".format(state)
+ )
+
+ def execute(self, command: str) -> Tuple[int, str]:
self.connect()
out_command = "( {} ); echo '|!EOF' $?\n".format(command)
@@ -362,19 +403,21 @@ class Machine:
return (status_code, output)
output += chunk
- def succeed(self, *commands):
+ def succeed(self, *commands: str) -> str:
"""Execute each command and check that it succeeds."""
+ output = ""
for command in commands:
with self.nested("must succeed: {}".format(command)):
- status, output = self.execute(command)
+ (status, out) = self.execute(command)
if status != 0:
- self.log("output: {}".format(output))
+ self.log("output: {}".format(out))
raise Exception(
"command `{}` failed (exit code {})".format(command, status)
)
- return output
+ output += out
+ return output
- def fail(self, *commands):
+ def fail(self, *commands: str) -> None:
"""Execute each command and check that it fails."""
for command in commands:
with self.nested("must fail: {}".format(command)):
@@ -384,21 +427,37 @@ class Machine:
"command `{}` unexpectedly succeeded".format(command)
)
- def wait_until_succeeds(self, command):
+ def wait_until_succeeds(self, command: str) -> str:
+ """Wait until a command returns success and return its output.
+ Throws an exception on timeout.
+ """
+ output = ""
+
+ def check_success(_: Any) -> bool:
+ nonlocal output
+ status, output = self.execute(command)
+ return status == 0
+
with self.nested("waiting for success: {}".format(command)):
- while True:
- status, output = self.execute(command)
- if status == 0:
- return output
+ retry(check_success)
+ return output
+
+ def wait_until_fails(self, command: str) -> str:
+ """Wait until a command returns failure.
+ Throws an exception on timeout.
+ """
+ output = ""
+
+ def check_failure(_: Any) -> bool:
+ nonlocal output
+ status, output = self.execute(command)
+ return status != 0
- def wait_until_fails(self, command):
with self.nested("waiting for failure: {}".format(command)):
- while True:
- status, output = self.execute(command)
- if status != 0:
- return output
+ retry(check_failure)
+ return output
- def wait_for_shutdown(self):
+ def wait_for_shutdown(self) -> None:
if not self.booted:
return
@@ -410,58 +469,71 @@ class Machine:
self.booted = False
self.connected = False
- def get_tty_text(self, tty):
+ def get_tty_text(self, tty: str) -> str:
status, output = self.execute(
"fold -w$(stty -F /dev/tty{0} size | "
"awk '{{print $2}}') /dev/vcs{0}".format(tty)
)
return output
- def wait_until_tty_matches(self, tty, regexp):
+ def wait_until_tty_matches(self, tty: str, regexp: str) -> None:
+ """Wait until the visible output on the chosen TTY matches regular
+ expression. Throws an exception on timeout.
+ """
matcher = re.compile(regexp)
- with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)):
- while True:
- text = self.get_tty_text(tty)
- if len(matcher.findall(text)) > 0:
- return True
- def send_chars(self, chars):
+ def tty_matches(last: bool) -> bool:
+ text = self.get_tty_text(tty)
+ if last:
+ self.log(
+ f"Last chance to match /{regexp}/ on TTY{tty}, "
+ f"which currently contains: {text}"
+ )
+ return len(matcher.findall(text)) > 0
+
+ with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)):
+ retry(tty_matches)
+
+ def send_chars(self, chars: List[str]) -> None:
with self.nested("sending keys ‘{}‘".format(chars)):
for char in chars:
self.send_key(char)
- def wait_for_file(self, filename):
- with self.nested("waiting for file ‘{}‘".format(filename)):
- while True:
- status, _ = self.execute("test -e {}".format(filename))
- if status == 0:
- return True
+ def wait_for_file(self, filename: str) -> None:
+ """Waits until the file exists in machine's file system."""
- def wait_for_open_port(self, port):
- def port_is_open(_):
+ def check_file(_: Any) -> bool:
+ status, _ = self.execute("test -e {}".format(filename))
+ return status == 0
+
+ with self.nested("waiting for file ‘{}‘".format(filename)):
+ retry(check_file)
+
+ def wait_for_open_port(self, port: int) -> None:
+ def port_is_open(_: Any) -> bool:
status, _ = self.execute("nc -z localhost {}".format(port))
return status == 0
with self.nested("waiting for TCP port {}".format(port)):
retry(port_is_open)
- def wait_for_closed_port(self, port):
- def port_is_closed(_):
+ def wait_for_closed_port(self, port: int) -> None:
+ def port_is_closed(_: Any) -> bool:
status, _ = self.execute("nc -z localhost {}".format(port))
return status != 0
retry(port_is_closed)
- def start_job(self, jobname, user=None):
+ def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]:
return self.systemctl("start {}".format(jobname), user)
- def stop_job(self, jobname, user=None):
+ def stop_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]:
return self.systemctl("stop {}".format(jobname), user)
- def wait_for_job(self, jobname):
- return self.wait_for_unit(jobname)
+ def wait_for_job(self, jobname: str) -> None:
+ self.wait_for_unit(jobname)
- def connect(self):
+ def connect(self) -> None:
if self.connected:
return
@@ -477,7 +549,7 @@ class Machine:
self.log("(connecting took {:.2f} seconds)".format(toc - tic))
self.connected = True
- def screenshot(self, filename):
+ def screenshot(self, filename: str) -> None:
out_dir = os.environ.get("out", os.getcwd())
word_pattern = re.compile(r"^\w+$")
if word_pattern.match(filename):
@@ -494,7 +566,39 @@ class Machine:
if ret.returncode != 0:
raise Exception("Cannot convert screenshot")
- def get_screen_text(self):
+ def copy_from_vm(self, source: str, target_dir: str = "") -> None:
+ """Copy a file from the VM (specified by an in-VM source path) to a path
+ relative to `$out`. The file is copied via the `shared_dir` shared among
+ all the VMs (using a temporary directory).
+ """
+ # Compute the source, target, and intermediate shared file names
+ out_dir = pathlib.Path(os.environ.get("out", os.getcwd()))
+ vm_src = pathlib.Path(source)
+ with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td:
+ shared_temp = pathlib.Path(shared_td)
+ vm_shared_temp = pathlib.Path("/tmp/xchg") / shared_temp.name
+ vm_intermediate = vm_shared_temp / vm_src.name
+ intermediate = shared_temp / vm_src.name
+ # Copy the file to the shared directory inside VM
+ self.succeed(make_command(["mkdir", "-p", vm_shared_temp]))
+ self.succeed(make_command(["cp", "-r", vm_src, vm_intermediate]))
+ self.succeed("sync")
+ abs_target = out_dir / target_dir / vm_src.name
+ abs_target.parent.mkdir(exist_ok=True, parents=True)
+ # Copy the file from the shared directory outside VM
+ if intermediate.is_dir():
+ shutil.copytree(intermediate, abs_target)
+ else:
+ shutil.copy(intermediate, abs_target)
+ # Make sure the cleanup is synced into VM
+ self.succeed("sync")
+
+ def dump_tty_contents(self, tty: str) -> None:
+ """Debugging: Dump the contents of the TTY
+ """
+ self.execute("fold -w 80 /dev/vcs{} | systemd-cat".format(tty))
+
+ def get_screen_text(self) -> str:
if shutil.which("tesseract") is None:
raise Exception("get_screen_text used but enableOCR is false")
@@ -522,30 +626,30 @@ class Machine:
return ret.stdout.decode("utf-8")
- def wait_for_text(self, regex):
- def screen_matches(last):
+ def wait_for_text(self, regex: str) -> None:
+ def screen_matches(last: bool) -> bool:
text = self.get_screen_text()
- m = re.search(regex, text)
+ matches = re.search(regex, text) is not None
- if last and not m:
+ if last and not matches:
self.log("Last OCR attempt failed. Text was: {}".format(text))
- return m
+ return matches
with self.nested("waiting for {} to appear on screen".format(regex)):
retry(screen_matches)
- def send_key(self, key):
+ def send_key(self, key: str) -> None:
key = CHAR_TO_KEY.get(key, key)
self.send_monitor_command("sendkey {}".format(key))
- def start(self):
+ def start(self) -> None:
if self.booted:
return
self.log("starting vm")
- def create_socket(path):
+ def create_socket(path: str) -> socket.socket:
if os.path.exists(path):
os.unlink(path)
s = socket.socket(family=socket.AF_UNIX, type=socket.SOCK_STREAM)
@@ -575,12 +679,15 @@ class Machine:
+ os.environ.get("QEMU_OPTS", "")
)
- environment = {
- "QEMU_OPTS": qemu_options,
- "SHARED_DIR": self.shared_dir,
- "USE_TMPDIR": "1",
- }
- environment.update(dict(os.environ))
+ environment = dict(os.environ)
+ environment.update(
+ {
+ "TMPDIR": self.state_dir,
+ "SHARED_DIR": self.shared_dir,
+ "USE_TMPDIR": "1",
+ "QEMU_OPTS": qemu_options,
+ }
+ )
self.process = subprocess.Popen(
self.script,
@@ -588,16 +695,16 @@ class Machine:
stdin=subprocess.DEVNULL,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
- shell=False,
+ shell=True,
cwd=self.state_dir,
env=environment,
)
self.monitor, _ = self.monitor_socket.accept()
self.shell, _ = self.shell_socket.accept()
- def process_serial_output():
- for line in self.process.stdout:
- line = line.decode().replace("\r", "").rstrip()
+ def process_serial_output() -> None:
+ for _line in self.process.stdout:
+ line = _line.decode("unicode_escape").replace("\r", "").rstrip()
eprint("{} # {}".format(self.name, line))
self.logger.enqueue({"msg": line, "machine": self.name})
@@ -610,83 +717,117 @@ class Machine:
self.log("QEMU running (pid {})".format(self.pid))
- def shutdown(self):
- if self.booted:
+ def shutdown(self) -> None:
+ if not self.booted:
return
self.shell.send("poweroff\n".encode())
self.wait_for_shutdown()
- def crash(self):
- if self.booted:
+ def crash(self) -> None:
+ if not self.booted:
return
self.log("forced crash")
self.send_monitor_command("quit")
self.wait_for_shutdown()
- def wait_for_x(self):
+ def wait_for_x(self) -> None:
"""Wait until it is possible to connect to the X server. Note that
testing the existence of /tmp/.X11-unix/X0 is insufficient.
"""
- with self.nested("waiting for the X11 server"):
- while True:
- cmd = (
- "journalctl -b SYSLOG_IDENTIFIER=systemd | "
- + 'grep "Reached target Current graphical"'
- )
- status, _ = self.execute(cmd)
- if status != 0:
- continue
- status, _ = self.execute("[ -e /tmp/.X11-unix/X0 ]")
- if status == 0:
- return
- def sleep(self, secs):
+ def check_x(_: Any) -> bool:
+ cmd = (
+ "journalctl -b SYSLOG_IDENTIFIER=systemd | "
+ + 'grep "Reached target Current graphical"'
+ )
+ status, _ = self.execute(cmd)
+ if status != 0:
+ return False
+ status, _ = self.execute("[ -e /tmp/.X11-unix/X0 ]")
+ return status == 0
+
+ with self.nested("waiting for the X11 server"):
+ retry(check_x)
+
+ def get_window_names(self) -> List[str]:
+ return self.succeed(
+ r"xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'"
+ ).splitlines()
+
+ def wait_for_window(self, regexp: str) -> None:
+ pattern = re.compile(regexp)
+
+ def window_is_visible(last_try: bool) -> bool:
+ names = self.get_window_names()
+ if last_try:
+ self.log(
+ "Last chance to match {} on the window list,".format(regexp)
+ + " which currently contains: "
+ + ", ".join(names)
+ )
+ return any(pattern.search(name) for name in names)
+
+ with self.nested("Waiting for a window to appear"):
+ retry(window_is_visible)
+
+ def sleep(self, secs: int) -> None:
time.sleep(secs)
- def block(self):
+ def forward_port(self, host_port: int = 8080, guest_port: int = 80) -> None:
+ """Forward a TCP port on the host to a TCP port on the guest.
+ Useful during interactive testing.
+ """
+ self.send_monitor_command(
+ "hostfwd_add tcp::{}-:{}".format(host_port, guest_port)
+ )
+
+ def block(self) -> None:
"""Make the machine unreachable by shutting down eth1 (the multicast
interface used to talk to the other VMs). We keep eth0 up so that
the test driver can continue to talk to the machine.
"""
self.send_monitor_command("set_link virtio-net-pci.1 off")
- def unblock(self):
+ def unblock(self) -> None:
"""Make the machine reachable.
"""
self.send_monitor_command("set_link virtio-net-pci.1 on")
-def create_machine(args):
+def create_machine(args: Dict[str, Any]) -> Machine:
global log
args["log"] = log
args["redirectSerial"] = os.environ.get("USE_SERIAL", "0") == "1"
return Machine(args)
-def start_all():
+def start_all() -> None:
+ global machines
with log.nested("starting all VMs"):
for machine in machines:
machine.start()
-def join_all():
+def join_all() -> None:
+ global machines
with log.nested("waiting for all VMs to finish"):
for machine in machines:
machine.wait_for_shutdown()
-def test_script():
+def test_script() -> None:
exec(os.environ["testScript"])
-def run_tests():
+def run_tests() -> None:
+ global machines
tests = os.environ.get("tests", None)
if tests is not None:
with log.nested("running the VM test script"):
try:
- exec(tests)
+ exec(tests, globals())
except Exception as e:
eprint("error: {}".format(str(e)))
sys.exit(1)
@@ -700,11 +841,13 @@ def run_tests():
machine.execute("sync")
if nr_tests != 0:
- log.log("{} out of {} tests succeeded".format(nr_succeeded, nr_tests))
+ eprint("{} out of {} tests succeeded".format(nr_succeeded, nr_tests))
+ if nr_tests > nr_succeeded:
+ sys.exit(1)
@contextmanager
-def subtest(name):
+def subtest(name: str) -> Iterator[None]:
global nr_tests
global nr_succeeded
@@ -721,7 +864,6 @@ def subtest(name):
if __name__ == "__main__":
- global log
log = Logger()
vlan_nrs = list(dict.fromkeys(os.environ["VLANS"].split()))
@@ -740,7 +882,7 @@ if __name__ == "__main__":
nr_succeeded = 0
@atexit.register
- def clean_up():
+ def clean_up() -> None:
with log.nested("cleaning up"):
for machine in machines:
if machine.pid is None:
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index 21f6172e9671..3d09be3b6cd5 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -26,7 +26,7 @@ in rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ (python3.withPackages (p: [ p.ptpython ])) ];
- checkInputs = with python3Packages; [ pylint black ];
+ checkInputs = with python3Packages; [ pylint black mypy ];
dontUnpack = true;
@@ -34,6 +34,9 @@ in rec {
doCheck = true;
checkPhase = ''
+ mypy --disallow-untyped-defs \
+ --no-implicit-optional \
+ --ignore-missing-imports ${testDriverScript}
pylint --errors-only ${testDriverScript}
black --check --diff ${testDriverScript}
'';
@@ -92,6 +95,8 @@ in rec {
, makeCoverageReport ? false
, enableOCR ? false
, name ? "unnamed"
+ # Skip linting (mainly intended for faster dev cycles)
+ , skipLint ? false
, ...
} @ t:
@@ -130,7 +135,7 @@ in rec {
# Generate onvenience wrappers for running the test driver
# interactively with the specified network, and for starting the
# VMs from the command line.
- driver = runCommand testDriverName
+ driver = let warn = if skipLint then lib.warn "Linting is disabled!" else lib.id; in warn (runCommand testDriverName
{ buildInputs = [ makeWrapper];
testScript = testScript';
preferLocalBuild = true;
@@ -140,7 +145,9 @@ in rec {
mkdir -p $out/bin
echo -n "$testScript" > $out/test-script
- ${python3Packages.black}/bin/black --check --diff $out/test-script
+ ${lib.optionalString (!skipLint) ''
+ ${python3Packages.black}/bin/black --check --diff $out/test-script
+ ''}
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
@@ -157,7 +164,7 @@ in rec {
--set tests 'start_all(); join_all();' \
--set VLANS '${toString vlans}' \
${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
- ''; # "
+ ''); # "
passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
meta = (drv.meta or {}) // t.meta;
@@ -258,11 +265,9 @@ in rec {
inherit require;
virtualisation.memorySize = 1024;
services.xserver.enable = true;
- services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.auto.enable = true;
- services.xserver.windowManager.default = "icewm";
+ services.xserver.displayManager.defaultSession = "none+icewm";
services.xserver.windowManager.icewm.enable = true;
- services.xserver.desktopManager.default = "none";
};
in
runInMachine ({
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 767068771036..ae8ecd6270ce 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -248,11 +248,9 @@ in rec {
inherit require;
virtualisation.memorySize = 1024;
services.xserver.enable = true;
- services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.auto.enable = true;
- services.xserver.windowManager.default = "icewm";
+ services.xserver.displayManager.defaultSession = "none+icewm";
services.xserver.windowManager.icewm.enable = true;
- services.xserver.desktopManager.default = "none";
};
in
runInMachine ({
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index f08e500e079a..5dc1c5aaed57 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -211,11 +211,11 @@ upload_image() {
log "Registering snapshot $snapshot_id as AMI"
local block_device_mappings=(
- "DeviceName=/dev/sda1,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp2}"
+ "DeviceName=/dev/xvda,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp2}"
)
local extra_flags=(
- --root-device-name /dev/sda1
+ --root-device-name /dev/xvda
--sriov-net-support simple
--ena-support
--virtualization-type hvm
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix
new file mode 100644
index 000000000000..f662ed62d31d
--- /dev/null
+++ b/nixos/modules/config/console.nix
@@ -0,0 +1,203 @@
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.console;
+
+ makeColor = i: concatMapStringsSep "," (x: "0x" + substring (2*i) 2 x);
+
+ isUnicode = hasSuffix "UTF-8" (toUpper config.i18n.defaultLocale);
+
+ optimizedKeymap = pkgs.runCommand "keymap" {
+ nativeBuildInputs = [ pkgs.buildPackages.kbd ];
+ LOADKEYS_KEYMAP_PATH = "${consoleEnv}/share/keymaps/**";
+ preferLocalBuild = true;
+ } ''
+ loadkeys -b ${optionalString isUnicode "-u"} "${cfg.keyMap}" > $out
+ '';
+
+ # Sadly, systemd-vconsole-setup doesn't support binary keymaps.
+ vconsoleConf = pkgs.writeText "vconsole.conf" ''
+ KEYMAP=${cfg.keyMap}
+ FONT=${cfg.font}
+ '';
+
+ consoleEnv = pkgs.buildEnv {
+ name = "console-env";
+ paths = [ pkgs.kbd ] ++ cfg.packages;
+ pathsToLink = [
+ "/share/consolefonts"
+ "/share/consoletrans"
+ "/share/keymaps"
+ "/share/unimaps"
+ ];
+ };
+
+ setVconsole = !config.boot.isContainer;
+in
+
+{
+ ###### interface
+
+ options.console = {
+ font = mkOption {
+ type = types.str;
+ default = "Lat2-Terminus16";
+ example = "LatArCyrHeb-16";
+ description = ''
+ The font used for the virtual consoles. Leave empty to use
+ whatever the setfont program considers the
+ default font.
+ '';
+ };
+
+ keyMap = mkOption {
+ type = with types; either str path;
+ default = "us";
+ example = "fr";
+ description = ''
+ The keyboard mapping table for the virtual consoles.
+ '';
+ };
+
+ colors = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [
+ "002b36" "dc322f" "859900" "b58900"
+ "268bd2" "d33682" "2aa198" "eee8d5"
+ "002b36" "cb4b16" "586e75" "657b83"
+ "839496" "6c71c4" "93a1a1" "fdf6e3"
+ ];
+ description = ''
+ The 16 colors palette used by the virtual consoles.
+ Leave empty to use the default colors.
+ Colors must be in hexadecimal format and listed in
+ order from color 0 to color 15.
+ '';
+
+ };
+
+ packages = mkOption {
+ type = types.listOf types.package;
+ default = with pkgs.kbdKeymaps; [ dvp neo ];
+ defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]'';
+ description = ''
+ List of additional packages that provide console fonts, keymaps and
+ other resources for virtual consoles use.
+ '';
+ };
+
+ extraTTYs = mkOption {
+ default = [];
+ type = types.listOf types.str;
+ example = ["tty8" "tty9"];
+ description = ''
+ TTY (virtual console) devices, in addition to the consoles on
+ which mingetty and syslogd run, that must be initialised.
+ Only useful if you have some program that you want to run on
+ some fixed console. For example, the NixOS installation CD
+ opens the manual in a web browser on console 7, so it sets
+ console.extraTTYs to ["tty7"] .
+ '';
+ };
+
+ useXkbConfig = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If set, configure the virtual console keymap from the xserver
+ keyboard settings.
+ '';
+ };
+
+ earlySetup = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Enable setting virtual console options as early as possible (in initrd).
+ '';
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkMerge [
+ { console.keyMap = with config.services.xserver;
+ mkIf cfg.useXkbConfig
+ (pkgs.runCommand "xkb-console-keymap" { preferLocalBuild = true; } ''
+ '${pkgs.ckbcomp}/bin/ckbcomp' -model '${xkbModel}' -layout '${layout}' \
+ -option '${xkbOptions}' -variant '${xkbVariant}' > "$out"
+ '');
+ }
+
+ (mkIf (!setVconsole) {
+ systemd.services.systemd-vconsole-setup.enable = false;
+ })
+
+ (mkIf setVconsole (mkMerge [
+ { environment.systemPackages = [ pkgs.kbd ];
+
+ # Let systemd-vconsole-setup.service do the work of setting up the
+ # virtual consoles.
+ environment.etc."vconsole.conf".source = vconsoleConf;
+ # Provide kbd with additional packages.
+ environment.etc.kbd.source = "${consoleEnv}/share";
+
+ boot.initrd.preLVMCommands = mkBefore ''
+ kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console
+ printf "\033%%${if isUnicode then "G" else "@"}" >> /dev/console
+ loadkmap < ${optimizedKeymap}
+
+ ${optionalString cfg.earlySetup ''
+ setfont -C /dev/console $extraUtils/share/consolefonts/font.psf
+ ''}
+ '';
+
+ systemd.services.systemd-vconsole-setup =
+ { before = [ "display-manager.service" ];
+ after = [ "systemd-udev-settle.service" ];
+ restartTriggers = [ vconsoleConf consoleEnv ];
+ };
+ }
+
+ (mkIf (cfg.colors != []) {
+ boot.kernelParams = [
+ "vt.default_red=${makeColor 0 cfg.colors}"
+ "vt.default_grn=${makeColor 1 cfg.colors}"
+ "vt.default_blu=${makeColor 2 cfg.colors}"
+ ];
+ })
+
+ (mkIf cfg.earlySetup {
+ boot.initrd.extraUtilsCommands = ''
+ mkdir -p $out/share/consolefonts
+ ${if substring 0 1 cfg.font == "/" then ''
+ font="${cfg.font}"
+ '' else ''
+ font="$(echo ${consoleEnv}/share/consolefonts/${cfg.font}.*)"
+ ''}
+ if [[ $font == *.gz ]]; then
+ gzip -cd $font > $out/share/consolefonts/font.psf
+ else
+ cp -L $font $out/share/consolefonts/font.psf
+ fi
+ '';
+ })
+ ]))
+ ];
+
+ imports = [
+ (mkRenamedOptionModule [ "i18n" "consoleFont" ] [ "console" "font" ])
+ (mkRenamedOptionModule [ "i18n" "consoleKeyMap" ] [ "console" "keyMap" ])
+ (mkRenamedOptionModule [ "i18n" "consoleColors" ] [ "console" "colors" ])
+ (mkRenamedOptionModule [ "i18n" "consolePackages" ] [ "console" "packages" ])
+ (mkRenamedOptionModule [ "i18n" "consoleUseXkbConfig" ] [ "console" "useXkbConfig" ])
+ (mkRenamedOptionModule [ "boot" "earlyVconsoleSetup" ] [ "console" "earlySetup" ])
+ (mkRenamedOptionModule [ "boot" "extraTTYs" ] [ "console" "extraTTYs" ])
+ ];
+}
diff --git a/nixos/modules/config/fonts/corefonts.nix b/nixos/modules/config/fonts/corefonts.nix
deleted file mode 100644
index b9f69879a103..000000000000
--- a/nixos/modules/config/fonts/corefonts.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-# This module is deprecated, since you can just say ‘fonts.fonts = [
-# pkgs.corefonts ];’ instead.
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
-
- options = {
-
- fonts = {
-
- enableCoreFonts = mkOption {
- visible = false;
- default = false;
- description = ''
- Whether to include Microsoft's proprietary Core Fonts. These fonts
- are redistributable, but only verbatim, among other restrictions.
- See
- for details.
- '';
- };
-
- };
-
- };
-
-
- config = mkIf config.fonts.enableCoreFonts {
-
- fonts.fonts = [ pkgs.corefonts ];
-
- };
-
-}
diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
deleted file mode 100644
index 84d90899dfff..000000000000
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let cfg = config.fonts.fontconfig.ultimate;
-
- latestVersion = pkgs.fontconfig.configVersion;
-
- # The configuration to be included in /etc/font/
- confPkg = pkgs.runCommand "font-ultimate-conf" { preferLocalBuild = true; } ''
- support_folder=$out/etc/fonts/conf.d
- latest_folder=$out/etc/fonts/${latestVersion}/conf.d
-
- mkdir -p $support_folder
- mkdir -p $latest_folder
-
- # fontconfig ultimate substitutions
- ${optionalString (cfg.substitutions != "none") ''
- ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/presets/${cfg.substitutions}/*.conf \
- $support_folder
- ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/presets/${cfg.substitutions}/*.conf \
- $latest_folder
- ''}
-
- # fontconfig ultimate various configuration files
- ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/conf.d/*.conf \
- $support_folder
- ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/conf.d/*.conf \
- $latest_folder
- '';
-
-in
-{
-
- options = {
-
- fonts = {
-
- fontconfig = {
-
- ultimate = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable fontconfig-ultimate settings (formerly known as
- Infinality). Besides the customizable settings in this NixOS
- module, fontconfig-ultimate also provides many font-specific
- rendering tweaks.
- '';
- };
-
- substitutions = mkOption {
- type = types.enum ["free" "combi" "ms" "none"];
- default = "free";
- description = ''
- Font substitutions to replace common Type 1 fonts with nicer
- TrueType fonts. free uses free fonts,
- ms uses Microsoft fonts,
- combi uses a combination, and
- none disables the substitutions.
- '';
- };
-
- preset = mkOption {
- type = types.enum ["ultimate1" "ultimate2" "ultimate3" "ultimate4" "ultimate5" "osx" "windowsxp"];
- default = "ultimate3";
- description = ''
- FreeType rendering settings preset. Any of the presets may be
- customized by setting environment variables.
- '';
- };
- };
- };
- };
-
- };
-
- config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {
-
- fonts.fontconfig.confPackages = [ confPkg ];
- environment.variables.INFINALITY_FT = cfg.preset;
-
- };
-
-}
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 8f227c423266..3bfa1893a8ba 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -264,6 +264,16 @@ let
};
in
{
+ imports = [
+ (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ])
+ (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ])
+ (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ])
+ (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ])
+ (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
+ (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
+ (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
+ (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
+ ];
options = {
diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix
index abb806b601a7..b9bae44b2f9c 100644
--- a/nixos/modules/config/fonts/fonts.nix
+++ b/nixos/modules/config/fonts/fonts.nix
@@ -3,6 +3,9 @@
with lib;
{
+ imports = [
+ (mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.")
+ ];
options = {
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index d0db8fedecd8..45691f4839c8 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -58,62 +58,6 @@ with lib;
'';
};
- consolePackages = mkOption {
- type = types.listOf types.package;
- default = with pkgs.kbdKeymaps; [ dvp neo ];
- defaultText = ''with pkgs.kbdKeymaps; [ dvp neo ]'';
- description = ''
- List of additional packages that provide console fonts, keymaps and
- other resources.
- '';
- };
-
- consoleFont = mkOption {
- type = types.str;
- default = "Lat2-Terminus16";
- example = "LatArCyrHeb-16";
- description = ''
- The font used for the virtual consoles. Leave empty to use
- whatever the setfont program considers the
- default font.
- '';
- };
-
- consoleUseXkbConfig = mkOption {
- type = types.bool;
- default = false;
- description = ''
- If set, configure the console keymap from the xserver keyboard
- settings.
- '';
- };
-
- consoleKeyMap = mkOption {
- type = with types; either str path;
- default = "us";
- example = "fr";
- description = ''
- The keyboard mapping table for the virtual consoles.
- '';
- };
-
- consoleColors = mkOption {
- type = types.listOf types.str;
- default = [];
- example = [
- "002b36" "dc322f" "859900" "b58900"
- "268bd2" "d33682" "2aa198" "eee8d5"
- "002b36" "cb4b16" "586e75" "657b83"
- "839496" "6c71c4" "93a1a1" "fdf6e3"
- ];
- description = ''
- The 16 colors palette used by the virtual consoles.
- Leave empty to use the default colors.
- Colors must be in hexadecimal format and listed in
- order from color 0 to color 15.
- '';
- };
-
};
};
@@ -123,13 +67,6 @@ with lib;
config = {
- i18n.consoleKeyMap = with config.services.xserver;
- mkIf config.i18n.consoleUseXkbConfig
- (pkgs.runCommand "xkb-console-keymap" { preferLocalBuild = true; } ''
- '${pkgs.ckbcomp}/bin/ckbcomp' -model '${xkbModel}' -layout '${layout}' \
- -option '${xkbOptions}' -variant '${xkbVariant}' > "$out"
- '');
-
environment.systemPackages =
optional (config.i18n.supportedLocales != []) config.i18n.glibcLocales;
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index a89667ea221c..81427bb8ee64 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -16,6 +16,9 @@ let
in
{
+ imports = [
+ (mkRemovedOptionModule [ "networking" "hostConf" ] "Use environment.etc.\"host.conf\" instead.")
+ ];
options = {
@@ -41,19 +44,6 @@ in
'';
};
- networking.hostConf = lib.mkOption {
- type = types.lines;
- default = "multi on";
- example = ''
- multi on
- reorder on
- trim lan
- '';
- description = ''
- The contents of /etc/host.conf . See also host.conf 5 .
- '';
- };
-
networking.timeServers = mkOption {
default = [
"0.nixos.pool.ntp.org"
@@ -186,7 +176,9 @@ in
'';
# /etc/host.conf: resolver configuration file
- "host.conf".text = cfg.hostConf;
+ "host.conf".text = ''
+ multi on
+ '';
} // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") {
# /etc/rpc: RPC program numbers.
diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt5.nix
index 7de1c0f5d557..d9dec74f1552 100644
--- a/nixos/modules/config/qt5.nix
+++ b/nixos/modules/config/qt5.nix
@@ -10,7 +10,7 @@ let
isQtStyle = cfg.platformTheme == "gtk2" && cfg.style != "adwaita";
packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ]
- else if isQtStyle then [ pkgs.qtstyleplugins ]
+ else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ]
else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible.";
in
diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix
index 406c6a7ac329..7d2f252a8886 100644
--- a/nixos/modules/config/resolvconf.nix
+++ b/nixos/modules/config/resolvconf.nix
@@ -33,6 +33,12 @@ let
in
{
+ imports = [
+ (mkRenamedOptionModule [ "networking" "dnsSingleRequest" ] [ "networking" "resolvconf" "dnsSingleRequest" ])
+ (mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ])
+ (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
+ (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])
+ ];
options = {
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index b79e16cd7979..a0a20228a742 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -122,7 +122,7 @@ in
description = ''
Include ~/bin/ in $PATH.
'';
- default = true;
+ default = false;
type = types.bool;
};
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index ae3bdeb00e64..141e43fec39b 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -403,6 +403,10 @@ let
filter types.shellPackage.check shells;
in {
+ imports = [
+ (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
+ (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])
+ ];
###### interface
diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix
deleted file mode 100644
index 356e007c0a3e..000000000000
--- a/nixos/modules/config/vpnc.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
- cfg = config.networking.vpnc;
- mkServiceDef = name: value:
- {
- name = "vpnc/${name}.conf";
- value = { text = value; };
- };
-
-in
-{
- options = {
- networking.vpnc = {
- services = mkOption {
- type = types.attrsOf types.str;
- default = {};
- example = literalExample ''
- { test = '''
- IPSec gateway 192.168.1.1
- IPSec ID someID
- IPSec secret secretKey
- Xauth username name
- Xauth password pass
- ''';
- }
- '';
- description =
- ''
- The names of cisco VPNs and their associated definitions
- '';
- };
- };
- };
-
- config.environment.etc = mapAttrs' mkServiceDef cfg.services;
-}
-
-
diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix
index bdbbfda2bb42..95fa8e05fa3f 100644
--- a/nixos/modules/config/xdg/portal.nix
+++ b/nixos/modules/config/xdg/portal.nix
@@ -3,6 +3,10 @@
with lib;
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "flatpak" "extraPortals" ] [ "xdg" "portal" "extraPortals" ])
+ ];
+
options.xdg.portal = {
enable =
mkEnableOption " xdg desktop integration"//{
diff --git a/nixos/modules/config/xdg/sounds.nix b/nixos/modules/config/xdg/sounds.nix
index 148240d631cf..14d6340fc33b 100644
--- a/nixos/modules/config/xdg/sounds.nix
+++ b/nixos/modules/config/xdg/sounds.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
with lib;
{
@@ -14,6 +14,10 @@ with lib;
};
config = mkIf config.xdg.sounds.enable {
+ environment.systemPackages = [
+ pkgs.sound-theme-freedesktop
+ ];
+
environment.pathsToLink = [
"/share/sounds"
];
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index 534fcc34276b..16be8bcfdd7d 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -6,6 +6,14 @@ let
cfg = config.hardware;
in {
+ imports = [
+ (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ ];
+
###### interface
options = {
diff --git a/nixos/modules/hardware/ckb-next.nix b/nixos/modules/hardware/ckb-next.nix
index 20b2756d8b26..fe0ca9f26d54 100644
--- a/nixos/modules/hardware/ckb-next.nix
+++ b/nixos/modules/hardware/ckb-next.nix
@@ -7,6 +7,11 @@ let
in
{
+ imports = [
+ (mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])
+ (mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])
+ ];
+
options.hardware.ckb-next = {
enable = mkEnableOption "the Corsair keyboard/mouse driver";
diff --git a/nixos/modules/hardware/ksm.nix b/nixos/modules/hardware/ksm.nix
index 99d46c25236e..0938dbdc1101 100644
--- a/nixos/modules/hardware/ksm.nix
+++ b/nixos/modules/hardware/ksm.nix
@@ -6,6 +6,10 @@ let
cfg = config.hardware.ksm;
in {
+ imports = [
+ (mkRenamedOptionModule [ "hardware" "enableKSM" ] [ "hardware" "ksm" "enable" ])
+ ];
+
options.hardware.ksm = {
enable = mkEnableOption "Kernel Same-Page Merging";
sleep = mkOption {
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 57cac56bd8ab..89dc5008df58 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -31,6 +31,11 @@ let
in
{
+
+ imports = [
+ (mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ])
+ ];
+
options = {
hardware.opengl = {
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 3ab2afc97407..fcb30187fa2f 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -75,7 +75,7 @@ in
Note that this configuration will only be successful when a display manager
for which the services.xserver.displayManager.setupCommands
- option is supported is used; notably, SLiM is not supported.
+ option is supported is used.
'';
};
@@ -111,9 +111,10 @@ in
config = mkIf enabled {
assertions = [
{
- assertion = with config.services.xserver.displayManager; gdm.enable -> !gdm.wayland;
- message = "NVIDIA drivers don't support wayland, set services.xserver.displayManager.gdm.wayland=false";
+ assertion = with config.services.xserver.displayManager; gdm.nvidiaWayland -> cfg.modesetting.enable;
+ message = "You cannot use wayland with GDM without modesetting enabled for NVIDIA drivers, set `hardware.nvidia.modesetting.enable = true`";
}
+
{
assertion = !optimusCfg.enable ||
(optimusCfg.nvidiaBusId != "" && optimusCfg.intelBusId != "");
diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix
index 8109ef76c402..810e1643d316 100644
--- a/nixos/modules/i18n/input-method/ibus.nix
+++ b/nixos/modules/i18n/input-method/ibus.nix
@@ -27,6 +27,10 @@ let
};
in
{
+ imports = [
+ (mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "inputMethod" "ibus" "engines" ])
+ ];
+
options = {
i18n.inputMethod.ibus = {
engines = mkOption {
@@ -53,9 +57,15 @@ in
config = mkIf (config.i18n.inputMethod.enabled == "ibus") {
i18n.inputMethod.package = ibusPackage;
+ environment.systemPackages = [
+ ibusAutostart
+ ];
+
# Without dconf enabled it is impossible to use IBus
- environment.systemPackages = with pkgs; [
- gnome3.dconf ibusAutostart
+ programs.dconf.enable = true;
+
+ services.dbus.packages = [
+ ibusAutostart
];
environment.variables = {
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
index 719ba5ffb127..e0b558dcb0d8 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
@@ -22,17 +22,7 @@ with lib;
});
'';
- services.xserver = {
- enable = true;
-
- # Automatically login as nixos.
- displayManager.slim = {
- enable = true;
- defaultUser = "nixos";
- autoLogin = true;
- };
-
- };
+ services.xserver.enable = true;
# Provide networkmanager for easy wireless configuration.
networking.networkmanager.enable = true;
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
index 0b813bbf37b4..23c3426bff08 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
@@ -10,8 +10,6 @@ with lib;
services.xserver.desktopManager.gnome3.enable = true;
- services.xserver.displayManager.slim.enable = mkForce false;
-
# Auto-login as root.
services.xserver.displayManager.gdm.autoLogin = {
enable = true;
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
index 1dc7920ff640..e00d3f7535b2 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
@@ -11,7 +11,15 @@ with lib;
services.xserver = {
desktopManager.plasma5 = {
enable = true;
- enableQt4Support = false;
+ };
+
+ # Automatically login as nixos.
+ displayManager.sddm = {
+ enable = true;
+ autoLogin = {
+ enable = true;
+ user = "nixos";
+ };
};
};
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 009f1e2c543a..11319e5f4f82 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -603,9 +603,6 @@ in
{ source = config.system.build.squashfsStore;
target = "/nix-store.squashfs";
}
- { source = config.isoImage.efiSplashImage;
- target = "/EFI/boot/efi-background.png";
- }
{ source = config.isoImage.splashImage;
target = "/isolinux/background.png";
}
@@ -630,8 +627,8 @@ in
{ source = "${efiDir}/EFI";
target = "/EFI";
}
- { source = pkgs.writeText "loopback.cfg" "source /EFI/boot/grub.cfg";
- target = "/boot/grub/loopback.cfg";
+ { source = (pkgs.writeTextDir "grub/loopback.cfg" "source /EFI/boot/grub.cfg") + "/grub";
+ target = "/boot/grub";
}
] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [
{ source = "${pkgs.memtest86plus}/memtest.bin";
@@ -641,6 +638,10 @@ in
{ source = config.isoImage.grubTheme;
target = "/EFI/boot/grub-theme";
}
+ ] ++ [
+ { source = config.isoImage.efiSplashImage;
+ target = "/EFI/boot/efi-background.png";
+ }
];
boot.loader.timeout = 10;
diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index d510f3b2daf2..901c60befb6c 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -18,6 +18,7 @@ with lib;
let
rootfsImage = pkgs.callPackage ../../../lib/make-ext4-fs.nix ({
inherit (config.sdImage) storePaths;
+ compressImage = true;
populateImageCommands = config.sdImage.populateRootCommands;
volumeLabel = "NIXOS_SD";
} // optionalAttrs (config.sdImage.rootPartitionUUID != null) {
@@ -128,10 +129,11 @@ in
sdImage.storePaths = [ config.system.build.toplevel ];
- system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, mtools, libfaketime, utillinux, bzip2 }: stdenv.mkDerivation {
+ system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs,
+ mtools, libfaketime, utillinux, bzip2, zstd }: stdenv.mkDerivation {
name = config.sdImage.imageName;
- nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 ];
+ nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime utillinux bzip2 zstd ];
inherit (config.sdImage) compressImage;
@@ -140,13 +142,20 @@ in
export img=$out/sd-image/${config.sdImage.imageName}
echo "${pkgs.stdenv.buildPlatform.system}" > $out/nix-support/system
- echo "file sd-image $img" >> $out/nix-support/hydra-build-products
+ if test -n "$compressImage"; then
+ echo "file sd-image $img.bz2" >> $out/nix-support/hydra-build-products
+ else
+ echo "file sd-image $img" >> $out/nix-support/hydra-build-products
+ fi
+
+ echo "Decompressing rootfs image"
+ zstd -d --no-progress "${rootfsImage}" -o ./root-fs.img
# Gap in front of the first partition, in MiB
gap=8
# Create the image file sized to fit /boot/firmware and /, plus slack for the gap.
- rootSizeBlocks=$(du -B 512 --apparent-size ${rootfsImage} | awk '{ print $1 }')
+ rootSizeBlocks=$(du -B 512 --apparent-size ./root-fs.img | awk '{ print $1 }')
firmwareSizeBlocks=$((${toString config.sdImage.firmwareSize} * 1024 * 1024 / 512))
imageSize=$((rootSizeBlocks * 512 + firmwareSizeBlocks * 512 + gap * 1024 * 1024))
truncate -s $imageSize $img
@@ -164,7 +173,7 @@ in
# Copy the rootfs into the SD image
eval $(partx $img -o START,SECTORS --nr 2 --pairs)
- dd conv=notrunc if=${rootfsImage} of=$img seek=$START count=$SECTORS
+ dd conv=notrunc if=./root-fs.img of=$img seek=$START count=$SECTORS
# Create a FAT32 /boot/firmware partition of suitable size into firmware_part.img
eval $(partx $img -o START,SECTORS --nr 1 --pairs)
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index f2ffe61c42cb..629c56814a16 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -335,6 +335,9 @@ if (@swaps) {
next unless -e $swapFilename;
my $dev = findStableDevPath $swapFilename;
if ($swapType =~ "partition") {
+ # zram devices are more likely created by configuration.nix, so
+ # ignore them here
+ next if ($swapFilename =~ /^\/dev\/zram/);
push @swapDevices, "{ device = \"$dev\"; }";
} elsif ($swapType =~ "file") {
# swap *files* are more likely specified in configuration.nix, so
@@ -498,7 +501,7 @@ if (-f $fb_modes_file && -r $fb_modes_file) {
my $console_width = $1, my $console_height = $2;
if ($console_width > 1920) {
push @attrs, "# High-DPI console";
- push @attrs, 'i18n.consoleFont = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";';
+ push @attrs, 'console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";';
}
}
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 891f374df536..c53dc1000c4a 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -90,6 +90,11 @@ while [ "$#" -gt 0 ]; do
targetHost="$1"
shift 1
;;
+ --use-remote-sudo)
+ # note the trailing space
+ maybeSudo="sudo "
+ shift 1
+ ;;
*)
echo "$0: unknown option \`$i'"
exit 1
@@ -97,10 +102,6 @@ while [ "$#" -gt 0 ]; do
esac
done
-if [ -n "$SUDO_USER" ]; then
- maybeSudo="sudo "
-fi
-
if [ -z "$buildHost" -a -n "$targetHost" ]; then
buildHost="$targetHost"
fi
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index deecb005270f..820553270e3b 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -67,6 +67,11 @@ let
in
{
+ imports = [
+ (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ])
+ (mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ])
+ (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ])
+ ];
options = {
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 3e8a5b07a5ed..bedd87a368eb 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -11,6 +11,9 @@
{ lib, ... }:
+let
+ inherit (lib) types;
+in
{
options = {
@@ -19,6 +22,7 @@
description = ''
The user IDs used in NixOS.
'';
+ type = types.attrsOf types.int;
};
ids.gids = lib.mkOption {
@@ -26,6 +30,7 @@
description = ''
The group IDs used in NixOS.
'';
+ type = types.attrsOf types.int;
};
};
@@ -75,8 +80,8 @@
#kdm = 39; # dropped in 17.03
#ghostone = 40; # dropped in 18.03
git = 41;
- fourstore = 42;
- fourstorehttp = 43;
+ #fourstore = 42; # dropped in 20.03
+ #fourstorehttp = 43; # dropped in 20.03
virtuoso = 44;
rtkit = 45;
dovecot2 = 46;
@@ -128,7 +133,7 @@
tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice.
firebird = 95;
#keys = 96; # unused
- haproxy = 97;
+ #haproxy = 97; # DynamicUser as of 2019-11-08
mongodb = 98;
openldap = 99;
#users = 100; # unused
@@ -443,7 +448,7 @@
#tcpcryptd = 93; # unused
firebird = 95;
keys = 96;
- haproxy = 97;
+ #haproxy = 97; # DynamicUser as of 2019-11-08
#mongodb = 98; # unused
openldap = 99;
munin = 102;
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 737ed5c0a3f6..552535c253e6 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -7,6 +7,11 @@ let
isMLocate = hasPrefix "mlocate" cfg.locate.name;
isFindutils = hasPrefix "findutils" cfg.locate.name;
in {
+ imports = [
+ (mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ])
+ (mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths" )
+ ];
+
options.services.locate = with types; {
enable = mkOption {
type = bool;
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 773724ffbd5e..0540b493003f 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -10,6 +10,12 @@ let
in
{
+ imports = [
+ (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ])
+ (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ])
+ (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ])
+ (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ])
+ ];
options.system = {
@@ -92,7 +98,7 @@ in
VERSION="${cfg.version} (${cfg.codeName})"
VERSION_CODENAME=${toLower cfg.codeName}
VERSION_ID="${cfg.version}"
- PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})"
+ PRETTY_NAME="NixOS ${cfg.release} (${cfg.codeName})"
LOGO="nix-snowflake"
HOME_URL="https://nixos.org/"
DOCUMENTATION_URL="https://nixos.org/nixos/manual/index.html"
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index cacb4b13f41f..914f9a878b0c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1,9 +1,7 @@
[
./config/debug-info.nix
- ./config/fonts/corefonts.nix
./config/fonts/fontconfig.nix
./config/fonts/fontconfig-penultimate.nix
- ./config/fonts/fontconfig-ultimate.nix
./config/fonts/fontdir.nix
./config/fonts/fonts.nix
./config/fonts/ghostscript.nix
@@ -13,6 +11,7 @@
./config/xdg/mime.nix
./config/xdg/portal.nix
./config/appstream.nix
+ ./config/console.nix
./config/xdg/sounds.nix
./config/gtk/gtk-icon-cache.nix
./config/gnu.nix
@@ -37,7 +36,6 @@
./config/terminfo.nix
./config/unix-odbc-drivers.nix
./config/users-groups.nix
- ./config/vpnc.nix
./config/vte.nix
./config/zram.nix
./hardware/acpilight.nix
@@ -257,8 +255,6 @@
./services/continuous-integration/jenkins/default.nix
./services/continuous-integration/jenkins/job-builder.nix
./services/continuous-integration/jenkins/slave.nix
- ./services/databases/4store-endpoint.nix
- ./services/databases/4store.nix
./services/databases/aerospike.nix
./services/databases/cassandra.nix
./services/databases/clickhouse.nix
@@ -310,6 +306,7 @@
./services/desktops/gnome3/sushi.nix
./services/desktops/gnome3/tracker.nix
./services/desktops/gnome3/tracker-miners.nix
+ ./services/desktops/neard.nix
./services/desktops/profile-sync-daemon.nix
./services/desktops/system-config-printer.nix
./services/desktops/telepathy.nix
@@ -318,6 +315,7 @@
./services/development/bloop.nix
./services/development/hoogle.nix
./services/development/jupyter/default.nix
+ ./services/development/lorri.nix
./services/editors/emacs.nix
./services/editors/infinoted.nix
./services/games/factorio.nix
@@ -446,6 +444,7 @@
./services/misc/logkeys.nix
./services/misc/leaps.nix
./services/misc/lidarr.nix
+ ./services/misc/mame.nix
./services/misc/mathics.nix
./services/misc/matrix-synapse.nix
./services/misc/mbpfan.nix
@@ -520,7 +519,6 @@
./services/monitoring/munin.nix
./services/monitoring/nagios.nix
./services/monitoring/netdata.nix
- ./services/monitoring/osquery.nix
./services/monitoring/prometheus/default.nix
./services/monitoring/prometheus/alertmanager.nix
./services/monitoring/prometheus/exporters.nix
@@ -540,7 +538,6 @@
./services/monitoring/zabbix-agent.nix
./services/monitoring/zabbix-proxy.nix
./services/monitoring/zabbix-server.nix
- ./services/network-filesystems/beegfs.nix
./services/network-filesystems/cachefilesd.nix
./services/network-filesystems/davfs2.nix
./services/network-filesystems/drbd.nix
@@ -561,6 +558,7 @@
./services/network-filesystems/yandex-disk.nix
./services/network-filesystems/xtreemfs.nix
./services/network-filesystems/ceph.nix
+ ./services/networking/3proxy.nix
./services/networking/amuled.nix
./services/networking/aria2.nix
./services/networking/asterisk.nix
@@ -620,7 +618,6 @@
./services/networking/iodine.nix
./services/networking/iperf3.nix
./services/networking/ircd-hybrid/default.nix
- ./services/networking/jormungandr.nix
./services/networking/iwd.nix
./services/networking/keepalived/default.nix
./services/networking/keybase.nix
@@ -698,6 +695,7 @@
./services/networking/sniproxy.nix
./services/networking/smokeping.nix
./services/networking/softether.nix
+ ./services/networking/spacecookie.nix
./services/networking/spiped.nix
./services/networking/squid.nix
./services/networking/sslh.nix
@@ -726,6 +724,7 @@
./services/networking/tvheadend.nix
./services/networking/unbound.nix
./services/networking/unifi.nix
+ ./services/networking/v2ray.nix
./services/networking/vsftpd.nix
./services/networking/wakeonlan.nix
./services/networking/websockify.nix
@@ -817,6 +816,7 @@
./services/web-apps/restya-board.nix
./services/web-apps/tt-rss.nix
./services/web-apps/trac.nix
+ ./services/web-apps/trilium.nix
./services/web-apps/selfoss.nix
./services/web-apps/shiori.nix
./services/web-apps/virtlyst.nix
@@ -844,6 +844,7 @@
./services/web-servers/shellinabox.nix
./services/web-servers/tomcat.nix
./services/web-servers/traefik.nix
+ ./services/web-servers/ttyd.nix
./services/web-servers/uwsgi.nix
./services/web-servers/varnish/default.nix
./services/web-servers/zope2.nix
@@ -870,6 +871,7 @@
./services/x11/hardware/digimend.nix
./services/x11/hardware/cmt.nix
./services/x11/gdk-pixbuf.nix
+ ./services/x11/imwheel.nix
./services/x11/redshift.nix
./services/x11/urxvtd.nix
./services/x11/window-managers/awesome.nix
@@ -940,7 +942,6 @@
./tasks/filesystems/vfat.nix
./tasks/filesystems/xfs.nix
./tasks/filesystems/zfs.nix
- ./tasks/kbd.nix
./tasks/lvm.nix
./tasks/network-interfaces.nix
./tasks/network-interfaces-systemd.nix
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index 649f5564ac61..d80456cede56 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -9,14 +9,12 @@
displayManager.sddm.enable = true;
desktopManager.plasma5 = {
enable = true;
- enableQt4Support = false;
};
libinput.enable = true; # for touchpad support on many laptops
};
# Enable sound in virtualbox appliances.
hardware.pulseaudio.enable = true;
- hardware.pulseaudio.systemWide = true; # Needed since we run plasma as root.
environment.systemPackages = [ pkgs.glxinfo pkgs.firefox ];
}
diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix
index 250d8c252a3b..83bcfe886aa1 100644
--- a/nixos/modules/programs/adb.nix
+++ b/nixos/modules/programs/adb.nix
@@ -23,7 +23,8 @@ with lib;
###### implementation
config = mkIf config.programs.adb.enable {
services.udev.packages = [ pkgs.android-udev-rules ];
- environment.systemPackages = [ pkgs.androidenv.androidPkgs_9_0.platform-tools ];
+ # Give platform-tools lower priority so mke2fs+friends are taken from other packages first
+ environment.systemPackages = [ (lowPrio pkgs.androidenv.androidPkgs_9_0.platform-tools) ];
users.groups.adbusers = {};
};
}
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 548babac38ca..366c07c0a352 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -40,6 +40,10 @@ let
in
{
+ imports = [
+ (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
+ ];
+
options = {
programs.bash = {
diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix
index eeebc3558bdf..e0e2ffd80cff 100644
--- a/nixos/modules/programs/dconf.nix
+++ b/nixos/modules/programs/dconf.nix
@@ -32,13 +32,13 @@ in
environment.etc = optionals (cfg.profiles != {})
(mapAttrsToList mkDconfProfile cfg.profiles);
- services.dbus.packages = [ pkgs.gnome3.dconf ];
+ services.dbus.packages = [ pkgs.dconf ];
# For dconf executable
- environment.systemPackages = [ pkgs.gnome3.dconf ];
+ environment.systemPackages = [ pkgs.dconf ];
# Needed for unwrapped applications
- environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.gnome3.dconf.lib}/lib/gio/modules" ];
+ environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ];
};
}
diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix
index e42219e9638c..1b806071c43c 100644
--- a/nixos/modules/programs/nm-applet.nix
+++ b/nixos/modules/programs/nm-applet.nix
@@ -10,5 +10,7 @@
partOf = [ "graphical-session.target" ];
serviceConfig.ExecStart = "${pkgs.networkmanagerapplet}/bin/nm-applet";
};
+
+ services.dbus.packages = [ pkgs.gcr ];
};
}
diff --git a/nixos/modules/programs/oblogout.nix b/nixos/modules/programs/oblogout.nix
index 720c29b1eaee..a039b0623b52 100644
--- a/nixos/modules/programs/oblogout.nix
+++ b/nixos/modules/programs/oblogout.nix
@@ -1,176 +1,11 @@
-# Global configuration for oblogout.
-
{ config, lib, pkgs, ... }:
with lib;
-let cfg = config.programs.oblogout;
-
-in
{
- ###### interface
- options = {
+ imports = [
+ (mkRemovedOptionModule [ "programs" "oblogout" ] "programs.oblogout has been removed from NixOS. This is because the oblogout repository has been archived upstream.")
+ ];
- programs.oblogout = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to install OBLogout and create /etc/oblogout.conf .
- See ${pkgs.oblogout}/share/doc/README .
- '';
- };
-
- opacity = mkOption {
- type = types.int;
- default = 70;
- description = ''
- Opacity percentage of Cairo rendered backgrounds.
- '';
- };
-
- bgcolor = mkOption {
- type = types.str;
- default = "black";
- description = ''
- Colour name or hex code (#ffffff) of the background color.
- '';
- };
-
- buttontheme = mkOption {
- type = types.str;
- default = "simplistic";
- description = ''
- Icon theme for the buttons, must be in the themes folder of
- the package, or in
- ~/.themes/<name>/oblogout/ .
- '';
- };
-
- buttons = mkOption {
- type = types.str;
- default = "cancel, logout, restart, shutdown, suspend, hibernate";
- description = ''
- List and order of buttons to show.
- '';
- };
-
- cancel = mkOption {
- type = types.str;
- default = "Escape";
- description = ''
- Cancel logout/shutdown shortcut.
- '';
- };
-
- shutdown = mkOption {
- type = types.str;
- default = "S";
- description = ''
- Shutdown shortcut.
- '';
- };
-
- restart = mkOption {
- type = types.str;
- default = "R";
- description = ''
- Restart shortcut.
- '';
- };
-
- suspend = mkOption {
- type = types.str;
- default = "U";
- description = ''
- Suspend shortcut.
- '';
- };
-
- logout = mkOption {
- type = types.str;
- default = "L";
- description = ''
- Logout shortcut.
- '';
- };
-
- lock = mkOption {
- type = types.str;
- default = "K";
- description = ''
- Lock session shortcut.
- '';
- };
-
- hibernate = mkOption {
- type = types.str;
- default = "H";
- description = ''
- Hibernate shortcut.
- '';
- };
-
- clogout = mkOption {
- type = types.str;
- default = "openbox --exit";
- description = ''
- Command to logout.
- '';
- };
-
- clock = mkOption {
- type = types.str;
- default = "";
- description = ''
- Command to lock screen.
- '';
- };
-
- cswitchuser = mkOption {
- type = types.str;
- default = "";
- description = ''
- Command to switch user.
- '';
- };
- };
- };
-
- ###### implementation
-
- config = mkIf cfg.enable {
- environment.systemPackages = [ pkgs.oblogout ];
-
- environment.etc."oblogout.conf".text = ''
- [settings]
- usehal = false
-
- [looks]
- opacity = ${toString cfg.opacity}
- bgcolor = ${cfg.bgcolor}
- buttontheme = ${cfg.buttontheme}
- buttons = ${cfg.buttons}
-
- [shortcuts]
- cancel = ${cfg.cancel}
- shutdown = ${cfg.shutdown}
- restart = ${cfg.restart}
- suspend = ${cfg.suspend}
- logout = ${cfg.logout}
- lock = ${cfg.lock}
- hibernate = ${cfg.hibernate}
-
- [commands]
- shutdown = systemctl poweroff
- restart = systemctl reboot
- suspend = systemctl suspend
- hibernate = systemctl hibernate
- logout = ${cfg.clogout}
- lock = ${cfg.clock}
- switchuser = ${cfg.cswitchuser}
- '';
- };
}
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 703975fd06c9..80198990ed11 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -251,7 +251,7 @@ in
ExecStart =
"${cfg.package}/bin/ssh-agent " +
optionalString (cfg.agentTimeout != null) ("-t ${cfg.agentTimeout} ") +
- optionalString (cfg.agentPKCS11Whitelist != null) ("-P ${cfg.agentPKCS11Whitelist} ")
+ optionalString (cfg.agentPKCS11Whitelist != null) ("-P ${cfg.agentPKCS11Whitelist} ") +
"-a %t/ssh-agent";
StandardOutput = "null";
Type = "forking";
diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix
index 0e060e3f5226..f794eac8af00 100644
--- a/nixos/modules/programs/ssmtp.nix
+++ b/nixos/modules/programs/ssmtp.nix
@@ -8,18 +8,21 @@
with lib;
let
-
- cfg = config.networking.defaultMailServer;
+ cfg = config.services.ssmtp;
in
-
{
+ imports = [
+ (mkRenamedOptionModule [ "networking" "defaultMailServer" ] [ "services" "ssmtp" ])
+ (mkRenamedOptionModule [ "services" "ssmtp" "directDelivery" ] [ "services" "ssmtp" "enable" ])
+ ];
+
options = {
- networking.defaultMailServer = {
+ services.ssmtp = {
- directDelivery = mkOption {
+ enable = mkOption {
type = types.bool;
default = false;
description = ''
@@ -29,7 +32,7 @@ in
sendmail or postfix on
your machine, set this option to true , and
set the option
- networking.defaultMailServer.hostName to the
+ services.ssmtp.hostName to the
host name of your preferred mail server.
'';
};
@@ -129,9 +132,9 @@ in
};
- config = mkIf cfg.directDelivery {
+ config = mkIf cfg.enable {
- networking.defaultMailServer.authPassFile = mkIf (cfg.authPass != "")
+ services.ssmtp.authPassFile = mkIf (cfg.authPass != "")
(mkDefault (toString (pkgs.writeTextFile {
name = "ssmtp-authpass";
text = cfg.authPass;
diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index f92d09a7ef44..e2a4018e9023 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -4,26 +4,32 @@ with lib;
let
cfg = config.programs.sway;
- swayPackage = pkgs.sway;
- swayWrapped = pkgs.writeShellScriptBin "sway" ''
- set -o errexit
+ wrapperOptions = types.submodule {
+ options =
+ let
+ mkWrapperFeature = default: description: mkOption {
+ type = types.bool;
+ inherit default;
+ example = !default;
+ description = "Whether to make use of the ${description}";
+ };
+ in {
+ base = mkWrapperFeature true ''
+ base wrapper to execute extra session commands and prepend a
+ dbus-run-session to the sway command.
+ '';
+ gtk = mkWrapperFeature false ''
+ wrapGAppsHook wrapper to execute sway with required environment
+ variables for GTK applications.
+ '';
+ };
+ };
- if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
- export _SWAY_WRAPPER_ALREADY_EXECUTED=1
- ${cfg.extraSessionCommands}
- fi
-
- if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
- export DBUS_SESSION_BUS_ADDRESS
- exec ${swayPackage}/bin/sway "$@"
- else
- exec ${pkgs.dbus}/bin/dbus-run-session ${swayPackage}/bin/sway "$@"
- fi
- '';
- swayJoined = pkgs.symlinkJoin {
- name = "sway-joined";
- paths = [ swayWrapped swayPackage ];
+ swayPackage = pkgs.sway.override {
+ extraSessionCommands = cfg.extraSessionCommands;
+ withBaseWrapper = cfg.wrapperFeatures.base;
+ withGtkWrapper = cfg.wrapperFeatures.gtk;
};
in {
options.programs.sway = {
@@ -35,6 +41,15 @@ in {
Please have a look at the "extraSessionCommands" example for running
programs natively under Wayland'';
+ wrapperFeatures = mkOption {
+ type = wrapperOptions;
+ default = { };
+ example = { gtk = true; };
+ description = ''
+ Attribute set of features to enable in the wrapper.
+ '';
+ };
+
extraSessionCommands = mkOption {
type = types.lines;
default = "";
@@ -55,7 +70,7 @@ in {
extraPackages = mkOption {
type = with types; listOf package;
default = with pkgs; [
- swaylock swayidle swaybg
+ swaylock swayidle
xwayland rxvt_unicode dmenu
];
defaultText = literalExample ''
@@ -75,8 +90,17 @@ in {
};
config = mkIf cfg.enable {
+ assertions = [
+ {
+ assertion = cfg.extraSessionCommands != "" -> cfg.wrapperFeatures.base;
+ message = ''
+ The extraSessionCommands for Sway will not be run if
+ wrapperFeatures.base is disabled.
+ '';
+ }
+ ];
environment = {
- systemPackages = [ swayJoined ] ++ cfg.extraPackages;
+ systemPackages = [ swayPackage ] ++ cfg.extraPackages;
etc = {
"sway/config".source = mkOptionDefault "${swayPackage}/etc/sway/config";
#"sway/security.d".source = mkOptionDefault "${swayPackage}/etc/sway/security.d/";
@@ -87,6 +111,8 @@ in {
hardware.opengl.enable = mkDefault true;
fonts.enableDefaultFonts = mkDefault true;
programs.dconf.enable = mkDefault true;
+ # To make a Sway session available if a display manager like SDDM is enabled:
+ services.xserver.displayManager.sessionPackages = [ swayPackage ];
};
meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ];
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix
index f4df4e983e42..932a780a356a 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.nix
+++ b/nixos/modules/programs/zsh/oh-my-zsh.nix
@@ -29,6 +29,13 @@ let
in
{
+ imports = [
+ (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "enable" ] [ "programs" "zsh" "ohMyZsh" "enable" ])
+ (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ])
+ (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ])
+ (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ])
+ ];
+
options = {
programs.zsh.ohMyZsh = {
enable = mkOption {
diff --git a/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/nixos/modules/programs/zsh/zsh-autosuggestions.nix
index ded17f38a618..037888fdc5a8 100644
--- a/nixos/modules/programs/zsh/zsh-autosuggestions.nix
+++ b/nixos/modules/programs/zsh/zsh-autosuggestions.nix
@@ -6,6 +6,10 @@ let
cfg = config.programs.zsh.autosuggestions;
in
{
+ imports = [
+ (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestions" "enable" ])
+ ];
+
options.programs.zsh.autosuggestions = {
enable = mkEnableOption "zsh-autosuggestions";
diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
index 7184e5d9b9a8..927a904369d5 100644
--- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
+++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
@@ -6,6 +6,13 @@ let
cfg = config.programs.zsh.syntaxHighlighting;
in
{
+ imports = [
+ (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
+ (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "enable" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
+ (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "highlighters" ] [ "programs" "zsh" "syntaxHighlighting" "highlighters" ])
+ (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "patterns" ] [ "programs" "zsh" "syntaxHighlighting" "patterns" ])
+ ];
+
options = {
programs.zsh.syntaxHighlighting = {
enable = mkEnableOption "zsh-syntax-highlighting";
@@ -81,7 +88,7 @@ in
];
programs.zsh.interactiveShellInit = with pkgs;
- lib.concatStringsSep "\n" ([
+ lib.mkAfter (lib.concatStringsSep "\n" ([
"source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
] ++ optional (length(cfg.highlighters) > 0)
"ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})"
@@ -95,6 +102,6 @@ in
styles: design:
"ZSH_HIGHLIGHT_STYLES[${styles}]='${design}'"
) cfg.styles)
- );
+ ));
};
}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 886e2e83ba62..7109ab5a1099 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -4,292 +4,30 @@ with lib;
{
imports = [
- (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ])
- (mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
- (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
- (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
- (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
- (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ])
- (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]
- (config:
- let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;
- in if enabled then [ pkgs.gutenprint ] else [ ]))
- (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]
- (config:
- let value = getAttrFromPath [ "services" "ddclient" "domain" ] config;
- in if value != "" then [ value ] else []))
- (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "")
- (mkRenamedOptionModule [ "services" "flatpak" "extraPortals" ] [ "xdg" "portal" "extraPortals" ])
- (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])
- (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])
- (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
- (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "port" ] ["services" "kubernetes" "apiserver" "insecurePort"])
- (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")
- (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ])
- (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "address" ] ["services" "kubernetes" "controllerManager" "bindAddress"])
- (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "port" ] ["services" "kubernetes" "controllerManager" "insecurePort"])
- (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "servers" ] [ "services" "kubernetes" "apiserver" "etcd" "servers" ])
- (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "keyFile" ] [ "services" "kubernetes" "apiserver" "etcd" "keyFile" ])
- (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "certFile" ] [ "services" "kubernetes" "apiserver" "etcd" "certFile" ])
- (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "caFile" ] [ "services" "kubernetes" "apiserver" "etcd" "caFile" ])
- (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "")
- (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")
- (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "")
- (mkRenamedOptionModule [ "services" "kubernetes" "proxy" "address" ] ["services" "kubernetes" "proxy" "bindAddress"])
- (mkRemovedOptionModule [ "services" "kubernetes" "verbose" ] "")
- (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
- (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ])
- (mkRenamedOptionModule [ "services" "neo4j" "listenAddress" ] [ "services" "neo4j" "defaultListenAddress" ])
- (mkRenamedOptionModule [ "services" "neo4j" "enableBolt" ] [ "services" "neo4j" "bolt" "enable" ])
- (mkRenamedOptionModule [ "services" "neo4j" "enableHttps" ] [ "services" "neo4j" "https" "enable" ])
- (mkRenamedOptionModule [ "services" "neo4j" "certDir" ] [ "services" "neo4j" "directories" "certificates" ])
- (mkRenamedOptionModule [ "services" "neo4j" "dataDir" ] [ "services" "neo4j" "directories" "home" ])
- (mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.")
- (mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.")
- (mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.")
- (mkRemovedOptionModule [ "services" "misc" "nzbget" "configFile" ] "The configuration of nzbget is now managed by users through the web interface.")
- (mkRemovedOptionModule [ "services" "misc" "nzbget" "dataDir" ] "The data directory for nzbget is now /var/lib/nzbget.")
- (mkRemovedOptionModule [ "services" "misc" "nzbget" "openFirewall" ] "The port used by nzbget is managed through the web interface so you should adjust your firewall rules accordingly.")
- (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "user" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a user setting.")
- (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.")
- (mkRemovedOptionModule [ "services" "prometheus" "alertmanagerURL" ] ''
- Due to incompatibility, the alertmanagerURL option has been removed,
- please use 'services.prometheus2.alertmanagers' instead.
- '')
- (mkRenamedOptionModule [ "services" "prometheus2" ] [ "services" "prometheus" ])
- (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
- (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ])
- (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
+ /*
+ This file defines some renaming/removing options for backwards compatibility
- (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])
- (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "")
-
- (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ])
-
- (mkRemovedOptionModule [ "services" "pykms" "verbose" ] "Use services.pykms.logLevel instead")
-
- (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead")
- (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead")
-
- (mkRenamedOptionModule [ "security" "virtualization" "flushL1DataCache" ] [ "security" "virtualisation" "flushL1DataCache" ])
-
- # PAM
- (mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ])
-
- # rmilter/rspamd
- (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")
-
- # Xsession script
- (mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "xserver" "displayManager" "job" "logToFile" ])
- (mkRenamedOptionModule [ "services" "xserver" "displayManager" "logToJournal" ] [ "services" "xserver" "displayManager" "job" "logToJournal" ])
-
- # Old Grub-related options.
- (mkRenamedOptionModule [ "boot" "loader" "grub" "timeout" ] [ "boot" "loader" "timeout" ])
- (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "timeout" ] [ "boot" "loader" "timeout" ])
-
- # OpenSSH
- (mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
- (mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
-
- # libvirtd
- (mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ]
- "Set the option `virtualisation.libvirtd.qemuPackage' instead.")
-
- # ibus
- (mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "inputMethod" "ibus" "engines" ])
-
- # sandboxing
- (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ])
- (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ])
-
- (mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ])
+ It should ONLY be used when the relevant module can't define these imports
+ itself, such as when the module was removed completely.
+ See https://github.com/NixOS/nixpkgs/pull/61570 for explanation
+ */
+ # This alias module can't be where _module.check is defined because it would
+ # be added to submodules as well there
(mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
- # opendkim
- (mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ])
-
- # Enlightenment
- (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ])
-
- # Iodine
- (mkRenamedOptionModule [ "services" "iodined" "enable" ] [ "services" "iodine" "server" "enable" ])
- (mkRenamedOptionModule [ "services" "iodined" "domain" ] [ "services" "iodine" "server" "domain" ])
- (mkRenamedOptionModule [ "services" "iodined" "ip" ] [ "services" "iodine" "server" "ip" ])
- (mkRenamedOptionModule [ "services" "iodined" "extraConfig" ] [ "services" "iodine" "server" "extraConfig" ])
- (mkRemovedOptionModule [ "services" "iodined" "client" ] "")
-
- # Unity3D
- (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ])
-
- # murmur
- (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
- (mkRemovedOptionModule [ "services" "murmur" "pidfile" ] "Hardcoded to /run/murmur/murmurd.pid now")
-
- # parsoid
- (mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] "Use services.parsoid.wikis instead")
-
- # plexpy / tautulli
- (mkRenamedOptionModule [ "services" "plexpy" ] [ "services" "tautulli" ])
-
- # piwik was renamed to matomo
- (mkRenamedOptionModule [ "services" "piwik" "enable" ] [ "services" "matomo" "enable" ])
- (mkRenamedOptionModule [ "services" "piwik" "webServerUser" ] [ "services" "matomo" "webServerUser" ])
- (mkRemovedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools..settings")
- (mkRemovedOptionModule [ "services" "matomo" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools..settings")
- (mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ])
-
- # tarsnap
- (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives..cachedir")
-
- # alsa
- (mkRenamedOptionModule [ "sound" "enableMediaKeys" ] [ "sound" "mediaKeys" "enable" ])
-
- # postgrey
- (mkMergedOptionModule [ [ "services" "postgrey" "inetAddr" ] [ "services" "postgrey" "inetPort" ] ] [ "services" "postgrey" "socket" ] (config: let
- value = p: getAttrFromPath p config;
- inetAddr = [ "services" "postgrey" "inetAddr" ];
- inetPort = [ "services" "postgrey" "inetPort" ];
- in
- if value inetAddr == null
- then { path = "/run/postgrey.sock"; }
- else { addr = value inetAddr; port = value inetPort; }
- ))
-
- # dhcpd
- (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ])
-
- # locate
- (mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ])
- (mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths" )
-
- # nfs
- (mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ])
- (mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ])
-
- # KDE Plasma 5
- (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
-
- # Fontconfig
- (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ])
- (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ])
- (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ])
- (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ])
- (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
-
- # postgresqlBackup
- (mkRemovedOptionModule [ "services" "postgresqlBackup" "period" ] ''
- A systemd timer is now used instead of cron.
- The starting time can be configured via services.postgresqlBackup.startAt .
- '')
-
- # phpfpm
- (mkRemovedOptionModule [ "services" "phpfpm" "poolConfigs" ] "Use services.phpfpm.pools instead.")
-
- # zabbixServer
- (mkRenamedOptionModule [ "services" "zabbixServer" "dbServer" ] [ "services" "zabbixServer" "database" "host" ])
-
- # Profile splitting
- (mkRenamedOptionModule [ "virtualisation" "growPartition" ] [ "boot" "growPartition" ])
-
- # misc/version.nix
- (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ])
- (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ])
- (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ])
- (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ])
-
- # Users
- (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
- (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])
-
- # Options that are obsolete and have no replacement.
- (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
- (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
- (mkRemovedOptionModule [ "services" "samba" "defaultShare" ] "")
- (mkRemovedOptionModule [ "services" "syslog-ng" "serviceName" ] "")
- (mkRemovedOptionModule [ "services" "syslog-ng" "listenToJournal" ] "")
- (mkRemovedOptionModule [ "ec2" "metadata" ] "")
- (mkRemovedOptionModule [ "services" "openvpn" "enable" ] "")
- (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "")
- (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "")
- (mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.")
- (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.")
- (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ]
- "See the 16.09 release notes for more information.")
- (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")
- (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")
+ # Completely removed modules
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "")
- (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
- (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
- "Set the option `services.xserver.displayManager.sddm.package' instead.")
- (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "")
- (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
- (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
- (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.")
- (mkRemovedOptionModule [ "services" "logstash" "enableWeb" ] "The web interface was removed from logstash")
- (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.")
- (mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd")
- (mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.")
- (mkRemovedOptionModule [ "services" "zabbixServer" "dbPassword" ] "Use services.zabbixServer.database.passwordFile instead.")
- (mkRemovedOptionModule [ "systemd" "generator-packages" ] "Use systemd.packages instead.")
-
- # ZSH
- (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
- (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "enable" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
- (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "highlighters" ] [ "programs" "zsh" "syntaxHighlighting" "highlighters" ])
- (mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "patterns" ] [ "programs" "zsh" "syntaxHighlighting" "patterns" ])
- (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "enable" ] [ "programs" "zsh" "ohMyZsh" "enable" ])
- (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ])
- (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ])
- (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ])
-
- (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestions" "enable" ])
-
- # Xen
- (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ])
-
- (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ])
- (mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ])
- (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ])
-
- # ckb
- (mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])
- (mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])
-
- # binfmt
- (mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ])
-
- # ACME
- (mkRemovedOptionModule [ "security" "acme" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")
- (mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
- (mkRemovedOptionModule [ "security" "acme" "activationDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
-
- # KSM
- (mkRenamedOptionModule [ "hardware" "enableKSM" ] [ "hardware" "ksm" "enable" ])
-
- # resolvconf
- (mkRenamedOptionModule [ "networking" "dnsSingleRequest" ] [ "networking" "resolvconf" "dnsSingleRequest" ])
- (mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ])
- (mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])
- (mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])
-
- # BLCR
+ (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.")
(mkRemovedOptionModule [ "environment.blcr.enable" ] "The BLCR module has been removed")
+ (mkRemovedOptionModule [ "services.beegfsEnable" ] "The BeeGFS module has been removed")
+ (mkRemovedOptionModule [ "services.beegfs" ] "The BeeGFS module has been removed")
+ (mkRemovedOptionModule [ "services.osquery" ] "The osquery module has been removed")
+ (mkRemovedOptionModule [ "services.fourStore" ] "The fourStore module has been removed")
+ (mkRemovedOptionModule [ "services.fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
- # Redis
- (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
- (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")
- (mkRemovedOptionModule [ "services" "redis" "dbFilename" ] "The redis module now uses /var/lib/redis/dump.rdb as database dump location.")
- (mkRemovedOptionModule [ "services" "redis" "appendOnlyFilename" ] "This option was never used.")
- (mkRemovedOptionModule [ "services" "redis" "pidFile" ] "This option was removed.")
-
- ] ++ (forEach [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
- "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
- "snmpExporter" "unifiExporter" "varnishExporter" ]
- (opt: mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] ''
- The prometheus exporters are now configured using `services.prometheus.exporters'.
- See the 18.03 release notes for more information.
- '' ));
+ # Do NOT add any option renames here, see top of the file
+ ];
}
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index d14613f22b05..890c421b0ea9 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -127,6 +127,9 @@ in
"https://acme-staging-v02.api.letsencrypt.org/directory".
''
)
+ (mkRemovedOptionModule [ "security" "acme" "directory"] "ACME Directory is now hardcoded to /var/lib/acme and its permisisons are managed by systemd. See https://github.com/NixOS/nixpkgs/issues/53852 for more info.")
+ (mkRemovedOptionModule [ "security" "acme" "preDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
+ (mkRemovedOptionModule [ "security" "acme" "activationDelay"] "This option has been removed. If you want to make sure that something executes before certificates are provisioned, add a RequiredBy=acme-\${cert}.service to the service you want to execute before the cert renewal")
];
options = {
security.acme = {
@@ -224,6 +227,12 @@ in
environment.REQUESTS_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt";
serviceConfig = {
Type = "oneshot";
+ # With RemainAfterExit the service is considered active even
+ # after the main process having exited, which means when it
+ # gets changed, the activation phase restarts it, meaning
+ # the permissions of the StateDirectory get adjusted
+ # according to the specified group
+ RemainAfterExit = true;
SuccessExitStatus = [ "0" "1" ];
User = data.user;
Group = data.group;
@@ -232,9 +241,9 @@ in
StateDirectoryMode = rights;
WorkingDirectory = "/var/lib/${lpath}";
ExecStart = "${pkgs.simp_le}/bin/simp_le ${escapeShellArgs cmdline}";
- ExecStopPost =
+ ExecStartPost =
let
- script = pkgs.writeScript "acme-post-stop" ''
+ script = pkgs.writeScript "acme-post-start" ''
#!${pkgs.runtimeShell} -e
${data.postRun}
'';
diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index 498c2f25d1c0..3c93f5440ab5 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -4,6 +4,9 @@ let
in
with lib;
{
+ imports = [
+ (mkRenamedOptionModule [ "security" "virtualization" "flushL1DataCache" ] [ "security" "virtualisation" "flushL1DataCache" ])
+ ];
options.security.apparmor.confineSUIDApplications = mkOption {
default = true;
diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix
index 2255477f26e4..b83dbc4202a8 100644
--- a/nixos/modules/security/chromium-suid-sandbox.nix
+++ b/nixos/modules/security/chromium-suid-sandbox.nix
@@ -7,6 +7,10 @@ let
sandbox = pkgs.chromium.sandbox;
in
{
+ imports = [
+ (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ])
+ ];
+
options.security.chromiumSuidSandbox.enable = mkOption {
type = types.bool;
default = false;
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 11227354ad3b..0adc27c47f02 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -484,6 +484,10 @@ in
{
+ imports = [
+ (mkRenamedOptionModule [ "security" "pam" "enableU2F" ] [ "security" "pam" "u2f" "enable" ])
+ ];
+
###### interface
options = {
@@ -707,7 +711,7 @@ in
Use "challenge-response" for offline validation using YubiKeys with HMAC-SHA-1
Challenge-Response configurations. See the man-page ykpamcfg(1) for further
- details on how to configure offline Challenge-Response validation.
+ details on how to configure offline Challenge-Response validation.
More information can be found here.
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index f2b2df4004cb..a6724bd75832 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -42,15 +42,14 @@ in
security.polkit.adminIdentities = mkOption {
type = types.listOf types.str;
- default = [ "unix-user:0" "unix-group:wheel" ];
+ default = [ "unix-group:wheel" ];
example = [ "unix-user:alice" "unix-group:admin" ];
description =
''
Specifies which users are considered “administrators”, for those
actions that require the user to authenticate as an
administrator (i.e. have an auth_admin
- value). By default, this is the root
- user and all users in the wheel group.
+ value). By default, this is all users in the wheel group.
'';
};
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 47738e7962ea..a0fadb018eca 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -94,6 +94,10 @@ let
) programs;
in
{
+ imports = [
+ (lib.mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead")
+ (lib.mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead")
+ ];
###### interface
diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix
index da81be3f23e8..885eaed1de6f 100644
--- a/nixos/modules/services/admin/oxidized.nix
+++ b/nixos/modules/services/admin/oxidized.nix
@@ -111,6 +111,7 @@ in
Restart = "always";
WorkingDirectory = cfg.dataDir;
KillSignal = "SIGKILL";
+ PIDFile = "${cfg.dataDir}.config/oxidized/pid";
};
};
};
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index f632644af09e..990398e65463 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -12,6 +12,9 @@ let
in
{
+ imports = [
+ (mkRenamedOptionModule [ "sound" "enableMediaKeys" ] [ "sound" "mediaKeys" "enable" ])
+ ];
###### interface
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 56dc858b6405..7932d094197b 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -18,7 +18,6 @@ let
''}
state_file "${cfg.dataDir}/state"
sticker_file "${cfg.dataDir}/sticker.sql"
- log_file "syslog"
user "${cfg.user}"
group "${cfg.group}"
diff --git a/nixos/modules/services/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix
index 4eda3c5708da..6aed485638cc 100644
--- a/nixos/modules/services/audio/roon-server.nix
+++ b/nixos/modules/services/audio/roon-server.nix
@@ -66,7 +66,8 @@ in {
if cfg.user == "roon-server" then {
isSystemUser = true;
description = "Roon Server user";
- groups = [ cfg.group "audio" ];
+ group = cfg.group;
+ extraGroups = [ "audio" ];
}
else {};
};
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index 41bda7893a75..cef304734aee 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -44,7 +44,17 @@ let
Pid Directory = "/run";
${sd_cfg.extraStorageConfig}
}
-
+
+ ${concatStringsSep "\n" (mapAttrsToList (name: value: ''
+ Autochanger {
+ Name = "${name}";
+ Device = ${concatStringsSep ", " (map (a: "\"${a}\"") value.devices)};
+ Changer Device = "${value.changerDevice}";
+ Changer Command = "${value.changerCommand}";
+ ${value.extraAutochangerConfig}
+ }
+ '') sd_cfg.autochanger)}
+
${concatStringsSep "\n" (mapAttrsToList (name: value: ''
Device {
Name = "${name}";
@@ -103,7 +113,19 @@ let
password = mkOption {
# TODO: required?
description = ''
- Specifies the password that must be supplied for a Director to b
+ Specifies the password that must be supplied for the default Bacula
+ Console to be authorized. The same password must appear in the
+ Director resource of the Console configuration file. For added
+ security, the password is never passed across the network but instead
+ a challenge response hash code created with the password. This
+ directive is required. If you have either /dev/random or bc on your
+ machine, Bacula will generate a random password during the
+ configuration process, otherwise it will be left blank and you must
+ manually supply it.
+
+ The password is plain text. It is not generated through any special
+ process but as noted above, it is better to use random text for
+ security reasons.
'';
};
@@ -111,26 +133,133 @@ let
default = "no";
example = "yes";
description = ''
- If Monitor is set to no (default), this director will have full
+ If Monitor is set to no , this director will have
+ full access to this Storage daemon. If Monitor is set to
+ yes , this director will only be able to fetch the
+ current status of this Storage daemon.
+
+ Please note that if this director is being used by a Monitor, we
+ highly recommend to set this directive to yes to avoid serious
+ security problems.
'';
};
};
};
+ autochangerOptions = {...}:
+ {
+ options = {
+ changerDevice = mkOption {
+ description = ''
+ The specified name-string must be the generic SCSI device name of the
+ autochanger that corresponds to the normal read/write Archive Device
+ specified in the Device resource. This generic SCSI device name
+ should be specified if you have an autochanger or if you have a
+ standard tape drive and want to use the Alert Command (see below).
+ For example, on Linux systems, for an Archive Device name of
+ /dev/nst0 , you would specify
+ /dev/sg0 for the Changer Device name. Depending
+ on your exact configuration, and the number of autochangers or the
+ type of autochanger, what you specify here can vary. This directive
+ is optional. See the Using AutochangersAutochangersChapter chapter of
+ this manual for more details of using this and the following
+ autochanger directives.
+ '';
+ };
+
+ changerCommand = mkOption {
+ description = ''
+ The name-string specifies an external program to be called that will
+ automatically change volumes as required by Bacula. Normally, this
+ directive will be specified only in the AutoChanger resource, which
+ is then used for all devices. However, you may also specify the
+ different Changer Command in each Device resource. Most frequently,
+ you will specify the Bacula supplied mtx-changer script as follows:
+
+ "/path/mtx-changer %c %o %S %a %d"
+
+ and you will install the mtx on your system (found in the depkgs
+ release). An example of this command is in the default bacula-sd.conf
+ file. For more details on the substitution characters that may be
+ specified to configure your autochanger please see the
+ AutochangersAutochangersChapter chapter of this manual. For FreeBSD
+ users, you might want to see one of the several chio scripts in
+ examples/autochangers.
+ '';
+ default = "/etc/bacula/mtx-changer %c %o %S %a %d";
+ };
+
+ devices = mkOption {
+ description = ''
+ '';
+ };
+
+ extraAutochangerConfig = mkOption {
+ default = "";
+ description = ''
+ Extra configuration to be passed in Autochanger directive.
+ '';
+ example = ''
+
+ '';
+ };
+ };
+ };
+
+
deviceOptions = {...}:
{
options = {
archiveDevice = mkOption {
# TODO: required?
description = ''
- The specified name-string gives the system file name of the storage device managed by this storage daemon. This will usually be the device file name of a removable storage device (tape drive), for example " /dev/nst0" or "/dev/rmt/0mbn". For a DVD-writer, it will be for example /dev/hdc. It may also be a directory name if you are archiving to disk storage.
+ The specified name-string gives the system file name of the storage
+ device managed by this storage daemon. This will usually be the
+ device file name of a removable storage device (tape drive), for
+ example /dev/nst0 or
+ /dev/rmt/0mbn . For a DVD-writer, it will be for
+ example /dev/hdc . It may also be a directory name
+ if you are archiving to disk storage. In this case, you must supply
+ the full absolute path to the directory. When specifying a tape
+ device, it is preferable that the "non-rewind" variant of the device
+ file name be given.
'';
};
mediaType = mkOption {
# TODO: required?
description = ''
- The specified name-string names the type of media supported by this device, for example, "DLT7000". Media type names are arbitrary in that you set them to anything you want, but they must be known to the volume database to keep track of which storage daemons can read which volumes. In general, each different storage type should have a unique Media Type associated with it. The same name-string must appear in the appropriate Storage resource definition in the Director's configuration file.
+ The specified name-string names the type of media supported by this
+ device, for example, DLT7000 . Media type names are
+ arbitrary in that you set them to anything you want, but they must be
+ known to the volume database to keep track of which storage daemons
+ can read which volumes. In general, each different storage type
+ should have a unique Media Type associated with it. The same
+ name-string must appear in the appropriate Storage resource
+ definition in the Director's configuration file.
+
+ Even though the names you assign are arbitrary (i.e. you choose the
+ name you want), you should take care in specifying them because the
+ Media Type is used to determine which storage device Bacula will
+ select during restore. Thus you should probably use the same Media
+ Type specification for all drives where the Media can be freely
+ interchanged. This is not generally an issue if you have a single
+ Storage daemon, but it is with multiple Storage daemons, especially
+ if they have incompatible media.
+
+ For example, if you specify a Media Type of DDS-4
+ then during the restore, Bacula will be able to choose any Storage
+ Daemon that handles DDS-4 . If you have an
+ autochanger, you might want to name the Media Type in a way that is
+ unique to the autochanger, unless you wish to possibly use the
+ Volumes in other drives. You should also ensure to have unique Media
+ Type names if the Media is not compatible between drives. This
+ specification is required for all devices.
+
+ In addition, if you are using disk storage, each Device resource will
+ generally have a different mount point or directory. In order for
+ Bacula to select the correct Device resource, each one must have a
+ unique Media Type.
'';
};
@@ -166,8 +295,8 @@ in {
default = "${config.networking.hostName}-fd";
description = ''
The client name that must be used by the Director when connecting.
- Generally, it is a good idea to use a name related to the machine
- so that error messages can be easily identified if you have multiple
+ Generally, it is a good idea to use a name related to the machine so
+ that error messages can be easily identified if you have multiple
Clients. This directive is required.
'';
};
@@ -232,7 +361,8 @@ in {
default = 9103;
type = types.int;
description = ''
- Specifies port number on which the Storage daemon listens for Director connections. The default is 9103.
+ Specifies port number on which the Storage daemon listens for
+ Director connections.
'';
};
@@ -251,7 +381,15 @@ in {
'';
type = with types; attrsOf (submodule deviceOptions);
};
-
+
+ autochanger = mkOption {
+ default = {};
+ description = ''
+ This option defines Autochanger resources in Bacula Storage Daemon.
+ '';
+ type = with types; attrsOf (submodule autochangerOptions);
+ };
+
extraStorageConfig = mkOption {
default = "";
description = ''
@@ -287,7 +425,8 @@ in {
name = mkOption {
default = "${config.networking.hostName}-dir";
description = ''
- The director name used by the system administrator. This directive is required.
+ The director name used by the system administrator. This directive is
+ required.
'';
};
@@ -295,7 +434,12 @@ in {
default = 9101;
type = types.int;
description = ''
- Specify the port (a positive integer) on which the Director daemon will listen for Bacula Console connections. This same port number must be specified in the Director resource of the Console configuration file. The default is 9101, so normally this directive need not be specified. This directive should not be used if you specify DirAddresses (N.B plural) directive.
+ Specify the port (a positive integer) on which the Director daemon
+ will listen for Bacula Console connections. This same port number
+ must be specified in the Director resource of the Console
+ configuration file. The default is 9101, so normally this directive
+ need not be specified. This directive should not be used if you
+ specify DirAddresses (N.B plural) directive.
'';
};
diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index 10d42325a6b1..a2eb80c55a8c 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -68,7 +68,7 @@ let
{ BORG_PASSPHRASE = passphrase; }
else { };
- mkBackupService = name: cfg:
+ mkBackupService = name: cfg:
let
userHome = config.users.users.${cfg.user}.home;
in nameValuePair "borgbackup-job-${name}" {
@@ -98,6 +98,23 @@ let
inherit (cfg) startAt;
};
+ # utility function around makeWrapper
+ mkWrapperDrv = {
+ original, name, set ? {}
+ }:
+ pkgs.runCommandNoCC "${name}-wrapper" {
+ buildInputs = [ pkgs.makeWrapper ];
+ } (with lib; ''
+ makeWrapper "${original}" "$out/bin/${name}" \
+ ${concatStringsSep " \\\n " (mapAttrsToList (name: value: ''--set ${name} "${value}"'') set)}
+ '');
+
+ mkBorgWrapper = name: cfg: mkWrapperDrv {
+ original = "${pkgs.borgbackup}/bin/borg";
+ name = "borg-job-${name}";
+ set = { BORG_REPO = cfg.repo; } // (mkPassEnv cfg) // cfg.environment;
+ };
+
# Paths listed in ReadWritePaths must exist before service is started
mkActivationScript = name: cfg:
let
@@ -176,7 +193,11 @@ in {
###### interface
options.services.borgbackup.jobs = mkOption {
- description = "Deduplicating backups using BorgBackup.";
+ description = ''
+ Deduplicating backups using BorgBackup.
+ Adding a job will cause a borg-job-NAME wrapper to be added
+ to your system path, so that you can perform maintenance easily.
+ '';
default = { };
example = literalExample ''
{
@@ -623,6 +644,6 @@ in {
users = mkMerge (mapAttrsToList mkUsersConfig repos);
- environment.systemPackages = with pkgs; [ borgbackup ];
+ environment.systemPackages = with pkgs; [ borgbackup ] ++ (mapAttrsToList mkBorgWrapper jobs);
});
}
diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index 13a36ae32ac0..580c7ce68f1d 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -35,6 +35,13 @@ let
in {
+ imports = [
+ (mkRemovedOptionModule [ "services" "postgresqlBackup" "period" ] ''
+ A systemd timer is now used instead of cron.
+ The starting time can be configured via services.postgresqlBackup.startAt .
+ '')
+ ];
+
options = {
services.postgresqlBackup = {
enable = mkOption {
@@ -82,7 +89,7 @@ in {
pgdumpOptions = mkOption {
type = types.separatedString " ";
- default = "-Cbo";
+ default = "-C";
description = ''
Command line options for pg_dump. This options is not used
if config.services.postgresqlBackup.backupAll is enabled.
diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 4fc7c24813a5..6d99a1efb613 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -23,6 +23,10 @@ let
'';
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives..cachedir")
+ ];
+
options = {
services.tarsnap = {
enable = mkOption {
diff --git a/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix b/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
index 70f96d75a461..2ed7742eda09 100644
--- a/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
+++ b/nixos/modules/services/cluster/kubernetes/addons/dashboard.nix
@@ -5,6 +5,10 @@ with lib;
let
cfg = config.services.kubernetes.addons.dashboard;
in {
+ imports = [
+ (mkRenamedOptionModule [ "services" "kubernetes" "addons" "dashboard" "enableRBAC" ] [ "services" "kubernetes" "addons" "dashboard" "rbac" "enable" ])
+ ];
+
options.services.kubernetes.addons.dashboard = {
enable = mkEnableOption "kubernetes dashboard addon";
diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix
index 47e588de3c93..f12e866930da 100644
--- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix
+++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix
@@ -3,7 +3,7 @@
with lib;
let
- version = "1.5.0";
+ version = "1.6.4";
cfg = config.services.kubernetes.addons.dns;
ports = {
dns = 10053;
@@ -55,9 +55,9 @@ in {
type = types.attrs;
default = {
imageName = "coredns/coredns";
- imageDigest = "sha256:e83beb5e43f8513fa735e77ffc5859640baea30a882a11cc75c4c3244a737d3c";
+ imageDigest = "sha256:493ee88e1a92abebac67cbd4b5658b4730e0f33512461442d8d9214ea6734a9b";
finalImageTag = version;
- sha256 = "15sbmhrxjxidj0j0cccn1qxpg6al175w43m6ngspl0mc132zqc9q";
+ sha256 = "0fm9zdjavpf5hni8g7fkdd3csjbhd7n7py7llxjc66sbii087028";
};
};
};
@@ -68,7 +68,7 @@ in {
services.kubernetes.addonManager.bootstrapAddons = {
coredns-cr = {
- apiVersion = "rbac.authorization.k8s.io/v1beta1";
+ apiVersion = "rbac.authorization.k8s.io/v1";
kind = "ClusterRole";
metadata = {
labels = {
@@ -94,7 +94,7 @@ in {
};
coredns-crb = {
- apiVersion = "rbac.authorization.k8s.io/v1beta1";
+ apiVersion = "rbac.authorization.k8s.io/v1";
kind = "ClusterRoleBinding";
metadata = {
annotations = {
@@ -170,7 +170,7 @@ in {
};
coredns-deploy = {
- apiVersion = "extensions/v1beta1";
+ apiVersion = "apps/v1";
kind = "Deployment";
metadata = {
labels = {
diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix
index 33796bf2e080..95bdb4c0d14e 100644
--- a/nixos/modules/services/cluster/kubernetes/apiserver.nix
+++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix
@@ -13,6 +13,18 @@ let
)) + ".1");
in
{
+
+ imports = [
+ (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])
+ (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
+ (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "port" ] ["services" "kubernetes" "apiserver" "insecurePort"])
+ (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")
+ (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "servers" ] [ "services" "kubernetes" "apiserver" "etcd" "servers" ])
+ (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "keyFile" ] [ "services" "kubernetes" "apiserver" "etcd" "keyFile" ])
+ (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "certFile" ] [ "services" "kubernetes" "apiserver" "etcd" "certFile" ])
+ (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "caFile" ] [ "services" "kubernetes" "apiserver" "etcd" "caFile" ])
+ ];
+
###### interface
options.services.kubernetes.apiserver = with lib.types; {
diff --git a/nixos/modules/services/cluster/kubernetes/controller-manager.nix b/nixos/modules/services/cluster/kubernetes/controller-manager.nix
index 0b73d090f241..a99ef6640e97 100644
--- a/nixos/modules/services/cluster/kubernetes/controller-manager.nix
+++ b/nixos/modules/services/cluster/kubernetes/controller-manager.nix
@@ -7,6 +7,11 @@ let
cfg = top.controllerManager;
in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "address" ] ["services" "kubernetes" "controllerManager" "bindAddress"])
+ (mkRenamedOptionModule [ "services" "kubernetes" "controllerManager" "port" ] ["services" "kubernetes" "controllerManager" "insecurePort"])
+ ];
+
###### interface
options.services.kubernetes.controllerManager = with lib.types; {
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index 3790ac9b6918..3605d0365094 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -74,6 +74,10 @@ let
};
in {
+ imports = [
+ (mkRemovedOptionModule [ "services" "kubernetes" "verbose" ] "")
+ ];
+
###### interface
options.services.kubernetes = {
diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix
index d799e638fc94..548ffed1ddb5 100644
--- a/nixos/modules/services/cluster/kubernetes/flannel.nix
+++ b/nixos/modules/services/cluster/kubernetes/flannel.nix
@@ -40,6 +40,7 @@ in
cni.config = mkDefault [{
name = "mynet";
type = "flannel";
+ cniVersion = "0.3.1";
delegate = {
isDefaultGateway = true;
bridge = "docker0";
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index 250da4c807ec..c3d67552cc8c 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -52,6 +52,12 @@ let
taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (mapAttrsToList (n: v: v) cfg.taints);
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "applyManifests" ] "")
+ (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "cadvisorPort" ] "")
+ (mkRemovedOptionModule [ "services" "kubernetes" "kubelet" "allowPrivileged" ] "")
+ ];
+
###### interface
options.services.kubernetes.kubelet = with lib.types; {
@@ -92,7 +98,7 @@ in
default = [];
example = literalExample ''
[{
- "cniVersion": "0.2.0",
+ "cniVersion": "0.3.1",
"name": "mynet",
"type": "bridge",
"bridge": "cni0",
@@ -106,7 +112,7 @@ in
]
}
} {
- "cniVersion": "0.2.0",
+ "cniVersion": "0.3.1",
"type": "loopback"
}]
'';
diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix
index bd4bf04ea833..86d1dc2439bd 100644
--- a/nixos/modules/services/cluster/kubernetes/proxy.nix
+++ b/nixos/modules/services/cluster/kubernetes/proxy.nix
@@ -7,6 +7,9 @@ let
cfg = top.proxy;
in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "kubernetes" "proxy" "address" ] ["services" "kubernetes" "proxy" "bindAddress"])
+ ];
###### interface
options.services.kubernetes.proxy = with lib.types; {
@@ -31,6 +34,12 @@ in
type = listOf str;
};
+ hostname = mkOption {
+ description = "Kubernetes proxy hostname override.";
+ default = config.networking.hostName;
+ type = str;
+ };
+
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes proxy";
verbosity = mkOption {
@@ -59,6 +68,7 @@ in
"--cluster-cidr=${top.clusterCidr}"} \
${optionalString (cfg.featureGates != [])
"--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
+ --hostname-override=${cfg.hostname} \
--kubeconfig=${top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
${cfg.extraOpts}
@@ -69,6 +79,8 @@ in
};
};
+ services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName;
+
services.kubernetes.pki.certs = {
kubeProxyClient = top.lib.mkCert {
name = "kube-proxy-client";
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index d1a1383e45b0..c70d999ca96d 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -18,7 +18,7 @@ let
${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
${toString (map (x: "NodeName=${x}\n") cfg.nodeName)}
${toString (map (x: "PartitionName=${x}\n") cfg.partitionName)}
- PlugStackConfig=${plugStackConfig}
+ PlugStackConfig=${plugStackConfig}/plugstack.conf
ProctrackType=${cfg.procTrackType}
${cfg.extraConfig}
'';
@@ -39,6 +39,8 @@ let
DbdHost=${cfg.dbdserver.dbdHost}
SlurmUser=${cfg.user}
StorageType=accounting_storage/mysql
+ StorageUser=${cfg.dbdserver.storageUser}
+ ${optionalString (cfg.dbdserver.storagePass != null) "StoragePass=${cfg.dbdserver.storagePass}"}
${cfg.dbdserver.extraConfig}
'';
@@ -48,7 +50,6 @@ let
name = "etc-slurm";
paths = [ configFile cgroupConfig plugStackConfig ] ++ cfg.extraConfigPaths;
};
-
in
{
@@ -86,6 +87,37 @@ in
'';
};
+ storageUser = mkOption {
+ type = types.str;
+ default = cfg.user;
+ description = ''
+ Database user name.
+ '';
+ };
+
+ storagePass = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Database password. Note that this password will be publicable
+ readable in the nix store. Use configFile
+ to store the and config file and password outside the nix store.
+ '';
+ };
+
+ configFile = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Path to slurmdbd.conf . The password for the database connection
+ is stored in the config file. Use this option to specfify a path
+ outside the nix store. If this option is unset a configuration file
+ will be generated. See also:
+ slurmdbd.conf
+ 8 .
+ '';
+ };
+
extraConfig = mkOption {
type = types.lines;
default = "";
@@ -112,7 +144,7 @@ in
package = mkOption {
type = types.package;
- default = pkgs.slurm;
+ default = pkgs.slurm.override { enableX11 = ! cfg.enableSrunX11; };
defaultText = "pkgs.slurm";
example = literalExample "pkgs.slurm-full";
description = ''
@@ -178,9 +210,14 @@ in
If enabled srun will accept the option "--x11" to allow for X11 forwarding
from within an interactive session or a batch job. This activates the
slurm-spank-x11 module. Note that this option also enables
- 'services.openssh.forwardX11' on the client.
+ services.openssh.forwardX11 on the client.
This option requires slurm to be compiled without native X11 support.
+ The default behavior is to re-compile the slurm package with native X11
+ support disabled if this option is set to true.
+
+ To use the native X11 support add PrologFlags=X11 in extraConfig .
+ Note that this method will only work RSA SSH host keys.
'';
};
@@ -356,7 +393,11 @@ in
requires = [ "munged.service" "mysql.service" ];
# slurm strips the last component off the path
- environment.SLURM_CONF = "${slurmdbdConf}/slurm.conf";
+ environment.SLURM_CONF =
+ if (cfg.dbdserver.configFile == null) then
+ "${slurmdbdConf}/slurm.conf"
+ else
+ cfg.dbdserver.configFile;
serviceConfig = {
Type = "forking";
diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix
deleted file mode 100644
index 59ed0e5f0afd..000000000000
--- a/nixos/modules/services/databases/4store-endpoint.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
- cfg = config.services.fourStoreEndpoint;
- endpointUser = "fourstorehttp";
- run = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${endpointUser} -c";
-in
-with lib;
-{
-
- ###### interface
-
- options = {
-
- services.fourStoreEndpoint = {
-
- enable = mkOption {
- default = false;
- description = "Whether to enable 4Store SPARQL endpoint.";
- };
-
- database = mkOption {
- default = config.services.fourStore.database;
- description = "RDF database name to expose via the endpoint. Defaults to local 4Store database name.";
- };
-
- listenAddress = mkOption {
- default = null;
- description = "IP address to listen on.";
- };
-
- port = mkOption {
- default = 8080;
- description = "port to listen on.";
- };
-
- options = mkOption {
- default = "";
- description = "Extra CLI options to pass to 4Store's 4s-httpd process.";
- };
-
- };
-
- };
-
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- assertions = singleton
- { assertion = cfg.enable -> cfg.database != "";
- message = "Must specify 4Store database name";
- };
-
- users.users = singleton
- { name = endpointUser;
- uid = config.ids.uids.fourstorehttp;
- description = "4Store SPARQL endpoint user";
- };
-
- services.avahi.enable = true;
-
- systemd.services."4store-endpoint" = {
- after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
-
- script = ''
- ${run} '${pkgs.rdf4store}/bin/4s-httpd -D ${cfg.options} ${if cfg.listenAddress!=null then "-H ${cfg.listenAddress}" else "" } -p ${toString cfg.port} ${cfg.database}'
- '';
- };
-
- };
-
-}
diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix
deleted file mode 100644
index be4351c1c38f..000000000000
--- a/nixos/modules/services/databases/4store.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
- cfg = config.services.fourStore;
- stateDir = "/var/lib/4store";
- fourStoreUser = "fourstore";
- run = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${fourStoreUser}";
-in
-with lib;
-{
-
- ###### interface
-
- options = {
-
- services.fourStore = {
-
- enable = mkOption {
- default = false;
- description = "Whether to enable 4Store RDF database server.";
- };
-
- database = mkOption {
- default = "";
- description = "RDF database name. If it doesn't exist, it will be created. Databases are stored in ${stateDir}.";
- };
-
- options = mkOption {
- default = "";
- description = "Extra CLI options to pass to 4Store.";
- };
-
- };
-
- };
-
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- assertions = singleton
- { assertion = cfg.enable -> cfg.database != "";
- message = "Must specify 4Store database name.";
- };
-
- users.users = singleton
- { name = fourStoreUser;
- uid = config.ids.uids.fourstore;
- description = "4Store database user";
- home = stateDir;
- };
-
- services.avahi.enable = true;
-
- systemd.services."4store" = {
- after = [ "network.target" ];
- wantedBy = [ "multi-user.target" ];
-
- preStart = ''
- mkdir -p ${stateDir}/
- chown ${fourStoreUser} ${stateDir}
- if ! test -e "${stateDir}/${cfg.database}"; then
- ${run} -c '${pkgs.rdf4store}/bin/4s-backend-setup ${cfg.database}'
- fi
- '';
-
- script = ''
- ${run} -c '${pkgs.rdf4store}/bin/4s-backend -D ${cfg.options} ${cfg.database}'
- '';
- };
- };
-}
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 39192d059485..6af32700fc77 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -8,15 +8,11 @@ let
mysql = cfg.package;
- isMariaDB =
- let
- pName = _p: (builtins.parseDrvName (_p.name)).name;
- in pName mysql == pName pkgs.mariadb;
+ isMariaDB = lib.getName mysql == lib.getName pkgs.mariadb;
+
isMysqlAtLeast57 =
- let
- pName = _p: (builtins.parseDrvName (_p.name)).name;
- in (pName mysql == pName pkgs.mysql57)
- && ((builtins.compareVersions mysql.version "5.7") >= 0);
+ (lib.getName mysql == lib.getName pkgs.mysql57)
+ && (builtins.compareVersions mysql.version "5.7" >= 0);
mysqldOptions =
"--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql}";
@@ -28,6 +24,10 @@ let
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "mysql" "pidDir" ] "Don't wait for pidfiles, describe dependencies through systemd")
+ (mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.")
+ ];
###### interface
diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
index 5533182c3116..29a83300ec10 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -103,6 +103,18 @@ let
in {
+ imports = [
+ (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "defaultListenAddress" ])
+ (mkRenamedOptionModule [ "services" "neo4j" "listenAddress" ] [ "services" "neo4j" "defaultListenAddress" ])
+ (mkRenamedOptionModule [ "services" "neo4j" "enableBolt" ] [ "services" "neo4j" "bolt" "enable" ])
+ (mkRenamedOptionModule [ "services" "neo4j" "enableHttps" ] [ "services" "neo4j" "https" "enable" ])
+ (mkRenamedOptionModule [ "services" "neo4j" "certDir" ] [ "services" "neo4j" "directories" "certificates" ])
+ (mkRenamedOptionModule [ "services" "neo4j" "dataDir" ] [ "services" "neo4j" "directories" "home" ])
+ (mkRemovedOptionModule [ "services" "neo4j" "port" ] "Use services.neo4j.http.listenAddress instead.")
+ (mkRemovedOptionModule [ "services" "neo4j" "boltPort" ] "Use services.neo4j.bolt.listenAddress instead.")
+ (mkRemovedOptionModule [ "services" "neo4j" "httpsPort" ] "Use services.neo4j.https.listenAddress instead.")
+ ];
+
###### interface
options.services.neo4j = {
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 3bedfe96a180..c8fdd89d0d8f 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -339,9 +339,9 @@ in
'') cfg.ensureDatabases}
'' + ''
${concatMapStrings (user: ''
- $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc "CREATE USER ${user.name}"
+ $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"'
${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
- $PSQL -tAc 'GRANT ${permission} ON ${database} TO ${user.name}'
+ $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"'
'') user.ensurePermissions)}
'') cfg.ensureUsers}
'';
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index 5695eeaf74cb..70895fa53e45 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -32,6 +32,13 @@ let
'';
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "redis" "user" ] "The redis module now is hardcoded to the redis user.")
+ (mkRemovedOptionModule [ "services" "redis" "dbpath" ] "The redis module now uses /var/lib/redis as data directory.")
+ (mkRemovedOptionModule [ "services" "redis" "dbFilename" ] "The redis module now uses /var/lib/redis/dump.rdb as database dump location.")
+ (mkRemovedOptionModule [ "services" "redis" "appendOnlyFilename" ] "This option was never used.")
+ (mkRemovedOptionModule [ "services" "redis" "pidFile" ] "This option was removed.")
+ ];
###### interface
@@ -185,10 +192,10 @@ in
###### implementation
config = mkIf config.services.redis.enable {
-
- boot.kernel.sysctl = {
- "vm.nr_hugepages" = "0";
- } // mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; };
+ boot.kernel.sysctl = (mkMerge [
+ { "vm.nr_hugepages" = "0"; }
+ ( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } )
+ ]);
networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.port ];
diff --git a/nixos/modules/services/desktops/neard.nix b/nixos/modules/services/desktops/neard.nix
new file mode 100644
index 000000000000..9b0f8d1b3a77
--- /dev/null
+++ b/nixos/modules/services/desktops/neard.nix
@@ -0,0 +1,23 @@
+# neard service.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ ###### interface
+ options = {
+ services.neard = {
+ enable = mkEnableOption "neard, NFC daemon";
+ };
+ };
+
+
+ ###### implementation
+ config = mkIf config.services.neard.enable {
+ environment.systemPackages = [ pkgs.neard ];
+
+ services.dbus.packages = [ pkgs.neard ];
+
+ systemd.packages = [ pkgs.neard ];
+ };
+}
diff --git a/nixos/modules/services/desktops/pantheon/contractor.nix b/nixos/modules/services/desktops/pantheon/contractor.nix
index 2638a21df733..c76145191a70 100644
--- a/nixos/modules/services/desktops/pantheon/contractor.nix
+++ b/nixos/modules/services/desktops/pantheon/contractor.nix
@@ -6,35 +6,12 @@ with lib;
{
- meta.maintainers = pkgs.pantheon.maintainers;
-
- ###### interface
-
- options = {
-
- services.pantheon.contractor = {
-
- enable = mkEnableOption "contractor, a desktop-wide extension service used by pantheon";
-
- };
-
- };
-
###### implementation
config = mkIf config.services.pantheon.contractor.enable {
- environment.systemPackages = with pkgs.pantheon; [
- contractor
- extra-elementary-contracts
- ];
-
- services.dbus.packages = [ pkgs.pantheon.contractor ];
-
- environment.pathsToLink = [
- "/share/contractor"
- ];
+
};
diff --git a/nixos/modules/services/desktops/pantheon/files.nix b/nixos/modules/services/desktops/pantheon/files.nix
index 577aad6c2987..8cee9f42b62f 100644
--- a/nixos/modules/services/desktops/pantheon/files.nix
+++ b/nixos/modules/services/desktops/pantheon/files.nix
@@ -6,33 +6,8 @@ with lib;
{
- meta.maintainers = pkgs.pantheon.maintainers;
-
- ###### interface
-
- options = {
-
- services.pantheon.files = {
-
- enable = mkEnableOption "pantheon files daemon";
-
- };
-
- };
-
-
- ###### implementation
-
- config = mkIf config.services.pantheon.files.enable {
-
- environment.systemPackages = [
- pkgs.pantheon.elementary-files
- ];
-
- services.dbus.packages = [
- pkgs.pantheon.elementary-files
- ];
-
- };
+ imports = [
+ (mkRemovedOptionModule [ "services" "pantheon" "files" "enable" ] "Use `environment.systemPackages [ pkgs.pantheon.elementary-files ];`")
+ ];
}
diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix
index d18088d4634b..a833e99ff8c6 100644
--- a/nixos/modules/services/desktops/tumbler.nix
+++ b/nixos/modules/services/desktops/tumbler.nix
@@ -7,12 +7,17 @@ with lib;
let
cfg = config.services.tumbler;
- tumbler = cfg.package;
in
{
+ imports = [
+ (mkRemovedOptionModule
+ [ "services" "tumbler" "package" ]
+ "")
+ ];
+
###### interface
options = {
@@ -21,13 +26,6 @@ in
enable = mkEnableOption "Tumbler, A D-Bus thumbnailer service";
- package = mkOption {
- type = types.package;
- default = pkgs.xfce4-14.tumbler;
- description = "Which tumbler package to use";
- example = pkgs.xfce4-12.tumbler;
- };
-
};
};
@@ -37,11 +35,11 @@ in
config = mkIf cfg.enable {
- environment.systemPackages = [
+ environment.systemPackages = with pkgs.xfce; [
tumbler
];
- services.dbus.packages = [
+ services.dbus.packages = with pkgs.xfce; [
tumbler
];
diff --git a/nixos/modules/services/development/lorri.nix b/nixos/modules/services/development/lorri.nix
new file mode 100644
index 000000000000..c843aa56d133
--- /dev/null
+++ b/nixos/modules/services/development/lorri.nix
@@ -0,0 +1,47 @@
+{ config, lib, pkgs, ... }:
+
+let
+ cfg = config.services.lorri;
+ socketPath = "lorri/daemon.socket";
+in {
+ options = {
+ services.lorri = {
+ enable = lib.mkOption {
+ default = false;
+ type = lib.types.bool;
+ description = ''
+ Enables the daemon for `lorri`, a nix-shell replacement for project
+ development. The socket-activated daemon starts on the first request
+ issued by the `lorri` command.
+ '';
+ };
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+ systemd.user.sockets.lorri = {
+ description = "Socket for Lorri Daemon";
+ wantedBy = [ "sockets.target" ];
+ socketConfig = {
+ ListenStream = "%t/${socketPath}";
+ RuntimeDirectory = "lorri";
+ };
+ };
+
+ systemd.user.services.lorri = {
+ description = "Lorri Daemon";
+ requires = [ "lorri.socket" ];
+ after = [ "lorri.socket" ];
+ path = with pkgs; [ config.nix.package git gnutar gzip ];
+ serviceConfig = {
+ ExecStart = "${pkgs.lorri}/bin/lorri daemon";
+ PrivateTmp = true;
+ ProtectSystem = "strict";
+ ProtectHome = "read-only";
+ Restart = "on-failure";
+ };
+ };
+
+ environment.systemPackages = [ pkgs.lorri ];
+ };
+}
diff --git a/nixos/modules/services/games/openarena.nix b/nixos/modules/services/games/openarena.nix
index b7d1aea6b8d2..8c014d78809b 100644
--- a/nixos/modules/services/games/openarena.nix
+++ b/nixos/modules/services/games/openarena.nix
@@ -43,7 +43,7 @@ in
serviceConfig = {
DynamicUser = true;
StateDirectory = "openarena";
- ExecStart = "${pkgs.openarena}/bin/openarena-server +set fs_basepath ${pkgs.openarena}/openarena-0.8.8 +set fs_homepath /var/lib/openarena ${concatStringsSep " " cfg.extraFlags}";
+ ExecStart = "${pkgs.openarena}/bin/oa_ded +set fs_basepath ${pkgs.openarena}/openarena-0.8.8 +set fs_homepath /var/lib/openarena ${concatStringsSep " " cfg.extraFlags}";
Restart = "on-failure";
# Hardening
diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index c5f9d1f9b725..11d67418a31e 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -36,17 +36,25 @@ in {
'';
};
+ config = mkOption {
+ type = with types; attrsOf (attrsOf (oneOf [ bool int str ]));
+ example = {
+ General = {
+ ControllerMode = "bredr";
+ };
+ };
+ description = "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf).";
+ };
+
extraConfig = mkOption {
- type = types.lines;
- default = "";
+ type = with types; nullOr lines;
+ default = null;
example = ''
[General]
ControllerMode = bredr
'';
description = ''
Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf).
-
- NOTE: We already include [Policy], so any configuration under the Policy group should come first.
'';
};
};
@@ -56,16 +64,18 @@ in {
###### implementation
config = mkIf cfg.enable {
+ warnings = optional (cfg.extraConfig != null) "hardware.bluetooth.`extraConfig` is deprecated, please use hardware.bluetooth.`config`.";
- environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
+ hardware.bluetooth.config = {
+ Policy = {
+ AutoEnable = mkDefault cfg.powerOnBoot;
+ };
+ };
+
+ environment.systemPackages = [ bluez-bluetooth ];
environment.etc = singleton {
- source = pkgs.writeText "main.conf" ''
- [Policy]
- AutoEnable=${lib.boolToString cfg.powerOnBoot}
-
- ${cfg.extraConfig}
- '';
+ source = pkgs.writeText "main.conf" (generators.toINI { } cfg.config + optionalString (cfg.extraConfig != null) cfg.extraConfig);
target = "bluetooth/main.conf";
};
diff --git a/nixos/modules/services/hardware/fwupd.nix b/nixos/modules/services/hardware/fwupd.nix
index 6c341bcbf240..51877970a8bc 100644
--- a/nixos/modules/services/hardware/fwupd.nix
+++ b/nixos/modules/services/hardware/fwupd.nix
@@ -74,7 +74,7 @@ in {
default = false;
description = ''
Whether to enable test remote. This is used by
- installed tests.
+ installed tests.
'';
};
@@ -115,10 +115,6 @@ in {
services.udev.packages = [ cfg.package ];
systemd.packages = [ cfg.package ];
-
- systemd.tmpfiles.rules = [
- "d /var/lib/fwupd 0755 root root -"
- ];
};
meta = {
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 4f8af7978286..adc1881a525d 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -37,7 +37,7 @@ in
enable = mkOption {
type = types.bool;
default = false;
- description = "Whether to enable the TLP daemon.";
+ description = "Whether to enable the TLP power management daemon.";
};
extraConfig = mkOption {
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 83ab93bd7cfc..50997bb9bb1b 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -221,8 +221,8 @@ in
type = types.lines;
description = ''
Additional hwdb files. They'll be written
- into file 10-local.hwdb . Thus they are
- read before all other files.
+ into file 99-local.hwdb . Thus they are
+ read after all other files.
'';
};
diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix
index 5e7ac7a6e659..449810b53150 100644
--- a/nixos/modules/services/hardware/upower.nix
+++ b/nixos/modules/services/hardware/upower.nix
@@ -37,6 +37,172 @@ in
'';
};
+ enableWattsUpPro = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable the Watts Up Pro device.
+
+ The Watts Up Pro contains a generic FTDI USB device without a specific
+ vendor and product ID. When we probe for WUP devices, we can cause
+ the user to get a perplexing "Device or resource busy" error when
+ attempting to use their non-WUP device.
+
+ The generic FTDI device is known to also be used on:
+
+
+ Sparkfun FT232 breakout board
+ Parallax Propeller
+
+ '';
+ };
+
+ noPollBatteries = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Don't poll the kernel for battery level changes.
+
+ Some hardware will send us battery level changes through
+ events, rather than us having to poll for it. This option
+ allows disabling polling for hardware that sends out events.
+ '';
+ };
+
+ ignoreLid = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Do we ignore the lid state
+
+ Some laptops are broken. The lid state is either inverted, or stuck
+ on or off. We can't do much to fix these problems, but this is a way
+ for users to make the laptop panel vanish, a state that might be used
+ by a couple of user-space daemons. On Linux systems, see also
+ logind.conf(5).
+ '';
+ };
+
+ usePercentageForPolicy = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Policy for warnings and action based on battery levels
+
+ Whether battery percentage based policy should be used. The default
+ is to use the percentage, which
+ should work around broken firmwares. It is also more reliable than
+ the time left (frantically saving all your files is going to use more
+ battery than letting it rest for example).
+ '';
+ };
+
+ percentageLow = mkOption {
+ type = types.ints.unsigned;
+ default = 10;
+ description = ''
+ When usePercentageForPolicy is
+ true , the levels at which UPower will consider the
+ battery low.
+
+ This will also be used for batteries which don't have time information
+ such as that of peripherals.
+
+ If any value (of percentageLow ,
+ percentageCritical and
+ percentageAction ) is invalid, or not in descending
+ order, the defaults will be used.
+ '';
+ };
+
+ percentageCritical = mkOption {
+ type = types.ints.unsigned;
+ default = 3;
+ description = ''
+ When usePercentageForPolicy is
+ true , the levels at which UPower will consider the
+ battery critical.
+
+ This will also be used for batteries which don't have time information
+ such as that of peripherals.
+
+ If any value (of percentageLow ,
+ percentageCritical and
+ percentageAction ) is invalid, or not in descending
+ order, the defaults will be used.
+ '';
+ };
+
+ percentageAction = mkOption {
+ type = types.ints.unsigned;
+ default = 2;
+ description = ''
+ When usePercentageForPolicy is
+ true , the levels at which UPower will take action
+ for the critical battery level.
+
+ This will also be used for batteries which don't have time information
+ such as that of peripherals.
+
+ If any value (of percentageLow ,
+ percentageCritical and
+ percentageAction ) is invalid, or not in descending
+ order, the defaults will be used.
+ '';
+ };
+
+ timeLow = mkOption {
+ type = types.ints.unsigned;
+ default = 1200;
+ description = ''
+ When usePercentageForPolicy is
+ false , the time remaining at which UPower will
+ consider the battery low.
+
+ If any value (of timeLow ,
+ timeCritical and timeAction ) is
+ invalid, or not in descending order, the defaults will be used.
+ '';
+ };
+
+ timeCritical = mkOption {
+ type = types.ints.unsigned;
+ default = 300;
+ description = ''
+ When usePercentageForPolicy is
+ false , the time remaining at which UPower will
+ consider the battery critical.
+
+ If any value (of timeLow ,
+ timeCritical and timeAction ) is
+ invalid, or not in descending order, the defaults will be used.
+ '';
+ };
+
+ timeAction = mkOption {
+ type = types.ints.unsigned;
+ default = 120;
+ description = ''
+ When usePercentageForPolicy is
+ false , the time remaining at which UPower will
+ take action for the critical battery level.
+
+ If any value (of timeLow ,
+ timeCritical and timeAction ) is
+ invalid, or not in descending order, the defaults will be used.
+ '';
+ };
+
+ criticalPowerAction = mkOption {
+ type = types.enum [ "PowerOff" "Hibernate" "HybridSleep" ];
+ default = "HybridSleep";
+ description = ''
+ The action to take when timeAction or
+ percentageAction has been reached for the batteries
+ (UPS or laptop batteries) supplying the computer
+ '';
+ };
+
};
};
@@ -54,6 +220,21 @@ in
systemd.packages = [ cfg.package ];
+ environment.etc."UPower/UPower.conf".text = generators.toINI {} {
+ UPower = {
+ EnableWattsUpPro = cfg.enableWattsUpPro;
+ NoPollBatteries = cfg.noPollBatteries;
+ IgnoreLid = cfg.ignoreLid;
+ UsePercentageForPolicy = cfg.usePercentageForPolicy;
+ PercentageLow = cfg.percentageLow;
+ PercentageCritical = cfg.percentageCritical;
+ PercentageAction = cfg.percentageAction;
+ TimeLow = cfg.timeLow;
+ TimeCritical = cfg.timeCritical;
+ TimeAction = cfg.timeAction;
+ CriticalPowerAction = cfg.criticalPowerAction;
+ };
+ };
};
}
diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix
index a92ff3bee490..d51c9a5cffab 100644
--- a/nixos/modules/services/logging/awstats.nix
+++ b/nixos/modules/services/logging/awstats.nix
@@ -4,31 +4,116 @@ with lib;
let
cfg = config.services.awstats;
- httpd = config.services.httpd;
package = pkgs.awstats;
-in
+ configOpts = {name, config, ...}: {
+ options = {
+ type = mkOption{
+ type = types.enum [ "mail" "web" ];
+ default = "web";
+ example = "mail";
+ description = ''
+ The type of log being collected.
+ '';
+ };
+ domain = mkOption {
+ type = types.str;
+ default = name;
+ description = "The domain name to collect stats for.";
+ example = "example.com";
+ };
-{
- options.services.awstats = {
- enable = mkOption {
- type = types.bool;
- default = cfg.service.enable;
- description = ''
- Enable the awstats program (but not service).
- Currently only simple httpd (Apache) configs are supported,
- and awstats plugins may not work correctly.
- '';
+ logFile = mkOption {
+ type = types.str;
+ example = "/var/spool/nginx/logs/access.log";
+ description = ''
+ The log file to be scanned.
+
+ For mail, set this to
+
+ journalctl $OLD_CURSOR -u postfix.service | ''${pkgs.perl}/bin/perl ''${pkgs.awstats.out}/share/awstats/tools/maillogconvert.pl standard |
+
+ '';
+ };
+
+ logFormat = mkOption {
+ type = types.str;
+ default = "1";
+ description = ''
+ The log format being used.
+
+ For mail, set this to
+
+ %time2 %email %email_r %host %host_r %method %url %code %bytesd
+
+ '';
+ };
+
+ hostAliases = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = "[ \"www.example.org\" ]";
+ description = ''
+ List of aliases the site has.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = literalExample ''
+ {
+ "ValidHTTPCodes" = "404";
+ }
+ '';
+ };
+
+ webService = {
+ enable = mkEnableOption "awstats web service";
+
+ hostname = mkOption {
+ type = types.str;
+ default = config.domain;
+ description = "The hostname the web service appears under.";
+ };
+
+ urlPrefix = mkOption {
+ type = types.str;
+ default = "/awstats";
+ description = "The URL prefix under which the awstats pages appear.";
+ };
+ };
};
- vardir = mkOption {
+ };
+ webServices = filterAttrs (name: value: value.webService.enable) cfg.configs;
+in
+{
+ imports = [
+ (mkRemovedOptionModule [ "services" "awstats" "service" "enable" ] "Please enable per domain with `services.awstats.configs..webService.enable`")
+ (mkRemovedOptionModule [ "services" "awstats" "service" "urlPrefix" ] "Please set per domain with `services.awstats.configs..webService.urlPrefix`")
+ (mkRenamedOptionModule [ "services" "awstats" "vardir" ] [ "services" "awstats" "dataDir" ])
+ ];
+
+ options.services.awstats = {
+ enable = mkEnableOption "awstats";
+
+ dataDir = mkOption {
type = types.path;
default = "/var/lib/awstats";
- description = "The directory where variable awstats data will be stored.";
+ description = "The directory where awstats data will be stored.";
};
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- description = "Extra configuration to be appendend to awstats.conf.";
+ configs = mkOption {
+ type = types.attrsOf (types.submodule configOpts);
+ default = {};
+ example = literalExample ''
+ {
+ "mysite" = {
+ domain = "example.com";
+ logFile = "/var/spool/nginx/logs/access.log";
+ };
+ }
+ '';
+ description = "Attribute set of domains to collect stats for.";
};
updateAt = mkOption {
@@ -42,75 +127,129 @@ in
7 )
'';
};
-
- service = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''Enable the awstats web service. This switches on httpd.'';
- };
- urlPrefix = mkOption {
- type = types.str;
- default = "/awstats";
- description = "The URL prefix under which the awstats service appears.";
- };
- };
};
config = mkIf cfg.enable {
environment.systemPackages = [ package.bin ];
- /* TODO:
- - heed config.services.httpd.logPerVirtualHost, etc.
- - Can't AllowToUpdateStatsFromBrowser, as CGI scripts don't have permission
- to read the logs, and our httpd config apparently doesn't an option for that.
- */
- environment.etc."awstats/awstats.conf".source = pkgs.runCommand "awstats.conf"
+
+ environment.etc = mapAttrs' (name: opts:
+ nameValuePair "awstats/awstats.${name}.conf" {
+ source = pkgs.runCommand "awstats.${name}.conf"
{ preferLocalBuild = true; }
- ( let
- logFormat =
- if httpd.logFormat == "combined" then "1" else
- if httpd.logFormat == "common" then "4" else
- throw "awstats service doesn't support Apache log format `${httpd.logFormat}`";
- in
+ (''
+ sed \
+ ''
+ # set up mail stats
+ + optionalString (opts.type == "mail")
+ ''
+ -e 's|^\(LogType\)=.*$|\1=M|' \
+ -e 's|^\(LevelForBrowsersDetection\)=.*$|\1=0|' \
+ -e 's|^\(LevelForOSDetection\)=.*$|\1=0|' \
+ -e 's|^\(LevelForRefererAnalyze\)=.*$|\1=0|' \
+ -e 's|^\(LevelForRobotsDetection\)=.*$|\1=0|' \
+ -e 's|^\(LevelForSearchEnginesDetection\)=.*$|\1=0|' \
+ -e 's|^\(LevelForFileTypesDetection\)=.*$|\1=0|' \
+ -e 's|^\(LevelForWormsDetection\)=.*$|\1=0|' \
+ -e 's|^\(ShowMenu\)=.*$|\1=1|' \
+ -e 's|^\(ShowSummary\)=.*$|\1=HB|' \
+ -e 's|^\(ShowMonthStats\)=.*$|\1=HB|' \
+ -e 's|^\(ShowDaysOfMonthStats\)=.*$|\1=HB|' \
+ -e 's|^\(ShowDaysOfWeekStats\)=.*$|\1=HB|' \
+ -e 's|^\(ShowHoursStats\)=.*$|\1=HB|' \
+ -e 's|^\(ShowDomainsStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowHostsStats\)=.*$|\1=HB|' \
+ -e 's|^\(ShowAuthenticatedUsers\)=.*$|\1=0|' \
+ -e 's|^\(ShowRobotsStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowEMailSenders\)=.*$|\1=HBML|' \
+ -e 's|^\(ShowEMailReceivers\)=.*$|\1=HBML|' \
+ -e 's|^\(ShowSessionsStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowPagesStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowFileTypesStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowFileSizesStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowBrowsersStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowOSStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowOriginStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowKeyphrasesStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowKeywordsStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowMiscStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowHTTPErrorsStats\)=.*$|\1=0|' \
+ -e 's|^\(ShowSMTPErrorsStats\)=.*$|\1=1|' \
+ ''
+ +
+ # common options
+ ''
+ -e 's|^\(DirData\)=.*$|\1="${cfg.dataDir}/${name}"|' \
+ -e 's|^\(DirIcons\)=.*$|\1="icons"|' \
+ -e 's|^\(CreateDirDataIfNotExists\)=.*$|\1=1|' \
+ -e 's|^\(SiteDomain\)=.*$|\1="${name}"|' \
+ -e 's|^\(LogFile\)=.*$|\1="${opts.logFile}"|' \
+ -e 's|^\(LogFormat\)=.*$|\1="${opts.logFormat}"|' \
+ ''
+ +
+ # extra config
+ concatStringsSep "\n" (mapAttrsToList (n: v: ''
+ -e 's|^\(${n}\)=.*$|\1="${v}"|' \
+ '') opts.extraConfig)
+ +
+ ''
+ < '${package.out}/wwwroot/cgi-bin/awstats.model.conf' > "$out"
+ '');
+ }) cfg.configs;
+
+ # create data directory with the correct permissions
+ systemd.tmpfiles.rules =
+ [ "d '${cfg.dataDir}' 755 root root - -" ] ++
+ mapAttrsToList (name: opts: "d '${cfg.dataDir}/${name}' 755 root root - -") cfg.configs ++
+ [ "Z '${cfg.dataDir}' 755 root root - -" ];
+
+ # nginx options
+ services.nginx.virtualHosts = mapAttrs'(name: opts: {
+ name = opts.webService.hostname;
+ value = {
+ locations = {
+ "${opts.webService.urlPrefix}/css/" = {
+ alias = "${package.out}/wwwroot/css/";
+ };
+ "${opts.webService.urlPrefix}/icons/" = {
+ alias = "${package.out}/wwwroot/icon/";
+ };
+ "${opts.webService.urlPrefix}/" = {
+ alias = "${cfg.dataDir}/${name}/";
+ extraConfig = ''
+ autoindex on;
+ '';
+ };
+ };
+ };
+ }) webServices;
+
+ # update awstats
+ systemd.services = mkIf (cfg.updateAt != null) (mapAttrs' (name: opts:
+ nameValuePair "awstats-${name}-update" {
+ description = "update awstats for ${name}";
+ script = optionalString (opts.type == "mail")
''
- sed \
- -e 's|^\(DirData\)=.*$|\1="${cfg.vardir}"|' \
- -e 's|^\(DirIcons\)=.*$|\1="icons"|' \
- -e 's|^\(CreateDirDataIfNotExists\)=.*$|\1=1|' \
- -e 's|^\(SiteDomain\)=.*$|\1="${httpd.hostName}"|' \
- -e 's|^\(LogFile\)=.*$|\1="${httpd.logDir}/access_log"|' \
- -e 's|^\(LogFormat\)=.*$|\1=${logFormat}|' \
- < '${package.out}/wwwroot/cgi-bin/awstats.model.conf' > "$out"
- echo '${cfg.extraConfig}' >> "$out"
- '');
-
- systemd.tmpfiles.rules = optionals cfg.service.enable [
- "d '${cfg.vardir}' - ${httpd.user} ${httpd.group} - -"
- "Z '${cfg.vardir}' - ${httpd.user} ${httpd.group} - -"
- ];
-
- # The httpd sub-service showing awstats.
- services.httpd = optionalAttrs cfg.service.enable {
- enable = true;
- extraConfig = ''
- Alias ${cfg.service.urlPrefix}/classes "${package.out}/wwwroot/classes/"
- Alias ${cfg.service.urlPrefix}/css "${package.out}/wwwroot/css/"
- Alias ${cfg.service.urlPrefix}/icons "${package.out}/wwwroot/icon/"
- ScriptAlias ${cfg.service.urlPrefix}/ "${package.out}/wwwroot/cgi-bin/"
-
-
- Options None
- Require all granted
-
- '';
- };
-
- systemd.services.awstats-update = mkIf (cfg.updateAt != null) {
- description = "awstats log collector";
- script = "exec '${package.bin}/bin/awstats' -update -config=awstats.conf";
- startAt = cfg.updateAt;
- };
+ if [[ -f "${cfg.dataDir}/${name}-cursor" ]]; then
+ CURSOR="$(cat "${cfg.dataDir}/${name}-cursor" | tr -d '\n')"
+ if [[ -n "$CURSOR" ]]; then
+ echo "Using cursor: $CURSOR"
+ export OLD_CURSOR="--cursor $CURSOR"
+ fi
+ fi
+ NEW_CURSOR="$(journalctl $OLD_CURSOR -u postfix.service --show-cursor | tail -n 1 | tr -d '\n' | sed -e 's#^-- cursor: \(.*\)#\1#')"
+ echo "New cursor: $NEW_CURSOR"
+ ${package.bin}/bin/awstats -update -config=${name}
+ if [ -n "$NEW_CURSOR" ]; then
+ echo -n "$NEW_CURSOR" > ${cfg.dataDir}/${name}-cursor
+ fi
+ '' + ''
+ ${package.out}/share/awstats/tools/awstats_buildstaticpages.pl \
+ -config=${name} -update -dir=${cfg.dataDir}/${name} \
+ -awstatsprog=${package.bin}/bin/awstats
+ '';
+ startAt = cfg.updateAt;
+ }) cfg.configs);
};
}
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index 4943e8d7db3a..21a83803fd8c 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -37,6 +37,11 @@ let
in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
+ (mkRemovedOptionModule [ "services" "logstash" "enableWeb" ] "The web interface was removed from logstash")
+ ];
+
###### interface
options = {
diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix
index 65e103ac2ba5..35055311680b 100644
--- a/nixos/modules/services/logging/syslog-ng.nix
+++ b/nixos/modules/services/logging/syslog-ng.nix
@@ -25,6 +25,10 @@ let
];
in {
+ imports = [
+ (mkRemovedOptionModule [ "services" "syslog-ng" "serviceName" ] "")
+ (mkRemovedOptionModule [ "services" "syslog-ng" "listenToJournal" ] "")
+ ];
options = {
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 3fd06812c675..2cda8c49f5e1 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -86,7 +86,7 @@ let
}
plugin {
- quota_rule = *:storage=${cfg.quotaGlobalPerUser}
+ quota_rule = *:storage=${cfg.quotaGlobalPerUser}
quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working
quota_status_success = DUNNO
quota_status_nouser = DUNNO
@@ -133,6 +133,9 @@ let
};
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")
+ ];
options.services.dovecot2 = {
enable = mkEnableOption "Dovecot 2.x POP3/IMAP server";
diff --git a/nixos/modules/services/mail/mailcatcher.nix b/nixos/modules/services/mail/mailcatcher.nix
index f5b4508b335c..84f06ed199dc 100644
--- a/nixos/modules/services/mail/mailcatcher.nix
+++ b/nixos/modules/services/mail/mailcatcher.nix
@@ -25,6 +25,13 @@ in
description = "The port address of the http server.";
};
+ http.path = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ description = "Prefix to all HTTP paths.";
+ example = "/mailcatcher";
+ };
+
smtp.ip = mkOption {
type = types.str;
default = "127.0.0.1";
@@ -53,7 +60,7 @@ in
serviceConfig = {
DynamicUser = true;
Restart = "always";
- ExecStart = "${pkgs.mailcatcher}/bin/mailcatcher --foreground --no-quit --http-ip ${cfg.http.ip} --http-port ${toString cfg.http.port} --smtp-ip ${cfg.smtp.ip} --smtp-port ${toString cfg.smtp.port}";
+ ExecStart = "${pkgs.mailcatcher}/bin/mailcatcher --foreground --no-quit --http-ip ${cfg.http.ip} --http-port ${toString cfg.http.port} --smtp-ip ${cfg.smtp.ip} --smtp-port ${toString cfg.smtp.port}" + optionalString (cfg.http.path != null) " --http-path ${cfg.http.path}";
AmbientCapabilities = optionalString (cfg.http.port < 1024 || cfg.smtp.port < 1024) "cap_net_bind_service";
};
};
diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix
index 253823cbaf9c..6431531d5eb6 100644
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixos/modules/services/mail/opendkim.nix
@@ -18,6 +18,9 @@ let
] ++ optionals (cfg.configFile != null) [ "-x" cfg.configFile ];
in {
+ imports = [
+ (mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ])
+ ];
###### interface
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index a870550ba50b..1fabe2da45c5 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -101,6 +101,12 @@ in {
};
};
+ systemd.tmpfiles.rules = [
+ "d /var/spool/smtpd 711 root - - -"
+ "d /var/spool/smtpd/offline 770 root smtpq - -"
+ "d /var/spool/smtpd/purge 700 smtpq root - -"
+ ];
+
systemd.services.opensmtpd = let
procEnv = pkgs.buildEnv {
name = "opensmtpd-procs";
@@ -110,18 +116,6 @@ in {
in {
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- preStart = ''
- mkdir -p /var/spool/smtpd
- chmod 711 /var/spool/smtpd
-
- mkdir -p /var/spool/smtpd/offline
- chown root.smtpq /var/spool/smtpd/offline
- chmod 770 /var/spool/smtpd/offline
-
- mkdir -p /var/spool/smtpd/purge
- chown smtpq.root /var/spool/smtpd/purge
- chmod 700 /var/spool/smtpd/purge
- '';
serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}";
environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
};
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index d5fd76da970b..df438a0c69d1 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -631,6 +631,14 @@ in
setgid = true;
};
+ security.wrappers.mailq = {
+ program = "mailq";
+ source = "${pkgs.postfix}/bin/mailq";
+ group = setgidGroup;
+ setuid = false;
+ setgid = true;
+ };
+
security.wrappers.postqueue = {
program = "postqueue";
source = "${pkgs.postfix}/bin/postqueue";
diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 88fb7f0b4ad1..709f6b21aa0a 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -42,6 +42,17 @@ with lib; let
};
in {
+ imports = [
+ (mkMergedOptionModule [ [ "services" "postgrey" "inetAddr" ] [ "services" "postgrey" "inetPort" ] ] [ "services" "postgrey" "socket" ] (config: let
+ value = p: getAttrFromPath p config;
+ inetAddr = [ "services" "postgrey" "inetAddr" ];
+ inetPort = [ "services" "postgrey" "inetPort" ];
+ in
+ if value inetAddr == null
+ then { path = "/run/postgrey.sock"; }
+ else { addr = value inetAddr; port = value inetPort; }
+ ))
+ ];
options = {
services.postgrey = with types; {
diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix
index bdedfa1bb701..36dda619ad06 100644
--- a/nixos/modules/services/mail/roundcube.nix
+++ b/nixos/modules/services/mail/roundcube.nix
@@ -160,7 +160,7 @@ in
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'";
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
fi
- PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
+ PGPASSWORD="${cfg.database.password}" ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
-f ${cfg.package}/SQL/postgres.initial.sql \
-h ${cfg.database.host} ${cfg.database.dbname}
touch /var/lib/roundcube/db-created
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 4db35d9e89ab..f156595e6f88 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -60,7 +60,7 @@ let
};
type = mkOption {
type = types.nullOr (types.enum [
- "normal" "controller" "fuzzy_storage" "rspamd_proxy" "lua" "proxy"
+ "normal" "controller" "fuzzy" "rspamd_proxy" "lua" "proxy"
]);
description = ''
The type of this worker. The type proxy is
@@ -220,7 +220,6 @@ let
in
{
-
###### interface
options = {
@@ -414,5 +413,6 @@ in
"Socket activation never worked correctly and could at this time not be fixed and so was removed")
(mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ])
(mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ])
+ (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service")
];
}
diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index 798e902ccae4..46308f74dc91 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -131,7 +131,7 @@ in {
home = head cfg.logDirs;
};
- systemd.tmpfiles.rules = map (logDir: "d '${logDir} 0700 apache-kafka - - -") cfg.logDirs;
+ systemd.tmpfiles.rules = map (logDir: "d '${logDir}' 0700 apache-kafka - - -") cfg.logDirs;
systemd.services.apache-kafka = {
description = "Apache Kafka Daemon";
diff --git a/nixos/modules/services/misc/beanstalkd.nix b/nixos/modules/services/misc/beanstalkd.nix
index 06e881406b52..bcd133c97411 100644
--- a/nixos/modules/services/misc/beanstalkd.nix
+++ b/nixos/modules/services/misc/beanstalkd.nix
@@ -44,7 +44,8 @@ in
serviceConfig = {
DynamicUser = true;
Restart = "always";
- ExecStart = "${pkg}/bin/beanstalkd -l ${cfg.listen.address} -p ${toString cfg.listen.port}";
+ ExecStart = "${pkg}/bin/beanstalkd -l ${cfg.listen.address} -p ${toString cfg.listen.port} -b $STATE_DIRECTORY";
+ StateDirectory = "beanstalkd";
};
};
diff --git a/nixos/modules/services/misc/ethminer.nix b/nixos/modules/services/misc/ethminer.nix
index 2958cf214473..95afb0460fb8 100644
--- a/nixos/modules/services/misc/ethminer.nix
+++ b/nixos/modules/services/misc/ethminer.nix
@@ -71,7 +71,7 @@ in
maxPower = mkOption {
type = types.int;
- default = 115;
+ default = 113;
description = "Miner max watt usage.";
};
@@ -92,7 +92,9 @@ in
serviceConfig = {
DynamicUser = true;
+ ExecStartPre = "${pkgs.ethminer}/bin/.ethminer-wrapped --list-devices";
ExecStartPost = optional (cfg.toolkit == "cuda") "+${getBin config.boot.kernelPackages.nvidia_x11}/bin/nvidia-smi -pl ${toString cfg.maxPower}";
+ Restart = "always";
};
environment = {
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index c8c59fb256e8..258476dd9feb 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -394,6 +394,26 @@ in
WorkingDirectory = cfg.stateDir;
ExecStart = "${gitea.bin}/bin/gitea web";
Restart = "always";
+
+ # Filesystem
+ ProtectHome = true;
+ PrivateDevices = true;
+ ProtectKernelTunables = true;
+ ProtectKernelModules = true;
+ ProtectControlGroups = true;
+ ReadWritePaths = cfg.stateDir;
+ # Caps
+ CapabilityBoundingSet = "";
+ NoNewPrivileges = true;
+ # Misc.
+ LockPersonality = true;
+ RestrictRealtime = true;
+ PrivateMounts = true;
+ PrivateUsers = true;
+ MemoryDenyWriteExecute = true;
+ SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @reboot @resources @setuid @swap";
+ SystemCallArchitectures = "native";
+ RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
};
environment = {
@@ -453,4 +473,5 @@ in
timerConfig.OnCalendar = cfg.dump.interval;
};
};
+ meta.maintainers = with lib.maintainers; [ srhb ];
}
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 07ea9c458437..61d0ce0aef8c 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -189,6 +189,11 @@ let
in {
+ imports = [
+ (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])
+ (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "")
+ ];
+
options = {
services.gitlab = {
enable = mkOption {
diff --git a/nixos/modules/services/misc/mame.nix b/nixos/modules/services/misc/mame.nix
new file mode 100644
index 000000000000..c5d5e9e48371
--- /dev/null
+++ b/nixos/modules/services/misc/mame.nix
@@ -0,0 +1,67 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.mame;
+ mame = "mame${lib.optionalString pkgs.stdenv.is64bit "64"}";
+in
+{
+ options = {
+ services.mame = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to setup TUN/TAP Ethernet interface for MAME emulator.
+ '';
+ };
+ user = mkOption {
+ type = types.str;
+ description = ''
+ User from which you run MAME binary.
+ '';
+ };
+ hostAddr = mkOption {
+ type = types.str;
+ description = ''
+ IP address of the host system. Usually an address of the main network
+ adapter or the adapter through which you get an internet connection.
+ '';
+ example = "192.168.31.156";
+ };
+ emuAddr = mkOption {
+ type = types.str;
+ description = ''
+ IP address of the guest system. The same you set inside guest OS under
+ MAME. Should be on the same subnet as services.mame.hostAddr .
+ '';
+ example = "192.168.31.155";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.mame ];
+
+ security.wrappers."${mame}" = {
+ source = "${pkgs.mame}/bin/${mame}";
+ capabilities = "cap_net_admin,cap_net_raw+eip";
+ };
+
+ systemd.services.mame = {
+ description = "MAME TUN/TAP Ethernet interface";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ path = [ pkgs.iproute ];
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ ExecStart = "${pkgs.mame}/bin/taputil.sh -c ${cfg.user} ${cfg.emuAddr} ${cfg.hostAddr} -";
+ ExecStop = "${pkgs.mame}/bin/taputil.sh -d ${cfg.user}";
+ };
+ };
+ };
+
+ meta.maintainers = with lib.maintainers; [ gnidorah ];
+}
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 0f4eb2ccfcad..0bda8980720d 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -407,6 +407,9 @@ in {
"192.168.0.0/16"
"100.64.0.0/10"
"169.254.0.0/16"
+ "::1/128"
+ "fe80::/64"
+ "fc00::/7"
];
description = ''
List of IP address CIDR ranges that the URL preview spider is denied
@@ -668,43 +671,30 @@ in {
gid = config.ids.gids.matrix-synapse;
} ];
- services.postgresql.enable = mkIf usePostgresql (mkDefault true);
+ services.postgresql = mkIf (usePostgresql && cfg.create_local_database) {
+ enable = mkDefault true;
+ ensureDatabases = [ cfg.database_name ];
+ ensureUsers = [{
+ name = cfg.database_user;
+ ensurePermissions = { "DATABASE \"${cfg.database_name}\"" = "ALL PRIVILEGES"; };
+ }];
+ };
systemd.services.matrix-synapse = {
description = "Synapse Matrix homeserver";
- after = [ "network.target" "postgresql.service" ];
+ after = [ "network.target" ] ++ lib.optional config.services.postgresql.enable "postgresql.service" ;
wantedBy = [ "multi-user.target" ];
preStart = ''
${cfg.package}/bin/homeserver \
--config-path ${configFile} \
--keys-directory ${cfg.dataDir} \
--generate-keys
- '' + optionalString (usePostgresql && cfg.create_local_database) ''
- if ! test -e "${cfg.dataDir}/db-created"; then
- ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \
- ${pg.package}/bin/createuser \
- --login \
- --no-createdb \
- --no-createrole \
- --encrypted \
- ${cfg.database_user}
- ${pkgs.sudo}/bin/sudo -u ${pg.superUser} \
- ${pg.package}/bin/createdb \
- --owner=${cfg.database_user} \
- --encoding=UTF8 \
- --lc-collate=C \
- --lc-ctype=C \
- --template=template0 \
- ${cfg.database_name}
- touch "${cfg.dataDir}/db-created"
- fi
'';
serviceConfig = {
Type = "notify";
User = "matrix-synapse";
Group = "matrix-synapse";
WorkingDirectory = cfg.dataDir;
- PermissionsStartOnly = true;
ExecStart = ''
${cfg.package}/bin/homeserver \
${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index dcec4d4fc6cd..24780446d504 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -68,6 +68,10 @@ let
in
{
+ imports = [
+ (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ])
+ (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ])
+ ];
###### interface
diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix
index eb7b4c05d82d..715ec891cd68 100644
--- a/nixos/modules/services/misc/nzbget.nix
+++ b/nixos/modules/services/misc/nzbget.nix
@@ -27,6 +27,12 @@ let
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "misc" "nzbget" "configFile" ] "The configuration of nzbget is now managed by users through the web interface.")
+ (mkRemovedOptionModule [ "services" "misc" "nzbget" "dataDir" ] "The data directory for nzbget is now /var/lib/nzbget.")
+ (mkRemovedOptionModule [ "services" "misc" "nzbget" "openFirewall" ] "The port used by nzbget is managed through the web interface so you should adjust your firewall rules accordingly.")
+ ];
+
# interface
options = {
diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix
index c757093e5c1b..61626e78f8b3 100644
--- a/nixos/modules/services/misc/parsoid.nix
+++ b/nixos/modules/services/misc/parsoid.nix
@@ -26,6 +26,10 @@ let
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "parsoid" "interwikis" ] "Use services.parsoid.wikis instead")
+ ];
+
##### interface
options = {
diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix
index e2d1254602b0..25aa27ae7673 100644
--- a/nixos/modules/services/misc/pykms.nix
+++ b/nixos/modules/services/misc/pykms.nix
@@ -9,6 +9,10 @@ let
in {
meta.maintainers = with lib.maintainers; [ peterhoeg ];
+ imports = [
+ (mkRemovedOptionModule [ "services" "pykms" "verbose" ] "Use services.pykms.logLevel instead")
+ ];
+
options = {
services.pykms = {
enable = mkOption {
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index 24b9e27ac2da..bf9a6914a483 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -62,20 +62,11 @@ in
services.redmine = {
enable = mkEnableOption "Redmine";
- # default to the 4.x series not forcing major version upgrade of those on the 3.x series
package = mkOption {
type = types.package;
- default = if versionAtLeast config.system.stateVersion "19.03"
- then pkgs.redmine_4
- else pkgs.redmine
- ;
- defaultText = "pkgs.redmine";
- description = ''
- Which Redmine package to use. This defaults to version 3.x if
- system.stateVersion < 19.03 and version 4.x
- otherwise.
- '';
- example = "pkgs.redmine_4.override { ruby = pkgs.ruby_2_4; }";
+ default = pkgs.redmine;
+ description = "Which Redmine package to use.";
+ example = "pkgs.redmine.override { ruby = pkgs.ruby_2_4; }";
};
user = mkOption {
diff --git a/nixos/modules/services/misc/tautulli.nix b/nixos/modules/services/misc/tautulli.nix
index 50e450366478..aded33629f1c 100644
--- a/nixos/modules/services/misc/tautulli.nix
+++ b/nixos/modules/services/misc/tautulli.nix
@@ -6,6 +6,10 @@ let
cfg = config.services.tautulli;
in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "plexpy" ] [ "services" "tautulli" ])
+ ];
+
options = {
services.tautulli = {
enable = mkEnableOption "Tautulli Plex Monitor";
diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix
index 3bff04e7127d..d7f7324580c0 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixos/modules/services/misc/zoneminder.nix
@@ -265,7 +265,7 @@ in {
}
location /cache/ {
- alias /var/cache/${dirName};
+ alias /var/cache/${dirName}/;
}
location ~ \.php$ {
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index bf1084eecc3a..0f8bc2471e33 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -43,7 +43,7 @@ let
ANALYTICS_REPORTING_ENABLED = boolToString cfg.analytics.reporting.enable;
- SMTP_ENABLE = boolToString cfg.smtp.enable;
+ SMTP_ENABLED = boolToString cfg.smtp.enable;
SMTP_HOST = cfg.smtp.host;
SMTP_USER = cfg.smtp.user;
SMTP_PASSWORD = cfg.smtp.password;
diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix
index 6a3b97769462..4128bc12030f 100644
--- a/nixos/modules/services/monitoring/nagios.nix
+++ b/nixos/modules/services/monitoring/nagios.nix
@@ -8,6 +8,7 @@ let
nagiosState = "/var/lib/nagios";
nagiosLogDir = "/var/log/nagios";
+ urlPath = "/nagios";
nagiosObjectDefs = cfg.objectDefs;
@@ -49,12 +50,12 @@ let
''
main_config_file=${cfg.mainConfigFile}
use_authentication=0
- url_html_path=${cfg.urlPath}
+ url_html_path=${urlPath}
'';
extraHttpdConfig =
''
- ScriptAlias ${cfg.urlPath}/cgi-bin ${pkgs.nagios}/sbin
+ ScriptAlias ${urlPath}/cgi-bin ${pkgs.nagios}/sbin
Options ExecCGI
@@ -62,7 +63,7 @@ let
SetEnv NAGIOS_CGI_CONFIG ${cfg.cgiConfigFile}
- Alias ${cfg.urlPath} ${pkgs.nagios}/share
+ Alias ${urlPath} ${pkgs.nagios}/share
Options None
@@ -72,6 +73,10 @@ let
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "nagios" "urlPath" ] "The urlPath option has been removed as it is hard coded to /nagios in the nagios package.")
+ ];
+
options = {
services.nagios = {
enable = mkOption {
@@ -128,13 +133,20 @@ in
";
};
- urlPath = mkOption {
- default = "/nagios";
- description = "
- The URL path under which the Nagios web interface appears.
- That is, you can access the Nagios web interface through
- http://server /urlPath .
- ";
+ virtualHost = mkOption {
+ type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix);
+ example = literalExample ''
+ { hostName = "example.org";
+ adminAddr = "webmaster@example.org";
+ enableSSL = true;
+ sslServerCert = "/var/lib/acme/example.org/full.pem";
+ sslServerKey = "/var/lib/acme/example.org/key.pem";
+ }
+ '';
+ description = ''
+ Apache configuration can be done by adapting services.httpd.virtualHosts .
+ See for further information.
+ '';
};
};
};
@@ -182,6 +194,8 @@ in
'';
};
- services.httpd.extraConfig = optionalString cfg.enableWebInterface extraHttpdConfig;
+ services.httpd.virtualHosts = optionalAttrs cfg.enableWebInterface {
+ ${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost { extraConfig = extraHttpdConfig; } ];
+ };
};
}
diff --git a/nixos/modules/services/monitoring/osquery.nix b/nixos/modules/services/monitoring/osquery.nix
deleted file mode 100644
index c8c625577d39..000000000000
--- a/nixos/modules/services/monitoring/osquery.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with builtins;
-with lib;
-
-let
- cfg = config.services.osquery;
-
-in
-
-{
-
- options = {
-
- services.osquery = {
-
- enable = mkEnableOption "osquery";
-
- loggerPath = mkOption {
- type = types.path;
- description = "Base directory used for logging.";
- default = "/var/log/osquery";
- };
-
- pidfile = mkOption {
- type = types.path;
- description = "Path used for pid file.";
- default = "/var/osquery/osqueryd.pidfile";
- };
-
- utc = mkOption {
- type = types.bool;
- description = "Attempt to convert all UNIX calendar times to UTC.";
- default = true;
- };
-
- databasePath = mkOption {
- type = types.path;
- description = "Path used for database file.";
- default = "/var/osquery/osquery.db";
- };
-
- extraConfig = mkOption {
- type = types.attrs // {
- merge = loc: foldl' (res: def: recursiveUpdate res def.value) {};
- };
- description = "Extra config to be recursively merged into the JSON config file.";
- default = { };
- };
- };
-
- };
-
- config = mkIf cfg.enable {
-
- environment.systemPackages = [ pkgs.osquery ];
-
- environment.etc."osquery/osquery.conf".text = toJSON (
- recursiveUpdate {
- options = {
- config_plugin = "filesystem";
- logger_plugin = "filesystem";
- logger_path = cfg.loggerPath;
- database_path = cfg.databasePath;
- utc = cfg.utc;
- };
- } cfg.extraConfig
- );
-
- systemd.services.osqueryd = {
- description = "The osquery Daemon";
- after = [ "network.target" "syslog.service" ];
- wantedBy = [ "multi-user.target" ];
- path = [ pkgs.osquery ];
- preStart = ''
- mkdir -p ${escapeShellArg cfg.loggerPath}
- mkdir -p "$(dirname ${escapeShellArg cfg.pidfile})"
- mkdir -p "$(dirname ${escapeShellArg cfg.databasePath})"
- '';
- serviceConfig = {
- TimeoutStartSec = "infinity";
- ExecStart = "${pkgs.osquery}/bin/osqueryd --logger_path ${escapeShellArg cfg.loggerPath} --pidfile ${escapeShellArg cfg.pidfile} --database_path ${escapeShellArg cfg.databasePath}";
- KillMode = "process";
- KillSignal = "SIGTERM";
- Restart = "on-failure";
- };
- };
-
- };
-
-}
diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index 11d85e9c4fc3..9af6b1d94f37 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@@ -27,6 +27,15 @@ let
"--log.format ${cfg.logFormat}"
);
in {
+ imports = [
+ (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "user" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a user setting.")
+ (mkRemovedOptionModule [ "services" "prometheus" "alertmanager" "group" ] "The alertmanager service is now using systemd's DynamicUser mechanism which obviates a group setting.")
+ (mkRemovedOptionModule [ "services" "prometheus" "alertmanagerURL" ] ''
+ Due to incompatibility, the alertmanagerURL option has been removed,
+ please use 'services.prometheus2.alertmanagers' instead.
+ '')
+ ];
+
options = {
services.prometheus.alertmanager = {
enable = mkEnableOption "Prometheus Alertmanager";
diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index 191c0bff9c84..b67f697ca0de 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -464,6 +464,11 @@ let
};
in {
+
+ imports = [
+ (mkRenamedOptionModule [ "services" "prometheus2" ] [ "services" "prometheus" ])
+ ];
+
options.services.prometheus = {
enable = mkOption {
diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 35b513bac571..36ebffa44636 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -160,6 +160,24 @@ let
};
in
{
+
+ imports = (lib.forEach [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
+ "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
+ "snmpExporter" "unifiExporter" "varnishExporter" ]
+ (opt: lib.mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] ''
+ The prometheus exporters are now configured using `services.prometheus.exporters'.
+ See the 18.03 release notes for more information.
+ '' ))
+
+ ++ (lib.forEach [ "enable" "substitutions" "preset" ]
+ (opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] ''
+ The fonts.fontconfig.ultimate module and configuration is obsolete.
+ The repository has since been archived and activity has ceased.
+ https://github.com/bohoomil/fontconfig-ultimate/issues/171.
+ No action should be needed for font configuration, as the fonts.fontconfig
+ module is already used by default.
+ '' ));
+
options.services.prometheus.exporters = mkOption {
type = types.submodule {
options = (mkSubModules);
@@ -197,6 +215,9 @@ in
services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey;
})] ++ [(mkIf config.services.rspamd.enable {
services.prometheus.exporters.rspamd.url = mkDefault "http://localhost:11334/stat";
+ })] ++ [(mkIf config.services.nginx.enable {
+ systemd.services.prometheus-nginx-exporter.after = [ "nginx.service" ];
+ systemd.services.prometheus-nginx-exporter.requires = [ "nginx.service" ];
})] ++ (mapAttrsToList (name: conf:
mkExporterConf {
inherit name;
diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix
index e9f1590760a4..b4e4378ce1e7 100644
--- a/nixos/modules/services/monitoring/zabbix-server.nix
+++ b/nixos/modules/services/monitoring/zabbix-server.nix
@@ -44,6 +44,11 @@ let
in
{
+ imports = [
+ (lib.mkRenamedOptionModule [ "services" "zabbixServer" "dbServer" ] [ "services" "zabbixServer" "database" "host" ])
+ (lib.mkRemovedOptionModule [ "services" "zabbixServer" "dbPassword" ] "Use services.zabbixServer.database.passwordFile instead.")
+ ];
+
# interface
options = {
diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix
deleted file mode 100644
index 2e03a422665a..000000000000
--- a/nixos/modules/services/network-filesystems/beegfs.nix
+++ /dev/null
@@ -1,357 +0,0 @@
-{ config, lib, pkgs, ...} :
-
-with lib;
-
-let
- cfg = config.services.beegfs;
-
- # functions for the generations of config files
-
- configMgmtd = name: cfg: pkgs.writeText "mgmt-${name}.conf" ''
- storeMgmtdDirectory = ${cfg.mgmtd.storeDir}
- storeAllowFirstRunInit = false
- connAuthFile = ${cfg.connAuthFile}
- connPortShift = ${toString cfg.connPortShift}
-
- ${cfg.mgmtd.extraConfig}
- '';
-
- configAdmon = name: cfg: pkgs.writeText "admon-${name}.conf" ''
- sysMgmtdHost = ${cfg.mgmtdHost}
- connAuthFile = ${cfg.connAuthFile}
- connPortShift = ${toString cfg.connPortShift}
-
- ${cfg.admon.extraConfig}
- '';
-
- configMeta = name: cfg: pkgs.writeText "meta-${name}.conf" ''
- storeMetaDirectory = ${cfg.meta.storeDir}
- sysMgmtdHost = ${cfg.mgmtdHost}
- connAuthFile = ${cfg.connAuthFile}
- connPortShift = ${toString cfg.connPortShift}
- storeAllowFirstRunInit = false
-
- ${cfg.meta.extraConfig}
- '';
-
- configStorage = name: cfg: pkgs.writeText "storage-${name}.conf" ''
- storeStorageDirectory = ${cfg.storage.storeDir}
- sysMgmtdHost = ${cfg.mgmtdHost}
- connAuthFile = ${cfg.connAuthFile}
- connPortShift = ${toString cfg.connPortShift}
- storeAllowFirstRunInit = false
-
- ${cfg.storage.extraConfig}
- '';
-
- configHelperd = name: cfg: pkgs.writeText "helperd-${name}.conf" ''
- connAuthFile = ${cfg.connAuthFile}
- ${cfg.helperd.extraConfig}
- '';
-
- configClientFilename = name : "/etc/beegfs/client-${name}.conf";
-
- configClient = name: cfg: ''
- sysMgmtdHost = ${cfg.mgmtdHost}
- connAuthFile = ${cfg.connAuthFile}
- connPortShift = ${toString cfg.connPortShift}
-
- ${cfg.client.extraConfig}
- '';
-
- serviceList = [
- { service = "admon"; cfgFile = configAdmon; }
- { service = "meta"; cfgFile = configMeta; }
- { service = "mgmtd"; cfgFile = configMgmtd; }
- { service = "storage"; cfgFile = configStorage; }
- ];
-
- # functions to generate systemd.service entries
-
- systemdEntry = service: cfgFile: (mapAttrs' ( name: cfg:
- (nameValuePair "beegfs-${service}-${name}" (mkIf cfg.${service}.enable {
- wantedBy = [ "multi-user.target" ];
- requires = [ "network-online.target" ];
- after = [ "network-online.target" ];
- serviceConfig = rec {
- ExecStart = ''
- ${pkgs.beegfs}/bin/beegfs-${service} \
- cfgFile=${cfgFile name cfg} \
- pidFile=${PIDFile}
- '';
- PIDFile = "/run/beegfs-${service}-${name}.pid";
- TimeoutStopSec = "300";
- };
- }))) cfg);
-
- systemdHelperd = mapAttrs' ( name: cfg:
- (nameValuePair "beegfs-helperd-${name}" (mkIf cfg.client.enable {
- wantedBy = [ "multi-user.target" ];
- requires = [ "network-online.target" ];
- after = [ "network-online.target" ];
- serviceConfig = rec {
- ExecStart = ''
- ${pkgs.beegfs}/bin/beegfs-helperd \
- cfgFile=${configHelperd name cfg} \
- pidFile=${PIDFile}
- '';
- PIDFile = "/run/beegfs-helperd-${name}.pid";
- TimeoutStopSec = "300";
- };
- }))) cfg;
-
- # wrappers to beegfs tools. Avoid typing path of config files
- utilWrappers = mapAttrsToList ( name: cfg:
- ( pkgs.runCommand "beegfs-utils-${name}" {
- nativeBuildInputs = [ pkgs.makeWrapper ];
- preferLocalBuild = true;
- } ''
- mkdir -p $out/bin
-
- makeWrapper ${pkgs.beegfs}/bin/beegfs-check-servers \
- $out/bin/beegfs-check-servers-${name} \
- --add-flags "-c ${configClientFilename name}" \
- --prefix PATH : ${lib.makeBinPath [ pkgs.beegfs ]}
-
- makeWrapper ${pkgs.beegfs}/bin/beegfs-ctl \
- $out/bin/beegfs-ctl-${name} \
- --add-flags "--cfgFile=${configClientFilename name}"
-
- makeWrapper ${pkgs.beegfs}/bin/beegfs-ctl \
- $out/bin/beegfs-df-${name} \
- --add-flags "--cfgFile=${configClientFilename name}" \
- --add-flags --listtargets \
- --add-flags --hidenodeid \
- --add-flags --pools \
- --add-flags --spaceinfo
-
- makeWrapper ${pkgs.beegfs}/bin/beegfs-fsck \
- $out/bin/beegfs-fsck-${name} \
- --add-flags "--cfgFile=${configClientFilename name}"
- ''
- )) cfg;
-in
-{
- ###### interface
-
- options = {
- services.beegfsEnable = mkEnableOption "BeeGFS";
-
- services.beegfs = mkOption {
- default = {};
- description = ''
- BeeGFS configurations. Every mount point requires a separate configuration.
- '';
- type = with types; attrsOf (submodule ({ ... } : {
- options = {
- mgmtdHost = mkOption {
- type = types.str;
- default = null;
- example = "master";
- description = ''Hostname of managament host.'';
- };
-
- connAuthFile = mkOption {
- type = types.str;
- default = "";
- example = "/etc/my.key";
- description = "File containing shared secret authentication.";
- };
-
- connPortShift = mkOption {
- type = types.int;
- default = 0;
- example = 5;
- description = ''
- For each additional beegfs configuration shift all
- service TCP/UDP ports by at least 5.
- '';
- };
-
- client = {
- enable = mkEnableOption "BeeGFS client";
-
- mount = mkOption {
- type = types.bool;
- default = true;
- description = "Create fstab entry automatically";
- };
-
- mountPoint = mkOption {
- type = types.str;
- default = "/run/beegfs";
- description = ''
- Mount point under which the beegfs filesytem should be mounted.
- If mounted manually the mount option specifing the config file is needed:
- cfgFile=/etc/beegfs/beegfs-client-<name>.conf
- '';
- };
-
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- description = ''
- Additional lines for beegfs-client.conf.
- See documentation for further details.
- '';
- };
- };
-
- helperd = {
- enable = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Enable the BeeGFS helperd.
- The helpered is need for logging purposes on the client.
- Disabling helperd allows for runing the client
- with allowUnfree = false .
- '';
- };
-
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- description = ''
- Additional lines for beegfs-helperd.conf. See documentation
- for further details.
- '';
- };
- };
-
- mgmtd = {
- enable = mkEnableOption "BeeGFS mgmtd daemon";
-
- storeDir = mkOption {
- type = types.path;
- default = null;
- example = "/data/beegfs-mgmtd";
- description = ''
- Data directory for mgmtd.
- Must not be shared with other beegfs daemons.
- This directory must exist and it must be initialized
- with beegfs-setup-mgmtd, e.g. "beegfs-setup-mgmtd -C -p <storeDir>"
- '';
- };
-
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- description = ''
- Additional lines for beegfs-mgmtd.conf. See documentation
- for further details.
- '';
- };
- };
-
- admon = {
- enable = mkEnableOption "BeeGFS admon daemon";
-
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- description = ''
- Additional lines for beegfs-admon.conf. See documentation
- for further details.
- '';
- };
- };
-
- meta = {
- enable = mkEnableOption "BeeGFS meta data daemon";
-
- storeDir = mkOption {
- type = types.path;
- default = null;
- example = "/data/beegfs-meta";
- description = ''
- Data directory for meta data service.
- Must not be shared with other beegfs daemons.
- The underlying filesystem must be mounted with xattr turned on.
- This directory must exist and it must be initialized
- with beegfs-setup-meta, e.g.
- "beegfs-setup-meta -C -s <serviceID> -p <storeDir>"
- '';
- };
-
- extraConfig = mkOption {
- type = types.str;
- default = "";
- description = ''
- Additional lines for beegfs-meta.conf. See documentation
- for further details.
- '';
- };
- };
-
- storage = {
- enable = mkEnableOption "BeeGFS storage daemon";
-
- storeDir = mkOption {
- type = types.path;
- default = null;
- example = "/data/beegfs-storage";
- description = ''
- Data directories for storage service.
- Must not be shared with other beegfs daemons.
- The underlying filesystem must be mounted with xattr turned on.
- This directory must exist and it must be initialized
- with beegfs-setup-storage, e.g.
- "beegfs-setup-storage -C -s <serviceID> -i <storageTargetID> -p <storeDir>"
- '';
- };
-
- extraConfig = mkOption {
- type = types.str;
- default = "";
- description = ''
- Addional lines for beegfs-storage.conf. See documentation
- for further details.
- '';
- };
- };
- };
- }));
- };
- };
-
- ###### implementation
-
- config =
- mkIf config.services.beegfsEnable {
-
- environment.systemPackages = utilWrappers;
-
- # Put the client.conf files in /etc since they are needed
- # by the commandline tools
- environment.etc = mapAttrs' ( name: cfg:
- (nameValuePair "beegfs/client-${name}.conf" (mkIf (cfg.client.enable)
- {
- enable = true;
- text = configClient name cfg;
- }))) cfg;
-
- # Kernel module, we need it only once per host.
- boot = mkIf (
- foldr (a: b: a || b) false
- (map (x: x.client.enable) (collect (x: x ? client) cfg)))
- {
- kernelModules = [ "beegfs" ];
- extraModulePackages = [ pkgs.linuxPackages.beegfs-module ];
- };
-
- # generate fstab entries
- fileSystems = mapAttrs' (name: cfg:
- (nameValuePair cfg.client.mountPoint (optionalAttrs cfg.client.mount (mkIf cfg.client.enable {
- device = "beegfs_nodev";
- fsType = "beegfs";
- mountPoint = cfg.client.mountPoint;
- options = [ "cfgFile=${configClientFilename name}" "_netdev" ];
- })))) cfg;
-
- # generate systemd services
- systemd.services = systemdHelperd //
- foldr (a: b: a // b) {}
- (map (x: systemdEntry x.service x.cfgFile) serviceList);
- };
-}
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
index 656a2d21b868..543a7b25d5d6 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -9,12 +9,14 @@ let
expandCamelCase = replaceStrings upperChars (map (s: " ${s}") lowerChars);
expandCamelCaseAttrs = mapAttrs' (name: value: nameValuePair (expandCamelCase name) value);
- makeServices = (daemonType: daemonIds: extraServiceConfig:
+ makeServices = (daemonType: daemonIds:
mkMerge (map (daemonId:
- { "ceph-${daemonType}-${daemonId}" = makeService daemonType daemonId cfg.global.clusterName pkgs.ceph extraServiceConfig; })
+ { "ceph-${daemonType}-${daemonId}" = makeService daemonType daemonId cfg.global.clusterName pkgs.ceph; })
daemonIds));
- makeService = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: {
+ makeService = (daemonType: daemonId: clusterName: ceph:
+ let
+ stateDirectory = "ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}"; in {
enable = true;
description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}";
after = [ "network-online.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target";
@@ -22,6 +24,11 @@ let
partOf = [ "ceph-${daemonType}.target" ];
wantedBy = [ "ceph-${daemonType}.target" ];
+ path = [ pkgs.getopt ];
+
+ # Don't start services that are not yet initialized
+ unitConfig.ConditionPathExists = "/var/lib/${stateDirectory}/keyring";
+
serviceConfig = {
LimitNOFILE = 1048576;
LimitNPROC = 1048576;
@@ -34,22 +41,22 @@ let
Restart = "on-failure";
StartLimitBurst = "5";
StartLimitInterval = "30min";
+ StateDirectory = stateDirectory;
+ User = "ceph";
+ Group = if daemonType == "osd" then "disk" else "ceph";
ExecStart = ''${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \
- -f --cluster ${clusterName} --id ${daemonId} --setuser ceph \
- --setgroup ${if daemonType == "osd" then "disk" else "ceph"}'';
- } // extraServiceConfig
- // optionalAttrs (daemonType == "osd") { ExecStartPre = ''${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh \
- --id ${daemonId} --cluster ${clusterName}''; };
- } // optionalAttrs (builtins.elem daemonType [ "mds" "mon" "rgw" "mgr" ]) {
- preStart = ''
- daemonPath="/var/lib/ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}"
- if [ ! -d $daemonPath ]; then
- mkdir -m 755 -p $daemonPath
- chown -R ceph:ceph $daemonPath
- fi
- '';
- } // optionalAttrs (daemonType == "osd") { path = [ pkgs.getopt ]; }
- );
+ -f --cluster ${clusterName} --id ${daemonId}'';
+ } // optionalAttrs (daemonType == "osd") {
+ ExecStartPre = ''${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}'';
+ StartLimitBurst = "30";
+ RestartSec = "20s";
+ PrivateDevices = "no"; # osd needs disk access
+ } // optionalAttrs ( daemonType == "mon") {
+ RestartSec = "10";
+ } // optionalAttrs (lib.elem daemonType ["mgr" "mds"]) {
+ StartLimitBurst = "3";
+ };
+ });
makeTarget = (daemonType:
{
@@ -58,6 +65,7 @@ let
partOf = [ "ceph.target" ];
wantedBy = [ "ceph.target" ];
before = [ "ceph.target" ];
+ unitConfig.StopWhenUnneeded = true;
};
}
);
@@ -377,22 +385,22 @@ in
systemd.services = let
services = []
- ++ optional cfg.mon.enable (makeServices "mon" cfg.mon.daemons { RestartSec = "10"; })
- ++ optional cfg.mds.enable (makeServices "mds" cfg.mds.daemons { StartLimitBurst = "3"; })
- ++ optional cfg.osd.enable (makeServices "osd" cfg.osd.daemons { StartLimitBurst = "30";
- RestartSec = "20s";
- PrivateDevices = "no"; # osd needs disk access
- })
- ++ optional cfg.rgw.enable (makeServices "rgw" cfg.rgw.daemons { })
- ++ optional cfg.mgr.enable (makeServices "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; });
+ ++ optional cfg.mon.enable (makeServices "mon" cfg.mon.daemons)
+ ++ optional cfg.mds.enable (makeServices "mds" cfg.mds.daemons)
+ ++ optional cfg.osd.enable (makeServices "osd" cfg.osd.daemons)
+ ++ optional cfg.rgw.enable (makeServices "rgw" cfg.rgw.daemons)
+ ++ optional cfg.mgr.enable (makeServices "mgr" cfg.mgr.daemons);
in
mkMerge services;
systemd.targets = let
targets = [
- { ceph = { description = "Ceph target allowing to start/stop all ceph service instances at once";
- wantedBy = [ "multi-user.target" ]; }; }
- ] ++ optional cfg.mon.enable (makeTarget "mon")
+ { ceph = {
+ description = "Ceph target allowing to start/stop all ceph service instances at once";
+ wantedBy = [ "multi-user.target" ];
+ unitConfig.StopWhenUnneeded = true;
+ }; } ]
+ ++ optional cfg.mon.enable (makeTarget "mon")
++ optional cfg.mds.enable (makeTarget "mds")
++ optional cfg.osd.enable (makeTarget "osd")
++ optional cfg.rgw.enable (makeTarget "rgw")
@@ -401,7 +409,11 @@ in
mkMerge targets;
systemd.tmpfiles.rules = [
+ "d /etc/ceph - ceph ceph - -"
"d /run/ceph 0770 ceph ceph -"
- ];
+ "d /var/lib/ceph - ceph ceph - -"]
+ ++ optionals cfg.mgr.enable [ "d /var/lib/ceph/mgr - ceph ceph - -"]
+ ++ optionals cfg.mon.enable [ "d /var/lib/ceph/mon - ceph ceph - -"]
+ ++ optionals cfg.osd.enable [ "d /var/lib/ceph/osd - ceph ceph - -"];
};
}
diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index 1a78f9a76a33..1b62bfa82035 100644
--- a/nixos/modules/services/network-filesystems/nfsd.nix
+++ b/nixos/modules/services/network-filesystems/nfsd.nix
@@ -11,6 +11,10 @@ let
in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ])
+ (mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ])
+ ];
###### interface
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index ce565dbaab81..a3c22ce69484 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -12,11 +12,6 @@ let
samba = cfg.package;
- setupScript =
- ''
- mkdir -p /var/lock/samba /var/log/samba /var/cache/samba /var/lib/samba/private
- '';
-
shareConfig = name:
let share = getAttr name cfg.shares; in
"[${name}]\n " + (smbToString (
@@ -45,7 +40,7 @@ let
daemonService = appName: args:
{ description = "Samba Service Daemon ${appName}";
- after = [ "network.target" ];
+ after = [ (mkIf (cfg.enableNmbd && "${appName}" == "smbd") "samba-nmbd.service") ];
requiredBy = [ "samba.target" ];
partOf = [ "samba.target" ];
@@ -62,6 +57,7 @@ let
Type = "notify";
NotifyAccess = "all"; #may not do anything...
};
+ unitConfig.RequiresMountsFor = "/var/lib/samba";
restartTriggers = [ configFile ];
};
@@ -69,6 +65,9 @@ let
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "samba" "defaultShare" ] "")
+ ];
###### interface
@@ -119,7 +118,7 @@ in
type = types.package;
default = pkgs.samba;
defaultText = "pkgs.samba";
- example = literalExample "pkgs.samba3";
+ example = literalExample "pkgs.samba4Full";
description = ''
Defines which package should be used for the samba server.
'';
@@ -228,8 +227,7 @@ in
systemd = {
targets.samba = {
description = "Samba Server";
- requires = [ "samba-setup.service" ];
- after = [ "samba-setup.service" "network.target" ];
+ after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
};
# Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd
@@ -238,12 +236,13 @@ in
samba-smbd = daemonService "smbd" "";
samba-nmbd = mkIf cfg.enableNmbd (daemonService "nmbd" "");
samba-winbindd = mkIf cfg.enableWinbindd (daemonService "winbindd" "");
- samba-setup = {
- description = "Samba Setup Task";
- script = setupScript;
- unitConfig.RequiresMountsFor = "/var/lib/samba";
- };
};
+ tmpfiles.rules = [
+ "d /var/lock/samba - - - - -"
+ "d /var/log/samba - - - - -"
+ "d /var/cache/samba - - - - -"
+ "d /var/lib/samba/private - - - - -"
+ ];
};
security.pam.services.samba = {};
diff --git a/nixos/modules/services/networking/3proxy.nix b/nixos/modules/services/networking/3proxy.nix
new file mode 100644
index 000000000000..26aa16679467
--- /dev/null
+++ b/nixos/modules/services/networking/3proxy.nix
@@ -0,0 +1,424 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+ pkg = pkgs._3proxy;
+ cfg = config.services._3proxy;
+ optionalList = list: if list == [ ] then "*" else concatMapStringsSep "," toString list;
+in {
+ options.services._3proxy = {
+ enable = mkEnableOption "3proxy";
+ confFile = mkOption {
+ type = types.path;
+ example = "/var/lib/3proxy/3proxy.conf";
+ description = ''
+ Ignore all other 3proxy options and load configuration from this file.
+ '';
+ };
+ usersFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/var/lib/3proxy/3proxy.passwd";
+ description = ''
+ Load users and passwords from this file.
+
+ Example users file with plain-text passwords:
+
+
+ test1:CL:password1
+ test2:CL:password2
+
+
+ Example users file with md5-crypted passwords:
+
+
+ test1:CR:$1$tFkisVd2$1GA8JXkRmTXdLDytM/i3a1
+ test2:CR:$1$rkpibm5J$Aq1.9VtYAn0JrqZ8M.1ME.
+
+
+ You can generate md5-crypted passwords via https://unix4lyfe.org/crypt/
+ Note that htpasswd tool generates incompatible md5-crypted passwords.
+ Consult documentation for more information.
+ '';
+ };
+ services = mkOption {
+ type = types.listOf (types.submodule {
+ options = {
+ type = mkOption {
+ type = types.enum [
+ "proxy"
+ "socks"
+ "pop3p"
+ "ftppr"
+ "admin"
+ "dnspr"
+ "tcppm"
+ "udppm"
+ ];
+ example = "proxy";
+ description = ''
+ Service type. The following values are valid:
+
+
+
+ "proxy" : HTTP/HTTPS proxy (default port 3128).
+
+
+ "socks" : SOCKS 4/4.5/5 proxy (default port 1080).
+
+
+ "pop3p" : POP3 proxy (default port 110).
+
+
+ "ftppr" : FTP proxy (default port 21).
+
+
+ "admin" : Web interface (default port 80).
+
+
+ "dnspr" : Caching DNS proxy (default port 53).
+
+
+ "tcppm" : TCP portmapper.
+
+
+ "udppm" : UDP portmapper.
+
+
+ '';
+ };
+ bindAddress = mkOption {
+ type = types.str;
+ default = "[::]";
+ example = "127.0.0.1";
+ description = ''
+ Address used for service.
+ '';
+ };
+ bindPort = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ example = 3128;
+ description = ''
+ Override default port used for service.
+ '';
+ };
+ maxConnections = mkOption {
+ type = types.int;
+ default = 100;
+ example = 1000;
+ description = ''
+ Maximum number of simulationeous connections to this service.
+ '';
+ };
+ auth = mkOption {
+ type = types.listOf (types.enum [ "none" "iponly" "strong" ]);
+ example = [ "iponly" "strong" ];
+ description = ''
+ Authentication type. The following values are valid:
+
+
+
+ "none" : disables both authentication and authorization. You can not use ACLs.
+
+
+ "iponly" : specifies no authentication. ACLs authorization is used.
+
+
+ "strong" : authentication by username/password. If user is not registered his access is denied regardless of ACLs.
+
+
+
+ Double authentication is possible, e.g.
+
+
+ {
+ auth = [ "iponly" "strong" ];
+ acl = [
+ {
+ rule = "allow";
+ targets = [ "192.168.0.0/16" ];
+ }
+ {
+ rule = "allow"
+ users = [ "user1" "user2" ];
+ }
+ ];
+ }
+
+ In this example strong username authentication is not required to access 192.168.0.0/16.
+ '';
+ };
+ acl = mkOption {
+ type = types.listOf (types.submodule {
+ options = {
+ rule = mkOption {
+ type = types.enum [ "allow" "deny" ];
+ example = "allow";
+ description = ''
+ ACL rule. The following values are valid:
+
+
+
+ "allow" : connections allowed.
+
+
+ "deny" : connections not allowed.
+
+
+ '';
+ };
+ users = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "user1" "user2" "user3" ];
+ description = ''
+ List of users, use empty list for any.
+ '';
+ };
+ sources = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "127.0.0.1" "192.168.1.0/24" ];
+ description = ''
+ List of source IP range, use empty list for any.
+ '';
+ };
+ targets = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "127.0.0.1" "192.168.1.0/24" ];
+ description = ''
+ List of target IP ranges, use empty list for any.
+ May also contain host names instead of addresses.
+ It's possible to use wildmask in the begginning and in the the end of hostname, e.g. *badsite.com or *badcontent*.
+ Hostname is only checked if hostname presents in request.
+ '';
+ };
+ targetPorts = mkOption {
+ type = types.listOf types.int;
+ default = [ ];
+ example = [ 80 443 ];
+ description = ''
+ List of target ports, use empty list for any.
+ '';
+ };
+ };
+ });
+ default = [ ];
+ example = literalExample ''
+ [
+ {
+ rule = "allow";
+ users = [ "user1" ];
+ }
+ {
+ rule = "allow";
+ sources = [ "192.168.1.0/24" ];
+ }
+ {
+ rule = "deny";
+ }
+ ]
+ '';
+ description = ''
+ Use this option to limit user access to resources.
+ '';
+ };
+ extraArguments = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "-46";
+ description = ''
+ Extra arguments for service.
+ Consult "Options" section in documentation for available arguments.
+ '';
+ };
+ extraConfig = mkOption {
+ type = types.nullOr types.lines;
+ default = null;
+ description = ''
+ Extra configuration for service. Use this to configure things like bandwidth limiter or ACL-based redirection.
+ Consult documentation for available options.
+ '';
+ };
+ };
+ });
+ default = [ ];
+ example = literalExample ''
+ [
+ {
+ type = "proxy";
+ bindAddress = "192.168.1.24";
+ bindPort = 3128;
+ auth = [ "none" ];
+ }
+ {
+ type = "proxy";
+ bindAddress = "10.10.1.20";
+ bindPort = 3128;
+ auth = [ "iponly" ];
+ }
+ {
+ type = "socks";
+ bindAddress = "172.17.0.1";
+ bindPort = 1080;
+ auth = [ "strong" ];
+ }
+ ]
+ '';
+ description = ''
+ Use this option to define 3proxy services.
+ '';
+ };
+ denyPrivate = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to deny access to private IP ranges including loopback.
+ '';
+ };
+ privateRanges = mkOption {
+ type = types.listOf types.str;
+ default = [
+ "0.0.0.0/8"
+ "127.0.0.0/8"
+ "10.0.0.0/8"
+ "100.64.0.0/10"
+ "172.16.0.0/12"
+ "192.168.0.0/16"
+ "::"
+ "::1"
+ "fc00::/7"
+ ];
+ example = [
+ "0.0.0.0/8"
+ "127.0.0.0/8"
+ "10.0.0.0/8"
+ "100.64.0.0/10"
+ "172.16.0.0/12"
+ "192.168.0.0/16"
+ "::"
+ "::1"
+ "fc00::/7"
+ ];
+ description = ''
+ What IP ranges to deny access when denyPrivate is set tu true.
+ '';
+ };
+ resolution = mkOption {
+ type = types.submodule {
+ options = {
+ nserver = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "127.0.0.53" "192.168.1.3:5353/tcp" ];
+ description = ''
+ List of nameservers to use.
+
+ Up to 5 nservers may be specified. If no nserver is configured,
+ default system name resolution functions are used.
+ '';
+ };
+ nscache = mkOption {
+ type = types.int;
+ default = 65535;
+ example = 65535;
+ description = "Set name cache size for IPv4.";
+ };
+ nscache6 = mkOption {
+ type = types.int;
+ default = 65535;
+ example = 65535;
+ description = "Set name cache size for IPv6.";
+ };
+ nsrecord = mkOption {
+ type = types.attrsOf types.str;
+ default = { };
+ example = {
+ "files.local" = "192.168.1.12";
+ "site.local" = "192.168.1.43";
+ };
+ description = "Adds static nsrecords.";
+ };
+ };
+ };
+ default = { };
+ description = ''
+ Use this option to configure name resolution and DNS caching.
+ '';
+ };
+ extraConfig = mkOption {
+ type = types.nullOr types.lines;
+ default = null;
+ description = ''
+ Extra configuration, appended to the 3proxy configuration file.
+ Consult documentation for available options.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services._3proxy.confFile = mkDefault (pkgs.writeText "3proxy.conf" ''
+ # log to stdout
+ log
+
+ ${concatMapStringsSep "\n" (x: "nserver " + x) cfg.resolution.nserver}
+
+ nscache ${toString cfg.resolution.nscache}
+ nscache6 ${toString cfg.resolution.nscache6}
+
+ ${concatMapStringsSep "\n" (x: "nsrecord " + x)
+ (mapAttrsToList (name: value: "${name} ${value}")
+ cfg.resolution.nsrecord)}
+
+ ${optionalString (cfg.usersFile != null)
+ ''users $"${cfg.usersFile}"''
+ }
+
+ ${concatMapStringsSep "\n" (service: ''
+ auth ${concatStringsSep " " service.auth}
+
+ ${optionalString (cfg.denyPrivate)
+ "deny * * ${optionalList cfg.privateRanges}"}
+
+ ${concatMapStringsSep "\n" (acl:
+ "${acl.rule} ${
+ concatMapStringsSep " " optionalList [
+ acl.users
+ acl.sources
+ acl.targets
+ acl.targetPorts
+ ]
+ }") service.acl}
+
+ maxconn ${toString service.maxConnections}
+
+ ${optionalString (service.extraConfig != null) service.extraConfig}
+
+ ${service.type} -i${toString service.bindAddress} ${
+ optionalString (service.bindPort != null)
+ "-p${toString service.bindPort}"
+ } ${
+ optionalString (service.extraArguments != null) service.extraArguments
+ }
+
+ flush
+ '') cfg.services}
+ ${optionalString (cfg.extraConfig != null) cfg.extraConfig}
+ '');
+ systemd.services."3proxy" = {
+ description = "Tiny free proxy server";
+ documentation = [ "https://github.com/z3APA3A/3proxy/wiki" ];
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ DynamicUser = true;
+ StateDirectory = "3proxy";
+ ExecStart = "${pkg}/bin/3proxy ${cfg.confFile}";
+ Restart = "on-failure";
+ };
+ };
+ };
+
+ meta.maintainers = with maintainers; [ misuzu ];
+}
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 06af4dbcca4e..d09c6735e123 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -78,7 +78,11 @@ in
cacheNetworks = mkOption {
default = ["127.0.0.0/24"];
description = "
- What networks are allowed to use us as a resolver.
+ What networks are allowed to use us as a resolver. Note
+ that this is for recursive queries -- all networks are
+ allowed to query zones configured with the `zones` option.
+ It is recommended that you limit cacheNetworks to avoid your
+ server being used for DNS amplification attacks.
";
};
diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix
index 90f1291c0198..4e00a8865474 100644
--- a/nixos/modules/services/networking/bitcoind.nix
+++ b/nixos/modules/services/networking/bitcoind.nix
@@ -177,9 +177,6 @@ in {
NoNewPrivileges = "true";
PrivateDevices = "true";
MemoryDenyWriteExecute = "true";
-
- # Permission for preStart
- PermissionsStartOnly = "true";
};
};
users.users.${cfg.user} = {
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index 31127f790499..8402be939fe5 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -4,7 +4,7 @@ with pkgs;
with lib;
let
- cfg = config.networking.connman;
+ cfg = config.services.connman;
configFile = pkgs.writeText "connman.conf" ''
[General]
NetworkInterfaceBlacklist=${concatStringsSep "," cfg.networkInterfaceBlacklist}
@@ -13,11 +13,15 @@ let
'';
in {
+ imports = [
+ (mkRenamedOptionModule [ "networking" "connman" ] [ "services" "connman" ])
+ ];
+
###### interface
options = {
- networking.connman = {
+ services.connman = {
enable = mkOption {
type = types.bool;
@@ -71,13 +75,13 @@ in {
assertions = [{
assertion = !config.networking.useDHCP;
- message = "You can not use services.networking.connman with services.networking.useDHCP";
+ message = "You can not use services.connman with networking.useDHCP";
}{
assertion = config.networking.wireless.enable;
- message = "You must use services.networking.connman with services.networking.wireless";
+ message = "You must use services.connman with networking.wireless";
}{
assertion = !config.networking.networkmanager.enable;
- message = "You can not use services.networking.connman with services.networking.networkmanager";
+ message = "You can not use services.connman with networking.networkmanager";
}];
environment.systemPackages = [ connman ];
diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 04ce5ca3a874..053efe712709 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -30,6 +30,14 @@ with lib;
{
+ imports = [
+ (mkChangedOptionModule [ "services" "ddclient" "domain" ] [ "services" "ddclient" "domains" ]
+ (config:
+ let value = getAttrFromPath [ "services" "ddclient" "domain" ] config;
+ in if value != "" then [ value ] else []))
+ (mkRemovedOptionModule [ "services" "ddclient" "homeDir" ] "")
+ ];
+
###### interface
options = {
diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix
index 0b2063bc4246..67f7d8118870 100644
--- a/nixos/modules/services/networking/dhcpd.nix
+++ b/nixos/modules/services/networking/dhcpd.nix
@@ -182,6 +182,10 @@ in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ])
+ ];
+
###### interface
options = {
diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix
index 5b58ea9b0c91..2586f2d74e9c 100644
--- a/nixos/modules/services/networking/dnschain.nix
+++ b/nixos/modules/services/networking/dnschain.nix
@@ -137,7 +137,7 @@ in
];
services.pdns-recursor = mkIf cfgs.pdns-recursor.resolveDNSChainQueries {
- forwardZones =
+ forwardZonesRecurse =
{ bit = "127.0.0.1:${toString cfg.dns.port}";
dns = "127.0.0.1:${toString cfg.dns.port}";
};
@@ -180,4 +180,6 @@ in
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix
index 79f9e1a43083..e53fb7a15782 100644
--- a/nixos/modules/services/networking/dnscrypt-wrapper.nix
+++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix
@@ -197,4 +197,7 @@ in {
};
};
+
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/dnsdist.nix b/nixos/modules/services/networking/dnsdist.nix
index 12eee136e639..8249da69bc1a 100644
--- a/nixos/modules/services/networking/dnsdist.nix
+++ b/nixos/modules/services/networking/dnsdist.nix
@@ -46,11 +46,10 @@ in {
RestartSec="1";
DynamicUser = true;
StartLimitInterval="0";
- PrivateTmp=true;
PrivateDevices=true;
- CapabilityBoundingSet="CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID";
+ AmbientCapabilities="CAP_NET_BIND_SERVICE";
+ CapabilityBoundingSet="CAP_NET_BIND_SERVICE";
ExecStart = "${pkgs.dnsdist}/bin/dnsdist --supervised --disable-syslog --config ${configFile}";
- ProtectSystem="full";
ProtectHome=true;
RestrictAddressFamilies="AF_UNIX AF_INET AF_INET6";
LimitNOFILE="16384";
diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix
index be7337ece7e4..a2e5b30dc0f0 100644
--- a/nixos/modules/services/networking/eternal-terminal.nix
+++ b/nixos/modules/services/networking/eternal-terminal.nix
@@ -23,6 +23,8 @@ in
type = types.int;
description = ''
The port the server should listen on. Will use the server's default (2022) if not specified.
+
+ Make sure to open this port in the firewall if necessary.
'';
};
@@ -86,4 +88,8 @@ in
};
};
};
+
+ meta = {
+ maintainers = with lib.maintainers; [ pingiun ];
+ };
}
diff --git a/nixos/modules/services/networking/fakeroute.nix b/nixos/modules/services/networking/fakeroute.nix
index 82a9fb729d84..7916ad4098a7 100644
--- a/nixos/modules/services/networking/fakeroute.nix
+++ b/nixos/modules/services/networking/fakeroute.nix
@@ -60,4 +60,6 @@ in
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 5919962837a2..15aaf7410674 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -42,16 +42,7 @@ let
kernelHasRPFilter = ((kernel.config.isEnabled or (x: false)) "IP_NF_MATCH_RPFILTER") || (kernel.features.netfilterRPFilter or false);
- helpers =
- ''
- # Helper command to manipulate both the IPv4 and IPv6 tables.
- ip46tables() {
- iptables -w "$@"
- ${optionalString config.networking.enableIPv6 ''
- ip6tables -w "$@"
- ''}
- }
- '';
+ helpers = import ./helpers.nix { inherit config lib; };
writeShScript = name: text: let dir = pkgs.writeScriptBin name ''
#! ${pkgs.runtimeShell} -e
@@ -271,7 +262,7 @@ let
apply = canonicalizePortList;
example = [ 22 80 ];
description =
- ''
+ ''
List of TCP ports on which incoming connections are
accepted.
'';
@@ -282,7 +273,7 @@ let
default = [ ];
example = [ { from = 8999; to = 9003; } ];
description =
- ''
+ ''
A range of TCP ports on which incoming connections are
accepted.
'';
diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix
index 0438d0bf8d86..aff71e5e97da 100644
--- a/nixos/modules/services/networking/haproxy.nix
+++ b/nixos/modules/services/networking/haproxy.nix
@@ -1,7 +1,16 @@
{ config, lib, pkgs, ... }:
+
let
cfg = config.services.haproxy;
- haproxyCfg = pkgs.writeText "haproxy.conf" cfg.config;
+
+ haproxyCfg = pkgs.writeText "haproxy.conf" ''
+ global
+ # needed for hot-reload to work without dropping packets in multi-worker mode
+ stats socket /run/haproxy/haproxy.sock mode 600 expose-fd listeners level user
+
+ ${cfg.config}
+ '';
+
in
with lib;
{
@@ -25,9 +34,7 @@ with lib;
haproxy.conf .
'';
};
-
};
-
};
config = mkIf cfg.enable {
@@ -42,21 +49,16 @@ with lib;
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
- Type = "forking";
- PIDFile = "/run/haproxy.pid";
- ExecStartPre = "${pkgs.haproxy}/sbin/haproxy -c -q -f ${haproxyCfg}";
- ExecStart = "${pkgs.haproxy}/sbin/haproxy -D -f ${haproxyCfg} -p /run/haproxy.pid";
- ExecReload = "-${pkgs.bash}/bin/bash -c \"exec ${pkgs.haproxy}/sbin/haproxy -D -f ${haproxyCfg} -p /run/haproxy.pid -sf $MAINPID\"";
+ DynamicUser = true;
+ Type = "notify";
+ # when running the config test, don't be quiet so we can see what goes wrong
+ ExecStartPre = "${pkgs.haproxy}/sbin/haproxy -c -f ${haproxyCfg}";
+ ExecStart = "${pkgs.haproxy}/sbin/haproxy -Ws -f ${haproxyCfg}";
+ Restart = "on-failure";
+ RuntimeDirectory = "haproxy";
+ # needed in case we bind to port < 1024
+ AmbientCapabilities = "CAP_NET_BIND_SERVICE";
};
};
-
- environment.systemPackages = [ pkgs.haproxy ];
-
- users.users.haproxy = {
- group = "haproxy";
- uid = config.ids.uids.haproxy;
- };
-
- users.groups.haproxy.gid = config.ids.uids.haproxy;
};
}
diff --git a/nixos/modules/services/networking/helpers.nix b/nixos/modules/services/networking/helpers.nix
new file mode 100644
index 000000000000..d7d42de0e3a8
--- /dev/null
+++ b/nixos/modules/services/networking/helpers.nix
@@ -0,0 +1,11 @@
+{ config, lib, ... }: ''
+ # Helper command to manipulate both the IPv4 and IPv6 tables.
+ ip46tables() {
+ iptables -w "$@"
+ ${
+ lib.optionalString config.networking.enableIPv6 ''
+ ip6tables -w "$@"
+ ''
+ }
+ }
+''
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index f2be417738ee..e2c2275b5512 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -235,6 +235,10 @@ in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])
+ ];
+
###### interface
options = {
diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
index 344f84374bbd..97b5843bbcf1 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixos/modules/services/networking/iodine.nix
@@ -11,6 +11,13 @@ let
in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "iodined" "enable" ] [ "services" "iodine" "server" "enable" ])
+ (mkRenamedOptionModule [ "services" "iodined" "domain" ] [ "services" "iodine" "server" "domain" ])
+ (mkRenamedOptionModule [ "services" "iodined" "ip" ] [ "services" "iodine" "server" "ip" ])
+ (mkRenamedOptionModule [ "services" "iodined" "extraConfig" ] [ "services" "iodine" "server" "extraConfig" ])
+ (mkRemovedOptionModule [ "services" "iodined" "client" ] "")
+ ];
### configuration
diff --git a/nixos/modules/services/networking/jormungandr.nix b/nixos/modules/services/networking/jormungandr.nix
deleted file mode 100644
index 152cceb4bf91..000000000000
--- a/nixos/modules/services/networking/jormungandr.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
- cfg = config.services.jormungandr;
-
- inherit (lib) mkEnableOption mkIf mkOption;
- inherit (lib) optionalString types;
-
- dataDir = "/var/lib/jormungandr";
-
- # Default settings so far, as the service matures we will
- # move these out as separate settings
- configSettings = {
- storage = dataDir;
- p2p = {
- public_address = "/ip4/127.0.0.1/tcp/8299";
- topics_of_interest = {
- messages = "high";
- blocks = "high";
- };
- };
- rest = {
- listen = "127.0.0.1:8607";
- };
- };
-
- configFile = if cfg.configFile == null then
- pkgs.writeText "jormungandr.yaml" (builtins.toJSON configSettings)
- else cfg.configFile;
-
-in {
-
- options = {
-
- services.jormungandr = {
- enable = mkEnableOption "jormungandr service";
-
- configFile = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/var/lib/jormungandr/node.yaml";
- description = ''
- The path of the jormungandr blockchain configuration file in YAML format.
- If no file is specified, a file is generated using the other options.
- '';
- };
-
- secretFile = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/etc/secret/jormungandr.yaml";
- description = ''
- The path of the jormungandr blockchain secret node configuration file in
- YAML format. Do not store this in nix store!
- '';
- };
-
- genesisBlockHash = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "d70495af81ae8600aca3e642b2427327cb6001ec4d7a0037e96a00dabed163f9";
- description = ''
- Set the genesis block hash (the hash of the block0) so we can retrieve
- the genesis block (and the blockchain configuration) from the existing
- storage or from the network.
- '';
- };
-
- genesisBlockFile = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/var/lib/jormungandr/block-0.bin";
- description = ''
- The path of the genesis block file if we are hosting it locally.
- '';
- };
-
- };
- };
-
- config = mkIf cfg.enable {
-
- systemd.services.jormungandr = {
- description = "jormungandr server";
- wantedBy = [ "multi-user.target" ];
- after = [ "network-online.target" ];
- environment = {
- RUST_BACKTRACE = "full";
- };
- serviceConfig = {
- DynamicUser = true;
- StateDirectory = baseNameOf dataDir;
- ExecStart = ''
- ${pkgs.jormungandr}/bin/jormungandr --config ${configFile} \
- ${optionalString (cfg.secretFile != null) " --secret ${cfg.secretFile}"} \
- ${optionalString (cfg.genesisBlockHash != null) " --genesis-block-hash ${cfg.genesisBlockHash}"} \
- ${optionalString (cfg.genesisBlockFile != null) " --genesis-block ${cfg.genesisBlockFile}"}
- '';
- };
- };
- };
-}
diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix
index 831e4d60d8da..98a3456f6396 100644
--- a/nixos/modules/services/networking/monero.nix
+++ b/nixos/modules/services/networking/monero.nix
@@ -224,15 +224,17 @@ in
};
};
- assertions = singleton {
- assertion = cfg.mining.enable -> cfg.mining.address != "";
- message = ''
+ assertions = singleton {
+ assertion = cfg.mining.enable -> cfg.mining.address != "";
+ message = ''
You need a Monero address to receive mining rewards:
specify one using option monero.mining.address.
- '';
- };
+ '';
+ };
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 082953d2f6ab..3054ae1b201f 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -46,6 +46,11 @@ let
'';
in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ])
+ (mkRemovedOptionModule [ "services" "murmur" "pidfile" ] "Hardcoded to /run/murmur/murmurd.pid now")
+ ];
+
options = {
services.murmur = {
enable = mkOption {
diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix
index c8ee0a2f5647..43a9a0b2598b 100644
--- a/nixos/modules/services/networking/namecoind.nix
+++ b/nixos/modules/services/networking/namecoind.nix
@@ -201,4 +201,6 @@ in
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index 5681bda51cb4..f1238bc6b168 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -7,26 +7,33 @@
with lib;
let
-
cfg = config.networking.nat;
dest = if cfg.externalIP == null then "-j MASQUERADE" else "-j SNAT --to-source ${cfg.externalIP}";
+ helpers = import ./helpers.nix { inherit config lib; };
+
flushNat = ''
- iptables -w -t nat -D PREROUTING -j nixos-nat-pre 2>/dev/null|| true
- iptables -w -t nat -F nixos-nat-pre 2>/dev/null || true
- iptables -w -t nat -X nixos-nat-pre 2>/dev/null || true
- iptables -w -t nat -D POSTROUTING -j nixos-nat-post 2>/dev/null || true
- iptables -w -t nat -F nixos-nat-post 2>/dev/null || true
- iptables -w -t nat -X nixos-nat-post 2>/dev/null || true
+ ${helpers}
+ ip46tables -w -t nat -D PREROUTING -j nixos-nat-pre 2>/dev/null|| true
+ ip46tables -w -t nat -F nixos-nat-pre 2>/dev/null || true
+ ip46tables -w -t nat -X nixos-nat-pre 2>/dev/null || true
+ ip46tables -w -t nat -D POSTROUTING -j nixos-nat-post 2>/dev/null || true
+ ip46tables -w -t nat -F nixos-nat-post 2>/dev/null || true
+ ip46tables -w -t nat -X nixos-nat-post 2>/dev/null || true
+ ip46tables -w -t nat -D OUTPUT -j nixos-nat-out 2>/dev/null || true
+ ip46tables -w -t nat -F nixos-nat-out 2>/dev/null || true
+ ip46tables -w -t nat -X nixos-nat-out 2>/dev/null || true
${cfg.extraStopCommands}
'';
setupNat = ''
+ ${helpers}
# Create subchain where we store rules
- iptables -w -t nat -N nixos-nat-pre
- iptables -w -t nat -N nixos-nat-post
+ ip46tables -w -t nat -N nixos-nat-pre
+ ip46tables -w -t nat -N nixos-nat-post
+ ip46tables -w -t nat -N nixos-nat-out
# We can't match on incoming interface in POSTROUTING, so
# mark packets coming from the internal interfaces.
@@ -88,8 +95,9 @@ let
${cfg.extraCommands}
# Append our chains to the nat tables
- iptables -w -t nat -A PREROUTING -j nixos-nat-pre
- iptables -w -t nat -A POSTROUTING -j nixos-nat-post
+ ip46tables -w -t nat -A PREROUTING -j nixos-nat-pre
+ ip46tables -w -t nat -A POSTROUTING -j nixos-nat-post
+ ip46tables -w -t nat -A OUTPUT -j nixos-nat-out
'';
in
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 918bf891b103..53029b590677 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -336,6 +336,7 @@ in {
};
imports = [
+ (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ])
(mkRemovedOptionModule ["networking" "networkmanager" "dynamicHosts"] ''
This option was removed because allowing (multiple) regular users to
override host entries affecting the whole system opens up a huge attack
@@ -456,15 +457,19 @@ in {
};
# Turn off NixOS' network management when networking is managed entirely by NetworkManager
- networking = (mkIf (!delegateWireless) {
- useDHCP = false;
- # Use mkDefault to trigger the assertion about the conflict above
- wireless.enable = mkDefault false;
- }) // (mkIf cfg.enableStrongSwan {
- networkmanager.packages = [ pkgs.networkmanager_strongswan ];
- }) // (mkIf enableIwd {
- wireless.iwd.enable = true;
- });
+ networking = mkMerge [
+ (mkIf (!delegateWireless) {
+ useDHCP = false;
+ })
+
+ (mkIf cfg.enableStrongSwan {
+ networkmanager.packages = [ pkgs.networkmanager_strongswan ];
+ })
+
+ (mkIf enableIwd {
+ wireless.iwd.enable = true;
+ })
+ ];
security.polkit.extraConfig = polkitConf;
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index 05be97e66a3d..dcd7e9e5fa4c 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -73,6 +73,9 @@ let
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "openvpn" "enable" ] "")
+ ];
###### interface
diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index ebfdd9f35b72..6ff181377fcc 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -90,11 +90,19 @@ in {
};
forwardZones = mkOption {
+ type = types.attrs;
+ default = {};
+ description = ''
+ DNS zones to be forwarded to other authoritative servers.
+ '';
+ };
+
+ forwardZonesRecurse = mkOption {
type = types.attrs;
example = { eth = "127.0.0.1:5353"; };
default = {};
description = ''
- DNS zones to be forwarded to other servers.
+ DNS zones to be forwarded to other recursive servers.
'';
};
@@ -158,7 +166,8 @@ in {
webserver-port = cfg.api.port;
webserver-allow-from = cfg.api.allowFrom;
- forward-zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones;
+ forward-zones = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZones;
+ forward-zones-recurse = mapAttrsToList (zone: uri: "${zone}.=${uri}") cfg.forwardZonesRecurse;
export-etc-hosts = cfg.exportHosts;
dnssec = cfg.dnssecValidation;
serve-rfc1918 = cfg.serveRFC1918;
@@ -210,4 +219,6 @@ in {
"To change extra Recursor settings use services.pdns-recursor.settings instead.")
];
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix
index 49ca839a2c37..1f41c720adf5 100644
--- a/nixos/modules/services/networking/privoxy.nix
+++ b/nixos/modules/services/networking/privoxy.nix
@@ -109,4 +109,6 @@ in
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index 9412d0ef8a62..60fb3d5d6d44 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -75,4 +75,6 @@ in
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/networking/spacecookie.nix b/nixos/modules/services/networking/spacecookie.nix
new file mode 100644
index 000000000000..c4d06df6ad4a
--- /dev/null
+++ b/nixos/modules/services/networking/spacecookie.nix
@@ -0,0 +1,83 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.spacecookie;
+ configFile = pkgs.writeText "spacecookie.json" (lib.generators.toJSON {} {
+ inherit (cfg) hostname port root;
+ });
+in {
+
+ options = {
+
+ services.spacecookie = {
+
+ enable = mkEnableOption "spacecookie";
+
+ hostname = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "The hostname the service is reachable via. Clients will use this hostname for further requests after loading the initial gopher menu.";
+ };
+
+ port = mkOption {
+ type = types.port;
+ default = 70;
+ description = "Port the gopher service should be exposed on.";
+ };
+
+ root = mkOption {
+ type = types.path;
+ default = "/srv/gopher";
+ description = "The root directory spacecookie serves via gopher.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+
+ systemd.sockets.spacecookie = {
+ description = "Socket for the Spacecookie Gopher Server";
+ wantedBy = [ "sockets.target" ];
+ listenStreams = [ "[::]:${toString cfg.port}" ];
+ socketConfig = {
+ BindIPv6Only = "both";
+ };
+ };
+
+ systemd.services.spacecookie = {
+ description = "Spacecookie Gopher Server";
+ wantedBy = [ "multi-user.target" ];
+ requires = [ "spacecookie.socket" ];
+
+ serviceConfig = {
+ Type = "notify";
+ ExecStart = "${pkgs.haskellPackages.spacecookie}/bin/spacecookie ${configFile}";
+ FileDescriptorStoreMax = 1;
+
+ DynamicUser = true;
+
+ ProtectSystem = "strict";
+ ProtectHome = true;
+ PrivateTmp = true;
+ PrivateDevices = true;
+ PrivateMounts = true;
+ PrivateUsers = true;
+
+ ProtectKernelTunables = true;
+ ProtectKernelModules = true;
+ ProtectControlGroups = true;
+
+ CapabilityBoundingSet = "";
+ NoNewPrivileges = true;
+ LockPersonality = true;
+ RestrictRealtime = true;
+
+ # AF_UNIX for communication with systemd
+ # AF_INET replaced by BindIPv6Only=both
+ RestrictAddressFamilies = "AF_UNIX AF_INET6";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 91fc7d72bc6d..b0e2e303cbc0 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -74,6 +74,10 @@ let
in
{
+ imports = [
+ (mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
+ (mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
+ ];
###### interface
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 165fd5970cf8..b3f2af5b1794 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -18,6 +18,7 @@ let
fsWatcherEnabled = folder.watch;
fsWatcherDelayS = folder.watchDelay;
ignorePerms = folder.ignorePerms;
+ versioning = folder.versioning;
}) (filterAttrs (
_: folder:
folder.enable
@@ -220,6 +221,69 @@ in {
'';
};
+ versioning = mkOption {
+ default = null;
+ description = ''
+ How to keep changed/deleted files with syncthing.
+ There are 4 different types of versioning with different parameters.
+ See https://docs.syncthing.net/users/versioning.html
+ '';
+ example = [
+ {
+ versioning = {
+ type = "simple";
+ params.keep = "10";
+ };
+ }
+ {
+ versioning = {
+ type = "trashcan";
+ params.cleanoutDays = "1000";
+ };
+ }
+ {
+ versioning = {
+ type = "staggered";
+ params = {
+ cleanInterval = "3600";
+ maxAge = "31536000";
+ versionsPath = "/syncthing/backup";
+ };
+ };
+ }
+ {
+ versioning = {
+ type = "external";
+ params.versionsPath = pkgs.writers.writeBash "backup" ''
+ folderpath="$1"
+ filepath="$2"
+ rm -rf "$folderpath/$filepath"
+ '';
+ };
+ }
+ ];
+ type = with types; nullOr (submodule {
+ options = {
+ type = mkOption {
+ type = enum [ "external" "simple" "staggered" "trashcan" ];
+ description = ''
+ Type of versioning.
+ See https://docs.syncthing.net/users/versioning.html
+ '';
+ };
+ params = mkOption {
+ type = attrsOf (either str path);
+ description = ''
+ Parameters for versioning. Structure depends on versioning.type.
+ See https://docs.syncthing.net/users/versioning.html
+ '';
+ };
+ };
+ });
+ };
+
+
+
rescanInterval = mkOption {
type = types.int;
default = 3600;
diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix
index 7b2c464ab46b..79507b2ebcdd 100644
--- a/nixos/modules/services/networking/tinydns.nix
+++ b/nixos/modules/services/networking/tinydns.nix
@@ -37,6 +37,7 @@ with lib;
systemd.services.tinydns = {
description = "djbdns tinydns server";
wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
path = with pkgs; [ daemontools djbdns ];
preStart = ''
rm -rf /var/lib/tinydns
diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index 3cf82e8839bb..baed83591e1e 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -53,6 +53,13 @@ in
enable = mkEnableOption "Unbound domain name server";
+ package = mkOption {
+ type = types.package;
+ default = pkgs.unbound;
+ defaultText = "pkgs.unbound";
+ description = "The unbound package to use";
+ };
+
allowedAccess = mkOption {
default = [ "127.0.0.0/24" ];
type = types.listOf types.str;
@@ -94,7 +101,7 @@ in
config = mkIf cfg.enable {
- environment.systemPackages = [ pkgs.unbound ];
+ environment.systemPackages = [ cfg.package ];
users.users.unbound = {
description = "unbound daemon user";
@@ -114,7 +121,7 @@ in
mkdir -m 0755 -p ${stateDir}/dev/
cp ${confFile} ${stateDir}/unbound.conf
${optionalString cfg.enableRootTrustAnchor ''
- ${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!"
+ ${cfg.package}/bin/unbound-anchor -a ${rootTrustAnchorFile} || echo "Root anchor updated!"
chown unbound ${stateDir} ${rootTrustAnchorFile}
''}
touch ${stateDir}/dev/random
@@ -122,7 +129,7 @@ in
'';
serviceConfig = {
- ExecStart = "${pkgs.unbound}/bin/unbound -d -c ${stateDir}/unbound.conf";
+ ExecStart = "${cfg.package}/bin/unbound -d -c ${stateDir}/unbound.conf";
ExecStopPost="${pkgs.utillinux}/bin/umount ${stateDir}/dev/random";
ProtectSystem = true;
diff --git a/nixos/modules/services/networking/v2ray.nix b/nixos/modules/services/networking/v2ray.nix
new file mode 100644
index 000000000000..a1774cdffbb9
--- /dev/null
+++ b/nixos/modules/services/networking/v2ray.nix
@@ -0,0 +1,81 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ options = {
+
+ services.v2ray = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to run v2ray server.
+
+ Either configFile or config must be specified.
+ '';
+ };
+
+ configFile = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "/etc/v2ray/config.json";
+ description = ''
+ The absolute path to the configuration file.
+
+ Either configFile or config must be specified.
+
+ See .
+ '';
+ };
+
+ config = mkOption {
+ type = types.nullOr (types.attrsOf types.unspecified);
+ default = null;
+ example = {
+ inbounds = [{
+ port = 1080;
+ listen = "127.0.0.1";
+ protocol = "http";
+ }];
+ outbounds = [{
+ protocol = "freedom";
+ }];
+ };
+ description = ''
+ The configuration object.
+
+ Either `configFile` or `config` must be specified.
+
+ See .
+ '';
+ };
+ };
+
+ };
+
+ config = let
+ cfg = config.services.v2ray;
+ configFile = if cfg.configFile != null
+ then cfg.configFile
+ else (pkgs.writeText "v2ray.json" (builtins.toJSON cfg.config));
+
+ in mkIf cfg.enable {
+ assertions = [
+ {
+ assertion = (cfg.configFile == null) != (cfg.config == null);
+ message = "Either but not both `configFile` and `config` should be specified for v2ray.";
+ }
+ ];
+
+ systemd.services.v2ray = {
+ description = "v2ray Daemon";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ path = [ pkgs.v2ray ];
+ script = ''
+ exec v2ray -config ${configFile}
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index 67be60da5673..90093d9a78d9 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -34,6 +34,15 @@ let
};
optionDescription = [
+ (yesNoOption "allowWriteableChroot" "allow_writeable_chroot" false ''
+ Allow the use of writeable root inside chroot().
+ '')
+ (yesNoOption "virtualUseLocalPrivs" "virtual_use_local_privs" false ''
+ If enabled, virtual users will use the same privileges as local
+ users. By default, virtual users will use the same privileges as
+ anonymous users, which tends to be more restrictive (especially
+ in terms of write access).
+ '')
(yesNoOption "anonymousUser" "anonymous_enable" false ''
Whether to enable the anonymous FTP user.
'')
@@ -76,9 +85,21 @@ let
outgoing data connections can only connect to the client. Only enable if you
know what you are doing!
'')
- (yesNoOption "ssl_tlsv1" "ssl_tlsv1" true '' '')
- (yesNoOption "ssl_sslv2" "ssl_sslv2" false '' '')
- (yesNoOption "ssl_sslv3" "ssl_sslv3" false '' '')
+ (yesNoOption "ssl_tlsv1" "ssl_tlsv1" true ''
+ Only applies if ssl_enable is activated. If
+ enabled, this option will permit TLS v1 protocol connections.
+ TLS v1 connections are preferred.
+ '')
+ (yesNoOption "ssl_sslv2" "ssl_sslv2" false ''
+ Only applies if ssl_enable is activated. If
+ enabled, this option will permit SSL v2 protocol connections.
+ TLS v1 connections are preferred.
+ '')
+ (yesNoOption "ssl_sslv3" "ssl_sslv3" false ''
+ Only applies if ssl_enable is activated. If
+ enabled, this option will permit SSL v3 protocol connections.
+ TLS v1 connections are preferred.
+ '')
];
configFile = pkgs.writeText "vsftpd.conf"
@@ -98,6 +119,9 @@ let
listen=YES
nopriv_user=vsftpd
secure_chroot_dir=/var/empty
+ ${optionalString (cfg.localRoot != null) ''
+ local_root=${cfg.localRoot}
+ ''}
syslog_enable=YES
${optionalString (pkgs.stdenv.hostPlatform.system == "x86_64-linux") ''
seccomp_sandbox=NO
@@ -106,6 +130,11 @@ let
${optionalString cfg.anonymousUser ''
anon_root=${cfg.anonymousUserHome}
''}
+ ${optionalString cfg.enableVirtualUsers ''
+ guest_enable=YES
+ guest_username=vsftpd
+ pam_service_name=vsftpd
+ ''}
${cfg.extraConfig}
'';
@@ -119,10 +148,7 @@ in
services.vsftpd = {
- enable = mkOption {
- default = false;
- description = "Whether to enable the vsftpd FTP server.";
- };
+ enable = mkEnableOption "vsftpd";
userlist = mkOption {
default = [];
@@ -143,6 +169,61 @@ in
'';
};
+ enableVirtualUsers = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable the pam_userdb -based
+ virtual user system
+ '';
+ };
+
+ userDbPath = mkOption {
+ type = types.nullOr types.str;
+ example = "/etc/vsftpd/userDb";
+ default = null;
+ description = ''
+ Only applies if enableVirtualUsers is true.
+ Path pointing to the pam_userdb user
+ database used by vsftpd to authenticate the virtual users.
+
+ This user list should be stored in the Berkeley DB database
+ format.
+
+ To generate a new user database, create a text file, add
+ your users using the following format:
+
+ user1
+ password1
+ user2
+ password2
+
+
+ You can then install pkgs.db to generate
+ the Berkeley DB using
+
+ db_load -T -t hash -f logins.txt userDb.db
+
+
+ Caution: pam_userdb will automatically
+ append a .db suffix to the filename you
+ provide though this option. This option shouldn't include
+ this filetype suffix.
+ '';
+ };
+
+ localRoot = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "/var/www/$USER";
+ description = ''
+ This option represents a directory which vsftpd will try to
+ change into after a local (i.e. non- anonymous) login.
+
+ Failure is silently ignored.
+ '';
+ };
+
anonymousUserHome = mkOption {
type = types.path;
default = "/home/ftp/";
@@ -186,18 +267,25 @@ in
config = mkIf cfg.enable {
- assertions = singleton
+ assertions = [
{ assertion =
(cfg.forceLocalLoginsSSL -> cfg.rsaCertFile != null)
&& (cfg.forceLocalDataSSL -> cfg.rsaCertFile != null);
message = "vsftpd: If forceLocalLoginsSSL or forceLocalDataSSL is true then a rsaCertFile must be provided!";
- };
+ }
+ {
+ assertion = (cfg.enableVirtualUsers -> cfg.userDbPath != null)
+ && (cfg.enableVirtualUsers -> cfg.localUsers != null);
+ message = "vsftpd: If enableVirtualUsers is true, you need to setup both the userDbPath and localUsers options.";
+ }];
users.users =
[ { name = "vsftpd";
uid = config.ids.uids.vsftpd;
description = "VSFTPD user";
- home = "/homeless-shelter";
+ home = if cfg.localRoot != null
+ then cfg.localRoot # <= Necessary for virtual users.
+ else "/homeless-shelter";
}
] ++ optional cfg.anonymousUser
{ name = "ftp";
@@ -213,23 +301,24 @@ in
# = false and whitelist root
services.vsftpd.userlist = if cfg.userlistDeny then ["root"] else [];
- systemd.services.vsftpd =
- { description = "Vsftpd Server";
+ systemd = {
+ tmpfiles.rules = optional cfg.anonymousUser
+ #Type Path Mode User Gr Age Arg
+ "d '${builtins.toString cfg.anonymousUserHome}' 0555 'ftp' 'ftp' - -";
+ services.vsftpd = {
+ description = "Vsftpd Server";
wantedBy = [ "multi-user.target" ];
- preStart =
- optionalString cfg.anonymousUser
- ''
- mkdir -p -m 555 ${cfg.anonymousUserHome}
- chown -R ftp:ftp ${cfg.anonymousUserHome}
- '';
-
serviceConfig.ExecStart = "@${vsftpd}/sbin/vsftpd vsftpd ${configFile}";
serviceConfig.Restart = "always";
serviceConfig.Type = "forking";
};
+ };
+ security.pam.services.vsftpd.text = mkIf (cfg.enableVirtualUsers && cfg.userDbPath != null)''
+ auth required pam_userdb.so db=${cfg.userDbPath}
+ account required pam_userdb.so db=${cfg.userDbPath}
+ '';
};
-
}
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 4176da2c8cb8..980961225c9e 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -112,6 +112,32 @@ let
Determines whether to add allowed IPs as routes or not.
'';
};
+
+ socketNamespace = mkOption {
+ default = null;
+ type = with types; nullOr str;
+ example = "container";
+ description = ''The pre-existing network namespace in which the
+ WireGuard interface is created, and which retains the socket even if the
+ interface is moved via interfaceNamespace . When
+ null , the interface is created in the init namespace.
+ See documentation.
+ '';
+ };
+
+ interfaceNamespace = mkOption {
+ default = null;
+ type = with types; nullOr str;
+ example = "init";
+ description = ''The pre-existing network namespace the WireGuard
+ interface is moved to. The special value init means
+ the init namespace. When null , the interface is not
+ moved.
+ See documentation.
+ '';
+ };
};
};
@@ -239,6 +265,10 @@ let
if peer.presharedKey != null
then pkgs.writeText "wg-psk" peer.presharedKey
else peer.presharedKeyFile;
+ src = interfaceCfg.socketNamespace;
+ dst = interfaceCfg.interfaceNamespace;
+ ip = nsWrap "ip" src dst;
+ wg = nsWrap "wg" src dst;
in nameValuePair "wireguard-${interfaceName}-peer-${unitName}"
{
description = "WireGuard Peer - ${interfaceName} - ${peer.publicKey}";
@@ -255,16 +285,16 @@ let
};
script = let
- wg_setup = "wg set ${interfaceName} peer ${peer.publicKey}" +
+ wg_setup = "${wg} set ${interfaceName} peer ${peer.publicKey}" +
optionalString (psk != null) " preshared-key ${psk}" +
optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" +
optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" +
optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}";
route_setup =
- optionalString (interfaceCfg.allowedIPsAsRoutes != false)
+ optionalString interfaceCfg.allowedIPsAsRoutes
(concatMapStringsSep "\n"
(allowedIP:
- "ip route replace ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}"
+ "${ip} route replace ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}"
) peer.allowedIPs);
in ''
${wg_setup}
@@ -272,13 +302,13 @@ let
'';
postStop = let
- route_destroy = optionalString (interfaceCfg.allowedIPsAsRoutes != false)
+ route_destroy = optionalString interfaceCfg.allowedIPsAsRoutes
(concatMapStringsSep "\n"
(allowedIP:
- "ip route delete ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}"
+ "${ip} route delete ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}"
) peer.allowedIPs);
in ''
- wg set ${interfaceName} peer ${peer.publicKey} remove
+ ${wg} set ${interfaceName} peer ${peer.publicKey} remove
${route_destroy}
'';
};
@@ -287,6 +317,13 @@ let
# exactly one way to specify the private key must be set
#assert (values.privateKey != null) != (values.privateKeyFile != null);
let privKey = if values.privateKeyFile != null then values.privateKeyFile else pkgs.writeText "wg-key" values.privateKey;
+ src = values.socketNamespace;
+ dst = values.interfaceNamespace;
+ ipPreMove = nsWrap "ip" src null;
+ ipPostMove = nsWrap "ip" src dst;
+ wg = nsWrap "wg" src dst;
+ ns = if dst == "init" then "1" else dst;
+
in
nameValuePair "wireguard-${name}"
{
@@ -307,26 +344,33 @@ let
${values.preSetup}
- ip link add dev ${name} type wireguard
+ ${ipPreMove} link add dev ${name} type wireguard
+ ${optionalString (values.interfaceNamespace != null && values.interfaceNamespace != values.socketNamespace) "${ipPreMove} link set ${name} netns ${ns}"}
${concatMapStringsSep "\n" (ip:
- "ip address add ${ip} dev ${name}"
+ "${ipPostMove} address add ${ip} dev ${name}"
) values.ips}
- wg set ${name} private-key ${privKey} ${
+ ${wg} set ${name} private-key ${privKey} ${
optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}"}
- ip link set up dev ${name}
+ ${ipPostMove} link set up dev ${name}
${values.postSetup}
'';
postStop = ''
- ip link del dev ${name}
+ ${ipPostMove} link del dev ${name}
${values.postShutdown}
'';
};
+ nsWrap = cmd: src: dst:
+ let
+ nsList = filter (ns: ns != null) [ src dst ];
+ ns = last nsList;
+ in
+ if (length nsList > 0 && ns != "init") then "ip netns exec ${ns} ${cmd}" else cmd;
in
{
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 294c0d70edea..8f05c3949fba 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -236,9 +236,12 @@ in {
${if ifaces == [] then ''
for i in $(cd /sys/class/net && echo *); do
DEVTYPE=
- source /sys/class/net/$i/uevent
- if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
- ifaces="$ifaces''${ifaces:+ -N} -i$i"
+ UEVENT_PATH=/sys/class/net/$i/uevent
+ if [ -e "$UEVENT_PATH" ]; then
+ source "$UEVENT_PATH"
+ if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
+ ifaces="$ifaces''${ifaces:+ -N} -i$i"
+ fi
fi
done
'' else ''
diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix
index 0da50ccc344b..9e675ecd6f4b 100644
--- a/nixos/modules/services/networking/yggdrasil.nix
+++ b/nixos/modules/services/networking/yggdrasil.nix
@@ -12,11 +12,11 @@ let
configFileProvided = (cfg.configFile != null);
generateConfig = (
if configProvided && configFileProvided then
- "${pkgs.jq}/bin/jq -s add /run/yggdrasil/configFile.json ${configAsFile}"
+ "${pkgs.jq}/bin/jq -s add ${configAsFile} ${cfg.configFile}"
else if configProvided then
"cat ${configAsFile}"
else if configFileProvided then
- "cat /run/yggdrasil/configFile.json"
+ "cat ${cfg.configFile}"
else
"${cfg.package}/bin/yggdrasil -genconf"
);
@@ -128,12 +128,6 @@ in {
}
];
- environment.etc."yggdrasil.conf" = {
- enable = true;
- mode = "symlink";
- source = "/run/yggdrasil/yggdrasil.conf";
- };
-
systemd.services.yggdrasil = {
description = "Yggdrasil Network Service";
path = [ cfg.package ] ++ optional (configProvided && configFileProvided) pkgs.jq;
@@ -146,14 +140,14 @@ in {
'';
serviceConfig = {
- ExecStart = "${cfg.package}/bin/yggdrasil -useconffile /etc/yggdrasil.conf";
+ ExecStart = "${cfg.package}/bin/yggdrasil -useconffile /run/yggdrasil/yggdrasil.conf";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
Restart = "always";
RuntimeDirectory = "yggdrasil";
RuntimeDirectoryMode = "0700";
BindReadOnlyPaths = mkIf configFileProvided
- [ "${cfg.configFile}:/run/yggdrasil/configFile.json" ];
+ [ "${cfg.configFile}" ];
# TODO: as of yggdrasil 0.3.8 and systemd 243, yggdrasil fails
# to set up the network adapter when DynamicUser is set. See
diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix
index 05f97bfa539f..0a9848a49349 100644
--- a/nixos/modules/services/networking/znc/default.nix
+++ b/nixos/modules/services/networking/znc/default.nix
@@ -239,7 +239,7 @@ in
services.znc = {
configFile = mkDefault (pkgs.writeText "znc-generated.conf" semanticString);
config = {
- Version = (builtins.parseDrvName pkgs.znc.name).version;
+ Version = lib.getVersion pkgs.znc;
Listener.l.Port = mkDefault 5000;
Listener.l.SSL = mkDefault true;
};
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 1071c05d514e..cc35be49bc3b 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -112,6 +112,15 @@ in
{
+ imports = [
+ (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]
+ (config:
+ let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;
+ in if enabled then [ pkgs.gutenprint ] else [ ]))
+ (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "")
+ (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "")
+ ];
+
###### interface
options = {
diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index 04b433f8f2bf..ef5bde7907e0 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -30,6 +30,10 @@ let
'';
in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ])
+ ];
+
options = {
services.clamav = {
daemon = {
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index ed862387cce1..18c105b2f576 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -106,6 +106,12 @@ let
in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
+ (mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.")
+ (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.")
+ ];
+
options = {
services.tor = {
enable = mkOption {
diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix
index d5962ba9af90..b0ab8fadcbec 100644
--- a/nixos/modules/services/security/vault.nix
+++ b/nixos/modules/services/security/vault.nix
@@ -119,9 +119,8 @@ in
};
users.groups.vault.gid = config.ids.gids.vault;
- systemd.tmpfiles.rules = optional (cfg.storagePath != null) [
- "d '${cfg.storagePath}' 0700 vault vault - -"
- ];
+ systemd.tmpfiles.rules = optional (cfg.storagePath != null)
+ "d '${cfg.storagePath}' 0700 vault vault - -";
systemd.services.vault = {
description = "Vault server daemon";
diff --git a/nixos/modules/services/torrent/magnetico.nix b/nixos/modules/services/torrent/magnetico.nix
index a7acdb78b316..7465c10e002c 100644
--- a/nixos/modules/services/torrent/magnetico.nix
+++ b/nixos/modules/services/torrent/magnetico.nix
@@ -35,6 +35,7 @@ let
(if (cfg.web.credentialsFile != null || cfg.web.credentials != { })
then "--credentials=${toString credFile}"
else "--no-auth")
+ "--addr=${address}:${toString port}"
] ++ extraOptions);
in {
@@ -177,7 +178,7 @@ in {
systemd.services.magneticod = {
description = "Magnetico DHT crawler";
wantedBy = [ "multi-user.target" ];
- after = [ "network-online.target" ];
+ after = [ "network.target" ];
serviceConfig = {
User = "magnetico";
@@ -189,7 +190,7 @@ in {
systemd.services.magneticow = {
description = "Magnetico web interface";
wantedBy = [ "multi-user.target" ];
- after = [ "network-online.target" "magneticod.service"];
+ after = [ "network.target" "magneticod.service"];
serviceConfig = {
User = "magnetico";
@@ -202,7 +203,7 @@ in {
assertions =
[
{
- assertion = cfg.web.credentialsFile != null || cfg.web.credentials != { };
+ assertion = cfg.web.credentialsFile == null || cfg.web.credentials == { };
message = ''
The options services.magnetico.web.credentialsFile and
services.magnetico.web.credentials are mutually exclusives.
@@ -212,4 +213,6 @@ in {
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 7409eb8cdcbe..f7a88867b616 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -7,6 +7,7 @@ let
apparmor = config.security.apparmor.enable;
homeDir = cfg.home;
+ downloadDirPermissions = cfg.downloadDirPermissions;
downloadDir = "${homeDir}/Downloads";
incompleteDir = "${homeDir}/.incomplete";
@@ -16,16 +17,14 @@ let
# for users in group "transmission" to have access to torrents
fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings;
- # Directories transmission expects to exist and be ug+rwx.
- directoriesToManage = [ homeDir settingsDir fullSettings.download-dir fullSettings.incomplete-dir ];
-
preStart = pkgs.writeScript "transmission-pre-start" ''
#!${pkgs.runtimeShell}
set -ex
- for DIR in ${escapeShellArgs directoriesToManage}; do
+ for DIR in "${homeDir}" "${settingsDir}" "${fullSettings.download-dir}" "${fullSettings.incomplete-dir}"; do
mkdir -p "$DIR"
- chmod 770 "$DIR"
done
+ chmod 700 "${homeDir}" "${settingsDir}"
+ chmod ${downloadDirPermissions} "${fullSettings.download-dir}" "${fullSettings.incomplete-dir}"
cp -f ${settingsFile} ${settingsDir}/settings.json
'';
in
@@ -71,6 +70,16 @@ in
'';
};
+ downloadDirPermissions = mkOption {
+ type = types.str;
+ default = "770";
+ example = "775";
+ description = ''
+ The permissions to set for download-dir and incomplete-dir.
+ They will be applied on every service start.
+ '';
+ };
+
port = mkOption {
type = types.int;
default = 9091;
diff --git a/nixos/modules/services/web-apps/limesurvey.nix b/nixos/modules/services/web-apps/limesurvey.nix
index bd524524130d..e00a47191c6f 100644
--- a/nixos/modules/services/web-apps/limesurvey.nix
+++ b/nixos/modules/services/web-apps/limesurvey.nix
@@ -3,7 +3,7 @@
let
inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption;
- inherit (lib) mapAttrs optional optionalString types;
+ inherit (lib) literalExample mapAttrs optional optionalString types;
cfg = config.services.limesurvey;
fpm = config.services.phpfpm.pools.limesurvey;
@@ -100,19 +100,15 @@ in
};
virtualHost = mkOption {
- type = types.submodule ({
- options = import ../web-servers/apache-httpd/per-server-options.nix {
- inherit lib;
- forMainServer = false;
- };
- });
- example = {
- hostName = "survey.example.org";
- enableSSL = true;
- adminAddr = "webmaster@example.org";
- sslServerCert = "/var/lib/acme/survey.example.org/full.pem";
- sslServerKey = "/var/lib/acme/survey.example.org/key.pem";
- };
+ type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix);
+ example = literalExample ''
+ {
+ hostName = "survey.example.org";
+ adminAddr = "webmaster@example.org";
+ forceSSL = true;
+ enableACME = true;
+ }
+ '';
description = ''
Apache configuration can be done by adapting services.httpd.virtualHosts.<name> .
See for further information.
@@ -184,7 +180,7 @@ in
config = {
tempdir = "${stateDir}/tmp";
uploaddir = "${stateDir}/upload";
- force_ssl = mkIf cfg.virtualHost.enableSSL "on";
+ force_ssl = mkIf (cfg.virtualHost.addSSL || cfg.virtualHost.forceSSL || cfg.virtualHost.onlySSL) "on";
config.defaultlang = "en";
};
};
@@ -215,38 +211,36 @@ in
enable = true;
adminAddr = mkDefault cfg.virtualHost.adminAddr;
extraModules = [ "proxy_fcgi" ];
- virtualHosts = [ (mkMerge [
- cfg.virtualHost {
- documentRoot = mkForce "${pkg}/share/limesurvey";
- extraConfig = ''
- Alias "/tmp" "${stateDir}/tmp"
-
- AllowOverride all
- Require all granted
- Options -Indexes +FollowSymlinks
-
+ virtualHosts.${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost {
+ documentRoot = mkForce "${pkg}/share/limesurvey";
+ extraConfig = ''
+ Alias "/tmp" "${stateDir}/tmp"
+
+ AllowOverride all
+ Require all granted
+ Options -Indexes +FollowSymlinks
+
- Alias "/upload" "${stateDir}/upload"
-
- AllowOverride all
- Require all granted
- Options -Indexes
-
+ Alias "/upload" "${stateDir}/upload"
+
+ AllowOverride all
+ Require all granted
+ Options -Indexes
+
-
-
-
- SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
-
-
+
+
+
+ SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
+
+
- AllowOverride all
- Options -Indexes
- DirectoryIndex index.php
-
- '';
- }
- ]) ];
+ AllowOverride all
+ Options -Indexes
+ DirectoryIndex index.php
+
+ '';
+ } ];
};
systemd.tmpfiles.rules = [
diff --git a/nixos/modules/services/web-apps/matomo-doc.xml b/nixos/modules/services/web-apps/matomo-doc.xml
index 79cece551d34..69d1170e4523 100644
--- a/nixos/modules/services/web-apps/matomo-doc.xml
+++ b/nixos/modules/services/web-apps/matomo-doc.xml
@@ -84,12 +84,6 @@ GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost';
Issues
-
-
- Matomo's file integrity check will warn you. This is due to the patches
- necessary for NixOS, you can safely ignore this.
-
-
Matomo will warn you that the JavaScript tracker is not writable. This is
diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix
index 352cc4c647bc..75da474dc446 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -18,6 +18,14 @@ let
in join config.networking.hostName config.networking.domain;
in {
+ imports = [
+ (mkRenamedOptionModule [ "services" "piwik" "enable" ] [ "services" "matomo" "enable" ])
+ (mkRenamedOptionModule [ "services" "piwik" "webServerUser" ] [ "services" "matomo" "webServerUser" ])
+ (mkRemovedOptionModule [ "services" "piwik" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools..settings")
+ (mkRemovedOptionModule [ "services" "matomo" "phpfpmProcessManagerConfig" ] "Use services.phpfpm.pools..settings")
+ (mkRenamedOptionModule [ "services" "piwik" "nginx" ] [ "services" "matomo" "nginx" ])
+ ];
+
options = {
services.matomo = {
# NixOS PR for database setup: https://github.com/NixOS/nixpkgs/pull/6963
diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix
index 43edc04e1a49..8a109b39bb57 100644
--- a/nixos/modules/services/web-apps/mediawiki.nix
+++ b/nixos/modules/services/web-apps/mediawiki.nix
@@ -64,7 +64,7 @@ let
$wgScriptPath = "";
## The protocol and server name to use in fully-qualified URLs
- $wgServer = "${if cfg.virtualHost.enableSSL then "https" else "http"}://${cfg.virtualHost.hostName}";
+ $wgServer = "${if cfg.virtualHost.addSSL || cfg.virtualHost.forceSSL || cfg.virtualHost.onlySSL then "https" else "http"}://${cfg.virtualHost.hostName}";
## The URL path to static resources (images, scripts, etc.)
$wgResourceBasePath = $wgScriptPath;
@@ -290,19 +290,13 @@ in
};
virtualHost = mkOption {
- type = types.submodule ({
- options = import ../web-servers/apache-httpd/per-server-options.nix {
- inherit lib;
- forMainServer = false;
- };
- });
+ type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix);
example = literalExample ''
{
hostName = "mediawiki.example.org";
- enableSSL = true;
adminAddr = "webmaster@example.org";
- sslServerCert = "/var/lib/acme/mediawiki.example.org/full.pem";
- sslServerKey = "/var/lib/acme/mediawiki.example.org/key.pem";
+ forceSSL = true;
+ enableACME = true;
}
'';
description = ''
@@ -389,31 +383,28 @@ in
services.httpd = {
enable = true;
- adminAddr = mkDefault cfg.virtualHost.adminAddr;
extraModules = [ "proxy_fcgi" ];
- virtualHosts = [ (mkMerge [
- cfg.virtualHost {
- documentRoot = mkForce "${pkg}/share/mediawiki";
- extraConfig = ''
-
-
-
- SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
-
-
+ virtualHosts.${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost {
+ documentRoot = mkForce "${pkg}/share/mediawiki";
+ extraConfig = ''
+
+
+
+ SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
+
+
- Require all granted
- DirectoryIndex index.php
- AllowOverride All
-
- '' + optionalString (cfg.uploadsDir != null) ''
- Alias "/images" "${cfg.uploadsDir}"
-
- Require all granted
-
- '';
- }
- ]) ];
+ Require all granted
+ DirectoryIndex index.php
+ AllowOverride All
+
+ '' + optionalString (cfg.uploadsDir != null) ''
+ Alias "/images" "${cfg.uploadsDir}"
+
+ Require all granted
+
+ '';
+ } ];
};
systemd.tmpfiles.rules = [
diff --git a/nixos/modules/services/web-apps/moodle.nix b/nixos/modules/services/web-apps/moodle.nix
index ac59f9e0012a..595d070d940a 100644
--- a/nixos/modules/services/web-apps/moodle.nix
+++ b/nixos/modules/services/web-apps/moodle.nix
@@ -32,7 +32,7 @@ let
'dbcollation' => 'utf8mb4_unicode_ci',
);
- $CFG->wwwroot = '${if cfg.virtualHost.enableSSL then "https" else "http"}://${cfg.virtualHost.hostName}';
+ $CFG->wwwroot = '${if cfg.virtualHost.addSSL || cfg.virtualHost.forceSSL || cfg.virtualHost.onlySSL then "https" else "http"}://${cfg.virtualHost.hostName}';
$CFG->dataroot = '${stateDir}';
$CFG->admin = 'admin';
@@ -140,19 +140,15 @@ in
};
virtualHost = mkOption {
- type = types.submodule ({
- options = import ../web-servers/apache-httpd/per-server-options.nix {
- inherit lib;
- forMainServer = false;
- };
- });
- example = {
- hostName = "moodle.example.org";
- enableSSL = true;
- adminAddr = "webmaster@example.org";
- sslServerCert = "/var/lib/acme/moodle.example.org/full.pem";
- sslServerKey = "/var/lib/acme/moodle.example.org/key.pem";
- };
+ type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix);
+ example = literalExample ''
+ {
+ hostName = "moodle.example.org";
+ adminAddr = "webmaster@example.org";
+ forceSSL = true;
+ enableACME = true;
+ }
+ '';
description = ''
Apache configuration can be done by adapting services.httpd.virtualHosts .
See for further information.
@@ -241,22 +237,20 @@ in
enable = true;
adminAddr = mkDefault cfg.virtualHost.adminAddr;
extraModules = [ "proxy_fcgi" ];
- virtualHosts = [ (mkMerge [
- cfg.virtualHost {
- documentRoot = mkForce "${cfg.package}/share/moodle";
- extraConfig = ''
-
-
-
- SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
-
-
- Options -Indexes
- DirectoryIndex index.php
-
- '';
- }
- ]) ];
+ virtualHosts.${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost {
+ documentRoot = mkForce "${cfg.package}/share/moodle";
+ extraConfig = ''
+
+
+
+ SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
+
+
+ Options -Indexes
+ DirectoryIndex index.php
+
+ '';
+ } ];
};
systemd.tmpfiles.rules = [
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index b9186a1dc07f..e3a2db398e62 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -31,8 +31,12 @@ let
occ = pkgs.writeScriptBin "nextcloud-occ" ''
#! ${pkgs.stdenv.shell}
cd ${pkgs.nextcloud}
- exec /run/wrappers/bin/sudo -u nextcloud \
- NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" \
+ sudo=exec
+ if [[ "$USER" != nextcloud ]]; then
+ sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR'
+ fi
+ export NEXTCLOUD_CONFIG_DIR="${cfg.home}/config"
+ $sudo \
${phpPackage}/bin/php \
-c ${pkgs.writeText "php.ini" phpOptionsStr}\
occ $*
@@ -390,6 +394,7 @@ in {
in {
wantedBy = [ "multi-user.target" ];
before = [ "phpfpm-nextcloud.service" ];
+ path = [ occ ];
script = ''
chmod og+x ${cfg.home}
ln -sf ${pkgs.nextcloud}/apps ${cfg.home}/
@@ -419,6 +424,7 @@ in {
nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable {
serviceConfig.Type = "oneshot";
serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all";
+ serviceConfig.User = "nextcloud";
startAt = cfg.autoUpdateApps.startAt;
};
};
diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix
index 2c2f36ac598a..9d0a3f65253e 100644
--- a/nixos/modules/services/web-apps/restya-board.nix
+++ b/nixos/modules/services/web-apps/restya-board.nix
@@ -116,7 +116,7 @@ in
};
passwordFile = mkOption {
- type = types.nullOr types.str;
+ type = types.nullOr types.path;
default = null;
description = ''
The database user's password. 'null' if no password is set.
@@ -285,7 +285,7 @@ in
sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', 'restya');/g" "${runDir}/server/php/config.inc.php"
'' else ''
sed -i "s/^.*'R_DB_HOST'.*$/define('R_DB_HOST', '${cfg.database.host}');/g" "${runDir}/server/php/config.inc.php"
- sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', '$(<${cfg.database.dbPassFile})');/g" "${runDir}/server/php/config.inc.php"
+ sed -i "s/^.*'R_DB_PASSWORD'.*$/define('R_DB_PASSWORD', ${if cfg.database.passwordFile == null then "''" else "'file_get_contents(${cfg.database.passwordFile})'"});/g" "${runDir}/server/php/config.inc.php
''}
sed -i "s/^.*'R_DB_PORT'.*$/define('R_DB_PORT', '${toString cfg.database.port}');/g" "${runDir}/server/php/config.inc.php"
sed -i "s/^.*'R_DB_NAME'.*$/define('R_DB_NAME', '${cfg.database.name}');/g" "${runDir}/server/php/config.inc.php"
diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix
new file mode 100644
index 000000000000..6f47193c62b9
--- /dev/null
+++ b/nixos/modules/services/web-apps/trilium.nix
@@ -0,0 +1,137 @@
+{ config, lib, pkgs, ... }:
+
+let
+ cfg = config.services.trilium-server;
+ configIni = pkgs.writeText "trilium-config.ini" ''
+ [General]
+ # Instance name can be used to distinguish between different instances
+ instanceName=${cfg.instanceName}
+
+ # Disable automatically generating desktop icon
+ noDesktopIcon=true
+
+ [Network]
+ # host setting is relevant only for web deployments - set the host on which the server will listen
+ host=${cfg.host}
+ # port setting is relevant only for web deployments, desktop builds run on random free port
+ port=${toString cfg.port}
+ # true for TLS/SSL/HTTPS (secure), false for HTTP (unsecure).
+ https=false
+ '';
+in
+{
+
+ options.services.trilium-server = with lib; {
+ enable = mkEnableOption "trilium-server";
+
+ dataDir = mkOption {
+ type = types.str;
+ default = "/var/lib/trilium";
+ description = ''
+ The directory storing the nodes database and the configuration.
+ '';
+ };
+
+ instanceName = mkOption {
+ type = types.str;
+ default = "Trilium";
+ description = ''
+ Instance name used to distinguish between different instances
+ '';
+ };
+
+ host = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = ''
+ The host address to bind to (defaults to localhost).
+ '';
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 8080;
+ description = ''
+ The port number to bind to.
+ '';
+ };
+
+ nginx = mkOption {
+ default = {};
+ description = ''
+ Configuration for nginx reverse proxy.
+ '';
+
+ type = types.submodule {
+ options = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Configure the nginx reverse proxy settings.
+ '';
+ };
+
+ hostName = mkOption {
+ type = types.str;
+ description = ''
+ The hostname use to setup the virtualhost configuration
+ '';
+ };
+ };
+ };
+ };
+ };
+
+ config = lib.mkIf cfg.enable (lib.mkMerge [
+ {
+ meta.maintainers = with lib.maintainers; [ kampka ];
+
+ users.groups.trilium = {};
+ users.users.trilium = {
+ description = "Trilium User";
+ group = "trilium";
+ home = cfg.dataDir;
+ isSystemUser = true;
+ };
+
+ systemd.services.trilium-server = {
+ wantedBy = [ "multi-user.target" ];
+ environment.TRILIUM_DATA_DIR = cfg.dataDir;
+ serviceConfig = {
+ ExecStart = "${pkgs.trilium-server}/bin/trilium-server";
+ User = "trilium";
+ Group = "trilium";
+ PrivateTmp = "true";
+ };
+ };
+
+ systemd.tmpfiles.rules = [
+ "d ${cfg.dataDir} 0750 trilium trilium - -"
+ "L+ ${cfg.dataDir}/config.ini - - - - ${configIni}"
+ ];
+
+ }
+
+ (lib.mkIf cfg.nginx.enable {
+ services.nginx = {
+ enable = true;
+ virtualHosts."${cfg.nginx.hostName}" = {
+ locations."/" = {
+ proxyPass = "http://${cfg.host}:${toString cfg.port}/";
+ extraConfig = ''
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection 'upgrade';
+ proxy_set_header Host $host;
+ proxy_cache_bypass $http_upgrade;
+ '';
+ };
+ extraConfig = ''
+ client_max_body_size 0;
+ '';
+ };
+ };
+ })
+ ]);
+}
diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix
index f1370c2854b8..ad4f39fbf52c 100644
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixos/modules/services/web-apps/wordpress.nix
@@ -3,7 +3,7 @@
let
inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types;
inherit (lib) any attrValues concatMapStringsSep flatten literalExample;
- inherit (lib) mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString;
+ inherit (lib) mapAttrs mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString;
eachSite = config.services.wordpress;
user = "wordpress";
@@ -127,7 +127,7 @@ let
These themes need to be packaged before use, see example.
'';
example = ''
- # For shits and giggles, let's package the responsive theme
+ # Let's package the responsive theme
responsiveTheme = pkgs.stdenv.mkDerivation {
name = "responsive-theme";
# Download the theme from the wordpress site
@@ -209,18 +209,12 @@ let
};
virtualHost = mkOption {
- type = types.submodule ({
- options = import ../web-servers/apache-httpd/per-server-options.nix {
- inherit lib;
- forMainServer = false;
- };
- });
+ type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix);
example = literalExample ''
{
- enableSSL = true;
adminAddr = "webmaster@example.org";
- sslServerCert = "/var/lib/acme/wordpress.example.org/full.pem";
- sslServerKey = "/var/lib/acme/wordpress.example.org/key.pem";
+ forceSSL = true;
+ enableACME = true;
}
'';
description = ''
@@ -304,41 +298,37 @@ in
services.httpd = {
enable = true;
extraModules = [ "proxy_fcgi" ];
- virtualHosts = mapAttrsToList (hostName: cfg:
- (mkMerge [
- cfg.virtualHost {
- documentRoot = mkForce "${pkg hostName cfg}/share/wordpress";
- extraConfig = ''
-
-
-
- SetHandler "proxy:unix:${config.services.phpfpm.pools."wordpress-${hostName}".socket}|fcgi://localhost/"
-
-
+ virtualHosts = mapAttrs (hostName: cfg: mkMerge [ cfg.virtualHost {
+ documentRoot = mkForce "${pkg hostName cfg}/share/wordpress";
+ extraConfig = ''
+
+
+
+ SetHandler "proxy:unix:${config.services.phpfpm.pools."wordpress-${hostName}".socket}|fcgi://localhost/"
+
+
- # standard wordpress .htaccess contents
-
- RewriteEngine On
- RewriteBase /
- RewriteRule ^index\.php$ - [L]
- RewriteCond %{REQUEST_FILENAME} !-f
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteRule . /index.php [L]
-
+ # standard wordpress .htaccess contents
+
+ RewriteEngine On
+ RewriteBase /
+ RewriteRule ^index\.php$ - [L]
+ RewriteCond %{REQUEST_FILENAME} !-f
+ RewriteCond %{REQUEST_FILENAME} !-d
+ RewriteRule . /index.php [L]
+
- DirectoryIndex index.php
- Require all granted
- Options +FollowSymLinks
-
+ DirectoryIndex index.php
+ Require all granted
+ Options +FollowSymLinks
+
- # https://wordpress.org/support/article/hardening-wordpress/#securing-wp-config-php
-
- Require all denied
-
- '';
- }
- ])
- ) eachSite;
+ # https://wordpress.org/support/article/hardening-wordpress/#securing-wp-config-php
+
+ Require all denied
+
+ '';
+ } ]) eachSite;
};
systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [
diff --git a/nixos/modules/services/web-apps/zabbix.nix b/nixos/modules/services/web-apps/zabbix.nix
index 09538726b7cd..ee8447810c6d 100644
--- a/nixos/modules/services/web-apps/zabbix.nix
+++ b/nixos/modules/services/web-apps/zabbix.nix
@@ -113,19 +113,15 @@ in
};
virtualHost = mkOption {
- type = types.submodule ({
- options = import ../web-servers/apache-httpd/per-server-options.nix {
- inherit lib;
- forMainServer = false;
- };
- });
- example = {
- hostName = "zabbix.example.org";
- enableSSL = true;
- adminAddr = "webmaster@example.org";
- sslServerCert = "/var/lib/acme/zabbix.example.org/full.pem";
- sslServerKey = "/var/lib/acme/zabbix.example.org/key.pem";
- };
+ type = types.submodule (import ../web-servers/apache-httpd/per-server-options.nix);
+ example = literalExample ''
+ {
+ hostName = "zabbix.example.org";
+ adminAddr = "webmaster@example.org";
+ forceSSL = true;
+ enableACME = true;
+ }
+ '';
description = ''
Apache configuration can be done by adapting services.httpd.virtualHosts.<name> .
See for further information.
@@ -190,23 +186,21 @@ in
enable = true;
adminAddr = mkDefault cfg.virtualHost.adminAddr;
extraModules = [ "proxy_fcgi" ];
- virtualHosts = [ (mkMerge [
- cfg.virtualHost {
- documentRoot = mkForce "${cfg.package}/share/zabbix";
- extraConfig = ''
-
-
-
- SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
-
-
- AllowOverride all
- Options -Indexes
- DirectoryIndex index.php
-
- '';
- }
- ]) ];
+ virtualHosts.${cfg.virtualHost.hostName} = mkMerge [ cfg.virtualHost {
+ documentRoot = mkForce "${cfg.package}/share/zabbix";
+ extraConfig = ''
+
+
+
+ SetHandler "proxy:unix:${fpm.socket}|fcgi://localhost/"
+
+
+ AllowOverride all
+ Options -Indexes
+ DirectoryIndex index.php
+
+ '';
+ } ];
};
users.users.${user} = mapAttrs (name: mkDefault) {
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 99304d0e48ae..8e3be3162988 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -6,6 +6,8 @@ let
mainCfg = config.services.httpd;
+ runtimeDir = "/run/httpd";
+
httpd = mainCfg.package.out;
httpdConf = mainCfg.configFile;
@@ -16,52 +18,38 @@ let
mod_perl = pkgs.apacheHttpdPackages.mod_perl.override { apacheHttpd = httpd; };
- defaultListen = cfg: if cfg.enableSSL
- then [{ip = "*"; port = 443;}]
- else [{ip = "*"; port = 80;}];
+ vhosts = attrValues mainCfg.virtualHosts;
- getListen = cfg:
- if cfg.listen == []
- then defaultListen cfg
- else cfg.listen;
+ mkListenInfo = hostOpts:
+ if hostOpts.listen != [] then hostOpts.listen
+ else (
+ optional (hostOpts.onlySSL || hostOpts.addSSL || hostOpts.forceSSL) { ip = "*"; port = 443; ssl = true; } ++
+ optional (!hostOpts.onlySSL) { ip = "*"; port = 80; ssl = false; }
+ );
- listenToString = l: "${l.ip}:${toString l.port}";
+ listenInfo = unique (concatMap mkListenInfo vhosts);
- extraModules = attrByPath ["extraModules"] [] mainCfg;
- extraForeignModules = filter isAttrs extraModules;
- extraApacheModules = filter isString extraModules;
+ enableSSL = any (listen: listen.ssl) listenInfo;
- allHosts = [mainCfg] ++ mainCfg.virtualHosts;
+ enableUserDir = any (vhost: vhost.enableUserDir) vhosts;
- enableSSL = any (vhost: vhost.enableSSL) allHosts;
-
-
- # Names of modules from ${httpd}/modules that we want to load.
- apacheModules =
- [ # HTTP authentication mechanisms: basic and digest.
- "auth_basic" "auth_digest"
-
- # Authentication: is the user who he claims to be?
- "authn_file" "authn_dbm" "authn_anon" "authn_core"
-
- # Authorization: is the user allowed access?
- "authz_user" "authz_groupfile" "authz_host" "authz_core"
-
- # Other modules.
- "ext_filter" "include" "log_config" "env" "mime_magic"
- "cern_meta" "expires" "headers" "usertrack" /* "unique_id" */ "setenvif"
- "mime" "dav" "status" "autoindex" "asis" "info" "dav_fs"
- "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
- "userdir" "alias" "rewrite" "proxy" "proxy_http"
- "unixd" "cache" "cache_disk" "slotmem_shm" "socache_shmcb"
+ # NOTE: generally speaking order of modules is very important
+ modules =
+ [ # required apache modules our httpd service cannot run without
+ "authn_core" "authz_core"
+ "log_config"
+ "mime" "autoindex" "negotiation" "dir"
+ "alias" "rewrite"
+ "unixd" "slotmem_shm" "socache_shmcb"
"mpm_${mainCfg.multiProcessingModule}"
-
- # For compatibility with old configurations, the new module mod_access_compat is provided.
- "access_compat"
]
++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
++ optional enableSSL "ssl"
- ++ extraApacheModules;
+ ++ optional enableUserDir "userdir"
+ ++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; }
+ ++ optional mainCfg.enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; }
+ ++ optional mainCfg.enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; }
+ ++ mainCfg.extraModules;
allDenied = "Require all denied";
@@ -85,20 +73,22 @@ let
browserHacks = ''
- BrowserMatch "Mozilla/2" nokeepalive
- BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
- BrowserMatch "RealPlayer 4\.0" force-response-1.0
- BrowserMatch "Java/1\.0" force-response-1.0
- BrowserMatch "JDK/1\.0" force-response-1.0
- BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
- BrowserMatch "^WebDrive" redirect-carefully
- BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
- BrowserMatch "^gnome-vfs" redirect-carefully
+
+ BrowserMatch "Mozilla/2" nokeepalive
+ BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
+ BrowserMatch "RealPlayer 4\.0" force-response-1.0
+ BrowserMatch "Java/1\.0" force-response-1.0
+ BrowserMatch "JDK/1\.0" force-response-1.0
+ BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
+ BrowserMatch "^WebDrive" redirect-carefully
+ BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
+ BrowserMatch "^gnome-vfs" redirect-carefully
+
'';
sslConf = ''
- SSLSessionCache shmcb:${mainCfg.stateDir}/ssl_scache(512000)
+ SSLSessionCache shmcb:${runtimeDir}/ssl_scache(512000)
Mutex posixsem
@@ -123,129 +113,144 @@ let
'';
+ mkVHostConf = hostOpts:
+ let
+ adminAddr = if hostOpts.adminAddr != null then hostOpts.adminAddr else mainCfg.adminAddr;
+ listen = filter (listen: !listen.ssl) (mkListenInfo hostOpts);
+ listenSSL = filter (listen: listen.ssl) (mkListenInfo hostOpts);
- perServerConf = isMainServer: cfg: let
+ useACME = hostOpts.enableACME || hostOpts.useACMEHost != null;
+ sslCertDir =
+ if hostOpts.enableACME then config.security.acme.certs.${hostOpts.hostName}.directory
+ else if hostOpts.useACMEHost != null then config.security.acme.certs.${hostOpts.useACMEHost}.directory
+ else abort "This case should never happen.";
- # Canonical name must not include a trailing slash.
- canonicalNames =
- let defaultPort = (head (defaultListen cfg)).port; in
- map (port:
- (if cfg.enableSSL then "https" else "http") + "://" +
- cfg.hostName +
- (if port != defaultPort then ":${toString port}" else "")
- ) (map (x: x.port) (getListen cfg));
+ sslServerCert = if useACME then "${sslCertDir}/full.pem" else hostOpts.sslServerCert;
+ sslServerKey = if useACME then "${sslCertDir}/key.pem" else hostOpts.sslServerKey;
+ sslServerChain = if useACME then "${sslCertDir}/fullchain.pem" else hostOpts.sslServerChain;
- maybeDocumentRoot = fold (svc: acc:
- if acc == null then svc.documentRoot else assert svc.documentRoot == null; acc
- ) null ([ cfg ]);
+ acmeChallenge = optionalString useACME ''
+ Alias /.well-known/acme-challenge/ "${hostOpts.acmeRoot}/.well-known/acme-challenge/"
+
+ AllowOverride None
+ Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+ Require method GET POST OPTIONS
+ Require all granted
+
+ '';
+ in
+ optionalString (listen != []) ''
+
+ ServerName ${hostOpts.hostName}
+ ${concatMapStrings (alias: "ServerAlias ${alias}\n") hostOpts.serverAliases}
+ ServerAdmin ${adminAddr}
+
+ SSLEngine off
+
+ ${acmeChallenge}
+ ${if hostOpts.forceSSL then ''
+
+ RewriteEngine on
+ RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge [NC]
+ RewriteCond %{HTTPS} off
+ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+
+ '' else mkVHostCommonConf hostOpts}
+
+ '' +
+ optionalString (listenSSL != []) ''
+
+ ServerName ${hostOpts.hostName}
+ ${concatMapStrings (alias: "ServerAlias ${alias}\n") hostOpts.serverAliases}
+ ServerAdmin ${adminAddr}
+ SSLEngine on
+ SSLCertificateFile ${sslServerCert}
+ SSLCertificateKeyFile ${sslServerKey}
+ ${optionalString (sslServerChain != null) "SSLCertificateChainFile ${sslServerChain}"}
+ ${acmeChallenge}
+ ${mkVHostCommonConf hostOpts}
+
+ ''
+ ;
- documentRoot = if maybeDocumentRoot != null then maybeDocumentRoot else
- pkgs.runCommand "empty" { preferLocalBuild = true; } "mkdir -p $out";
+ mkVHostCommonConf = hostOpts:
+ let
+ documentRoot = if hostOpts.documentRoot != null
+ then hostOpts.documentRoot
+ else pkgs.runCommand "empty" { preferLocalBuild = true; } "mkdir -p $out"
+ ;
+ in
+ ''
+ ${optionalString mainCfg.logPerVirtualHost ''
+ ErrorLog ${mainCfg.logDir}/error-${hostOpts.hostName}.log
+ CustomLog ${mainCfg.logDir}/access-${hostOpts.hostName}.log ${hostOpts.logFormat}
+ ''}
- documentRootConf = ''
- DocumentRoot "${documentRoot}"
+ ${optionalString (hostOpts.robotsEntries != "") ''
+ Alias /robots.txt ${pkgs.writeText "robots.txt" hostOpts.robotsEntries}
+ ''}
-
- Options Indexes FollowSymLinks
- AllowOverride None
- ${allGranted}
-
- '';
+ DocumentRoot "${documentRoot}"
- # If this is a vhost, the include the entries for the main server as well.
- robotsTxt = concatStringsSep "\n" (filter (x: x != "") ([ cfg.robotsEntries ] ++ lib.optional (!isMainServer) mainCfg.robotsEntries));
+
+ Options Indexes FollowSymLinks
+ AllowOverride None
+ ${allGranted}
+
- in ''
- ${concatStringsSep "\n" (map (n: "ServerName ${n}") canonicalNames)}
+ ${optionalString hostOpts.enableUserDir ''
+ UserDir public_html
+ UserDir disabled root
+
+ AllowOverride FileInfo AuthConfig Limit Indexes
+ Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+
+ Require all granted
+
+
+ Require all denied
+
+
+ ''}
- ${concatMapStrings (alias: "ServerAlias ${alias}\n") cfg.serverAliases}
+ ${optionalString (hostOpts.globalRedirect != null && hostOpts.globalRedirect != "") ''
+ RedirectPermanent / ${hostOpts.globalRedirect}
+ ''}
- ${if cfg.sslServerCert != null then ''
- SSLCertificateFile ${cfg.sslServerCert}
- SSLCertificateKeyFile ${cfg.sslServerKey}
- ${if cfg.sslServerChain != null then ''
- SSLCertificateChainFile ${cfg.sslServerChain}
- '' else ""}
- '' else ""}
+ ${
+ let makeFileConf = elem: ''
+ Alias ${elem.urlPath} ${elem.file}
+ '';
+ in concatMapStrings makeFileConf hostOpts.servedFiles
+ }
+ ${
+ let makeDirConf = elem: ''
+ Alias ${elem.urlPath} ${elem.dir}/
+
+ Options +Indexes
+ ${allGranted}
+ AllowOverride All
+
+ '';
+ in concatMapStrings makeDirConf hostOpts.servedDirs
+ }
- ${if cfg.enableSSL then ''
- SSLEngine on
- '' else if enableSSL then /* i.e., SSL is enabled for some host, but not this one */
- ''
- SSLEngine off
- '' else ""}
-
- ${if isMainServer || cfg.adminAddr != null then ''
- ServerAdmin ${cfg.adminAddr}
- '' else ""}
-
- ${if !isMainServer && mainCfg.logPerVirtualHost then ''
- ErrorLog ${mainCfg.logDir}/error-${cfg.hostName}.log
- CustomLog ${mainCfg.logDir}/access-${cfg.hostName}.log ${cfg.logFormat}
- '' else ""}
-
- ${optionalString (robotsTxt != "") ''
- Alias /robots.txt ${pkgs.writeText "robots.txt" robotsTxt}
- ''}
-
- ${if isMainServer || maybeDocumentRoot != null then documentRootConf else ""}
-
- ${if cfg.enableUserDir then ''
-
- UserDir public_html
- UserDir disabled root
-
-
- AllowOverride FileInfo AuthConfig Limit Indexes
- Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-
- ${allGranted}
-
-
- ${allDenied}
-
-
-
- '' else ""}
-
- ${if cfg.globalRedirect != null && cfg.globalRedirect != "" then ''
- RedirectPermanent / ${cfg.globalRedirect}
- '' else ""}
-
- ${
- let makeFileConf = elem: ''
- Alias ${elem.urlPath} ${elem.file}
- '';
- in concatMapStrings makeFileConf cfg.servedFiles
- }
-
- ${
- let makeDirConf = elem: ''
- Alias ${elem.urlPath} ${elem.dir}/
-
- Options +Indexes
- ${allGranted}
- AllowOverride All
-
- '';
- in concatMapStrings makeDirConf cfg.servedDirs
- }
-
- ${cfg.extraConfig}
- '';
+ ${hostOpts.extraConfig}
+ ''
+ ;
confFile = pkgs.writeText "httpd.conf" ''
ServerRoot ${httpd}
+ ServerName ${config.networking.hostName}
+ DefaultRuntimeDir ${runtimeDir}/runtime
- DefaultRuntimeDir ${mainCfg.stateDir}/runtime
-
- PidFile ${mainCfg.stateDir}/httpd.pid
+ PidFile ${runtimeDir}/httpd.pid
${optionalString (mainCfg.multiProcessingModule != "prefork") ''
# mod_cgid requires this.
- ScriptSock ${mainCfg.stateDir}/cgisock
+ ScriptSock ${runtimeDir}/cgisock
''}
@@ -254,23 +259,21 @@ let
${let
- listen = concatMap getListen allHosts;
- toStr = listen: "Listen ${listenToString listen}\n";
- uniqueListen = uniqList {inputList = map toStr listen;};
- in concatStrings uniqueListen
+ toStr = listen: "Listen ${listen.ip}:${toString listen.port} ${if listen.ssl then "https" else "http"}";
+ uniqueListen = uniqList {inputList = map toStr listenInfo;};
+ in concatStringsSep "\n" uniqueListen
}
User ${mainCfg.user}
Group ${mainCfg.group}
${let
- load = {name, path}: "LoadModule ${name}_module ${path}\n";
- allModules = map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules
- ++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; }
- ++ optional mainCfg.enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; }
- ++ optional mainCfg.enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; }
- ++ extraForeignModules;
- in concatMapStrings load (unique allModules)
+ mkModule = module:
+ if isString module then { name = module; path = "${httpd}/modules/mod_${module}.so"; }
+ else if isAttrs module then { inherit (module) name path; }
+ else throw "Expecting either a string or attribute set including a name and path.";
+ in
+ concatMapStringsSep "\n" (module: "LoadModule ${module.name}_module ${module.path}") (unique (map mkModule modules))
}
AddHandler type-map var
@@ -306,17 +309,9 @@ let
${allGranted}
- # Generate directives for the main server.
- ${perServerConf true mainCfg}
+ ${mainCfg.extraConfig}
- ${let
- makeVirtualHost = vhost: ''
-
- ${perServerConf false vhost}
-
- '';
- in concatMapStrings makeVirtualHost mainCfg.virtualHosts
- }
+ ${concatMapStringsSep "\n" mkVHostConf vhosts}
'';
# Generate the PHP configuration file. Should probably be factored
@@ -337,6 +332,22 @@ in
imports = [
(mkRemovedOptionModule [ "services" "httpd" "extraSubservices" ] "Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.")
+ (mkRemovedOptionModule [ "services" "httpd" "stateDir" ] "The httpd module now uses /run/httpd as a runtime directory.")
+
+ # virtualHosts options
+ (mkRemovedOptionModule [ "services" "httpd" "documentRoot" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "enableSSL" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "enableUserDir" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "globalRedirect" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "hostName" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "listen" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "robotsEntries" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "servedDirs" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "servedFiles" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "serverAliases" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "sslServerCert" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "sslServerChain" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
+ (mkRemovedOptionModule [ "services" "httpd" "sslServerKey" ] "Please define a virtual host using `services.httpd.virtualHosts`.")
];
###### interface
@@ -375,7 +386,7 @@ in
type = types.lines;
default = "";
description = ''
- Cnfiguration lines appended to the generated Apache
+ Configuration lines appended to the generated Apache
configuration file. Note that this mechanism may not work
when configFile is overridden.
'';
@@ -384,7 +395,12 @@ in
extraModules = mkOption {
type = types.listOf types.unspecified;
default = [];
- example = literalExample ''[ "proxy_connect" { name = "php5"; path = "''${pkgs.php}/modules/libphp5.so"; } ]'';
+ example = literalExample ''
+ [
+ "proxy_connect"
+ { name = "jk"; path = "''${pkgs.tomcat_connectors}/modules/mod_jk.so"; }
+ ]
+ '';
description = ''
Additional Apache modules to be used. These can be
specified as a string in the case of modules distributed
@@ -394,9 +410,25 @@ in
'';
};
+ adminAddr = mkOption {
+ type = types.str;
+ example = "admin@example.org";
+ description = "E-mail address of the server administrator.";
+ };
+
+ logFormat = mkOption {
+ type = types.str;
+ default = "common";
+ example = "combined";
+ description = ''
+ Log format for log files. Possible values are: combined, common, referer, agent.
+ See for more details.
+ '';
+ };
+
logPerVirtualHost = mkOption {
type = types.bool;
- default = false;
+ default = true;
description = ''
If enabled, each virtual host gets its own
access.log and
@@ -431,37 +463,29 @@ in
'';
};
- stateDir = mkOption {
- type = types.path;
- default = "/run/httpd";
- description = ''
- Directory for Apache's transient runtime state (such as PID
- files). It is created automatically. Note that the default,
- /run/httpd , is deleted at boot time.
- '';
- };
-
virtualHosts = mkOption {
- type = types.listOf (types.submodule (
- { options = import ./per-server-options.nix {
- inherit lib;
- forMainServer = false;
+ type = with types; attrsOf (submodule (import ./per-server-options.nix));
+ default = {
+ localhost = {
+ documentRoot = "${httpd}/htdocs";
+ };
+ };
+ example = literalExample ''
+ {
+ "foo.example.com" = {
+ forceSSL = true;
+ documentRoot = "/var/www/foo.example.com"
+ };
+ "bar.example.com" = {
+ addSSL = true;
+ documentRoot = "/var/www/bar.example.com";
};
- }));
- default = [];
- example = [
- { hostName = "foo";
- documentRoot = "/data/webroot-foo";
}
- { hostName = "bar";
- documentRoot = "/data/webroot-bar";
- }
- ];
+ '';
description = ''
- Specification of the virtual hosts served by Apache. Each
+ Specification of the virtual hosts served by Apache. Each
element should be an attribute set specifying the
- configuration of the virtual host. The available options
- are the non-global options permissible for the main host.
+ configuration of the virtual host.
'';
};
@@ -547,13 +571,7 @@ in
example = "All -SSLv2 -SSLv3";
description = "Allowed SSL/TLS protocol versions.";
};
- }
-
- # Include the options shared between the main server and virtual hosts.
- // (import ./per-server-options.nix {
- inherit lib;
- forMainServer = true;
- });
+ };
};
@@ -562,11 +580,31 @@ in
config = mkIf config.services.httpd.enable {
- assertions = [ { assertion = mainCfg.enableSSL == true
- -> mainCfg.sslServerCert != null
- && mainCfg.sslServerKey != null;
- message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; }
- ];
+ assertions = [
+ {
+ assertion = all (hostOpts: !hostOpts.enableSSL) vhosts;
+ message = ''
+ The option `services.httpd.virtualHosts..enableSSL` no longer has any effect; please remove it.
+ Select one of `services.httpd.virtualHosts..addSSL`, `services.httpd.virtualHosts..forceSSL`,
+ or `services.httpd.virtualHosts..onlySSL`.
+ '';
+ }
+ {
+ assertion = all (hostOpts: with hostOpts; !(addSSL && onlySSL) && !(forceSSL && onlySSL) && !(addSSL && forceSSL)) vhosts;
+ message = ''
+ Options `services.httpd.virtualHosts..addSSL`,
+ `services.httpd.virtualHosts..onlySSL` and `services.httpd.virtualHosts..forceSSL`
+ are mutually exclusive.
+ '';
+ }
+ {
+ assertion = all (hostOpts: !(hostOpts.enableACME && hostOpts.useACMEHost != null)) vhosts;
+ message = ''
+ Options `services.httpd.virtualHosts..enableACME` and
+ `services.httpd.virtualHosts..useACMEHost` are mutually exclusive.
+ '';
+ }
+ ];
users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton
{ name = "wwwrun";
@@ -580,6 +618,15 @@ in
gid = config.ids.gids.wwwrun;
});
+ security.acme.certs = mapAttrs (name: hostOpts: {
+ user = mainCfg.user;
+ group = mkDefault mainCfg.group;
+ email = if hostOpts.adminAddr != null then hostOpts.adminAddr else mainCfg.adminAddr;
+ webroot = hostOpts.acmeRoot;
+ extraDomains = genAttrs hostOpts.serverAliases (alias: null);
+ postRun = "systemctl reload httpd.service";
+ }) (filterAttrs (name: hostOpts: hostOpts.enableACME) mainCfg.virtualHosts);
+
environment.systemPackages = [httpd];
services.httpd.phpOptions =
@@ -595,11 +642,37 @@ in
date.timezone = "${config.time.timeZone}"
'';
+ services.httpd.extraModules = mkBefore [
+ # HTTP authentication mechanisms: basic and digest.
+ "auth_basic" "auth_digest"
+
+ # Authentication: is the user who he claims to be?
+ "authn_file" "authn_dbm" "authn_anon"
+
+ # Authorization: is the user allowed access?
+ "authz_user" "authz_groupfile" "authz_host"
+
+ # Other modules.
+ "ext_filter" "include" "env" "mime_magic"
+ "cern_meta" "expires" "headers" "usertrack" "setenvif"
+ "dav" "status" "asis" "info" "dav_fs"
+ "vhost_alias" "imagemap" "actions" "speling"
+ "proxy" "proxy_http"
+ "cache" "cache_disk"
+
+ # For compatibility with old configurations, the new module mod_access_compat is provided.
+ "access_compat"
+ ];
+
systemd.services.httpd =
+ let
+ vhostsACME = filter (hostOpts: hostOpts.enableACME) vhosts;
+ in
{ description = "Apache HTTPD";
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" "fs.target" ];
+ wants = concatLists (map (hostOpts: [ "acme-${hostOpts.hostName}.service" "acme-selfsigned-${hostOpts.hostName}.service" ]) vhostsACME);
+ after = [ "network.target" "fs.target" ] ++ map (hostOpts: "acme-selfsigned-${hostOpts.hostName}.service") vhostsACME;
path =
[ httpd pkgs.coreutils pkgs.gnugrep ]
@@ -611,12 +684,6 @@ in
preStart =
''
- mkdir -m 0750 -p ${mainCfg.stateDir}
- [ $(id -u) != 0 ] || chown root.${mainCfg.group} ${mainCfg.stateDir}
-
- mkdir -m 0750 -p "${mainCfg.stateDir}/runtime"
- [ $(id -u) != 0 ] || chown root.${mainCfg.group} "${mainCfg.stateDir}/runtime"
-
mkdir -m 0700 -p ${mainCfg.logDir}
# Get rid of old semaphores. These tend to accumulate across
@@ -630,10 +697,13 @@ in
serviceConfig.ExecStart = "@${httpd}/bin/httpd httpd -f ${httpdConf}";
serviceConfig.ExecStop = "${httpd}/bin/httpd -f ${httpdConf} -k graceful-stop";
serviceConfig.ExecReload = "${httpd}/bin/httpd -f ${httpdConf} -k graceful";
+ serviceConfig.Group = mainCfg.group;
serviceConfig.Type = "forking";
- serviceConfig.PIDFile = "${mainCfg.stateDir}/httpd.pid";
+ serviceConfig.PIDFile = "${runtimeDir}/httpd.pid";
serviceConfig.Restart = "always";
serviceConfig.RestartSec = "5s";
+ serviceConfig.RuntimeDirectory = "httpd httpd/runtime";
+ serviceConfig.RuntimeDirectoryMode = "0750";
};
};
diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index c36207d54607..f2e92cda05f6 100644
--- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -1,174 +1,235 @@
-# This file defines the options that can be used both for the Apache
-# main server configuration, and for the virtual hosts. (The latter
-# has additional options that affect the web server as a whole, like
-# the user/group to run under.)
-
-{ forMainServer, lib }:
-
-with lib;
-
+{ config, lib, name, ... }:
+let
+ inherit (lib) mkOption types;
+in
{
+ options = {
+
+ hostName = mkOption {
+ type = types.str;
+ default = name;
+ description = "Canonical hostname for the server.";
+ };
+
+ serverAliases = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = ["www.example.org" "www.example.org:8080" "example.org"];
+ description = ''
+ Additional names of virtual hosts served by this virtual host configuration.
+ '';
+ };
+
+ listen = mkOption {
+ type = with types; listOf (submodule ({
+ options = {
+ port = mkOption {
+ type = types.port;
+ description = "Port to listen on";
+ };
+ ip = mkOption {
+ type = types.str;
+ default = "*";
+ description = "IP to listen on. 0.0.0.0 for IPv4 only, * for all.";
+ };
+ ssl = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable SSL (https) support.";
+ };
+ };
+ }));
+ default = [];
+ example = [
+ { ip = "195.154.1.1"; port = 443; ssl = true;}
+ { ip = "192.154.1.1"; port = 80; }
+ { ip = "*"; port = 8080; }
+ ];
+ description = ''
+ Listen addresses and ports for this virtual host.
+
+ This option overrides addSSL , forceSSL and onlySSL .
+
+ '';
+ };
+
+ enableSSL = mkOption {
+ type = types.bool;
+ visible = false;
+ default = false;
+ };
+
+ addSSL = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable HTTPS in addition to plain HTTP. This will set defaults for
+ listen to listen on all interfaces on the respective default
+ ports (80, 443).
+ '';
+ };
+
+ onlySSL = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable HTTPS and reject plain HTTP connections. This will set
+ defaults for listen to listen on all interfaces on port 443.
+ '';
+ };
+
+ forceSSL = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to add a separate nginx server block that permanently redirects (301)
+ all plain HTTP traffic to HTTPS. This will set defaults for
+ listen to listen on all interfaces on the respective default
+ ports (80, 443), where the non-SSL listens are used for the redirect vhosts.
+ '';
+ };
+
+ enableACME = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to ask Let's Encrypt to sign a certificate for this vhost.
+ Alternately, you can use an existing certificate through useACMEHost .
+ '';
+ };
+
+ useACMEHost = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ A host of an existing Let's Encrypt certificate to use.
+ This is useful if you have many subdomains and want to avoid hitting the
+ rate limit.
+ Alternately, you can generate a certificate through enableACME .
+ Note that this option does not create any certificates, nor it does add subdomains to existing ones – you will need to create them manually using .
+ '';
+ };
+
+ acmeRoot = mkOption {
+ type = types.str;
+ default = "/var/lib/acme/acme-challenges";
+ description = "Directory for the acme challenge which is PUBLIC, don't put certs or keys in here";
+ };
+
+ sslServerCert = mkOption {
+ type = types.path;
+ example = "/var/host.cert";
+ description = "Path to server SSL certificate.";
+ };
+
+ sslServerKey = mkOption {
+ type = types.path;
+ example = "/var/host.key";
+ description = "Path to server SSL certificate key.";
+ };
+
+ sslServerChain = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/var/ca.pem";
+ description = "Path to server SSL chain file.";
+ };
+
+ adminAddr = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "admin@example.org";
+ description = "E-mail address of the server administrator.";
+ };
+
+ documentRoot = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/data/webserver/docs";
+ description = ''
+ The path of Apache's document root directory. If left undefined,
+ an empty directory in the Nix store will be used as root.
+ '';
+ };
+
+ servedDirs = mkOption {
+ type = types.listOf types.attrs;
+ default = [];
+ example = [
+ { urlPath = "/nix";
+ dir = "/home/eelco/Dev/nix-homepage";
+ }
+ ];
+ description = ''
+ This option provides a simple way to serve static directories.
+ '';
+ };
+
+ servedFiles = mkOption {
+ type = types.listOf types.attrs;
+ default = [];
+ example = [
+ { urlPath = "/foo/bar.png";
+ file = "/home/eelco/some-file.png";
+ }
+ ];
+ description = ''
+ This option provides a simple way to serve individual, static files.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ example = ''
+
+ Options FollowSymlinks
+ AllowOverride All
+
+ '';
+ description = ''
+ These lines go to httpd.conf verbatim. They will go after
+ directories and directory aliases defined by default.
+ '';
+ };
+
+ enableUserDir = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable serving ~/public_html as
+ /~username .
+ '';
+ };
+
+ globalRedirect = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = http://newserver.example.org/;
+ description = ''
+ If set, all requests for this host are redirected permanently to
+ the given URL.
+ '';
+ };
+
+ logFormat = mkOption {
+ type = types.str;
+ default = "common";
+ example = "combined";
+ description = ''
+ Log format for Apache's log files. Possible values are: combined, common, referer, agent.
+ '';
+ };
+
+ robotsEntries = mkOption {
+ type = types.lines;
+ default = "";
+ example = "Disallow: /foo/";
+ description = ''
+ Specification of pages to be ignored by web crawlers. See for details.
+ '';
+ };
- hostName = mkOption {
- type = types.str;
- default = "localhost";
- description = "Canonical hostname for the server.";
};
-
- serverAliases = mkOption {
- type = types.listOf types.str;
- default = [];
- example = ["www.example.org" "www.example.org:8080" "example.org"];
- description = ''
- Additional names of virtual hosts served by this virtual host configuration.
- '';
- };
-
- listen = mkOption {
- type = types.listOf (types.submodule (
- {
- options = {
- port = mkOption {
- type = types.int;
- description = "port to listen on";
- };
- ip = mkOption {
- type = types.str;
- default = "*";
- description = "Ip to listen on. 0.0.0.0 for ipv4 only, * for all.";
- };
- };
- } ));
- description = ''
- List of { /* ip: "*"; */ port = 80;} to listen on
- '';
-
- default = [];
- };
-
- enableSSL = mkOption {
- type = types.bool;
- default = false;
- description = "Whether to enable SSL (https) support.";
- };
-
- # Note: sslServerCert and sslServerKey can be left empty, but this
- # only makes sense for virtual hosts (they will inherit from the
- # main server).
-
- sslServerCert = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/var/host.cert";
- description = "Path to server SSL certificate.";
- };
-
- sslServerKey = mkOption {
- type = types.path;
- example = "/var/host.key";
- description = "Path to server SSL certificate key.";
- };
-
- sslServerChain = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/var/ca.pem";
- description = "Path to server SSL chain file.";
- };
-
- adminAddr = mkOption ({
- type = types.nullOr types.str;
- example = "admin@example.org";
- description = "E-mail address of the server administrator.";
- } // (if forMainServer then {} else {default = null;}));
-
- documentRoot = mkOption {
- type = types.nullOr types.path;
- default = null;
- example = "/data/webserver/docs";
- description = ''
- The path of Apache's document root directory. If left undefined,
- an empty directory in the Nix store will be used as root.
- '';
- };
-
- servedDirs = mkOption {
- type = types.listOf types.attrs;
- default = [];
- example = [
- { urlPath = "/nix";
- dir = "/home/eelco/Dev/nix-homepage";
- }
- ];
- description = ''
- This option provides a simple way to serve static directories.
- '';
- };
-
- servedFiles = mkOption {
- type = types.listOf types.attrs;
- default = [];
- example = [
- { urlPath = "/foo/bar.png";
- file = "/home/eelco/some-file.png";
- }
- ];
- description = ''
- This option provides a simple way to serve individual, static files.
- '';
- };
-
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- example = ''
-
- Options FollowSymlinks
- AllowOverride All
-
- '';
- description = ''
- These lines go to httpd.conf verbatim. They will go after
- directories and directory aliases defined by default.
- '';
- };
-
- enableUserDir = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to enable serving ~/public_html as
- /~username .
- '';
- };
-
- globalRedirect = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = http://newserver.example.org/;
- description = ''
- If set, all requests for this host are redirected permanently to
- the given URL.
- '';
- };
-
- logFormat = mkOption {
- type = types.str;
- default = "common";
- example = "combined";
- description = ''
- Log format for Apache's log files. Possible values are: combined, common, referer, agent.
- '';
- };
-
- robotsEntries = mkOption {
- type = types.lines;
- default = "";
- example = "Disallow: /foo/";
- description = ''
- Specification of pages to be ignored by web crawlers. See for details.
- '';
- };
-
}
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index eb90dae94dfe..ada7a25604c4 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -47,7 +47,7 @@ let
''));
configFile = pkgs.writers.writeNginxConfig "nginx.conf" ''
- user ${cfg.user} ${cfg.group};
+ pid /run/nginx/nginx.pid;
error_log ${cfg.logError};
daemon off;
@@ -366,12 +366,7 @@ in
preStart = mkOption {
type = types.lines;
- default = ''
- test -d ${cfg.stateDir}/logs || mkdir -m 750 -p ${cfg.stateDir}/logs
- test `stat -c %a ${cfg.stateDir}` = "750" || chmod 750 ${cfg.stateDir}
- test `stat -c %a ${cfg.stateDir}/logs` = "750" || chmod 750 ${cfg.stateDir}/logs
- chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
- '';
+ default = "";
description = "
Shell commands executed before the service's nginx is started.
";
@@ -673,23 +668,36 @@ in
}
];
+ systemd.tmpfiles.rules = [
+ "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
+ "d '${cfg.stateDir}/logs' 0750 ${cfg.user} ${cfg.group} - -"
+ "Z '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -"
+ ];
+
systemd.services.nginx = {
description = "Nginx Web Server";
wantedBy = [ "multi-user.target" ];
wants = concatLists (map (vhostConfig: ["acme-${vhostConfig.serverName}.service" "acme-selfsigned-${vhostConfig.serverName}.service"]) acmeEnabledVhosts);
after = [ "network.target" ] ++ map (vhostConfig: "acme-selfsigned-${vhostConfig.serverName}.service") acmeEnabledVhosts;
stopIfChanged = false;
- preStart =
- ''
+ preStart = ''
${cfg.preStart}
- ${cfg.package}/bin/nginx -c ${configPath} -p ${cfg.stateDir} -t
- '';
+ ${cfg.package}/bin/nginx -c '${configPath}' -p '${cfg.stateDir}' -t
+ '';
serviceConfig = {
- ExecStart = "${cfg.package}/bin/nginx -c ${configPath} -p ${cfg.stateDir}";
+ ExecStart = "${cfg.package}/bin/nginx -c '${configPath}' -p '${cfg.stateDir}'";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
Restart = "always";
RestartSec = "10s";
StartLimitInterval = "1min";
+ # User and group
+ User = cfg.user;
+ Group = cfg.group;
+ # Runtime directory and mode
+ RuntimeDirectory = "nginx";
+ RuntimeDirectoryMode = "0750";
+ # Capabilities
+ AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ];
};
};
diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix
index aeb9b1dd79ef..3d9e391ecf20 100644
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixos/modules/services/web-servers/nginx/location-options.nix
@@ -1,4 +1,4 @@
-# This file defines the options that can be used both for the Apache
+# This file defines the options that can be used both for the Nginx
# main server configuration, and for the virtual hosts. (The latter
# has additional options that affect the web server as a whole, like
# the user/group to run under.)
@@ -67,7 +67,7 @@ with lib;
return = mkOption {
type = types.nullOr types.str;
default = null;
- example = "301 http://example.com$request_uri;";
+ example = "301 http://example.com$request_uri";
description = ''
Adds a return directive, for e.g. redirections.
'';
@@ -92,4 +92,3 @@ with lib;
};
};
}
-
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 15b933c984a6..455854e2a965 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -1,4 +1,4 @@
-# This file defines the options that can be used both for the Apache
+# This file defines the options that can be used both for the Nginx
# main server configuration, and for the virtual hosts. (The latter
# has additional options that affect the web server as a whole, like
# the user/group to run under.)
@@ -207,6 +207,7 @@ with lib;
default = null;
description = ''
Basic Auth password file for a vhost.
+ Can be created via: htpasswd -c <filename> <username>
'';
};
diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index 4ab7e3f0c0a9..2c73da103946 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -31,7 +31,7 @@ let
'';
passAsFile = [ "nixDefaults" "phpOptions" ];
} ''
- cat $phpPackage/etc/php.ini $nixDefaultsPath $phpOptionsPath > $out
+ cat ${poolOpts.phpPackage}/etc/php.ini $nixDefaultsPath $phpOptionsPath > $out
'';
poolOpts = { name, ... }:
@@ -69,8 +69,6 @@ let
phpOptions = mkOption {
type = types.lines;
- default = cfg.phpOptions;
- defaultText = "config.services.phpfpm.phpOptions";
description = ''
"Options appended to the PHP configuration file php.ini used for this PHP-FPM pool."
'';
@@ -137,6 +135,7 @@ let
config = {
socket = if poolOpts.listen == "" then "${runtimeDir}/${name}.sock" else poolOpts.listen;
group = mkDefault poolOpts.user;
+ phpOptions = mkBefore cfg.phpOptions;
settings = mapAttrs (name: mkDefault){
listen = poolOpts.socket;
@@ -147,6 +146,10 @@ let
};
in {
+ imports = [
+ (mkRemovedOptionModule [ "services" "phpfpm" "poolConfigs" ] "Use services.phpfpm.pools instead.")
+ (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")
+ ];
options = {
services.phpfpm = {
@@ -263,6 +266,7 @@ in {
in {
Slice = "phpfpm.slice";
PrivateDevices = true;
+ PrivateTmp = true;
ProtectSystem = "full";
ProtectHome = true;
# XXX: We need AF_NETLINK to make the sendmail SUID binary from postfix work
diff --git a/nixos/modules/services/web-servers/ttyd.nix b/nixos/modules/services/web-servers/ttyd.nix
new file mode 100644
index 000000000000..01a01d97a234
--- /dev/null
+++ b/nixos/modules/services/web-servers/ttyd.nix
@@ -0,0 +1,196 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.ttyd;
+
+ # Command line arguments for the ttyd daemon
+ args = [ "--port" (toString cfg.port) ]
+ ++ optionals (cfg.socket != null) [ "--interface" cfg.socket ]
+ ++ optionals (cfg.interface != null) [ "--interface" cfg.interface ]
+ ++ [ "--signal" (toString cfg.signal) ]
+ ++ (concatLists (mapAttrsToList (_k: _v: [ "--client-option" "${_k}=${_v}" ]) cfg.clientOptions))
+ ++ [ "--terminal-type" cfg.terminalType ]
+ ++ optionals cfg.checkOrigin [ "--check-origin" ]
+ ++ [ "--max-clients" (toString cfg.maxClients) ]
+ ++ optionals (cfg.indexFile != null) [ "--index" cfg.indexFile ]
+ ++ optionals cfg.enableIPv6 [ "--ipv6" ]
+ ++ optionals cfg.enableSSL [ "--ssl-cert" cfg.certFile
+ "--ssl-key" cfg.keyFile
+ "--ssl-ca" cfg.caFile ]
+ ++ [ "--debug" (toString cfg.logLevel) ];
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+ services.ttyd = {
+ enable = mkEnableOption "ttyd daemon";
+
+ port = mkOption {
+ type = types.int;
+ default = 7681;
+ description = "Port to listen on (use 0 for random port)";
+ };
+
+ socket = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/var/run/ttyd.sock";
+ description = "UNIX domain socket path to bind.";
+ };
+
+ interface = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "eth0";
+ description = "Network interface to bind.";
+ };
+
+ username = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = "Username for basic authentication.";
+ };
+
+ passwordFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ apply = value: if value == null then null else toString value;
+ description = ''
+ File containing the password to use for basic authentication.
+ For insecurely putting the password in the globally readable store use
+ pkgs.writeText "ttydpw" "MyPassword" .
+ '';
+ };
+
+ signal = mkOption {
+ type = types.ints.u8;
+ default = 1;
+ description = "Signal to send to the command on session close.";
+ };
+
+ clientOptions = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = literalExample ''{
+ fontSize = "16";
+ fontFamily = "Fira Code";
+
+ }'';
+ description = ''
+ Attribute set of client options for xtermjs.
+
+ '';
+ };
+
+ terminalType = mkOption {
+ type = types.str;
+ default = "xterm-256color";
+ description = "Terminal type to report.";
+ };
+
+ checkOrigin = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to allow a websocket connection from a different origin.";
+ };
+
+ maxClients = mkOption {
+ type = types.int;
+ default = 0;
+ description = "Maximum clients to support (0, no limit)";
+ };
+
+ indexFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = "Custom index.html path";
+ };
+
+ enableIPv6 = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether or not to enable IPv6 support.";
+ };
+
+ enableSSL = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether or not to enable SSL (https) support.";
+ };
+
+ certFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = "SSL certificate file path.";
+ };
+
+ keyFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ apply = value: if value == null then null else toString value;
+ description = ''
+ SSL key file path.
+ For insecurely putting the keyFile in the globally readable store use
+ pkgs.writeText "ttydKeyFile" "SSLKEY" .
+ '';
+ };
+
+ caFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = "SSL CA file path for client certificate verification.";
+ };
+
+ logLevel = mkOption {
+ type = types.int;
+ default = 7;
+ description = "Set log level.";
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ assertions =
+ [ { assertion = cfg.enableSSL
+ -> cfg.certFile != null && cfg.keyFile != null && cfg.caFile != null;
+ message = "SSL is enabled for ttyd, but no certFile, keyFile or caFile has been specefied."; }
+ { assertion = ! (cfg.interface != null && cfg.socket != null);
+ message = "Cannot set both interface and socket for ttyd."; }
+ { assertion = (cfg.username != null) == (cfg.passwordFile != null);
+ message = "Need to set both username and passwordFile for ttyd"; }
+ ];
+
+ systemd.services.ttyd = {
+ description = "ttyd Web Server Daemon";
+
+ wantedBy = [ "multi-user.target" ];
+
+ serviceConfig = {
+ # Runs login which needs to be run as root
+ # login: Cannot possibly work without effective root
+ User = "root";
+ };
+
+ script = if cfg.passwordFile != null then ''
+ PASSWORD=$(cat ${escapeShellArg cfg.passwordFile})
+ ${pkgs.ttyd}/bin/ttyd ${lib.escapeShellArgs args} \
+ --credential ${escapeShellArg cfg.username}:"$PASSWORD" \
+ ${pkgs.shadow}/bin/login
+ ''
+ else ''
+ ${pkgs.ttyd}/bin/ttyd ${lib.escapeShellArgs args} \
+ ${pkgs.shadow}/bin/login
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix
index 32f6d475b34e..b07212580a55 100644
--- a/nixos/modules/services/web-servers/unit/default.nix
+++ b/nixos/modules/services/web-servers/unit/default.nix
@@ -85,7 +85,7 @@ in {
systemd.tmpfiles.rules = [
"d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -"
"d '${cfg.logDir}' 0750 ${cfg.user} ${cfg.group} - -"
- ];
+ ];
systemd.services.unit = {
description = "Unit App Server";
@@ -93,23 +93,39 @@ in {
wantedBy = [ "multi-user.target" ];
path = with pkgs; [ curl ];
preStart = ''
- test -f '/run/unit/control.unit.sock' || rm -f '/run/unit/control.unit.sock'
+ test -f '${cfg.stateDir}/conf.json' || rm -f '${cfg.stateDir}/conf.json'
'';
postStart = ''
curl -X PUT --data-binary '@${configFile}' --unix-socket '/run/unit/control.unit.sock' 'http://localhost/config'
'';
serviceConfig = {
- User = cfg.user;
- Group = cfg.group;
- AmbientCapabilities = "CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID";
- CapabilityBoundingSet = "CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID";
ExecStart = ''
${cfg.package}/bin/unitd --control 'unix:/run/unit/control.unit.sock' --pid '/run/unit/unit.pid' \
--log '${cfg.logDir}/unit.log' --state '${cfg.stateDir}' --no-daemon \
--user ${cfg.user} --group ${cfg.group}
'';
+ # User and group
+ User = cfg.user;
+ Group = cfg.group;
+ # Capabilities
+ AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SETGID" "CAP_SETUID" ];
+ # Security
+ NoNewPrivileges = true;
+ # Sanboxing
+ ProtectSystem = "full";
+ ProtectHome = true;
RuntimeDirectory = "unit";
RuntimeDirectoryMode = "0750";
+ PrivateTmp = true;
+ PrivateDevices = true;
+ ProtectHostname = true;
+ ProtectKernelTunables = true;
+ ProtectKernelModules = true;
+ ProtectControlGroups = true;
+ LockPersonality = true;
+ MemoryDenyWriteExecute = true;
+ RestrictRealtime = true;
+ PrivateMounts = true;
};
};
diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index 63f967185c2d..01fe3d12917a 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -15,8 +15,8 @@ in
package = mkOption {
type = types.package;
- default = pkgs.varnish5;
- defaultText = "pkgs.varnish5";
+ default = pkgs.varnish;
+ defaultText = "pkgs.varnish";
description = ''
The package to use
'';
@@ -48,7 +48,7 @@ in
extraModules = mkOption {
type = types.listOf types.package;
default = [];
- example = literalExample "[ pkgs.varnish5Packages.geoip ]";
+ example = literalExample "[ pkgs.varnishPackages.geoip ]";
description = "
Varnish modules (except 'std').
";
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix
index a94a76ff0c0f..61174672e2dd 100644
--- a/nixos/modules/services/x11/compton.nix
+++ b/nixos/modules/services/x11/compton.nix
@@ -284,4 +284,6 @@ in {
environment.systemPackages = [ pkgs.compton ];
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/x11/desktop-managers/cde.nix b/nixos/modules/services/x11/desktop-managers/cde.nix
new file mode 100644
index 000000000000..c1b6d3bf064a
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/cde.nix
@@ -0,0 +1,55 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ xcfg = config.services.xserver;
+ cfg = xcfg.desktopManager.cde;
+in {
+ options.services.xserver.desktopManager.cde = {
+ enable = mkEnableOption "Common Desktop Environment";
+ };
+
+ config = mkIf (xcfg.enable && cfg.enable) {
+ services.rpcbind.enable = true;
+
+ services.xinetd.enable = true;
+ services.xinetd.services = [
+ {
+ name = "cmsd";
+ protocol = "udp";
+ user = "root";
+ server = "${pkgs.cdesktopenv}/opt/dt/bin/rpc.cmsd";
+ extraConfig = ''
+ type = RPC UNLISTED
+ rpc_number = 100068
+ rpc_version = 2-5
+ only_from = 127.0.0.1/0
+ '';
+ }
+ ];
+
+ users.groups.mail = {};
+ security.wrappers = {
+ dtmail = {
+ source = "${pkgs.cdesktopenv}/bin/dtmail";
+ group = "mail";
+ setgid = true;
+ };
+ };
+
+ system.activationScripts.setup-cde = ''
+ mkdir -p /var/dt/{tmp,appconfig/appmanager}
+ chmod a+w+t /var/dt/{tmp,appconfig/appmanager}
+ '';
+
+ services.xserver.desktopManager.session = [
+ { name = "CDE";
+ start = ''
+ exec ${pkgs.cdesktopenv}/opt/dt/bin/Xsession
+ '';
+ }];
+ };
+
+ meta.maintainers = [ maintainers.gnidorah ];
+}
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index dfb84113e130..970fa620c6b6 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -18,9 +18,9 @@ in
# determines the default: later modules (if enabled) are preferred.
# E.g., if Plasma 5 is enabled, it supersedes xterm.
imports = [
- ./none.nix ./xterm.nix ./xfce.nix ./xfce4-14.nix ./plasma5.nix ./lumina.nix
+ ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
- ./mate.nix ./pantheon.nix ./surf-display.nix
+ ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix
];
options = {
@@ -86,23 +86,14 @@ in
};
default = mkOption {
- type = types.str;
- default = "";
+ type = types.nullOr types.str;
+ default = null;
example = "none";
- description = "Default desktop manager loaded if none have been chosen.";
- apply = defaultDM:
- if defaultDM == "" && cfg.session.list != [] then
- (head cfg.session.list).name
- else if any (w: w.name == defaultDM) cfg.session.list then
- defaultDM
- else
- builtins.trace ''
- Default desktop manager (${defaultDM}) not found at evaluation time.
- These are the known valid session names:
- ${concatMapStringsSep "\n " (w: "services.xserver.desktopManager.default = \"${w.name}\";") cfg.session.list}
- It's also possible the default can be found in one of these packages:
- ${concatMapStringsSep "\n " (p: p.name) config.services.xserver.displayManager.extraSessionFilePackages}
- '' defaultDM;
+ description = ''
+ Deprecated , please use instead.
+
+ Default desktop manager loaded if none have been chosen.
+ '';
};
};
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 3745069f6eaf..04e82599b948 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -16,6 +16,10 @@ let
in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ])
+ ];
+
options = {
services.xserver.desktopManager.enlightenment.enable = mkOption {
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 5ad31e5b9d00..6d9bd284bc72 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -144,7 +144,7 @@ in
services.gnome3.core-shell.enable = true;
services.gnome3.core-utilities.enable = mkDefault true;
- services.xserver.displayManager.extraSessionFilePackages = [ pkgs.gnome3.gnome-session ];
+ services.xserver.displayManager.sessionPackages = [ pkgs.gnome3.gnome-session ];
environment.extraInit = ''
${concatMapStrings (p: ''
@@ -171,7 +171,7 @@ in
})
(mkIf flashbackEnabled {
- services.xserver.displayManager.extraSessionFilePackages = map
+ services.xserver.displayManager.sessionPackages = map
(wm: pkgs.gnome3.gnome-flashback.mkSessionForWm {
inherit (wm) wmName wmLabel wmCommand;
}) (optional cfg.flashback.enableMetacity {
@@ -184,6 +184,13 @@ in
enableGnomeKeyring = true;
};
+ systemd.packages = with pkgs.gnome3; [
+ gnome-flashback
+ ] ++ (map
+ (wm: gnome-flashback.mkSystemdTargetForWm {
+ inherit (wm) wmName;
+ }) cfg.flashback.customSessions);
+
services.dbus.packages = [
pkgs.gnome3.gnome-screensaver
];
@@ -217,6 +224,12 @@ in
services.xserver.updateDbusEnvironment = true;
+ # gnome has a custom alert theme but it still
+ # inherits from the freedesktop theme.
+ environment.systemPackages = with pkgs; [
+ sound-theme-freedesktop
+ ];
+
# Needed for themes and backgrounds
environment.pathsToLink = [
"/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173
@@ -265,6 +278,26 @@ in
source-sans-pro
];
+ ## Enable soft realtime scheduling, only supported on wayland ##
+
+ security.wrappers.".gnome-shell-wrapped" = {
+ source = "${pkgs.gnome3.gnome-shell}/bin/.gnome-shell-wrapped";
+ capabilities = "cap_sys_nice=ep";
+ };
+
+ systemd.user.services.gnome-shell-wayland = let
+ gnomeShellRT = with pkgs.gnome3; pkgs.runCommand "gnome-shell-rt" {} ''
+ mkdir -p $out/bin/
+ cp ${gnome-shell}/bin/gnome-shell $out/bin
+ sed -i "s@${gnome-shell}/bin/@${config.security.wrapperDir}/@" $out/bin/gnome-shell
+ '';
+ in {
+ # Note we need to clear ExecStart before overriding it
+ serviceConfig.ExecStart = ["" "${gnomeShellRT}/bin/gnome-shell"];
+ # Do not use the default environment, it provides a broken PATH
+ environment = mkForce {};
+ };
+
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-shell.bst
environment.systemPackages = with pkgs.gnome3; [
adwaita-icon-theme
@@ -276,7 +309,7 @@ in
gnome-shell
gnome-shell-extensions
gnome-themes-extra
- gnome-user-docs
+ pkgs.gnome-user-docs
pkgs.orca
pkgs.glib # for gsettings
pkgs.gnome-menus
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index fe63f36cf96a..4a6f2ca727d9 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -98,7 +98,6 @@ in
services.gnome3.at-spi2-core.enable = true;
services.gnome3.gnome-keyring.enable = true;
- services.gnome3.gnome-settings-daemon.enable = true;
services.udev.packages = [ pkgs.mate.mate-settings-daemon ];
services.gvfs.enable = true;
services.upower.enable = config.powerManagement.enable;
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 80dab135ee26..b46a2d189ef9 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -5,6 +5,7 @@ with lib;
let
cfg = config.services.xserver.desktopManager.pantheon;
+ serviceCfg = config.services.pantheon;
nixos-gsettings-desktop-schemas = pkgs.pantheon.elementary-gsettings-schemas.override {
extraGSettingsOverridePackages = cfg.extraGSettingsOverridePackages;
@@ -19,6 +20,16 @@ in
options = {
+ services.pantheon = {
+
+ contractor = {
+ enable = mkEnableOption "contractor, a desktop-wide extension service used by Pantheon";
+ };
+
+ apps.enable = mkEnableOption "Pantheon default applications";
+
+ };
+
services.xserver.desktopManager.pantheon = {
enable = mkOption {
type = types.bool;
@@ -41,6 +52,18 @@ in
];
};
+ extraWingpanelIndicators = mkOption {
+ default = null;
+ type = with types; nullOr (listOf package);
+ description = "Indicators to add to Wingpanel.";
+ };
+
+ extraSwitchboardPlugs = mkOption {
+ default = null;
+ type = with types; nullOr (listOf package);
+ description = "Plugs to add to Switchboard.";
+ };
+
extraGSettingsOverrides = mkOption {
default = "";
type = types.lines;
@@ -67,124 +90,88 @@ in
};
- config = mkIf cfg.enable {
+ config = mkMerge [
+ (mkIf cfg.enable {
- services.xserver.displayManager.extraSessionFilePackages = [ pkgs.pantheon.elementary-session-settings ];
+ services.xserver.displayManager.sessionPackages = [ pkgs.pantheon.elementary-session-settings ];
- # Ensure lightdm is used when Pantheon is enabled
- # Without it screen locking will be nonfunctional because of the use of lightlocker
+ # Ensure lightdm is used when Pantheon is enabled
+ # Without it screen locking will be nonfunctional because of the use of lightlocker
+ warnings = optional (config.services.xserver.displayManager.lightdm.enable != true)
+ ''
+ Using Pantheon without LightDM as a displayManager will break screenlocking from the UI.
+ '';
- warnings = optional (config.services.xserver.displayManager.lightdm.enable != true)
- ''
- Using Pantheon without LightDM as a displayManager will break screenlocking from the UI.
+ services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
+
+ # Without this, elementary LightDM greeter will pre-select non-existent `default` session
+ # https://github.com/elementary/greeter/issues/368
+ services.xserver.displayManager.defaultSession = "pantheon";
+
+ services.xserver.displayManager.sessionCommands = ''
+ if test "$XDG_CURRENT_DESKTOP" = "Pantheon"; then
+ ${concatMapStrings (p: ''
+ if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
+ export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
+ fi
+
+ if [ -d "${p}/lib/girepository-1.0" ]; then
+ export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
+ fi
+ '') cfg.sessionPath}
+ fi
'';
- services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true;
+ # Default services
+ hardware.bluetooth.enable = mkDefault true;
+ hardware.pulseaudio.enable = mkDefault true;
+ security.polkit.enable = true;
+ services.accounts-daemon.enable = true;
+ services.bamf.enable = true;
+ services.colord.enable = mkDefault true;
+ services.tumbler.enable = mkDefault true;
+ services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
+ services.dbus.packages = with pkgs.pantheon; [
+ switchboard-plug-power
+ elementary-default-settings # accountsservice extensions
+ ];
+ services.pantheon.apps.enable = mkDefault true;
+ services.pantheon.contractor.enable = mkDefault true;
+ services.gnome3.at-spi2-core.enable = true;
+ services.gnome3.evolution-data-server.enable = true;
+ services.gnome3.glib-networking.enable = true;
+ services.gnome3.gnome-keyring.enable = true;
+ services.gvfs.enable = true;
+ services.gnome3.rygel.enable = mkDefault true;
+ services.gsignond.enable = mkDefault true;
+ services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ];
+ services.udisks2.enable = true;
+ services.upower.enable = config.powerManagement.enable;
+ services.xserver.libinput.enable = mkDefault true;
+ services.xserver.updateDbusEnvironment = true;
+ services.zeitgeist.enable = mkDefault true;
+ services.geoclue2.enable = mkDefault true;
+ # pantheon has pantheon-agent-geoclue2
+ services.geoclue2.enableDemoAgent = false;
+ services.geoclue2.appConfig."io.elementary.desktop.agent-geoclue2" = {
+ isAllowed = true;
+ isSystem = true;
+ };
+ # Use gnome-settings-daemon fork
+ services.udev.packages = [
+ pkgs.pantheon.elementary-settings-daemon
+ ];
+ systemd.packages = [
+ pkgs.pantheon.elementary-settings-daemon
+ ];
+ programs.dconf.enable = true;
+ networking.networkmanager.enable = mkDefault true;
- # If not set manually Pantheon session cannot be started
- # Known issue of https://github.com/NixOS/nixpkgs/pull/43992
- services.xserver.desktopManager.default = mkForce "pantheon";
-
- services.xserver.displayManager.sessionCommands = ''
- if test "$XDG_CURRENT_DESKTOP" = "Pantheon"; then
- ${concatMapStrings (p: ''
- if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then
- export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}
- fi
-
- if [ -d "${p}/lib/girepository-1.0" ]; then
- export GI_TYPELIB_PATH=$GI_TYPELIB_PATH''${GI_TYPELIB_PATH:+:}${p}/lib/girepository-1.0
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${p}/lib
- fi
- '') cfg.sessionPath}
- fi
- '';
-
- hardware.bluetooth.enable = mkDefault true;
- hardware.pulseaudio.enable = mkDefault true;
- security.polkit.enable = true;
- services.accounts-daemon.enable = true;
- services.bamf.enable = true;
- services.colord.enable = mkDefault true;
- services.pantheon.files.enable = mkDefault true;
- services.tumbler.enable = mkDefault true;
- services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
- services.dbus.packages = with pkgs.pantheon; [
- switchboard-plug-power
- elementary-default-settings
- ];
- services.pantheon.contractor.enable = mkDefault true;
- services.gnome3.at-spi2-core.enable = true;
- services.gnome3.evolution-data-server.enable = true;
- services.gnome3.glib-networking.enable = true;
- # TODO: gnome-keyring's xdg autostarts will still be in the environment (from elementary-session-settings) if disabled forcefully
- services.gnome3.gnome-keyring.enable = true;
- services.gnome3.gnome-settings-daemon.enable = true;
- services.udev.packages = [ pkgs.pantheon.elementary-settings-daemon ];
- services.gvfs.enable = true;
- services.gnome3.rygel.enable = mkDefault true;
- services.gsignond.enable = mkDefault true;
- services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ];
- services.udisks2.enable = true;
- services.upower.enable = config.powerManagement.enable;
- services.xserver.libinput.enable = mkDefault true;
- services.xserver.updateDbusEnvironment = true;
- services.zeitgeist.enable = mkDefault true;
- services.geoclue2.enable = mkDefault true;
- # pantheon has pantheon-agent-geoclue2
- services.geoclue2.enableDemoAgent = false;
- services.geoclue2.appConfig."io.elementary.desktop.agent-geoclue2" = {
- isAllowed = true;
- isSystem = true;
- };
-
- programs.dconf.enable = true;
- programs.evince.enable = mkDefault true;
- programs.file-roller.enable = mkDefault true;
- # Otherwise you can't store NetworkManager Secrets with
- # "Store the password only for this user"
- programs.nm-applet.enable = true;
-
- # Shell integration for VTE terminals
- programs.bash.vteIntegration = mkDefault true;
- programs.zsh.vteIntegration = mkDefault true;
-
- # Harmonize Qt5 applications under Pantheon
- qt5.enable = true;
- qt5.platformTheme = "gnome";
- qt5.style = "adwaita";
-
- networking.networkmanager.enable = mkDefault true;
-
- # Override GSettings schemas
- environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
-
- environment.sessionVariables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1";
-
- # Settings from elementary-default-settings
- environment.sessionVariables.GTK_CSD = "1";
- environment.sessionVariables.GTK_MODULES = "pantheon-filechooser-module";
- environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
-
- environment.pathsToLink = [
- # FIXME: modules should link subdirs of `/share` rather than relying on this
- "/share"
- ];
-
- environment.systemPackages =
- pkgs.pantheon.artwork ++ pkgs.pantheon.desktop ++ pkgs.pantheon.services ++ cfg.sessionPath
- ++ (with pkgs; gnome3.removePackagesByName
- ([
- gnome3.geary
- gnome3.epiphany
- gnome3.gnome-font-viewer
- ] ++ pantheon.apps) config.environment.pantheon.excludePackages)
- ++ (with pkgs;
- [
- adwaita-qt
+ # Global environment
+ environment.systemPackages = with pkgs; [
desktop-file-utils
glib
- glib-networking
gnome-menus
gnome3.adwaita-icon-theme
gtk3.out
@@ -196,19 +183,111 @@ in
shared-mime-info
sound-theme-freedesktop
xdg-user-dirs
- ]);
+ ] ++ (with pkgs.pantheon; [
+ # Artwork
+ elementary-gtk-theme
+ elementary-icon-theme
+ elementary-sound-theme
+ elementary-wallpapers
- fonts.fonts = with pkgs; [
- open-sans
- roboto-mono
- pantheon.elementary-redacted-script # needed by screenshot-tool
- ];
+ # Desktop
+ elementary-default-settings
+ elementary-session-settings
+ elementary-shortcut-overlay
+ gala
+ (switchboard-with-plugs.override {
+ plugs = cfg.extraSwitchboardPlugs;
+ })
+ (wingpanel-with-indicators.override {
+ indicators = cfg.extraWingpanelIndicators;
+ })
- fonts.fontconfig.defaultFonts = {
- monospace = [ "Roboto Mono" ];
- sansSerif = [ "Open Sans" ];
- };
+ # Services
+ cerbere
+ elementary-capnet-assist
+ elementary-dpms-helper
+ elementary-settings-daemon
+ pantheon-agent-geoclue2
+ pantheon-agent-polkit
+ ]) ++ (gnome3.removePackagesByName [
+ gnome3.geary
+ gnome3.epiphany
+ gnome3.gnome-font-viewer
+ ] config.environment.pantheon.excludePackages);
- };
+ programs.evince.enable = mkDefault true;
+ programs.file-roller.enable = mkDefault true;
+ # Settings from elementary-default-settings
+ environment.sessionVariables.GTK_CSD = "1";
+ environment.sessionVariables.GTK3_MODULES = [ "pantheon-filechooser-module" ];
+ environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini";
+
+ # Override GSettings schemas
+ environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+
+ environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";
+
+ environment.pathsToLink = [
+ # FIXME: modules should link subdirs of `/share` rather than relying on this
+ "/share"
+ ];
+
+ # Otherwise you can't store NetworkManager Secrets with
+ # "Store the password only for this user"
+ programs.nm-applet.enable = true;
+
+ # Shell integration for VTE terminals
+ programs.bash.vteIntegration = mkDefault true;
+ programs.zsh.vteIntegration = mkDefault true;
+
+ # Harmonize Qt5 applications under Pantheon
+ qt5.enable = true;
+ qt5.platformTheme = "gnome";
+ qt5.style = "adwaita";
+
+ # Default Fonts
+ fonts.fonts = with pkgs; [
+ open-sans
+ roboto-mono
+ ];
+
+ fonts.fontconfig.defaultFonts = {
+ monospace = [ "Roboto Mono" ];
+ sansSerif = [ "Open Sans" ];
+ };
+ })
+
+ (mkIf serviceCfg.apps.enable {
+ environment.systemPackages = (with pkgs.pantheon; pkgs.gnome3.removePackagesByName [
+ elementary-calculator
+ elementary-calendar
+ elementary-camera
+ elementary-code
+ elementary-files
+ elementary-music
+ elementary-photos
+ elementary-screenshot-tool
+ elementary-terminal
+ elementary-videos
+ ] config.environment.pantheon.excludePackages);
+
+ # needed by screenshot-tool
+ fonts.fonts = [
+ pkgs.pantheon.elementary-redacted-script
+ ];
+ })
+
+ (mkIf serviceCfg.contractor.enable {
+ environment.systemPackages = with pkgs.pantheon; [
+ contractor
+ extra-elementary-contracts
+ ];
+
+ environment.pathsToLink = [
+ "/share/contractor"
+ ];
+ })
+
+ ];
}
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index b6fb7218da6f..fce274477b62 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -27,20 +27,14 @@ in
example = "vlc";
description = "Phonon audio backend to install.";
};
-
- enableQt4Support = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Enable support for Qt 4-based applications. Particularly, install a
- default backend for Phonon.
- '';
- };
-
};
};
+ imports = [
+ (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "enableQt4Support" ] "Phonon no longer supports Qt 4.")
+ (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
+ ];
config = mkMerge [
(mkIf cfg.enable {
@@ -173,12 +167,10 @@ in
# Phonon audio backend
++ lib.optional (cfg.phononBackend == "gstreamer") libsForQt5.phonon-backend-gstreamer
- ++ lib.optional (cfg.phononBackend == "gstreamer" && cfg.enableQt4Support) pkgs.phonon-backend-gstreamer
++ lib.optional (cfg.phononBackend == "vlc") libsForQt5.phonon-backend-vlc
- ++ lib.optional (cfg.phononBackend == "vlc" && cfg.enableQt4Support) pkgs.phonon-backend-vlc
# Optional hardware support features
- ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt ]
+ ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt openobex obexftp ]
++ lib.optional config.networking.networkmanager.enable plasma-nm
++ lib.optional config.hardware.pulseaudio.enable plasma-pa
++ lib.optional config.powerManagement.enable powerdevil
@@ -232,7 +224,6 @@ in
security.pam.services.kdm.enableKwallet = true;
security.pam.services.lightdm.enableKwallet = true;
security.pam.services.sddm.enableKwallet = true;
- security.pam.services.slim.enableKwallet = true;
xdg.portal.enable = true;
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
diff --git a/nixos/modules/services/x11/desktop-managers/surf-display.nix b/nixos/modules/services/x11/desktop-managers/surf-display.nix
index 140dde828daa..9aeb0bbd2a88 100644
--- a/nixos/modules/services/x11/desktop-managers/surf-display.nix
+++ b/nixos/modules/services/x11/desktop-managers/surf-display.nix
@@ -118,7 +118,7 @@ in {
};
config = mkIf cfg.enable {
- services.xserver.displayManager.extraSessionFilePackages = [
+ services.xserver.displayManager.sessionPackages = [
pkgs.surf-display
];
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 6965c6d26467..a08b1947f65b 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -7,6 +7,33 @@ let
in
{
+
+ imports = [
+ # added 2019-08-18
+ # needed to preserve some semblance of UI familarity
+ # with original XFCE module
+ (mkRenamedOptionModule
+ [ "services" "xserver" "desktopManager" "xfce4-14" "extraSessionCommands" ]
+ [ "services" "xserver" "displayManager" "sessionCommands" ])
+
+ # added 2019-11-04
+ # xfce4-14 module removed and promoted to xfce.
+ # Needed for configs that used xfce4-14 module to migrate to this one.
+ (mkRenamedOptionModule
+ [ "services" "xserver" "desktopManager" "xfce4-14" "enable" ]
+ [ "services" "xserver" "desktopManager" "xfce" "enable" ])
+ (mkRenamedOptionModule
+ [ "services" "xserver" "desktopManager" "xfce4-14" "noDesktop" ]
+ [ "services" "xserver" "desktopManager" "xfce" "noDesktop" ])
+ (mkRenamedOptionModule
+ [ "services" "xserver" "desktopManager" "xfce4-14" "enableXfwm" ]
+ [ "services" "xserver" "desktopManager" "xfce" "enableXfwm" ])
+ (mkRenamedOptionModule
+ [ "services" "xserver" "desktopManager" "xfce" "extraSessionCommands" ]
+ [ "services" "xserver" "displayManager" "sessionCommands" ])
+ (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "")
+ ];
+
options = {
services.xserver.desktopManager.xfce = {
enable = mkOption {
@@ -30,14 +57,6 @@ in
description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon).";
};
- extraSessionCommands = mkOption {
- default = "";
- type = types.lines;
- description = ''
- Shell commands executed just before XFCE is started.
- '';
- };
-
enableXfwm = mkOption {
type = types.bool;
default = true;
@@ -48,76 +67,101 @@ in
config = mkIf cfg.enable {
environment.systemPackages = with pkgs.xfce // pkgs; [
- # Get GTK themes and gtk-update-icon-cache
- gtk2.out
+ glib # for gsettings
+ gtk3.out # gtk-update-icon-cache
- # Supplies some abstract icons such as:
- # utilities-terminal, accessories-text-editor
+ gnome3.gnome-themes-extra
gnome3.adwaita-icon-theme
-
hicolor-icon-theme
tango-icon-theme
xfce4-icon-theme
+ desktop-file-utils
+ shared-mime-info # for update-mime-database
+
+ # For a polkit authentication agent
+ polkit_gnome
+
# Needed by Xfce's xinitrc script
- # TODO: replace with command -v
- which
+ xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
exo
garcon
- gtk-xfce-engine
libxfce4ui
- tumbler
xfconf
mousepad
+ parole
ristretto
xfce4-appfinder
xfce4-screenshooter
xfce4-session
xfce4-settings
+ xfce4-taskmanager
xfce4-terminal
(thunar.override { thunarPlugins = cfg.thunarPlugins; })
- thunar-volman # TODO: drop
- ] ++ (if config.hardware.pulseaudio.enable
- then [ xfce4-mixer-pulse xfce4-volumed-pulse ]
- else [ xfce4-mixer xfce4-volumed ])
- # TODO: NetworkManager doesn't belong here
- ++ optionals config.networking.networkmanager.enable [ networkmanagerapplet ]
- ++ optionals config.powerManagement.enable [ xfce4-power-manager ]
- ++ optionals cfg.enableXfwm [ xfwm4 ]
- ++ optionals (!cfg.noDesktop) [
- xfce4-panel
+ ] # TODO: NetworkManager doesn't belong here
+ ++ optional config.networking.networkmanager.enable networkmanagerapplet
+ ++ optional config.powerManagement.enable xfce4-power-manager
+ ++ optionals config.hardware.pulseaudio.enable [
+ pavucontrol
+ # volume up/down keys support:
+ # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
+ # but can only be used with xfce4-panel, so for no-desktop usage we still include
+ # xfce4-volumed-pulse
+ (if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)
+ ] ++ optionals cfg.enableXfwm [
+ xfwm4
+ xfwm4-themes
+ ] ++ optionals (!cfg.noDesktop) [
xfce4-notifyd
+ xfce4-panel
xfdesktop
];
environment.pathsToLink = [
"/share/xfce4"
- "/share/themes"
- "/share/gtksourceview-2.0"
+ "/lib/xfce4"
+ "/share/gtksourceview-3.0"
+ "/share/gtksourceview-4.0"
];
- services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
-
services.xserver.desktopManager.session = [{
name = "xfce";
bgSupport = true;
start = ''
- ${cfg.extraSessionCommands}
-
- ${pkgs.runtimeShell} ${pkgs.xfce.xinitrc} &
+ ${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} &
waitPID=$!
'';
}];
services.xserver.updateDbusEnvironment = true;
+ services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
# Enable helpful DBus services.
services.udisks2.enable = true;
+ security.polkit.enable = true;
+ services.accounts-daemon.enable = true;
services.upower.enable = config.powerManagement.enable;
+ services.gnome3.glib-networking.enable = true;
services.gvfs.enable = true;
services.gvfs.package = pkgs.xfce.gvfs;
+ services.tumbler.enable = true;
+ services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
+ services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager
+
+ # Enable default programs
+ programs.dconf.enable = true;
+
+ # Shell integration for VTE terminals
+ programs.bash.vteIntegration = mkDefault true;
+ programs.zsh.vteIntegration = mkDefault true;
+
+ # Systemd services
+ systemd.packages = with pkgs.xfce; [
+ (thunar.override { thunarPlugins = cfg.thunarPlugins; })
+ ] ++ optional (!cfg.noDesktop) xfce4-notifyd;
+
};
}
diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
deleted file mode 100644
index ffc99172e795..000000000000
--- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix
+++ /dev/null
@@ -1,152 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- cfg = config.services.xserver.desktopManager.xfce4-14;
-in
-
-{
- # added 2019-08-18
- # needed to preserve some semblance of UI familarity
- # with original XFCE module
- imports = [
- (mkRenamedOptionModule
- [ "services" "xserver" "desktopManager" "xfce4-14" "extraSessionCommands" ]
- [ "services" "xserver" "displayManager" "sessionCommands" ])
- ];
-
- options = {
- services.xserver.desktopManager.xfce4-14 = {
- enable = mkOption {
- type = types.bool;
- default = false;
- description = "Enable the Xfce desktop environment.";
- };
-
- # TODO: support thunar plugins
- # thunarPlugins = mkOption {
- # default = [];
- # type = types.listOf types.package;
- # example = literalExample "[ pkgs.xfce4-14.thunar-archive-plugin ]";
- # description = ''
- # A list of plugin that should be installed with Thunar.
- # '';
- # };
-
- noDesktop = mkOption {
- type = types.bool;
- default = false;
- description = "Don't install XFCE desktop components (xfdesktop, panel and notification daemon).";
- };
-
- enableXfwm = mkOption {
- type = types.bool;
- default = true;
- description = "Enable the XFWM (default) window manager.";
- };
- };
- };
-
- config = mkIf cfg.enable {
- environment.systemPackages = with pkgs.xfce4-14 // pkgs; [
- glib # for gsettings
- gtk3.out # gtk-update-icon-cache
-
- gnome3.gnome-themes-extra
- gnome3.adwaita-icon-theme
- hicolor-icon-theme
- tango-icon-theme
- xfce4-icon-theme
-
- desktop-file-utils
- shared-mime-info # for update-mime-database
-
- # For a polkit authentication agent
- polkit_gnome
-
- # Needed by Xfce's xinitrc script
- xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
-
- exo
- garcon
- libxfce4ui
- xfconf
-
- mousepad
- parole
- ristretto
- xfce4-appfinder
- xfce4-screenshooter
- xfce4-session
- xfce4-settings
- xfce4-taskmanager
- xfce4-terminal
-
- # TODO: resync patch for plugins
- #(thunar.override { thunarPlugins = cfg.thunarPlugins; })
- thunar
- ] # TODO: NetworkManager doesn't belong here
- ++ optional config.networking.networkmanager.enable networkmanagerapplet
- ++ optional config.powerManagement.enable xfce4-power-manager
- ++ optionals config.hardware.pulseaudio.enable [
- pavucontrol
- # volume up/down keys support:
- # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
- # but can only be used with xfce4-panel, so for no-desktop usage we still include
- # xfce4-volumed-pulse
- (if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)
- ] ++ optionals cfg.enableXfwm [
- xfwm4
- xfwm4-themes
- ] ++ optionals (!cfg.noDesktop) [
- xfce4-notifyd
- xfce4-panel
- xfdesktop
- ];
-
- environment.pathsToLink = [
- "/share/xfce4"
- "/lib/xfce4"
- "/share/gtksourceview-3.0"
- "/share/gtksourceview-4.0"
- ];
-
- services.xserver.desktopManager.session = [{
- name = "xfce4-14";
- bgSupport = true;
- start = ''
- ${pkgs.runtimeShell} ${pkgs.xfce4-14.xinitrc} &
- waitPID=$!
- '';
- }];
-
- services.xserver.updateDbusEnvironment = true;
- services.xserver.gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
-
- # Enable helpful DBus services.
- services.udisks2.enable = true;
- security.polkit.enable = true;
- services.accounts-daemon.enable = true;
- services.upower.enable = config.powerManagement.enable;
- services.gnome3.glib-networking.enable = true;
- services.gvfs.enable = true;
- services.gvfs.package = pkgs.xfce.gvfs;
- services.tumbler.enable = true;
- services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
- services.xserver.libinput.enable = mkDefault true; # used in xfce4-settings-manager
-
- # Enable default programs
- programs.dconf.enable = true;
-
- # Shell integration for VTE terminals
- programs.bash.vteIntegration = mkDefault true;
- programs.zsh.vteIntegration = mkDefault true;
-
- # Systemd services
- systemd.packages = with pkgs.xfce4-14; [
- thunar
- ] ++ optional (!cfg.noDesktop) xfce4-notifyd;
-
- };
-}
diff --git a/nixos/modules/services/x11/display-managers/account-service-util.nix b/nixos/modules/services/x11/display-managers/account-service-util.nix
new file mode 100644
index 000000000000..1dbe703b5662
--- /dev/null
+++ b/nixos/modules/services/x11/display-managers/account-service-util.nix
@@ -0,0 +1,39 @@
+{ accountsservice
+, glib
+, gobject-introspection
+, python3
+, wrapGAppsHook
+}:
+
+python3.pkgs.buildPythonApplication {
+ name = "set-session";
+
+ format = "other";
+
+ src = ./set-session.py;
+
+ dontUnpack = true;
+
+ strictDeps = false;
+
+ nativeBuildInputs = [
+ wrapGAppsHook
+ gobject-introspection
+ ];
+
+ buildInputs = [
+ accountsservice
+ glib
+ ];
+
+ propagatedBuildInputs = with python3.pkgs; [
+ pygobject3
+ ordered-set
+ ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp $src $out/bin/set-session
+ chmod +x $out/bin/set-session
+ '';
+}
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index bf6b048654b3..2d809b5cc9fd 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -1,9 +1,9 @@
# This module declares the options to define a *display manager*, the
-# program responsible for handling X logins (such as xdm, gdb, or
-# SLiM). The display manager allows the user to select a *session
-# type*. When the user logs in, the display manager starts the
+# program responsible for handling X logins (such as LightDM, GDM, or SDDM).
+# The display manager allows the user to select a *session
+# type*. When the user logs in, the display manager starts the
# *session script* ("xsession" below) to launch the selected session
-# type. The session type defines two things: the *desktop manager*
+# type. The session type defines two things: the *desktop manager*
# (e.g., KDE, Gnome or a plain xterm), and optionally the *window
# manager* (e.g. kwin or twm).
@@ -27,16 +27,7 @@ let
Xft.hintstyle: hintslight
'';
- mkCases = session:
- concatStrings (
- mapAttrsToList (name: starts: ''
- (${name})
- ${concatMapStringsSep "\n " (n: n.start) starts}
- ;;
- '') (lib.groupBy (n: n.name) session)
- );
-
- # file provided by services.xserver.displayManager.session.wrapper
+ # file provided by services.xserver.displayManager.sessionData.wrapper
xsessionWrapper = pkgs.writeScript "xsession-wrapper"
''
#! ${pkgs.bash}/bin/bash
@@ -116,99 +107,47 @@ let
# Run the supplied session command. Remove any double quotes with eval.
eval exec "$@"
else
- # Fall back to the default window/desktopManager
- exec ${cfg.displayManager.session.script}
+ # TODO: Do we need this? Should not the session always exist?
+ echo "error: unknown session $1" 1>&2
+ exit 1
fi
'';
- # file provided by services.xserver.displayManager.session.script
- xsession = wm: dm: pkgs.writeScript "xsession"
- ''
- #! ${pkgs.bash}/bin/bash
-
- # Legacy session script used to construct .desktop files from
- # `services.xserver.displayManager.session` entries. Called from
- # `sessionWrapper`.
-
- # Expected parameters:
- # $1 = +
-
- # The first argument of this script is the session type.
- sessionType="$1"
- if [ "$sessionType" = default ]; then sessionType=""; fi
-
- # The session type is "+", so
- # extract those (see:
- # http://wiki.bash-hackers.org/syntax/pe#substring_removal).
- windowManager="''${sessionType##*+}"
- : ''${windowManager:=${cfg.windowManager.default}}
- desktopManager="''${sessionType%%+*}"
- : ''${desktopManager:=${cfg.desktopManager.default}}
-
- # Start the window manager.
- case "$windowManager" in
- ${mkCases wm}
- (*) echo "$0: Window manager '$windowManager' not found.";;
- esac
-
- # Start the desktop manager.
- case "$desktopManager" in
- ${mkCases dm}
- (*) echo "$0: Desktop manager '$desktopManager' not found.";;
- esac
-
- ${optionalString cfg.updateDbusEnvironment ''
- ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd --all
- ''}
-
- test -n "$waitPID" && wait "$waitPID"
-
- ${config.systemd.package}/bin/systemctl --user stop graphical-session.target
-
- exit 0
- '';
-
- # Desktop Entry Specification:
- # - https://standards.freedesktop.org/desktop-entry-spec/latest/
- # - https://standards.freedesktop.org/desktop-entry-spec/latest/ar01s06.html
- mkDesktops = names: pkgs.runCommand "desktops"
+ installedSessions = pkgs.runCommand "desktops"
{ # trivial derivation
preferLocalBuild = true;
allowSubstitutes = false;
}
''
- mkdir -p "$out/share/xsessions"
- ${concatMapStrings (n: ''
- cat - > "$out/share/xsessions/${n}.desktop" << EODESKTOP
- [Desktop Entry]
- Version=1.0
- Type=XSession
- TryExec=${cfg.displayManager.session.script}
- Exec=${cfg.displayManager.session.script} "${n}"
- Name=${n}
- Comment=
- EODESKTOP
- '') names}
+ mkdir -p "$out/share/"{xsessions,wayland-sessions}
${concatMapStrings (pkg: ''
+ for n in ${concatStringsSep " " pkg.providedSessions}; do
+ if ! test -f ${pkg}/share/wayland-sessions/$n.desktop -o \
+ -f ${pkg}/share/xsessions/$n.desktop; then
+ echo "Couldn't find provided session name, $n.desktop, in session package ${pkg.name}:"
+ echo " ${pkg}"
+ return 1
+ fi
+ done
+
if test -d ${pkg}/share/xsessions; then
${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
fi
- '') cfg.displayManager.extraSessionFilePackages}
-
-
- ${concatMapStrings (pkg: ''
if test -d ${pkg}/share/wayland-sessions; then
- mkdir -p "$out/share/wayland-sessions"
${xorg.lndir}/bin/lndir ${pkg}/share/wayland-sessions $out/share/wayland-sessions
fi
- '') cfg.displayManager.extraSessionFilePackages}
+ '') cfg.displayManager.sessionPackages}
'';
+ dmDefault = cfg.desktopManager.default;
+ wmDefault = cfg.windowManager.default;
+
+ defaultSessionFromLegacyOptions = concatStringsSep "+" (filter (s: s != null) ([ dmDefault ] ++ optional (wmDefault != "none") wmDefault));
+
in
{
-
options = {
services.xserver.displayManager = {
@@ -263,11 +202,24 @@ in
'';
};
- extraSessionFilePackages = mkOption {
- type = types.listOf types.package;
+ sessionPackages = mkOption {
+ type = with types; listOf (package // {
+ description = "package with provided sessions";
+ check = p: assertMsg
+ (package.check p && p ? providedSessions
+ && p.providedSessions != [] && all isString p.providedSessions)
+ ''
+ Package, '${p.name}', did not specify any session names, as strings, in
+ 'passthru.providedSessions'. This is required when used as a session package.
+
+ The session names can be looked up in:
+ ${p}/share/xsessions
+ ${p}/share/wayland-sessions
+ '';
+ });
default = [];
description = ''
- A list of packages containing xsession files to be passed to the display manager.
+ A list of packages containing x11 or wayland session files to be passed to the display manager.
'';
};
@@ -298,18 +250,50 @@ in
inside the display manager with the desktop manager name
followed by the window manager name.
'';
- apply = list: rec {
- wm = filter (s: s.manage == "window") list;
- dm = filter (s: s.manage == "desktop") list;
- names = flip concatMap dm
- (d: map (w: d.name + optionalString (w.name != "none") ("+" + w.name))
- (filter (w: d.name != "none" || w.name != "none") wm));
- desktops = mkDesktops names;
- script = xsession wm dm;
+ };
+
+ sessionData = mkOption {
+ description = "Data exported for display managers’ convenience";
+ internal = true;
+ default = {};
+ apply = val: {
wrapper = xsessionWrapper;
+ desktops = installedSessions;
+ sessionNames = concatMap (p: p.providedSessions) cfg.displayManager.sessionPackages;
+ # We do not want to force users to set defaultSession when they have only single DE.
+ autologinSession =
+ if cfg.displayManager.defaultSession != null then
+ cfg.displayManager.defaultSession
+ else if cfg.displayManager.sessionData.sessionNames != [] then
+ head cfg.displayManager.sessionData.sessionNames
+ else
+ null;
};
};
+ defaultSession = mkOption {
+ type = with types; nullOr str // {
+ description = "session name";
+ check = d:
+ assertMsg (d != null -> (str.check d && elem d cfg.displayManager.sessionData.sessionNames)) ''
+ Default graphical session, '${d}', not found.
+ Valid names for 'services.xserver.displayManager.defaultSession' are:
+ ${concatStringsSep "\n " cfg.displayManager.sessionData.sessionNames}
+ '';
+ };
+ default =
+ if dmDefault != null || wmDefault != null then
+ defaultSessionFromLegacyOptions
+ else
+ null;
+ example = "gnome";
+ description = ''
+ Graphical session to pre-select in the session chooser (only effective for GDM and LightDM).
+
+ On GDM, LightDM and SDDM, it will also be used as a session for auto-login.
+ '';
+ };
+
job = {
preStart = mkOption {
@@ -322,7 +306,7 @@ in
execCmd = mkOption {
type = types.str;
example = literalExample ''
- "''${pkgs.slim}/bin/slim"
+ "''${pkgs.lightdm}/bin/lightdm"
'';
description = "Command to start the display manager.";
};
@@ -330,7 +314,6 @@ in
environment = mkOption {
type = types.attrsOf types.unspecified;
default = {};
- example = { SLIM_CFGFILE = "/etc/slim.conf"; };
description = "Additional environment variables needed by the display manager.";
};
@@ -359,6 +342,27 @@ in
};
config = {
+ assertions = [
+ {
+ assertion = cfg.desktopManager.default != null || cfg.windowManager.default != null -> cfg.displayManager.defaultSession == defaultSessionFromLegacyOptions;
+ message = "You cannot use both services.xserver.displayManager.defaultSession option and legacy options (services.xserver.desktopManager.default and services.xserver.windowManager.default).";
+ }
+ ];
+
+ warnings =
+ mkIf (dmDefault != null || wmDefault != null) [
+ ''
+ The following options are deprecated:
+ ${concatStringsSep "\n " (map ({c, t}: t) (filter ({c, t}: c != null) [
+ { c = dmDefault; t = "- services.xserver.desktopManager.default"; }
+ { c = wmDefault; t = "- services.xserver.windowManager.default"; }
+ ]))}
+ Please use
+ services.xserver.displayManager.defaultSession = "${concatStringsSep "+" (filter (s: s != null) [ dmDefault wmDefault ])}";
+ instead.
+ ''
+ ];
+
services.xserver.displayManager.xserverBin = "${xorg.xorgserver.out}/bin/X";
systemd.user.targets.graphical-session = {
@@ -367,11 +371,75 @@ in
StopWhenUnneeded = false;
};
};
+
+ # Create desktop files and scripts for starting sessions for WMs/DMs
+ # that do not have upstream session files (those defined using services.{display,desktop,window}Manager.session options).
+ services.xserver.displayManager.sessionPackages =
+ let
+ dms = filter (s: s.manage == "desktop") cfg.displayManager.session;
+ wms = filter (s: s.manage == "window") cfg.displayManager.session;
+
+ # Script responsible for starting the window manager and the desktop manager.
+ xsession = wm: dm: pkgs.writeScript "xsession" ''
+ #! ${pkgs.bash}/bin/bash
+
+ # Legacy session script used to construct .desktop files from
+ # `services.xserver.displayManager.session` entries. Called from
+ # `sessionWrapper`.
+
+ # Start the window manager.
+ ${wm.start}
+
+ # Start the desktop manager.
+ ${dm.start}
+
+ ${optionalString cfg.updateDbusEnvironment ''
+ ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd --all
+ ''}
+
+ test -n "$waitPID" && wait "$waitPID"
+
+ ${config.systemd.package}/bin/systemctl --user stop graphical-session.target
+
+ exit 0
+ '';
+ in
+ # We will generate every possible pair of WM and DM.
+ concatLists (
+ crossLists
+ (dm: wm: let
+ sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}";
+ script = xsession dm wm;
+ in
+ optional (dm.name != "none" || wm.name != "none")
+ (pkgs.writeTextFile {
+ name = "${sessionName}-xsession";
+ destination = "/share/xsessions/${sessionName}.desktop";
+ # Desktop Entry Specification:
+ # - https://standards.freedesktop.org/desktop-entry-spec/latest/
+ # - https://standards.freedesktop.org/desktop-entry-spec/latest/ar01s06.html
+ text = ''
+ [Desktop Entry]
+ Version=1.0
+ Type=XSession
+ TryExec=${script}
+ Exec=${script}
+ Name=${sessionName}
+ '';
+ } // {
+ providedSessions = [ sessionName ];
+ })
+ )
+ [dms wms]
+ );
};
imports = [
- (mkRemovedOptionModule [ "services" "xserver" "displayManager" "desktopManagerHandlesLidAndPower" ]
+ (mkRemovedOptionModule [ "services" "xserver" "displayManager" "desktopManagerHandlesLidAndPower" ]
"The option is no longer necessary because all display managers have already delegated lid management to systemd.")
+ (mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "xserver" "displayManager" "job" "logToFile" ])
+ (mkRenamedOptionModule [ "services" "xserver" "displayManager" "logToJournal" ] [ "services" "xserver" "displayManager" "job" "logToJournal" ])
+ (mkRenamedOptionModule [ "services" "xserver" "displayManager" "extraSessionFilesPackages" ] [ "services" "xserver" "displayManager" "sessionPackages" ])
];
}
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index e5990aec4b9c..6630f012f04f 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -31,6 +31,9 @@ let
load-module module-position-event-sounds
'';
+ defaultSessionName = config.services.xserver.displayManager.defaultSession;
+
+ setSessionScript = pkgs.callPackage ./account-service-util.nix { };
in
{
@@ -88,11 +91,21 @@ in
wayland = mkOption {
default = true;
description = ''
- Allow GDM run on Wayland instead of Xserver
+ Allow GDM to run on Wayland instead of Xserver.
+ Note to enable Wayland with Nvidia you need to
+ enable the nvidiaWayland .
'';
type = types.bool;
};
+ nvidiaWayland = mkOption {
+ default = false;
+ description = ''
+ Whether to allow wayland to be used with the proprietary
+ NVidia graphics driver.
+ '';
+ };
+
autoSuspend = mkOption {
default = true;
description = ''
@@ -138,7 +151,7 @@ in
environment = {
GDM_X_SERVER_EXTRA_ARGS = toString
(filter (arg: arg != "-terminate") cfg.xserverArgs);
- XDG_DATA_DIRS = "${cfg.session.desktops}/share/";
+ XDG_DATA_DIRS = "${cfg.sessionData.desktops}/share/";
} // 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
@@ -156,11 +169,19 @@ in
cat - > /run/gdm/.config/gnome-initial-setup-done <<- EOF
yes
EOF
+ '' + optionalString (defaultSessionName != null) ''
+ # Set default session in session chooser to a specified values – basically ignore session history.
+ ${setSessionScript}/bin/set-session ${cfg.sessionData.autologinSession}
'';
};
- # Because sd_login_monitor_new requires /run/systemd/machines
- systemd.services.display-manager.wants = [ "systemd-machined.service" ];
+ systemd.services.display-manager.wants = [
+ # Because sd_login_monitor_new requires /run/systemd/machines
+ "systemd-machined.service"
+ # setSessionScript wants AccountsService
+ "accounts-daemon.service"
+ ];
+
systemd.services.display-manager.after = [
"rc-local.service"
"systemd-machined.service"
@@ -197,6 +218,19 @@ in
services.dbus.packages = [ gdm ];
+ # We duplicate upstream's udev rules manually to make wayland with nvidia configurable
+ services.udev.extraRules = ''
+ # disable Wayland on Cirrus chipsets
+ ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-disable-wayland"
+ # disable Wayland on Hi1710 chipsets
+ ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-disable-wayland"
+ ${optionalString (!cfg.gdm.nvidiaWayland) ''
+ DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-disable-wayland"
+ ''}
+ # disable Wayland when modesetting is disabled
+ IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-disable-wayland"
+ '';
+
systemd.user.services.dbus.wantedBy = [ "default.target" ];
programs.dconf.profiles.gdm =
@@ -218,7 +252,7 @@ in
customDconfDb = pkgs.stdenv.mkDerivation {
name = "gdm-dconf-db";
buildCommand = ''
- ${pkgs.gnome3.dconf}/bin/dconf compile $out ${customDconf}/dconf
+ ${pkgs.dconf}/bin/dconf compile $out ${customDconf}/dconf
'';
};
in pkgs.stdenv.mkDerivation {
@@ -263,7 +297,7 @@ in
${optionalString cfg.gdm.debug "Enable=true"}
'';
- environment.etc."gdm/Xsession".source = config.services.xserver.displayManager.session.wrapper;
+ environment.etc."gdm/Xsession".source = config.services.xserver.displayManager.sessionData.wrapper;
# GDM LFS PAM modules, adapted somehow to NixOS
security.pam.services = {
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
index fa9445af32e7..0025f9b36037 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
@@ -53,9 +53,8 @@ in
Whether to enable lightdm-mini-greeter as the lightdm greeter.
Note that this greeter starts only the default X session.
- You can configure the default X session by
- services.xserver.desktopManager.default and
- services.xserver.windowManager.default .
+ You can configure the default X session using
+ .
'';
};
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
index 29cb6ccbc06b..77c94114e6d9 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
@@ -35,6 +35,9 @@ in
name = "io.elementary.greeter";
};
+ # Show manual login card.
+ services.xserver.displayManager.lightdm.extraSeatDefaults = "greeter-show-manual-login=true";
+
environment.etc."lightdm/io.elementary.greeter.conf".source = "${pkgs.pantheon.elementary-greeter}/etc/lightdm/io.elementary.greeter.conf";
environment.etc."wingpanel.d/io.elementary.greeter.whitelist".source = "${pkgs.pantheon.elementary-default-settings}/etc/wingpanel.d/io.elementary.greeter.whitelist";
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index cf4c05acbccd..f7face0adb7e 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -8,10 +8,9 @@ let
dmcfg = xcfg.displayManager;
xEnv = config.systemd.services.display-manager.environment;
cfg = dmcfg.lightdm;
+ sessionData = dmcfg.sessionData;
- dmDefault = xcfg.desktopManager.default;
- wmDefault = xcfg.windowManager.default;
- hasDefaultUserSession = dmDefault != "none" || wmDefault != "none";
+ setSessionScript = pkgs.callPackage ./account-service-util.nix { };
inherit (pkgs) lightdm writeScript writeText;
@@ -45,22 +44,19 @@ let
greeter-user = ${config.users.users.lightdm.name}
greeters-directory = ${cfg.greeter.package}
''}
- sessions-directory = ${dmcfg.session.desktops}/share/xsessions
+ sessions-directory = ${dmcfg.sessionData.desktops}/share/xsessions:${dmcfg.sessionData.desktops}/share/wayland-sessions
${cfg.extraConfig}
[Seat:*]
xserver-command = ${xserverWrapper}
- session-wrapper = ${dmcfg.session.wrapper}
+ session-wrapper = ${dmcfg.sessionData.wrapper}
${optionalString cfg.greeter.enable ''
greeter-session = ${cfg.greeter.name}
''}
${optionalString cfg.autoLogin.enable ''
autologin-user = ${cfg.autoLogin.user}
autologin-user-timeout = ${toString cfg.autoLogin.timeout}
- autologin-session = ${defaultSessionName}
- ''}
- ${optionalString hasDefaultUserSession ''
- user-session=${defaultSessionName}
+ autologin-session = ${sessionData.autologinSession}
''}
${optionalString (dmcfg.setupCommands != "") ''
display-setup-script=${pkgs.writeScript "lightdm-display-setup" ''
@@ -71,7 +67,6 @@ let
${cfg.extraSeatDefaults}
'';
- defaultSessionName = dmDefault + optionalString (wmDefault != "none") ("+" + wmDefault);
in
{
# Note: the order in which lightdm greeter modules are imported
@@ -199,11 +194,9 @@ in
LightDM auto-login requires services.xserver.displayManager.lightdm.autoLogin.user to be set
'';
}
- { assertion = cfg.autoLogin.enable -> dmDefault != "none" || wmDefault != "none";
+ { assertion = cfg.autoLogin.enable -> sessionData.autologinSession != null;
message = ''
- LightDM auto-login requires that services.xserver.desktopManager.default and
- services.xserver.windowManager.default are set to valid values. The current
- default session: ${defaultSessionName} is not valid.
+ LightDM auto-login requires that services.xserver.displayManager.defaultSession is set.
'';
}
{ assertion = !cfg.greeter.enable -> (cfg.autoLogin.enable && cfg.autoLogin.timeout == 0);
@@ -214,6 +207,20 @@ in
}
];
+ # Set default session in session chooser to a specified values – basically ignore session history.
+ # Auto-login is already covered by a config value.
+ services.xserver.displayManager.job.preStart = optionalString (!cfg.autoLogin.enable && dmcfg.defaultSession != null) ''
+ ${setSessionScript}/bin/set-session ${dmcfg.defaultSession}
+ '';
+
+ # setSessionScript needs session-files in XDG_DATA_DIRS
+ services.xserver.displayManager.job.environment.XDG_DATA_DIRS = "${dmcfg.sessionData.desktops}/share/";
+
+ # setSessionScript wants AccountsService
+ systemd.services.display-manager.wants = [
+ "accounts-daemon.service"
+ ];
+
# lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
services.xserver.displayManager.job.execCmd = ''
export PATH=${lightdm}/sbin:$PATH
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 8847acb0c604..4224c557ed63 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -14,7 +14,7 @@ let
xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
#!/bin/sh
${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)}
- exec systemd-cat ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} "$@"
+ exec systemd-cat -t xserver-wrapper ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} "$@"
'';
Xsetup = pkgs.writeScript "Xsetup" ''
@@ -50,8 +50,8 @@ let
MinimumVT=${toString (if xcfg.tty != null then xcfg.tty else 7)}
ServerPath=${xserverWrapper}
XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr
- SessionCommand=${dmcfg.session.wrapper}
- SessionDir=${dmcfg.session.desktops}/share/xsessions
+ SessionCommand=${dmcfg.sessionData.wrapper}
+ SessionDir=${dmcfg.sessionData.desktops}/share/xsessions
XauthPath=${pkgs.xorg.xauth}/bin/xauth
DisplayCommand=${Xsetup}
DisplayStopCommand=${Xstop}
@@ -59,26 +59,27 @@ let
[Wayland]
EnableHidpi=${if cfg.enableHidpi then "true" else "false"}
- SessionDir=${dmcfg.session.desktops}/share/wayland-sessions
+ SessionDir=${dmcfg.sessionData.desktops}/share/wayland-sessions
${optionalString cfg.autoLogin.enable ''
[Autologin]
User=${cfg.autoLogin.user}
- Session=${defaultSessionName}.desktop
+ Session=${autoLoginSessionName}.desktop
Relogin=${boolToString cfg.autoLogin.relogin}
''}
${cfg.extraConfig}
'';
- defaultSessionName =
- let
- dm = xcfg.desktopManager.default;
- wm = xcfg.windowManager.default;
- in dm + optionalString (wm != "none") ("+" + wm);
+ autoLoginSessionName = dmcfg.sessionData.autologinSession;
in
{
+ imports = [
+ (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
+ "Set the option `services.xserver.displayManager.sddm.package' instead.")
+ ];
+
options = {
services.xserver.displayManager.sddm = {
@@ -205,11 +206,9 @@ in
SDDM auto-login requires services.xserver.displayManager.sddm.autoLogin.user to be set
'';
}
- { assertion = cfg.autoLogin.enable -> elem defaultSessionName dmcfg.session.names;
+ { assertion = cfg.autoLogin.enable -> autoLoginSessionName != null;
message = ''
- SDDM auto-login requires that services.xserver.desktopManager.default and
- services.xserver.windowManager.default are set to valid values. The current
- default session: ${defaultSessionName} is not valid.
+ SDDM auto-login requires that services.xserver.displayManager.defaultSession is set.
'';
}
];
diff --git a/nixos/modules/services/x11/display-managers/set-session.py b/nixos/modules/services/x11/display-managers/set-session.py
new file mode 100755
index 000000000000..0cca80af44e8
--- /dev/null
+++ b/nixos/modules/services/x11/display-managers/set-session.py
@@ -0,0 +1,86 @@
+#!/usr/bin/env python
+
+import gi, argparse, os, logging, sys
+
+gi.require_version("AccountsService", "1.0")
+from gi.repository import AccountsService, GLib
+from ordered_set import OrderedSet
+
+
+def get_session_file(session):
+ system_data_dirs = GLib.get_system_data_dirs()
+
+ session_dirs = OrderedSet(
+ os.path.join(data_dir, session)
+ for data_dir in system_data_dirs
+ for session in {"wayland-sessions", "xsessions"}
+ )
+
+ session_files = OrderedSet(
+ os.path.join(dir, session + ".desktop")
+ for dir in session_dirs
+ if os.path.exists(os.path.join(dir, session + ".desktop"))
+ )
+
+ # Deal with duplicate wayland-sessions and xsessions.
+ # Needed for the situation in gnome-session, where there's
+ # a xsession named the same as a wayland session.
+ if any(map(is_session_wayland, session_files)):
+ session_files = OrderedSet(
+ session for session in session_files if is_session_wayland(session)
+ )
+ else:
+ session_files = OrderedSet(
+ session for session in session_files if is_session_xsession(session)
+ )
+
+ if len(session_files) == 0:
+ logging.warning("No session files are found.")
+ sys.exit(0)
+ else:
+ return session_files[0]
+
+
+def is_session_xsession(session_file):
+ return "/xsessions/" in session_file
+
+
+def is_session_wayland(session_file):
+ return "/wayland-sessions/" in session_file
+
+
+def main():
+ parser = argparse.ArgumentParser(
+ description="Set session type for all normal users."
+ )
+ parser.add_argument("session", help="Name of session to set.")
+
+ args = parser.parse_args()
+
+ session = getattr(args, "session")
+ session_file = get_session_file(session)
+
+ user_manager = AccountsService.UserManager.get_default()
+ users = user_manager.list_users()
+
+ for user in users:
+ if user.is_system_account():
+ continue
+ else:
+ if is_session_wayland(session_file):
+ logging.debug(
+ f"Setting session name: {session}, as we found the existing wayland-session: {session_file}"
+ )
+ user.set_session(session)
+ elif is_session_xsession(session_file):
+ logging.debug(
+ f"Setting session name: {session}, as we found the existing xsession: {session_file}"
+ )
+ user.set_x_session(session)
+ else:
+ logging.error(f"Couldn't figure out session type for {session_file}")
+ sys.exit(1)
+
+
+if __name__ == "__main__":
+ main()
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 124660a43f07..4b0948a5b7a5 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -2,155 +2,15 @@
with lib;
-let
-
- dmcfg = config.services.xserver.displayManager;
-
- cfg = dmcfg.slim;
-
- slimConfig = pkgs.writeText "slim.cfg"
- ''
- xauth_path ${dmcfg.xauthBin}
- default_xserver ${dmcfg.xserverBin}
- xserver_arguments ${toString dmcfg.xserverArgs}
- sessiondir ${dmcfg.session.desktops}/share/xsessions
- login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.wrapper} "%session"
- halt_cmd ${config.systemd.package}/sbin/shutdown -h now
- reboot_cmd ${config.systemd.package}/sbin/shutdown -r now
- logfile /dev/stderr
- ${optionalString (cfg.defaultUser != null) ("default_user " + cfg.defaultUser)}
- ${optionalString (cfg.defaultUser != null) ("focus_password yes")}
- ${optionalString cfg.autoLogin "auto_login yes"}
- ${optionalString (cfg.consoleCmd != null) "console_cmd ${cfg.consoleCmd}"}
- ${cfg.extraConfig}
- '';
-
- # Unpack the SLiM theme, or use the default.
- slimThemesDir =
- let
- unpackedTheme = pkgs.runCommand "slim-theme" { preferLocalBuild = true; }
- ''
- mkdir -p $out
- cd $out
- unpackFile ${cfg.theme}
- ln -s * default
- '';
- in if cfg.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme;
-
-in
-
{
-
- ###### interface
-
- options = {
-
- services.xserver.displayManager.slim = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to enable SLiM as the display manager.
- '';
- };
-
- theme = mkOption {
- type = types.nullOr types.path;
- default = pkgs.fetchurl {
- url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz";
- sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8";
- };
- defaultText = ''pkgs.fetchurl {
- url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz";
- sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8";
- }'';
- example = literalExample ''
- pkgs.fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-wave.tar.gz";
- sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy";
- }
- '';
- description = ''
- The theme for the SLiM login manager. If not specified, SLiM's
- default theme is used. See for a
- collection of themes. TODO: berlios shut down.
- '';
- };
-
- defaultUser = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "login";
- description = ''
- The default user to load. If you put a username here you
- get it automatically loaded into the username field, and
- the focus is placed on the password.
- '';
- };
-
- autoLogin = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Automatically log in as the default user.
- '';
- };
-
- extraConfig = mkOption {
- type = types.lines;
- default = "";
- description = ''
- Extra configuration options for SLiM login manager. Do not
- add options that can be configured directly.
- '';
- };
-
- consoleCmd = mkOption {
- type = types.nullOr types.str;
- default = ''
- ${pkgs.xterm}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e ${pkgs.shadow}/bin/login
- '';
- defaultText = ''
- ''${pkgs.xterm}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e ''${pkgs.shadow}/bin/login
- '';
- description = ''
- The command to run when "console" is given as the username.
- '';
- };
- };
-
- };
-
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- services.xserver.displayManager.job =
- { environment =
- { SLIM_CFGFILE = slimConfig;
- SLIM_THEMESDIR = slimThemesDir;
- };
- execCmd = "exec ${pkgs.slim}/bin/slim";
- };
-
- services.xserver.displayManager.sessionCommands =
- ''
- # Export the config/themes for slimlock.
- export SLIM_THEMESDIR=${slimThemesDir}
- '';
-
- # Allow null passwords so that the user can login as root on the
- # installation CD.
- security.pam.services.slim = { allowNullPassword = true; startSession = true; };
-
- # Allow slimlock to work.
- security.pam.services.slimlock = {};
-
- environment.systemPackages = [ pkgs.slim ];
-
- };
-
+ # added 2019-11-11
+ imports = [
+ (mkRemovedOptionModule [ "services" "xserver" "displayManager" "slim" ] ''
+ The SLIM project is abandoned and their last release was in 2013.
+ Because of this it poses a security risk to your system.
+ Other issues include it not fully supporting systemd and logind sessions.
+ Please use a different display manager such as LightDM, SDDM, or GDM.
+ You can also use the startx module which uses Xinitrc.
+ '')
+ ];
}
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index 4a25232383d3..71065dfc26bb 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -209,12 +209,12 @@ in {
services.xserver.config =
''
- # Automatically enable the libinput driver for all touchpads.
+ # General libinput configuration.
+ # See CONFIGURATION DETAILS section of man:libinput(4).
Section "InputClass"
Identifier "libinputConfiguration"
- MatchIsTouchpad "on"
+ MatchDriver "libinput"
${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
- Driver "libinput"
Option "AccelProfile" "${cfg.accelProfile}"
${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''}
${optionalString (cfg.buttonMapping != null) ''Option "ButtonMapping" "${cfg.buttonMapping}"''}
diff --git a/nixos/modules/services/x11/imwheel.nix b/nixos/modules/services/x11/imwheel.nix
new file mode 100644
index 000000000000..3923df498e79
--- /dev/null
+++ b/nixos/modules/services/x11/imwheel.nix
@@ -0,0 +1,68 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+ cfg = config.services.xserver.imwheel;
+in
+ {
+ options = {
+ services.xserver.imwheel = {
+ enable = mkEnableOption "IMWheel service";
+
+ extraOptions = mkOption {
+ type = types.listOf types.str;
+ default = [ "--buttons=45" ];
+ example = [ "--debug" ];
+ description = ''
+ Additional command-line arguments to pass to
+ imwheel .
+ '';
+ };
+
+ rules = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = literalExample ''
+ ".*" = '''
+ None, Up, Button4, 8
+ None, Down, Button5, 8
+ Shift_L, Up, Shift_L|Button4, 4
+ Shift_L, Down, Shift_L|Button5, 4
+ Control_L, Up, Control_L|Button4
+ Control_L, Down, Control_L|Button5
+ ''';
+ '';
+ description = ''
+ Window class translation rules.
+ /etc/X11/imwheelrc is generated based on this config
+ which means this config is global for all users.
+ See offical man pages
+ for more informations.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.imwheel ];
+
+ environment.etc."X11/imwheel/imwheelrc".source =
+ pkgs.writeText "imwheelrc" (concatStringsSep "\n\n"
+ (mapAttrsToList
+ (rule: conf: "\"${rule}\"\n${conf}") cfg.rules
+ ));
+
+ systemd.user.services.imwheel = {
+ description = "imwheel service";
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
+ serviceConfig = {
+ ExecStart = "${pkgs.imwheel}/bin/imwheel " + escapeShellArgs ([
+ "--detach"
+ "--kill"
+ ] ++ cfg.extraOptions);
+ ExecStop = "${pkgs.procps}/bin/pkill imwheel";
+ Restart = "on-failure";
+ };
+ };
+ };
+ }
diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index 5f16a680050d..2478aaabb799 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -71,4 +71,7 @@ in {
serviceConfig.Restart = "always";
};
};
+
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix
index d916fa5bb393..9bfcfa9b065d 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixos/modules/services/x11/urxvtd.nix
@@ -45,4 +45,6 @@ in {
environment.variables.RXVT_SOCKET = "/run/user/$(id -u)/urxvtd-socket";
};
+ meta.maintainers = with lib.maintainers; [ rnhmjoj ];
+
}
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index c17f3830d0e9..04a9fc46628c 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -59,15 +59,14 @@ in
};
default = mkOption {
- type = types.str;
- default = "none";
+ type = types.nullOr types.str;
+ default = null;
example = "wmii";
- description = "Default window manager loaded if none have been chosen.";
- apply = defaultWM:
- if any (w: w.name == defaultWM) cfg.session then
- defaultWM
- else
- throw "Default window manager (${defaultWM}) not found.";
+ description = ''
+ Deprecated , please use instead.
+
+ Default window manager loaded if none have been chosen.
+ '';
};
};
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index 0e1314122767..30c59b88f82f 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -86,7 +86,7 @@ in
${xmonadBin}
waitPID=$!
'' else ''
- ${xmonad}/bin/xmonad &
+ systemd-cat -t xmonad ${xmonad}/bin/xmonad &
waitPID=$!
'';
}];
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index a8406544a72f..1f6ee7cfffda 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -149,6 +149,8 @@ in
[ ./display-managers/default.nix
./window-managers/default.nix
./desktop-managers/default.nix
+ (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ]
+ "See the 16.09 release notes for more information.")
];
@@ -557,7 +559,6 @@ in
default = !( dmconf.auto.enable
|| dmconf.gdm.enable
|| dmconf.sddm.enable
- || dmconf.slim.enable
|| dmconf.xpra.enable );
in mkIf (default) true;
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
index a32c9dc1f2b4..a677ab4cb71a 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -134,6 +134,10 @@ let
};
in {
+ imports = [
+ (lib.mkRenamedOptionModule [ "boot" "binfmtMiscRegistrations" ] [ "boot" "binfmt" "registrations" ])
+ ];
+
options = {
boot.binfmt = {
registrations = mkOption {
diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix
index 8c9b1502558a..71a86c74772e 100644
--- a/nixos/modules/system/boot/grow-partition.nix
+++ b/nixos/modules/system/boot/grow-partition.nix
@@ -7,6 +7,9 @@
with lib;
{
+ imports = [
+ (mkRenamedOptionModule [ "virtualisation" "growPartition" ] [ "boot" "growPartition" ])
+ ];
options = {
boot.growPartition = mkEnableOption "grow the root partition on boot";
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index e13f0421d38f..9a4db84f7b73 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -47,8 +47,8 @@ let
grub = f grub;
grubTarget = f (grub.grubTarget or "");
shell = "${pkgs.runtimeShell}";
- fullName = (builtins.parseDrvName realGrub.name).name;
- fullVersion = (builtins.parseDrvName realGrub.name).version;
+ fullName = lib.getName realGrub;
+ fullVersion = lib.getVersion realGrub;
grubEfi = f grubEfi;
grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else "";
bootPath = args.path;
diff --git a/nixos/modules/system/boot/loader/loader.nix b/nixos/modules/system/boot/loader/loader.nix
index 7fbda9ef0f57..01475f79b9c2 100644
--- a/nixos/modules/system/boot/loader/loader.nix
+++ b/nixos/modules/system/boot/loader/loader.nix
@@ -3,6 +3,11 @@
with lib;
{
+ imports = [
+ (mkRenamedOptionModule [ "boot" "loader" "grub" "timeout" ] [ "boot" "loader" "timeout" ])
+ (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "timeout" ] [ "boot" "loader" "timeout" ])
+ ];
+
options = {
boot.loader.timeout = mkOption {
default = 5;
@@ -12,4 +17,4 @@ with lib;
'';
};
};
-}
\ No newline at end of file
+}
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index a4029d766b05..0bb8396a44fc 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -126,7 +126,7 @@ let
gpg-agent --daemon --scdaemon-program $out/bin/scdaemon > /dev/null 2> /dev/null
''}
-
+
# Disable all input echo for the whole stage. We could use read -s
# instead but that would ocasionally leak characters between read
# invocations.
@@ -417,6 +417,9 @@ let
in
{
+ imports = [
+ (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
+ ];
options = {
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 85a106527fe0..58d914d08106 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -10,8 +10,8 @@ let
checkLink = checkUnitConfig "Link" [
(assertOnlyFields [
- "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "OriginalName"
- "MTUBytes" "BitsPerSecond" "Duplex" "AutoNegotiation" "WakeOnLan" "Port"
+ "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name" "OriginalName"
+ "MTUBytes" "BitsPerSecond" "Duplex" "AutoNegotiation" "WakeOnLan" "Port" "Advertise"
"TCPSegmentationOffload" "TCP6SegmentationOffload" "GenericSegmentationOffload"
"GenericReceiveOffload" "LargeReceiveOffload" "RxChannels" "TxChannels"
"OtherChannels" "CombinedChannels"
@@ -201,7 +201,7 @@ let
(assertValueOneOf "IPv6AcceptRA" boolValues)
(assertValueOneOf "IPv4ProxyARP" boolValues)
(assertValueOneOf "IPv6ProxyNDP" boolValues)
- (assertValueOneOf "IPv6PrefixDelegation" boolValues)
+ (assertValueOneOf "IPv6PrefixDelegation" (boolValues ++ [ "dhcpv6" "static" ]))
(assertValueOneOf "ActiveSlave" boolValues)
(assertValueOneOf "PrimarySlave" boolValues)
(assertValueOneOf "ConfigureWithoutCarrier" boolValues)
@@ -276,7 +276,7 @@ let
(assertValueOneOf "ARP" boolValues)
(assertValueOneOf "Multicast" boolValues)
(assertValueOneOf "Unmanaged" boolValues)
- (assertValueOneOf "RequiredForOnline" boolValues)
+ (assertValueOneOf "RequiredForOnline" (boolValues ++ ["off" "no-carrier" "dormant" "degraded-carrier" "carrier" "degraded" "enslaved" "routable"]))
];
@@ -924,6 +924,8 @@ in
config = mkIf config.systemd.network.enable {
+ users.users.systemd-network.group = "systemd-network";
+
systemd.additionalUpstreamSystemUnits = [
"systemd-networkd.service" "systemd-networkd-wait-online.service"
];
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index adca3c3f66e7..23fce22366d8 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -25,6 +25,7 @@ let
[Daemon]
ShowDelay=0
Theme=${cfg.theme}
+ ${cfg.extraConfig}
'';
in
@@ -65,6 +66,15 @@ in
'';
};
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Literal string to append to configFile
+ and the config file generated by the plymouth module.
+ '';
+ };
+
};
};
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index 3ea96f8e4645..da61c64faf8b 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -136,6 +136,8 @@ in
}
];
+ users.users.resolved.group = "systemd-resolve";
+
systemd.additionalUpstreamSystemUnits = [
"systemd-resolved.service"
];
diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix
index 3ddd45b13482..1e2435e36f0c 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixos/modules/system/boot/systemd-nspawn.nix
@@ -126,7 +126,7 @@ in {
systemd.services."systemd-nspawn@".serviceConfig.ExecStart = [
"" # deliberately empty. signals systemd to override the ExecStart
# Only difference between upstream is that we do not pass the -U flag
- "${pkgs.systemd}/bin/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%i"
+ "${config.systemd.package}/bin/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%i"
];
}
];
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index c1f2c98afcd8..bee21f1a8f36 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -24,7 +24,7 @@ in rec {
in
if isList (head defs'')
then concatLists defs''
- else mergeOneOption loc defs';
+ else mergeEqualOption loc defs';
};
sharedOptions = {
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 33b350902a1a..7951dcc816a3 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -63,6 +63,7 @@ let
"systemd-logind.service"
"autovt@.service"
"systemd-user-sessions.service"
+ "dbus-org.freedesktop.import1.service"
"dbus-org.freedesktop.machine1.service"
"user@.service"
"user-runtime-dir@.service"
@@ -145,6 +146,7 @@ let
"user.slice"
"machine.slice"
"machines.target"
+ "systemd-importd.service"
"systemd-machined.service"
"systemd-nspawn@.service"
@@ -406,7 +408,6 @@ let
in
{
-
###### interface
options = {
@@ -1004,5 +1005,7 @@ in
[ (mkRenamedOptionModule [ "boot" "systemd" "sockets" ] [ "systemd" "sockets" ])
(mkRenamedOptionModule [ "boot" "systemd" "targets" ] [ "systemd" "targets" ])
(mkRenamedOptionModule [ "boot" "systemd" "services" ] [ "systemd" "services" ])
+ (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
+ (mkRemovedOptionModule [ "systemd" "generator-packages" ] "Use systemd.packages instead.")
];
}
diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix
index 8282cdd6f3aa..9e2f36ca01f8 100644
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixos/modules/system/boot/timesyncd.nix
@@ -20,6 +20,18 @@ with lib;
The set of NTP servers from which to synchronise.
'';
};
+ extraConfig = mkOption {
+ default = "";
+ type = types.lines;
+ example = ''
+ PollIntervalMaxSec=180
+ '';
+ description = ''
+ Extra config options for systemd-timesyncd. See
+
+ timesyncd.conf(5) for available options.
+ '';
+ };
};
};
@@ -35,9 +47,13 @@ with lib;
environment.etc."systemd/timesyncd.conf".text = ''
[Time]
NTP=${concatStringsSep " " config.services.timesyncd.servers}
+ ${config.services.timesyncd.extraConfig}
'';
- users.users.systemd-timesync.uid = config.ids.uids.systemd-timesync;
+ users.users.systemd-timesync = {
+ uid = config.ids.uids.systemd-timesync;
+ group = "systemd-timesync";
+ };
users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync;
system.activationScripts.systemd-timesyncd-migration = mkIf (versionOlder config.system.stateVersion "19.09") ''
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index e0e8bb1f03de..ddcc0ed8f5a4 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -25,6 +25,9 @@ let
'';
nfsConfFile = pkgs.writeText "nfs.conf" cfg.extraConfig;
+ requestKeyConfFile = pkgs.writeText "request-key.conf" ''
+ create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d
+ '';
cfg = config.services.nfs;
@@ -57,9 +60,12 @@ in
systemd.packages = [ pkgs.nfs-utils ];
+ environment.systemPackages = [ pkgs.keyutils ];
+
environment.etc = {
"idmapd.conf".source = idmapdConfFile;
"nfs.conf".source = nfsConfFile;
+ "request-key.conf".source = requestKeyConfFile;
};
systemd.services.nfs-blkmap =
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index fe11917c609c..d14ba98ec48b 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -12,6 +12,7 @@ let
cfgSnapFlags = cfgSnapshots.flags;
cfgScrub = config.services.zfs.autoScrub;
cfgTrim = config.services.zfs.trim;
+ cfgZED = config.services.zfs.zed;
inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems;
inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems;
@@ -87,10 +88,25 @@ let
}
'';
+ zedConf = generators.toKeyValue {
+ mkKeyValue = generators.mkKeyValueDefault {
+ mkValueString = v:
+ if isInt v then toString v
+ else if isString v then "\"${v}\""
+ else if true == v then "1"
+ else if false == v then "0"
+ else if isList v then "\"" + (concatStringsSep " " v) + "\""
+ else err "this value is" (toString v);
+ } "=";
+ } cfgZED.settings;
in
{
+ imports = [
+ (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.")
+ ];
+
###### interface
options = {
@@ -312,6 +328,32 @@ in
'';
};
};
+
+ services.zfs.zed.settings = mkOption {
+ type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
+ example = literalExample ''
+ {
+ ZED_DEBUG_LOG = "/tmp/zed.debug.log";
+
+ ZED_EMAIL_ADDR = [ "root" ];
+ ZED_EMAIL_PROG = "mail";
+ ZED_EMAIL_OPTS = "-s '@SUBJECT@' @ADDRESS@";
+
+ ZED_NOTIFY_INTERVAL_SECS = 3600;
+ ZED_NOTIFY_VERBOSE = false;
+
+ ZED_USE_ENCLOSURE_LEDS = true;
+ ZED_SCRUB_AFTER_RESILVER = false;
+ }
+ '';
+ description = ''
+ ZFS Event Daemon /etc/zfs/zed.d/zed.rc content
+
+ See
+ zed 8
+ for details on ZED and the scripts in /etc/zfs/zed.d to find the possible variables
+ '';
+ };
};
###### implementation
@@ -389,8 +431,32 @@ in
zfsSupport = true;
};
- environment.etc."zfs/zed.d".source = "${packages.zfsUser}/etc/zfs/zed.d/";
- environment.etc."zfs/zpool.d".source = "${packages.zfsUser}/etc/zfs/zpool.d/";
+ services.zfs.zed.settings = {
+ ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail";
+ };
+
+ environment.etc = genAttrs
+ (map
+ (file: "zfs/zed.d/${file}")
+ [
+ "all-syslog.sh"
+ "pool_import-led.sh"
+ "resilver_finish-start-scrub.sh"
+ "statechange-led.sh"
+ "vdev_attach-led.sh"
+ "zed-functions.sh"
+ "data-notify.sh"
+ "resilver_finish-notify.sh"
+ "scrub_finish-notify.sh"
+ "statechange-notify.sh"
+ "vdev_clear-led.sh"
+ ]
+ )
+ (file: { source = "${packages.zfsUser}/etc/${file}"; })
+ // {
+ "zfs/zed.d/zed.rc".text = zedConf;
+ "zfs/zpool.d".source = "${packages.zfsUser}/etc/zfs/zpool.d/";
+ };
system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck
environment.systemPackages = [ packages.zfsUser ]
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
deleted file mode 100644
index c6ba998b19e6..000000000000
--- a/nixos/modules/tasks/kbd.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- makeColor = n: value: "COLOR_${toString n}=${value}";
- makeColorCS =
- let positions = [ "0" "1" "2" "3" "4" "5" "6" "7" "8" "9" "A" "B" "C" "D" "E" "F" ];
- in n: value: "\\033]P${elemAt positions (n - 1)}${value}";
- colors = concatImapStringsSep "\n" makeColor config.i18n.consoleColors;
-
- isUnicode = hasSuffix "UTF-8" (toUpper config.i18n.defaultLocale);
-
- optimizedKeymap = pkgs.runCommand "keymap" {
- nativeBuildInputs = [ pkgs.buildPackages.kbd ];
- LOADKEYS_KEYMAP_PATH = "${kbdEnv}/share/keymaps/**";
- preferLocalBuild = true;
- } ''
- loadkeys -b ${optionalString isUnicode "-u"} "${config.i18n.consoleKeyMap}" > $out
- '';
-
- # Sadly, systemd-vconsole-setup doesn't support binary keymaps.
- vconsoleConf = pkgs.writeText "vconsole.conf" ''
- KEYMAP=${config.i18n.consoleKeyMap}
- FONT=${config.i18n.consoleFont}
- ${colors}
- '';
-
- kbdEnv = pkgs.buildEnv {
- name = "kbd-env";
- paths = [ pkgs.kbd ] ++ config.i18n.consolePackages;
- pathsToLink = [ "/share/consolefonts" "/share/consoletrans" "/share/keymaps" "/share/unimaps" ];
- };
-
- setVconsole = !config.boot.isContainer;
-in
-
-{
- ###### interface
-
- options = {
-
- # most options are defined in i18n.nix
-
- # FIXME: still needed?
- boot.extraTTYs = mkOption {
- default = [];
- type = types.listOf types.str;
- example = ["tty8" "tty9"];
- description = ''
- Tty (virtual console) devices, in addition to the consoles on
- which mingetty and syslogd run, that must be initialised.
- Only useful if you have some program that you want to run on
- some fixed console. For example, the NixOS installation CD
- opens the manual in a web browser on console 7, so it sets
- boot.extraTTYs to ["tty7"] .
- '';
- };
-
- boot.earlyVconsoleSetup = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Enable setting font as early as possible (in initrd).
- '';
- };
-
- };
-
-
- ###### implementation
-
- config = mkMerge [
- (mkIf (!setVconsole) {
- systemd.services.systemd-vconsole-setup.enable = false;
- })
-
- (mkIf setVconsole (mkMerge [
- { environment.systemPackages = [ pkgs.kbd ];
-
- # Let systemd-vconsole-setup.service do the work of setting up the
- # virtual consoles.
- environment.etc."vconsole.conf".source = vconsoleConf;
- # Provide kbd with additional packages.
- environment.etc.kbd.source = "${kbdEnv}/share";
-
- boot.initrd.preLVMCommands = mkBefore ''
- kbd_mode ${if isUnicode then "-u" else "-a"} -C /dev/console
- printf "\033%%${if isUnicode then "G" else "@"}" >> /dev/console
- loadkmap < ${optimizedKeymap}
-
- ${optionalString config.boot.earlyVconsoleSetup ''
- setfont -C /dev/console $extraUtils/share/consolefonts/font.psf
- ''}
-
- ${concatImapStringsSep "\n" (n: color: ''
- printf "${makeColorCS n color}" >> /dev/console
- '') config.i18n.consoleColors}
- '';
-
- systemd.services.systemd-vconsole-setup =
- { before = [ "display-manager.service" ];
- after = [ "systemd-udev-settle.service" ];
- restartTriggers = [ vconsoleConf kbdEnv ];
- };
- }
-
- (mkIf config.boot.earlyVconsoleSetup {
- boot.initrd.extraUtilsCommands = ''
- mkdir -p $out/share/consolefonts
- ${if substring 0 1 config.i18n.consoleFont == "/" then ''
- font="${config.i18n.consoleFont}"
- '' else ''
- font="$(echo ${kbdEnv}/share/consolefonts/${config.i18n.consoleFont}.*)"
- ''}
- if [[ $font == *.gz ]]; then
- gzip -cd $font > $out/share/consolefonts/font.psf
- else
- cp -L $font $out/share/consolefonts/font.psf
- fi
- '';
- })
- ]))
- ];
-
-}
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 9ffa1089ee69..e25dc0c0b39a 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -60,8 +60,8 @@ in
let
domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain);
genericNetwork = override:
- let gateway = optional (cfg.defaultGateway != null) cfg.defaultGateway.address
- ++ optional (cfg.defaultGateway6 != null) cfg.defaultGateway6.address;
+ let gateway = optional (cfg.defaultGateway != null && (cfg.defaultGateway.address or "") != "") cfg.defaultGateway.address
+ ++ optional (cfg.defaultGateway6 != null && (cfg.defaultGateway6.address or "") != "") cfg.defaultGateway6.address;
in optionalAttrs (gateway != [ ]) {
routes = override [
{
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 1a11d9ce7c26..1baeab53b0c2 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -15,7 +15,7 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
#
# One particular example are the boot tests where we want instrumentation
# within the images but not other stuff like setting up 9p filesystems.
- options.virtualisation.qemu.program = mkOption { type = types.path; };
+ options.virtualisation.qemu = { };
config = {
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index f7a37d8c9f3b..6ff6bdd30c20 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -10,6 +10,7 @@ with lib;
nix.optimise.automatic = mkDefault false; # the store is host managed
services.udisks2.enable = mkDefault false;
powerManagement.enable = mkDefault false;
+ documentation.nixos.enable = mkDefault false;
networking.useHostResolvConf = mkDefault true;
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 691ee2c136ec..09678ce9ea71 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -149,7 +149,7 @@ let
--setenv PATH="$PATH" \
${optionalString cfg.ephemeral "--ephemeral"} \
${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then
- ''--capability="${concatStringsSep " " cfg.additionalCapabilities}"'' else ""
+ ''--capability="${concatStringsSep "," cfg.additionalCapabilities}"'' else ""
} \
${if cfg.tmpfs != null && cfg.tmpfs != [] then
''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' else ""
diff --git a/nixos/modules/virtualisation/digital-ocean-config.nix b/nixos/modules/virtualisation/digital-ocean-config.nix
new file mode 100644
index 000000000000..88cb0cd450e8
--- /dev/null
+++ b/nixos/modules/virtualisation/digital-ocean-config.nix
@@ -0,0 +1,197 @@
+{ config, pkgs, lib, modulesPath, ... }:
+with lib;
+{
+ imports = [
+ (modulesPath + "/profiles/qemu-guest.nix")
+ (modulesPath + "/virtualisation/digital-ocean-init.nix")
+ ];
+ options.virtualisation.digitalOcean = with types; {
+ setRootPassword = mkOption {
+ type = bool;
+ default = false;
+ example = true;
+ description = "Whether to set the root password from the Digital Ocean metadata";
+ };
+ setSshKeys = mkOption {
+ type = bool;
+ default = true;
+ example = true;
+ description = "Whether to fetch ssh keys from Digital Ocean";
+ };
+ seedEntropy = mkOption {
+ type = bool;
+ default = true;
+ example = true;
+ description = "Whether to run the kernel RNG entropy seeding script from the Digital Ocean vendor data";
+ };
+ };
+ config =
+ let
+ cfg = config.virtualisation.digitalOcean;
+ hostName = config.networking.hostName;
+ doMetadataFile = "/run/do-metadata/v1.json";
+ in mkMerge [{
+ fileSystems."/" = {
+ device = "/dev/disk/by-label/nixos";
+ autoResize = true;
+ fsType = "ext4";
+ };
+ boot = {
+ growPartition = true;
+ kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
+ initrd.kernelModules = [ "virtio_scsi" ];
+ kernelModules = [ "virtio_pci" "virtio_net" ];
+ loader = {
+ grub.device = "/dev/vda";
+ timeout = 0;
+ grub.configurationLimit = 0;
+ };
+ };
+ services.openssh = {
+ enable = mkDefault true;
+ passwordAuthentication = mkDefault false;
+ };
+ services.do-agent.enable = mkDefault true;
+ networking = {
+ hostName = mkDefault ""; # use Digital Ocean metadata server
+ };
+
+ /* Check for and wait for the metadata server to become reachable.
+ * This serves as a dependency for all the other metadata services. */
+ systemd.services.digitalocean-metadata = {
+ path = [ pkgs.curl ];
+ description = "Get host metadata provided by Digitalocean";
+ script = ''
+ set -eu
+ DO_DELAY_ATTEMPTS=0
+ while ! curl -fsSL -o $RUNTIME_DIRECTORY/v1.json http://169.254.169.254/metadata/v1.json; do
+ DO_DELAY_ATTEMPTS=$((DO_DELAY_ATTEMPTS + 1))
+ if (( $DO_DELAY_ATTEMPTS >= $DO_DELAY_ATTEMPTS_MAX )); then
+ echo "giving up"
+ exit 1
+ fi
+
+ echo "metadata unavailable, trying again in 1s..."
+ sleep 1
+ done
+ chmod 600 $RUNTIME_DIRECTORY/v1.json
+ '';
+ environment = {
+ DO_DELAY_ATTEMPTS_MAX = "10";
+ };
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ RuntimeDirectory = "do-metadata";
+ RuntimeDirectoryPreserve = "yes";
+ };
+ unitConfig = {
+ ConditionPathExists = "!${doMetadataFile}";
+ After = [ "network-pre.target" ] ++
+ optional config.networking.dhcpcd.enable "dhcpcd.service" ++
+ optional config.systemd.network.enable "systemd-networkd.service";
+ };
+ };
+
+ /* Fetch the root password from the digital ocean metadata.
+ * There is no specific route for this, so we use jq to get
+ * it from the One Big JSON metadata blob */
+ systemd.services.digitalocean-set-root-password = mkIf cfg.setRootPassword {
+ path = [ pkgs.shadow pkgs.jq ];
+ description = "Set root password provided by Digitalocean";
+ wantedBy = [ "multi-user.target" ];
+ script = ''
+ set -eo pipefail
+ ROOT_PASSWORD=$(jq -er '.auth_key' ${doMetadataFile})
+ echo "root:$ROOT_PASSWORD" | chpasswd
+ mkdir -p /etc/do-metadata/set-root-password
+ '';
+ unitConfig = {
+ ConditionPathExists = "!/etc/do-metadata/set-root-password";
+ Before = optional config.services.openssh.enable "sshd.service";
+ After = [ "digitalocean-metadata.service" ];
+ Requires = [ "digitalocean-metadata.service" ];
+ };
+ serviceConfig = {
+ Type = "oneshot";
+ };
+ };
+
+ /* Set the hostname from Digital Ocean, unless the user configured it in
+ * the NixOS configuration. The cached metadata file isn't used here
+ * because the hostname is a mutable part of the droplet. */
+ systemd.services.digitalocean-set-hostname = mkIf (hostName == "") {
+ path = [ pkgs.curl pkgs.nettools ];
+ description = "Set hostname provided by Digitalocean";
+ wantedBy = [ "network.target" ];
+ script = ''
+ set -e
+ DIGITALOCEAN_HOSTNAME=$(curl -fsSL http://169.254.169.254/metadata/v1/hostname)
+ hostname "$DIGITALOCEAN_HOSTNAME"
+ if [[ ! -e /etc/hostname || -w /etc/hostname ]]; then
+ printf "%s\n" "$DIGITALOCEAN_HOSTNAME" > /etc/hostname
+ fi
+ '';
+ unitConfig = {
+ Before = [ "network.target" ];
+ After = [ "digitalocean-metadata.service" ];
+ Wants = [ "digitalocean-metadata.service" ];
+ };
+ serviceConfig = {
+ Type = "oneshot";
+ };
+ };
+
+ /* Fetch the ssh keys for root from Digital Ocean */
+ systemd.services.digitalocean-ssh-keys = mkIf cfg.setSshKeys {
+ description = "Set root ssh keys provided by Digital Ocean";
+ wantedBy = [ "multi-user.target" ];
+ path = [ pkgs.jq ];
+ script = ''
+ set -e
+ mkdir -m 0700 -p /root/.ssh
+ jq -er '.public_keys[]' ${doMetadataFile} > /root/.ssh/authorized_keys
+ chmod 600 /root/.ssh/authorized_keys
+ '';
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ };
+ unitConfig = {
+ ConditionPathExists = "!/root/.ssh/authorized_keys";
+ Before = optional config.services.openssh.enable "sshd.service";
+ After = [ "digitalocean-metadata.service" ];
+ Requires = [ "digitalocean-metadata.service" ];
+ };
+ };
+
+ /* Initialize the RNG by running the entropy-seed script from the
+ * Digital Ocean metadata
+ */
+ systemd.services.digitalocean-entropy-seed = mkIf cfg.seedEntropy {
+ description = "Run the kernel RNG entropy seeding script from the Digital Ocean vendor data";
+ wantedBy = [ "network.target" ];
+ path = [ pkgs.jq pkgs.mpack ];
+ script = ''
+ set -eo pipefail
+ TEMPDIR=$(mktemp -d)
+ jq -er '.vendor_data' ${doMetadataFile} | munpack -tC $TEMPDIR
+ ENTROPY_SEED=$(grep -rl "DigitalOcean Entropy Seed script" $TEMPDIR)
+ ${pkgs.runtimeShell} $ENTROPY_SEED
+ rm -rf $TEMPDIR
+ '';
+ unitConfig = {
+ Before = [ "network.target" ];
+ After = [ "digitalocean-metadata.service" ];
+ Requires = [ "digitalocean-metadata.service" ];
+ };
+ serviceConfig = {
+ Type = "oneshot";
+ };
+ };
+
+ }
+ ];
+ meta.maintainers = with maintainers; [ arianvp eamsden ];
+}
+
diff --git a/nixos/modules/virtualisation/digital-ocean-image.nix b/nixos/modules/virtualisation/digital-ocean-image.nix
new file mode 100644
index 000000000000..b582e235d435
--- /dev/null
+++ b/nixos/modules/virtualisation/digital-ocean-image.nix
@@ -0,0 +1,69 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+ cfg = config.virtualisation.digitalOceanImage;
+in
+{
+
+ imports = [ ./digital-ocean-config.nix ];
+
+ options = {
+ virtualisation.digitalOceanImage.diskSize = mkOption {
+ type = with types; int;
+ default = 4096;
+ description = ''
+ Size of disk image. Unit is MB.
+ '';
+ };
+
+ virtualisation.digitalOceanImage.configFile = mkOption {
+ type = with types; nullOr path;
+ default = null;
+ description = ''
+ A path to a configuration file which will be placed at
+ /etc/nixos/configuration.nix and be used when switching
+ to a new configuration. If set to null , a default
+ configuration is used that imports
+ (modulesPath + "/virtualisation/digital-ocean-config.nix") .
+ '';
+ };
+
+ virtualisation.digitalOceanImage.compressionMethod = mkOption {
+ type = types.enum [ "gzip" "bzip2" ];
+ default = "gzip";
+ example = "bzip2";
+ description = ''
+ Disk image compression method. Choose bzip2 to generate smaller images that
+ take longer to generate but will consume less metered storage space on your
+ Digital Ocean account.
+ '';
+ };
+ };
+
+ #### implementation
+ config = {
+
+ system.build.digitalOceanImage = import ../../lib/make-disk-image.nix {
+ name = "digital-ocean-image";
+ format = "qcow2";
+ postVM = let
+ compress = {
+ "gzip" = "${pkgs.gzip}/bin/gzip";
+ "bzip2" = "${pkgs.bzip2}/bin/bzip2";
+ }.${cfg.compressionMethod};
+ in ''
+ ${compress} $diskImage
+ '';
+ configFile = if cfg.configFile == null
+ then config.virtualisation.digitalOcean.defaultConfigFile
+ else cfg.configFile;
+ inherit (cfg) diskSize;
+ inherit config lib pkgs;
+ };
+
+ };
+
+ meta.maintainers = with maintainers; [ arianvp eamsden ];
+
+}
diff --git a/nixos/modules/virtualisation/digital-ocean-init.nix b/nixos/modules/virtualisation/digital-ocean-init.nix
new file mode 100644
index 000000000000..02f4de009fa8
--- /dev/null
+++ b/nixos/modules/virtualisation/digital-ocean-init.nix
@@ -0,0 +1,95 @@
+{ config, pkgs, lib, ... }:
+with lib;
+let
+ cfg = config.virtualisation.digitalOcean;
+ defaultConfigFile = pkgs.writeText "digitalocean-configuration.nix" ''
+ { modulesPath, lib, ... }:
+ {
+ imports = lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [
+ (modulesPath + "/virtualisation/digital-ocean-config.nix")
+ ];
+ }
+ '';
+in {
+ options.virtualisation.digitalOcean.rebuildFromUserData = mkOption {
+ type = types.bool;
+ default = true;
+ example = true;
+ description = "Whether to reconfigure the system from Digital Ocean user data";
+ };
+ options.virtualisation.digitalOcean.defaultConfigFile = mkOption {
+ type = types.path;
+ default = defaultConfigFile;
+ defaultText = ''
+ The default configuration imports user-data if applicable and
+ (modulesPath + "/virtualisation/digital-ocean-config.nix") .
+ '';
+ description = ''
+ A path to a configuration file which will be placed at
+ /etc/nixos/configuration.nix and be used when switching to
+ a new configuration.
+ '';
+ };
+
+ config = {
+ systemd.services.digitalocean-init = mkIf cfg.rebuildFromUserData {
+ description = "Reconfigure the system from Digital Ocean userdata on startup";
+ wantedBy = [ "network-online.target" ];
+ unitConfig = {
+ ConditionPathExists = "!/etc/nixos/do-userdata.nix";
+ After = [ "digitalocean-metadata.service" "network-online.target" ];
+ Requires = [ "digitalocean-metadata.service" ];
+ X-StopOnRemoval = false;
+ };
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ };
+ restartIfChanged = false;
+ path = [ pkgs.jq pkgs.gnused pkgs.gnugrep pkgs.systemd config.nix.package config.system.build.nixos-rebuild ];
+ environment = {
+ HOME = "/root";
+ NIX_PATH = concatStringsSep ":" [
+ "/nix/var/nix/profiles/per-user/root/channels/nixos"
+ "nixos-config=/etc/nixos/configuration.nix"
+ "/nix/var/nix/profiles/per-user/root/channels"
+ ];
+ };
+ script = ''
+ set -e
+ echo "attempting to fetch configuration from Digital Ocean user data..."
+ userData=$(mktemp)
+ if jq -er '.user_data' /run/do-metadata/v1.json > $userData; then
+ # If the user-data looks like it could be a nix expression,
+ # copy it over. Also, look for a magic three-hash comment and set
+ # that as the channel.
+ if nix-instantiate --parse $userData > /dev/null; then
+ channels="$(grep '^###' "$userData" | sed 's|###\s*||')"
+ printf "%s" "$channels" | while read channel; do
+ echo "writing channel: $channel"
+ done
+
+ if [[ -n "$channels" ]]; then
+ printf "%s" "$channels" > /root/.nix-channels
+ nix-channel --update
+ fi
+
+ echo "setting configuration from Digital Ocean user data"
+ cp "$userData" /etc/nixos/do-userdata.nix
+ if [[ ! -e /etc/nixos/configuration.nix ]]; then
+ install -m0644 ${cfg.defaultConfigFile} /etc/nixos/configuration.nix
+ fi
+ else
+ echo "user data does not appear to be a Nix expression; ignoring"
+ exit
+ fi
+
+ nixos-rebuild switch
+ else
+ echo "no user data is available"
+ fi
+ '';
+ };
+ };
+ meta.maintainers = with maintainers; [ arianvp eamsden ];
+}
diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index 82451787e8a1..629125350182 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -7,6 +7,10 @@
with lib;
{
+ imports = [
+ (mkRemovedOptionModule [ "ec2" "metadata" ] "")
+ ];
+
config = {
systemd.services.apply-ec2-data =
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 16b79d869193..52d852894ce5 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -28,6 +28,11 @@ let
in {
+ imports = [
+ (mkRemovedOptionModule [ "virtualisation" "libvirtd" "enableKVM" ]
+ "Set the option `virtualisation.libvirtd.qemuPackage' instead.")
+ ];
+
###### interface
options.virtualisation.libvirtd = {
@@ -146,7 +151,8 @@ in {
# this file is expected in /etc/qemu and not sysconfdir (/var/lib)
etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e:
"allow ${e}") cfg.allowedBridges;
- systemPackages = with pkgs; [ libvirt libressl.nc cfg.qemuPackage ];
+ systemPackages = with pkgs; [ libvirt libressl.nc iptables cfg.qemuPackage ];
+ etc.ethertypes.source = "${pkgs.iptables}/etc/ethertypes";
};
boot.kernelModules = [ "tun" ];
diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix
index 9b5adaf08249..f484d5ee59a8 100644
--- a/nixos/modules/virtualisation/lxc.nix
+++ b/nixos/modules/virtualisation/lxc.nix
@@ -58,7 +58,7 @@ in
''
This is the config file for managing unprivileged user network
administration access in LXC. See
- lxc-user-net 5
+ lxc-usernet 5
.
'';
};
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
index 505c11abd208..b4934a86cf56 100644
--- a/nixos/modules/virtualisation/lxd.nix
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -35,6 +35,18 @@ in
with nixos.
'';
};
+ recommendedSysctlSettings = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ enables various settings to avoid common pitfalls when
+ running containers requiring many file operations.
+ Fixes errors like "Too many open files" or
+ "neighbour: ndisc_cache: neighbor table overflow!".
+ See https://lxd.readthedocs.io/en/latest/production-setup/
+ for details.
+ '';
+ };
};
};
@@ -69,8 +81,11 @@ in
ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --group lxd";
Type = "simple";
KillMode = "process"; # when stopping, leave the containers alone
+ LimitMEMLOCK = "infinity";
+ LimitNOFILE = "1048576";
+ LimitNPROC = "infinity";
+ TasksMax = "infinity";
};
-
};
users.groups.lxd.gid = config.ids.gids.lxd;
@@ -79,5 +94,16 @@ in
subUidRanges = [ { startUid = 1000000; count = 65536; } ];
subGidRanges = [ { startGid = 1000000; count = 65536; } ];
};
+
+ boot.kernel.sysctl = mkIf cfg.recommendedSysctlSettings {
+ "fs.inotify.max_queued_events" = 1048576;
+ "fs.inotify.max_user_instances" = 1048576;
+ "fs.inotify.max_user_watches" = 1048576;
+ "vm.max_map_count" = 262144;
+ "kernel.dmesg_restrict" = 1;
+ "net.ipv4.neigh.default.gc_thresh3" = 8192;
+ "net.ipv6.neigh.default.gc_thresh3" = 8192;
+ "kernel.keys.maxkeys" = 2000;
+ };
};
}
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index edec37402308..6b8ad83661fe 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -42,6 +42,9 @@ in {
default = false;
description = ''
Whether to start racoon service for openvswitch.
+ Supported only if openvswitch version is less than 2.6.0.
+ Use virtualisation.vswitch.package = pkgs.openvswitch-lts
+ for a version that supports ipsec over GRE.
'';
};
};
@@ -89,6 +92,13 @@ in {
"${cfg.package}/share/openvswitch/vswitch.ovsschema"
fi
chmod -R +w /var/db/openvswitch
+ if ${cfg.package}/bin/ovsdb-tool needs-conversion /var/db/openvswitch/conf.db | grep -q "yes"
+ then
+ echo "Performing database upgrade"
+ ${cfg.package}/bin/ovsdb-tool convert /var/db/openvswitch/conf.db
+ else
+ echo "Database already up to date"
+ fi
'';
serviceConfig = {
ExecStart =
@@ -133,7 +143,7 @@ in {
};
}
- (mkIf cfg.ipsec {
+ (mkIf (cfg.ipsec && (versionOlder cfg.package.version "2.6.0")) {
services.racoon.enable = true;
services.racoon.configPath = "${runDir}/ipsec/etc/racoon/racoon.conf";
@@ -172,5 +182,4 @@ in {
'';
};
})]));
-
}
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index e313d2b411bb..31d332e9f07a 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -620,7 +620,7 @@ in
# Wireless won't work in the VM.
networking.wireless.enable = mkVMOverride false;
- networking.connman.enable = mkVMOverride false;
+ services.connman.enable = mkVMOverride false;
# Speed up booting by not waiting for ARP.
networking.dhcpcd.extraConfig = "noarp";
diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index f418f849759f..962a9059ea47 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -8,6 +8,10 @@ let
xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse;
in
{
+ imports = [
+ (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ])
+ ];
+
options.virtualisation.vmware.guest = {
enable = mkEnableOption "VMWare Guest Support";
headless = mkOption {
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 06d5c63476f9..6fd54c527580 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -9,6 +9,11 @@ let
in
{
+ imports = [
+ (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.")
+ (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ])
+ ];
+
###### interface
options = {
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 9e2109d88b5f..ca9c6f9a7f91 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -63,8 +63,7 @@ in rec {
#(all nixos.tests.containers)
(all nixos.tests.containers-imperative)
- (all nixos.tests.containers-ipv4)
- (all nixos.tests.containers-ipv6)
+ (all nixos.tests.containers-ip)
nixos.tests.chromium.x86_64-linux or []
(all nixos.tests.firefox)
(all nixos.tests.firewall)
@@ -121,8 +120,8 @@ in rec {
(all nixos.tests.networking.scripted.macvlan)
(all nixos.tests.networking.scripted.sit)
(all nixos.tests.networking.scripted.vlan)
- (all nixos.tests.nfs3)
- (all nixos.tests.nfs4)
+ (all nixos.tests.nfs3.simple)
+ (all nixos.tests.nfs4.simple)
(all nixos.tests.openssh)
(all nixos.tests.php-pcre)
(all nixos.tests.predictable-interface-names.predictable)
@@ -133,11 +132,9 @@ in rec {
(all nixos.tests.proxy)
(all nixos.tests.sddm.default)
(all nixos.tests.simple)
- (all nixos.tests.slim)
(all nixos.tests.switchTest)
(all nixos.tests.udisks2)
(all nixos.tests.xfce)
- (all nixos.tests.xfce4-14)
nixpkgs.tarball
(all allSupportedNixpkgs.emacs)
diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 84af457801a1..74c16e990f35 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -32,8 +32,7 @@ in rec {
tests = {
inherit (nixos'.tests)
containers-imperative
- containers-ipv4
- containers-ipv6
+ containers-ip
firewall
ipv6
login
diff --git a/nixos/tests/3proxy.nix b/nixos/tests/3proxy.nix
new file mode 100644
index 000000000000..b8e1dac0e89e
--- /dev/null
+++ b/nixos/tests/3proxy.nix
@@ -0,0 +1,162 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "3proxy";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ misuzu ];
+ };
+
+ nodes = {
+ peer0 = { lib, ... }: {
+ networking.useDHCP = false;
+ networking.interfaces.eth1 = {
+ ipv4.addresses = [
+ {
+ address = "192.168.0.1";
+ prefixLength = 24;
+ }
+ {
+ address = "216.58.211.111";
+ prefixLength = 24;
+ }
+ ];
+ };
+ };
+
+ peer1 = { lib, ... }: {
+ networking.useDHCP = false;
+ networking.interfaces.eth1 = {
+ ipv4.addresses = [
+ {
+ address = "192.168.0.2";
+ prefixLength = 24;
+ }
+ {
+ address = "216.58.211.112";
+ prefixLength = 24;
+ }
+ ];
+ };
+ # test that binding to [::] is working when ipv6 is disabled
+ networking.enableIPv6 = false;
+ services._3proxy = {
+ enable = true;
+ services = [
+ {
+ type = "admin";
+ bindPort = 9999;
+ auth = [ "none" ];
+ }
+ {
+ type = "proxy";
+ bindPort = 3128;
+ auth = [ "none" ];
+ }
+ ];
+ };
+ networking.firewall.allowedTCPPorts = [ 3128 9999 ];
+ };
+
+ peer2 = { lib, ... }: {
+ networking.useDHCP = false;
+ networking.interfaces.eth1 = {
+ ipv4.addresses = [
+ {
+ address = "192.168.0.3";
+ prefixLength = 24;
+ }
+ {
+ address = "216.58.211.113";
+ prefixLength = 24;
+ }
+ ];
+ };
+ services._3proxy = {
+ enable = true;
+ services = [
+ {
+ type = "admin";
+ bindPort = 9999;
+ auth = [ "none" ];
+ }
+ {
+ type = "proxy";
+ bindPort = 3128;
+ auth = [ "iponly" ];
+ acl = [
+ {
+ rule = "allow";
+ }
+ ];
+ }
+ ];
+ };
+ networking.firewall.allowedTCPPorts = [ 3128 9999 ];
+ };
+
+ peer3 = { lib, ... }: {
+ networking.useDHCP = false;
+ networking.interfaces.eth1 = {
+ ipv4.addresses = [
+ {
+ address = "192.168.0.4";
+ prefixLength = 24;
+ }
+ {
+ address = "216.58.211.114";
+ prefixLength = 24;
+ }
+ ];
+ };
+ services._3proxy = {
+ enable = true;
+ usersFile = pkgs.writeText "3proxy.passwd" ''
+ admin:CR:$1$.GUV4Wvk$WnEVQtaqutD9.beO5ar1W/
+ '';
+ services = [
+ {
+ type = "admin";
+ bindPort = 9999;
+ auth = [ "none" ];
+ }
+ {
+ type = "proxy";
+ bindPort = 3128;
+ auth = [ "strong" ];
+ acl = [
+ {
+ rule = "allow";
+ }
+ ];
+ }
+ ];
+ };
+ networking.firewall.allowedTCPPorts = [ 3128 9999 ];
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $peer1->waitForUnit("3proxy.service");
+
+ # test none auth
+ $peer0->succeed("${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://192.168.0.2:3128 -S -O /dev/null http://216.58.211.112:9999");
+ $peer0->succeed("${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://192.168.0.2:3128 -S -O /dev/null http://192.168.0.2:9999");
+ $peer0->succeed("${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://192.168.0.2:3128 -S -O /dev/null http://127.0.0.1:9999");
+
+ $peer2->waitForUnit("3proxy.service");
+
+ # test iponly auth
+ $peer0->succeed("${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://192.168.0.3:3128 -S -O /dev/null http://216.58.211.113:9999");
+ $peer0->fail("${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://192.168.0.3:3128 -S -O /dev/null http://192.168.0.3:9999");
+ $peer0->fail("${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://192.168.0.3:3128 -S -O /dev/null http://127.0.0.1:9999");
+
+ $peer3->waitForUnit("3proxy.service");
+
+ # test strong auth
+ $peer0->succeed("${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://admin:bigsecret\@192.168.0.4:3128 -S -O /dev/null http://216.58.211.114:9999");
+ $peer0->fail("${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://admin:bigsecret\@192.168.0.4:3128 -S -O /dev/null http://192.168.0.4:9999");
+ $peer0->fail("${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://192.168.0.4:3128 -S -O /dev/null http://216.58.211.114:9999");
+ $peer0->fail("${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://192.168.0.4:3128 -S -O /dev/null http://192.168.0.4:9999");
+ $peer0->fail("${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://192.168.0.4:3128 -S -O /dev/null http://127.0.0.1:9999");
+ '';
+})
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1d933153ffa3..111643ad69c3 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -21,6 +21,7 @@ let
else {};
in
{
+ _3proxy = handleTest ./3proxy.nix {};
acme = handleTestOn ["x86_64-linux"] ./acme.nix {};
atd = handleTest ./atd.nix {};
automysqlbackup = handleTest ./automysqlbackup.nix {};
@@ -28,7 +29,7 @@ in
babeld = handleTest ./babeld.nix {};
bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64
beanstalkd = handleTest ./beanstalkd.nix {};
- beegfs = handleTestOn ["x86_64-linux"] ./beegfs.nix {}; # beegfs is unsupported on aarch64
+ bees = handleTest ./bees.nix {};
bind = handleTest ./bind.nix {};
bittorrent = handleTest ./bittorrent.nix {};
#blivet = handleTest ./blivet.nix {}; # broken since 2017-07024
@@ -48,16 +49,16 @@ in
clickhouse = handleTest ./clickhouse.nix {};
cloud-init = handleTest ./cloud-init.nix {};
codimd = handleTest ./codimd.nix {};
- colord = handleTest ./colord.nix {};
+ consul = handleTest ./consul.nix {};
containers-bridge = handleTest ./containers-bridge.nix {};
containers-ephemeral = handleTest ./containers-ephemeral.nix {};
containers-extra_veth = handleTest ./containers-extra_veth.nix {};
containers-hosts = handleTest ./containers-hosts.nix {};
containers-imperative = handleTest ./containers-imperative.nix {};
- containers-ipv4 = handleTest ./containers-ipv4.nix {};
- containers-ipv6 = handleTest ./containers-ipv6.nix {};
+ containers-ip = handleTest ./containers-ip.nix {};
containers-macvlans = handleTest ./containers-macvlans.nix {};
containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {};
+ containers-portforward = handleTest ./containers-portforward.nix {};
containers-restart_networking = handleTest ./containers-restart_networking.nix {};
containers-tmpfs = handleTest ./containers-tmpfs.nix {};
couchdb = handleTest ./couchdb.nix {};
@@ -88,30 +89,25 @@ in
firewall = handleTest ./firewall.nix {};
fish = handleTest ./fish.nix {};
flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {};
- flatpak = handleTest ./flatpak.nix {};
- flatpak-builder = handleTest ./flatpak-builder.nix {};
fluentd = handleTest ./fluentd.nix {};
fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {};
fsck = handleTest ./fsck.nix {};
- fwupd = handleTestOn ["x86_64-linux"] ./fwupd.nix {}; # libsmbios is unsupported on aarch64
- gdk-pixbuf = handleTest ./gdk-pixbuf.nix {};
gotify-server = handleTest ./gotify-server.nix {};
gitea = handleTest ./gitea.nix {};
gitlab = handleTest ./gitlab.nix {};
gitolite = handleTest ./gitolite.nix {};
- gjs = handleTest ./gjs.nix {};
- glib-networking = handleTest ./glib-networking.nix {};
+ gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {};
glusterfs = handleTest ./glusterfs.nix {};
gnome3-xorg = handleTest ./gnome3-xorg.nix {};
gnome3 = handleTest ./gnome3.nix {};
- gnome-photos = handleTest ./gnome-photos.nix {};
+ installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {});
gocd-agent = handleTest ./gocd-agent.nix {};
gocd-server = handleTest ./gocd-server.nix {};
google-oslogin = handleTest ./google-oslogin {};
- graphene = handleTest ./graphene.nix {};
grafana = handleTest ./grafana.nix {};
graphite = handleTest ./graphite.nix {};
graylog = handleTest ./graylog.nix {};
+ gvisor = handleTest ./gvisor.nix {};
hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {};
hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {};
handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {};
@@ -135,8 +131,8 @@ in
jackett = handleTest ./jackett.nix {};
jellyfin = handleTest ./jellyfin.nix {};
jenkins = handleTest ./jenkins.nix {};
- jormungandr = handleTest ./jormungandr.nix {};
kafka = handleTest ./kafka.nix {};
+ keepalived = handleTest ./keepalived.nix {};
kerberos = handleTest ./kerberos/default.nix {};
kernel-latest = handleTest ./kernel-latest.nix {};
kernel-lts = handleTest ./kernel-lts.nix {};
@@ -150,14 +146,14 @@ in
latestKernel.login = handleTest ./login.nix { latestKernel = true; };
ldap = handleTest ./ldap.nix {};
leaps = handleTest ./leaps.nix {};
- libgdata = handleTest ./libgdata.nix {};
- libxmlb = handleTest ./libxmlb.nix {};
lidarr = handleTest ./lidarr.nix {};
lightdm = handleTest ./lightdm.nix {};
limesurvey = handleTest ./limesurvey.nix {};
login = handleTest ./login.nix {};
loki = handleTest ./loki.nix {};
#logstash = handleTest ./logstash.nix {};
+ lorri = handleTest ./lorri/default.nix {};
+ magnetico = handleTest ./magnetico.nix {};
mailcatcher = handleTest ./mailcatcher.nix {};
mathics = handleTest ./mathics.nix {};
matomo = handleTest ./matomo.nix {};
@@ -196,8 +192,9 @@ in
networkingProxy = handleTest ./networking-proxy.nix {};
nextcloud = handleTest ./nextcloud {};
nexus = handleTest ./nexus.nix {};
- nfs3 = handleTest ./nfs.nix { version = 3; };
- nfs4 = handleTest ./nfs.nix { version = 4; };
+ # TODO: Test nfsv3 + Kerberos
+ nfs3 = handleTest ./nfs { version = 3; };
+ nfs4 = handleTest ./nfs { version = 4; };
nghttpx = handleTest ./nghttpx.nix {};
nginx = handleTest ./nginx.nix {};
nginx-sso = handleTest ./nginx-sso.nix {};
@@ -215,9 +212,7 @@ in
openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};
orangefs = handleTest ./orangefs.nix {};
os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {};
- osquery = handleTest ./osquery.nix {};
osrm-backend = handleTest ./osrm-backend.nix {};
- ostree = handleTest ./ostree.nix {};
overlayfs = handleTest ./overlayfs.nix {};
packagekit = handleTest ./packagekit.nix {};
pam-oath-login = handleTest ./pam-oath-login.nix {};
@@ -243,7 +238,6 @@ in
prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {};
proxy = handleTest ./proxy.nix {};
quagga = handleTest ./quagga.nix {};
- quake3 = handleTest ./quake3.nix {};
rabbitmq = handleTest ./rabbitmq.nix {};
radarr = handleTest ./radarr.nix {};
radicale = handleTest ./radicale.nix {};
@@ -257,13 +251,14 @@ in
rxe = handleTest ./rxe.nix {};
samba = handleTest ./samba.nix {};
sddm = handleTest ./sddm.nix {};
+ shiori = handleTest ./shiori.nix {};
signal-desktop = handleTest ./signal-desktop.nix {};
simple = handleTest ./simple.nix {};
- slim = handleTest ./slim.nix {};
slurm = handleTest ./slurm.nix {};
smokeping = handleTest ./smokeping.nix {};
snapper = handleTest ./snapper.nix {};
solr = handleTest ./solr.nix {};
+ spacecookie = handleTest ./spacecookie.nix {};
sonarr = handleTest ./sonarr.nix {};
strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};
sudo = handleTest ./sudo.nix {};
@@ -271,17 +266,21 @@ in
syncthing-init = handleTest ./syncthing-init.nix {};
syncthing-relay = handleTest ./syncthing-relay.nix {};
systemd = handleTest ./systemd.nix {};
+ systemd-analyze = handleTest ./systemd-analyze.nix {};
systemd-confinement = handleTest ./systemd-confinement.nix {};
systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
systemd-networkd-wireguard = handleTest ./systemd-networkd-wireguard.nix {};
+ systemd-nspawn = handleTest ./systemd-nspawn.nix {};
pdns-recursor = handleTest ./pdns-recursor.nix {};
taskserver = handleTest ./taskserver.nix {};
telegraf = handleTest ./telegraf.nix {};
tiddlywiki = handleTest ./tiddlywiki.nix {};
+ timezone = handleTest ./timezone.nix {};
tinydns = handleTest ./tinydns.nix {};
tor = handleTest ./tor.nix {};
transmission = handleTest ./transmission.nix {};
trac = handleTest ./trac.nix {};
+ trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {};
trezord = handleTest ./trezord.nix {};
trickster = handleTest ./trickster.nix {};
udisks2 = handleTest ./udisks2.nix {};
@@ -291,15 +290,15 @@ in
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
wireguard = handleTest ./wireguard {};
wireguard-generated = handleTest ./wireguard/generated.nix {};
+ wireguard-namespaces = handleTest ./wireguard/namespaces.nix {};
wordpress = handleTest ./wordpress.nix {};
xautolock = handleTest ./xautolock.nix {};
- xdg-desktop-portal = handleTest ./xdg-desktop-portal.nix {};
xfce = handleTest ./xfce.nix {};
- xfce4-14 = handleTest ./xfce4-14.nix {};
xmonad = handleTest ./xmonad.nix {};
xrdp = handleTest ./xrdp.nix {};
xss-lock = handleTest ./xss-lock.nix {};
yabar = handleTest ./yabar.nix {};
yggdrasil = handleTest ./yggdrasil.nix {};
+ zsh-history = handleTest ./zsh-history.nix {};
zookeeper = handleTest ./zookeeper.nix {};
}
diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix
index 25db72799241..c3abe5c253df 100644
--- a/nixos/tests/atd.nix
+++ b/nixos/tests/atd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
{
name = "atd";
@@ -14,18 +14,18 @@ import ./make-test.nix ({ pkgs, ... }:
# "at" has a resolution of 1 minute
testScript = ''
- startAll;
+ start_all()
- $machine->waitForUnit('atd.service'); # wait for atd to start
- $machine->fail("test -f ~root/at-1");
- $machine->fail("test -f ~alice/at-1");
+ machine.wait_for_unit("atd.service") # wait for atd to start
+ machine.fail("test -f ~root/at-1")
+ machine.fail("test -f ~alice/at-1")
- $machine->succeed("echo 'touch ~root/at-1' | at now+1min");
- $machine->succeed("su - alice -c \"echo 'touch at-1' | at now+1min\"");
+ machine.succeed("echo 'touch ~root/at-1' | at now+1min")
+ machine.succeed("su - alice -c \"echo 'touch at-1' | at now+1min\"")
- $machine->succeed("sleep 1.5m");
+ machine.succeed("sleep 1.5m")
- $machine->succeed("test -f ~root/at-1");
- $machine->succeed("test -f ~alice/at-1");
+ machine.succeed("test -f ~root/at-1")
+ machine.succeed("test -f ~alice/at-1")
'';
})
diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index ae4f54d5266a..fe027c14d5a8 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -1,5 +1,5 @@
# Test whether `avahi-daemon' and `libnss-mdns' work as expected.
-import ./make-test.nix ({ pkgs, ... } : {
+import ./make-test-python.nix ({ pkgs, ... } : {
name = "avahi";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco ];
@@ -23,45 +23,45 @@ import ./make-test.nix ({ pkgs, ... } : {
two = cfg;
};
- testScript =
- '' startAll;
+ testScript = ''
+ start_all()
- # mDNS.
- $one->waitForUnit("network.target");
- $two->waitForUnit("network.target");
+ # mDNS.
+ one.wait_for_unit("network.target")
+ two.wait_for_unit("network.target")
- $one->succeed("avahi-resolve-host-name one.local | tee out >&2");
- $one->succeed("test \"`cut -f1 < out`\" = one.local");
- $one->succeed("avahi-resolve-host-name two.local | tee out >&2");
- $one->succeed("test \"`cut -f1 < out`\" = two.local");
+ one.succeed("avahi-resolve-host-name one.local | tee out >&2")
+ one.succeed('test "`cut -f1 < out`" = one.local')
+ one.succeed("avahi-resolve-host-name two.local | tee out >&2")
+ one.succeed('test "`cut -f1 < out`" = two.local')
- $two->succeed("avahi-resolve-host-name one.local | tee out >&2");
- $two->succeed("test \"`cut -f1 < out`\" = one.local");
- $two->succeed("avahi-resolve-host-name two.local | tee out >&2");
- $two->succeed("test \"`cut -f1 < out`\" = two.local");
+ two.succeed("avahi-resolve-host-name one.local | tee out >&2")
+ two.succeed('test "`cut -f1 < out`" = one.local')
+ two.succeed("avahi-resolve-host-name two.local | tee out >&2")
+ two.succeed('test "`cut -f1 < out`" = two.local')
- # Basic DNS-SD.
- $one->succeed("avahi-browse -r -t _workstation._tcp | tee out >&2");
- $one->succeed("test `wc -l < out` -gt 0");
- $two->succeed("avahi-browse -r -t _workstation._tcp | tee out >&2");
- $two->succeed("test `wc -l < out` -gt 0");
+ # Basic DNS-SD.
+ one.succeed("avahi-browse -r -t _workstation._tcp | tee out >&2")
+ one.succeed("test `wc -l < out` -gt 0")
+ two.succeed("avahi-browse -r -t _workstation._tcp | tee out >&2")
+ two.succeed("test `wc -l < out` -gt 0")
- # More DNS-SD.
- $one->execute("avahi-publish -s \"This is a test\" _test._tcp 123 one=1 &");
- $one->sleep(5);
- $two->succeed("avahi-browse -r -t _test._tcp | tee out >&2");
- $two->succeed("test `wc -l < out` -gt 0");
+ # More DNS-SD.
+ one.execute('avahi-publish -s "This is a test" _test._tcp 123 one=1 &')
+ one.sleep(5)
+ two.succeed("avahi-browse -r -t _test._tcp | tee out >&2")
+ two.succeed("test `wc -l < out` -gt 0")
- # NSS-mDNS.
- $one->succeed("getent hosts one.local >&2");
- $one->succeed("getent hosts two.local >&2");
- $two->succeed("getent hosts one.local >&2");
- $two->succeed("getent hosts two.local >&2");
+ # NSS-mDNS.
+ one.succeed("getent hosts one.local >&2")
+ one.succeed("getent hosts two.local >&2")
+ two.succeed("getent hosts one.local >&2")
+ two.succeed("getent hosts two.local >&2")
- # extra service definitions
- $one->succeed("avahi-browse -r -t _ssh._tcp | tee out >&2");
- $one->succeed("test `wc -l < out` -gt 0");
- $two->succeed("avahi-browse -r -t _ssh._tcp | tee out >&2");
- $two->succeed("test `wc -l < out` -gt 0");
- '';
+ # extra service definitions
+ one.succeed("avahi-browse -r -t _ssh._tcp | tee out >&2")
+ one.succeed("test `wc -l < out` -gt 0")
+ two.succeed("avahi-browse -r -t _ssh._tcp | tee out >&2")
+ two.succeed("test `wc -l < out` -gt 0")
+ '';
})
diff --git a/nixos/tests/babeld.nix b/nixos/tests/babeld.nix
index 5242cf395d70..fafa788ba57b 100644
--- a/nixos/tests/babeld.nix
+++ b/nixos/tests/babeld.nix
@@ -1,5 +1,5 @@
-import ./make-test.nix ({ pkgs, lib, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "babeld";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ hexa ];
@@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : {
};
};
- localRouter = { pkgs, lib, ... }:
+ local_router = { pkgs, lib, ... }:
{
virtualisation.vlans = [ 10 20 ];
@@ -70,7 +70,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : {
'';
};
};
- remoteRouter = { pkgs, lib, ... }:
+ remote_router = { pkgs, lib, ... }:
{
virtualisation.vlans = [ 20 30 ];
@@ -124,25 +124,25 @@ import ./make-test.nix ({ pkgs, lib, ...} : {
testScript =
''
- startAll;
+ start_all()
- $client->waitForUnit("network-online.target");
- $localRouter->waitForUnit("network-online.target");
- $remoteRouter->waitForUnit("network-online.target");
+ client.wait_for_unit("network-online.target")
+ local_router.wait_for_unit("network-online.target")
+ remote_router.wait_for_unit("network-online.target")
- $localRouter->waitForUnit("babeld.service");
- $remoteRouter->waitForUnit("babeld.service");
+ local_router.wait_for_unit("babeld.service")
+ remote_router.wait_for_unit("babeld.service")
- $localRouter->waitUntilSucceeds("ip route get 192.168.30.1");
- $localRouter->waitUntilSucceeds("ip route get 2001:db8:30::1");
+ local_router.wait_until_succeeds("ip route get 192.168.30.1")
+ local_router.wait_until_succeeds("ip route get 2001:db8:30::1")
- $remoteRouter->waitUntilSucceeds("ip route get 192.168.10.1");
- $remoteRouter->waitUntilSucceeds("ip route get 2001:db8:10::1");
+ remote_router.wait_until_succeeds("ip route get 192.168.10.1")
+ remote_router.wait_until_succeeds("ip route get 2001:db8:10::1")
- $client->succeed("ping -c1 192.168.30.1");
- $client->succeed("ping -c1 2001:db8:30::1");
+ client.succeed("ping -c1 192.168.30.1")
+ client.succeed("ping -c1 2001:db8:30::1")
- $remoteRouter->succeed("ping -c1 192.168.10.2");
- $remoteRouter->succeed("ping -c1 2001:db8:10::2");
+ remote_router.succeed("ping -c1 192.168.10.2")
+ remote_router.succeed("ping -c1 2001:db8:10::2")
'';
})
diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix
index 658676ef0ab9..0541e5803225 100644
--- a/nixos/tests/bcachefs.nix
+++ b/nixos/tests/bcachefs.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "bcachefs";
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ chiiruno ];
@@ -10,29 +10,25 @@ import ./make-test.nix ({ pkgs, ... }: {
};
testScript = ''
- $machine->succeed("modprobe bcachefs");
- $machine->succeed("bcachefs version");
- $machine->succeed("ls /dev");
+ machine.succeed("modprobe bcachefs")
+ machine.succeed("bcachefs version")
+ machine.succeed("ls /dev")
- $machine->succeed(
- "mkdir /tmp/mnt",
-
- "udevadm settle",
- "parted --script /dev/vdb mklabel msdos",
- "parted --script /dev/vdb -- mkpart primary 1024M -1s",
- "udevadm settle",
-
- # Due to #32279, we cannot use encryption for this test yet
- # "echo password | bcachefs format --encrypted /dev/vdb1",
- # "echo password | bcachefs unlock /dev/vdb1",
- "bcachefs format /dev/vdb1",
- "mount -t bcachefs /dev/vdb1 /tmp/mnt",
- "udevadm settle",
-
- "bcachefs fs usage /tmp/mnt",
-
- "umount /tmp/mnt",
- "udevadm settle"
- );
+ machine.succeed(
+ "mkdir /tmp/mnt",
+ "udevadm settle",
+ "parted --script /dev/vdb mklabel msdos",
+ "parted --script /dev/vdb -- mkpart primary 1024M -1s",
+ "udevadm settle",
+ # Due to #32279, we cannot use encryption for this test yet
+ # "echo password | bcachefs format --encrypted /dev/vdb1",
+ # "echo password | bcachefs unlock /dev/vdb1",
+ "bcachefs format /dev/vdb1",
+ "mount -t bcachefs /dev/vdb1 /tmp/mnt",
+ "udevadm settle",
+ "bcachefs fs usage /tmp/mnt",
+ "umount /tmp/mnt",
+ "udevadm settle",
+ )
'';
})
diff --git a/nixos/tests/beanstalkd.nix b/nixos/tests/beanstalkd.nix
index fa2fbc2c92ab..4f4a454fb47f 100644
--- a/nixos/tests/beanstalkd.nix
+++ b/nixos/tests/beanstalkd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
let
pythonEnv = pkgs.python3.withPackages (p: [p.beanstalkc]);
@@ -34,12 +34,16 @@ in
};
testScript = ''
- startAll;
+ start_all()
- $machine->waitForUnit('beanstalkd.service');
+ machine.wait_for_unit("beanstalkd.service")
- $machine->succeed("${produce}");
- $machine->succeed("${consume}") eq "this is a job\n" or die;
- $machine->succeed("${consume}") eq "this is another job\n" or die;
+ machine.succeed("${produce}")
+ assert "this is a job\n" == machine.succeed(
+ "${consume}"
+ )
+ assert "this is another job\n" == machine.succeed(
+ "${consume}"
+ )
'';
})
diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix
deleted file mode 100644
index 3465272f5599..000000000000
--- a/nixos/tests/beegfs.nix
+++ /dev/null
@@ -1,115 +0,0 @@
-import ./make-test.nix ({ ... } :
-
-let
- connAuthFile="beegfs/auth-def.key";
-
- client = { pkgs, ... } : {
- networking.firewall.enable = false;
- services.beegfsEnable = true;
- services.beegfs.default = {
- mgmtdHost = "mgmt";
- connAuthFile = "/etc/${connAuthFile}";
- client = {
- mount = false;
- enable = true;
- };
- };
-
- fileSystems = pkgs.lib.mkVMOverride # FIXME: this should be creatd by the module
- [ { mountPoint = "/beegfs";
- device = "default";
- fsType = "beegfs";
- options = [ "cfgFile=/etc/beegfs/client-default.conf" "_netdev" ];
- }
- ];
-
- environment.etc.${connAuthFile} = {
- enable = true;
- text = "ThisIsALousySecret";
- mode = "0600";
- };
- };
-
-
- server = service : { pkgs, ... } : {
- networking.firewall.enable = false;
- boot.initrd.postDeviceCommands = ''
- ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
- '';
-
- virtualisation.emptyDiskImages = [ 4096 ];
-
- fileSystems = pkgs.lib.mkVMOverride
- [ { mountPoint = "/data";
- device = "/dev/disk/by-label/data";
- fsType = "ext4";
- }
- ];
-
- environment.systemPackages = with pkgs; [ beegfs ];
- environment.etc.${connAuthFile} = {
- enable = true;
- text = "ThisIsALousySecret";
- mode = "0600";
- };
-
- services.beegfsEnable = true;
- services.beegfs.default = {
- mgmtdHost = "mgmt";
- connAuthFile = "/etc/${connAuthFile}";
- ${service} = {
- enable = true;
- storeDir = "/data";
- };
- };
- };
-
-in
-{
- name = "beegfs";
-
- nodes = {
- meta = server "meta";
- mgmt = server "mgmtd";
- storage1 = server "storage";
- storage2 = server "storage";
- client1 = client;
- client2 = client;
- };
-
- testScript = ''
- # Initalize the data directories
- $mgmt->waitForUnit("default.target");
- $mgmt->succeed("beegfs-setup-mgmtd -C -f -p /data");
- $mgmt->succeed("systemctl start beegfs-mgmtd-default");
-
- $meta->waitForUnit("default.target");
- $meta->succeed("beegfs-setup-meta -C -f -s 1 -p /data");
- $meta->succeed("systemctl start beegfs-meta-default");
-
- $storage1->waitForUnit("default.target");
- $storage1->succeed("beegfs-setup-storage -C -f -s 1 -i 1 -p /data");
- $storage1->succeed("systemctl start beegfs-storage-default");
-
- $storage2->waitForUnit("default.target");
- $storage2->succeed("beegfs-setup-storage -C -f -s 2 -i 2 -p /data");
- $storage2->succeed("systemctl start beegfs-storage-default");
-
- #
-
- # Basic test
- $client1->waitForUnit("beegfs.mount");
- $client1->succeed("beegfs-check-servers-default");
- $client1->succeed("echo test > /beegfs/test");
- $client2->waitForUnit("beegfs.mount");
- $client2->succeed("test -e /beegfs/test");
- $client2->succeed("cat /beegfs/test | grep test");
-
- # test raid0/stripping
- $client1->succeed("dd if=/dev/urandom bs=1M count=10 of=/beegfs/striped");
- $client2->succeed("cat /beegfs/striped > /dev/null");
-
- # check if fs is still healthy
- $client1->succeed("beegfs-fsck-default --checkfs");
- '';
-})
diff --git a/nixos/tests/bees.nix b/nixos/tests/bees.nix
index 6f68c2f834f1..6e6a9c3446b0 100644
--- a/nixos/tests/bees.nix
+++ b/nixos/tests/bees.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ... }:
+import ./make-test-python.nix ({ lib, pkgs, ... }:
{
name = "bees";
@@ -29,27 +29,34 @@ import ./make-test.nix ({ lib, ... }:
testScript =
let
- withRetry = content: maxTests: sleepTime: ''
- max_tests=${lib.escapeShellArg maxTests}; sleep_time=${lib.escapeShellArg sleepTime}; for ((i=0; i1 && $3 == 0 { count++ } END { print count }') -eq 0 ]]
'';
- someContentIsShared = loc: ''[[ $(btrfs fi du -s --raw ${lib.escapeShellArg loc}/dedup-me-{1,2} | awk 'BEGIN { count=0; } NR>1 && $3 == 0 { count++ } END { print count }') -eq 0 ]]'';
in ''
# shut down the instance started by systemd at boot, so we can test our test procedure
- $machine->succeed("systemctl stop beesd\@aux1.service");
+ machine.succeed("systemctl stop beesd@aux1.service")
- $machine->succeed("dd if=/dev/urandom of=/aux1/dedup-me-1 bs=1M count=8");
- $machine->succeed("cp --reflink=never /aux1/dedup-me-1 /aux1/dedup-me-2");
- $machine->succeed("cp --reflink=never /aux1/* /aux2/");
- $machine->succeed("sync");
- $machine->fail(q(${someContentIsShared "/aux1"}));
- $machine->fail(q(${someContentIsShared "/aux2"}));
- $machine->succeed("systemctl start beesd\@aux1.service");
+ machine.succeed(
+ "dd if=/dev/urandom of=/aux1/dedup-me-1 bs=1M count=8",
+ "cp --reflink=never /aux1/dedup-me-1 /aux1/dedup-me-2",
+ "cp --reflink=never /aux1/* /aux2/",
+ "sync",
+ )
+ machine.fail(
+ "${someContentIsShared "/aux1"}",
+ "${someContentIsShared "/aux2"}",
+ )
+ machine.succeed("systemctl start beesd@aux1.service")
# assert that "Set Shared" column is nonzero
- $machine->succeed(q(${withRetry (someContentIsShared "/aux1") 20 2}));
- $machine->fail(q(${someContentIsShared "/aux2"}));
+ machine.wait_until_succeeds(
+ "${someContentIsShared "/aux1"}",
+ )
+ machine.fail("${someContentIsShared "/aux2"}")
# assert that 16MB hash table size requested was honored
- $machine->succeed(q([[ $(stat -c %s /aux1/.beeshome/beeshash.dat) = $(( 16 * 1024 * 1024)) ]]))
+ machine.succeed(
+ "[[ $(stat -c %s /aux1/.beeshome/beeshash.dat) = $(( 16 * 1024 * 1024)) ]]"
+ )
'';
})
diff --git a/nixos/tests/bind.nix b/nixos/tests/bind.nix
index 1f8c1dc7be40..09917b15a8e0 100644
--- a/nixos/tests/bind.nix
+++ b/nixos/tests/bind.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix {
+import ./make-test-python.nix {
name = "bind";
machine = { pkgs, lib, ... }: {
@@ -20,8 +20,8 @@ import ./make-test.nix {
};
testScript = ''
- $machine->waitForUnit('bind.service');
- $machine->waitForOpenPort(53);
- $machine->succeed('host 192.168.0.1 127.0.0.1 | grep -qF ns.example.org');
+ machine.wait_for_unit("bind.service")
+ machine.wait_for_open_port(53)
+ machine.succeed("host 192.168.0.1 127.0.0.1 | grep -qF ns.example.org")
'';
}
diff --git a/nixos/tests/boot-stage1.nix b/nixos/tests/boot-stage1.nix
index b2e74bff6fcd..cfb2ccb82856 100644
--- a/nixos/tests/boot-stage1.nix
+++ b/nixos/tests/boot-stage1.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "boot-stage1";
machine = { config, pkgs, lib, ... }: {
@@ -150,12 +150,12 @@ import ./make-test.nix ({ pkgs, ... }: {
};
testScript = ''
- $machine->waitForUnit("multi-user.target");
- $machine->succeed('test -s /run/canary2.pid');
- $machine->fail('pgrep -a canary1');
- $machine->fail('kill -0 $(< /run/canary2.pid)');
- $machine->succeed('pgrep -a -f \'^@canary3$\''');
- $machine->succeed('pgrep -a -f \'^kcanary$\''');
+ machine.wait_for_unit("multi-user.target")
+ machine.succeed("test -s /run/canary2.pid")
+ machine.fail("pgrep -a canary1")
+ machine.fail("kill -0 $(< /run/canary2.pid)")
+ machine.succeed('pgrep -a -f "^@canary3$"')
+ machine.succeed('pgrep -a -f "^kcanary$"')
'';
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ aszlig ];
diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix
index 165f64b0d6dc..d97471e293e8 100644
--- a/nixos/tests/borgbackup.nix
+++ b/nixos/tests/borgbackup.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
let
passphrase = "supersecret";
@@ -106,60 +106,70 @@ in {
};
testScript = ''
- startAll;
+ start_all()
- $client->fail('test -d "${remoteRepo}"');
+ client.fail('test -d "${remoteRepo}"')
- $client->succeed("cp ${privateKey} /root/id_ed25519");
- $client->succeed("chmod 0600 /root/id_ed25519");
- $client->succeed("cp ${privateKeyAppendOnly} /root/id_ed25519.appendOnly");
- $client->succeed("chmod 0600 /root/id_ed25519.appendOnly");
+ client.succeed(
+ "cp ${privateKey} /root/id_ed25519"
+ )
+ client.succeed("chmod 0600 /root/id_ed25519")
+ client.succeed(
+ "cp ${privateKeyAppendOnly} /root/id_ed25519.appendOnly"
+ )
+ client.succeed("chmod 0600 /root/id_ed25519.appendOnly")
- $client->succeed("mkdir -p ${dataDir}");
- $client->succeed("touch ${dataDir}/${excludeFile}");
- $client->succeed("echo '${keepFileData}' > ${dataDir}/${keepFile}");
+ client.succeed("mkdir -p ${dataDir}")
+ client.succeed("touch ${dataDir}/${excludeFile}")
+ client.succeed("echo '${keepFileData}' > ${dataDir}/${keepFile}")
- subtest "local", sub {
- my $borg = "BORG_PASSPHRASE='${passphrase}' borg";
- $client->systemctl("start --wait borgbackup-job-local");
- $client->fail("systemctl is-failed borgbackup-job-local");
- # Make sure exactly one archive has been created
- $client->succeed("c=\$($borg list '${localRepo}' | wc -l) && [[ \$c == '1' ]]");
- # Make sure excludeFile has been excluded
- $client->fail("$borg list '${localRepo}::${archiveName}' | grep -qF '${excludeFile}'");
- # Make sure keepFile has the correct content
- $client->succeed("$borg extract '${localRepo}::${archiveName}'");
- $client->succeed('c=$(cat ${dataDir}/${keepFile}) && [[ "$c" == "${keepFileData}" ]]');
- # Make sure the same is true when using `borg mount`
- $client->succeed("mkdir -p /mnt/borg && $borg mount '${localRepo}::${archiveName}' /mnt/borg");
- $client->succeed('c=$(cat /mnt/borg/${dataDir}/${keepFile}) && [[ "$c" == "${keepFileData}" ]]');
- };
+ with subtest("local"):
+ borg = "BORG_PASSPHRASE='${passphrase}' borg"
+ client.systemctl("start --wait borgbackup-job-local")
+ client.fail("systemctl is-failed borgbackup-job-local")
+ # Make sure exactly one archive has been created
+ assert int(client.succeed("{} list '${localRepo}' | wc -l".format(borg))) > 0
+ # Make sure excludeFile has been excluded
+ client.fail(
+ "{} list '${localRepo}::${archiveName}' | grep -qF '${excludeFile}'".format(borg)
+ )
+ # Make sure keepFile has the correct content
+ client.succeed("{} extract '${localRepo}::${archiveName}'".format(borg))
+ assert "${keepFileData}" in client.succeed("cat ${dataDir}/${keepFile}")
+ # Make sure the same is true when using `borg mount`
+ client.succeed(
+ "mkdir -p /mnt/borg && {} mount '${localRepo}::${archiveName}' /mnt/borg".format(
+ borg
+ )
+ )
+ assert "${keepFileData}" in client.succeed(
+ "cat /mnt/borg/${dataDir}/${keepFile}"
+ )
- subtest "remote", sub {
- my $borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519' borg";
- $server->waitForUnit("sshd.service");
- $client->waitForUnit("network.target");
- $client->systemctl("start --wait borgbackup-job-remote");
- $client->fail("systemctl is-failed borgbackup-job-remote");
+ with subtest("remote"):
+ borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519' borg"
+ server.wait_for_unit("sshd.service")
+ client.wait_for_unit("network.target")
+ client.systemctl("start --wait borgbackup-job-remote")
+ client.fail("systemctl is-failed borgbackup-job-remote")
- # Make sure we can't access repos other than the specified one
- $client->fail("$borg list borg\@server:wrong");
+ # Make sure we can't access repos other than the specified one
+ client.fail("{} list borg\@server:wrong".format(borg))
- #TODO: Make sure that data is actually deleted
- };
+ # TODO: Make sure that data is actually deleted
- subtest "remoteAppendOnly", sub {
- my $borg = "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519.appendOnly' borg";
- $server->waitForUnit("sshd.service");
- $client->waitForUnit("network.target");
- $client->systemctl("start --wait borgbackup-job-remoteAppendOnly");
- $client->fail("systemctl is-failed borgbackup-job-remoteAppendOnly");
+ with subtest("remoteAppendOnly"):
+ borg = (
+ "BORG_RSH='ssh -oStrictHostKeyChecking=no -i /root/id_ed25519.appendOnly' borg"
+ )
+ server.wait_for_unit("sshd.service")
+ client.wait_for_unit("network.target")
+ client.systemctl("start --wait borgbackup-job-remoteAppendOnly")
+ client.fail("systemctl is-failed borgbackup-job-remoteAppendOnly")
- # Make sure we can't access repos other than the specified one
- $client->fail("$borg list borg\@server:wrong");
-
- #TODO: Make sure that data is not actually deleted
- };
+ # Make sure we can't access repos other than the specified one
+ client.fail("{} list borg\@server:wrong".format(borg))
+ # TODO: Make sure that data is not actually deleted
'';
})
diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix
index ab9d2fbf4d1d..fc10df0c79b5 100644
--- a/nixos/tests/caddy.nix
+++ b/nixos/tests/caddy.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "caddy";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ xfix ];
@@ -50,33 +50,38 @@ import ./make-test.nix ({ pkgs, ... }: {
etagSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-1";
justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/fine-tune/child-2";
in ''
- my $url = 'http://localhost/example.html';
- $webserver->waitForUnit("caddy");
- $webserver->waitForOpenPort("80");
+ url = "http://localhost/example.html"
+ webserver.wait_for_unit("caddy")
+ webserver.wait_for_open_port("80")
- sub checkEtag {
- my $etag = $webserver->succeed(
- 'curl -v '.$url.' 2>&1 | sed -n -e "s/^< [Ee][Tt][Aa][Gg]: *//p"'
- );
- $etag =~ s/\r?\n$//;
- my $httpCode = $webserver->succeed(
- 'curl -w "%{http_code}" -X HEAD -H \'If-None-Match: '.$etag.'\' '.$url
- );
- die "HTTP code is not 304" unless $httpCode == 304;
- return $etag;
- }
- subtest "check ETag if serving Nix store paths", sub {
- my $oldEtag = checkEtag;
- $webserver->succeed("${etagSystem}/bin/switch-to-configuration test >&2");
- $webserver->sleep(1); # race condition
- my $newEtag = checkEtag;
- die "Old ETag $oldEtag is the same as $newEtag" if $oldEtag eq $newEtag;
- };
+ def check_etag(url):
+ etag = webserver.succeed(
+ "curl -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format(url)
+ )
+ etag = etag.replace("\r\n", " ")
+ http_code = webserver.succeed(
+ "curl -w \"%{{http_code}}\" -X HEAD -H 'If-None-Match: {}' {}".format(etag, url)
+ )
+ assert int(http_code) == 304, "HTTP code is not 304"
+ return etag
- subtest "config is reloaded on nixos-rebuild switch", sub {
- $webserver->succeed("${justReloadSystem}/bin/switch-to-configuration test >&2");
- $webserver->waitForOpenPort("8080");
- };
+
+ with subtest("check ETag if serving Nix store paths"):
+ old_etag = check_etag(url)
+ webserver.succeed(
+ "${etagSystem}/bin/switch-to-configuration test >&2"
+ )
+ webserver.sleep(1)
+ new_etag = check_etag(url)
+ assert old_etag != new_etag, "Old ETag {} is the same as {}".format(
+ old_etag, new_etag
+ )
+
+ with subtest("config is reloaded on nixos-rebuild switch"):
+ webserver.succeed(
+ "${justReloadSystem}/bin/switch-to-configuration test >&2"
+ )
+ webserver.wait_for_open_port("8080")
'';
})
diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix
index e60bae4b7003..60c04f147800 100644
--- a/nixos/tests/cadvisor.nix
+++ b/nixos/tests/cadvisor.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... } : {
+import ./make-test-python.nix ({ pkgs, ... } : {
name = "cadvisor";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ offline ];
@@ -16,20 +16,19 @@ import ./make-test.nix ({ pkgs, ... } : {
};
};
- testScript =
- ''
- startAll;
- $machine->waitForUnit("cadvisor.service");
- $machine->succeed("curl http://localhost:8080/containers/");
+ testScript = ''
+ start_all()
+ machine.wait_for_unit("cadvisor.service")
+ machine.succeed("curl http://localhost:8080/containers/")
- $influxdb->waitForUnit("influxdb.service");
+ influxdb.wait_for_unit("influxdb.service")
# create influxdb database
- $influxdb->succeed(q~
- curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root"
- ~);
+ influxdb.succeed(
+ 'curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root"'
+ )
- $influxdb->waitForUnit("cadvisor.service");
- $influxdb->succeed("curl http://localhost:8080/containers/");
+ influxdb.wait_for_unit("cadvisor.service")
+ influxdb.succeed("curl http://localhost:8080/containers/")
'';
})
diff --git a/nixos/tests/cassandra.nix b/nixos/tests/cassandra.nix
index c55733c9be7b..05607956a9d6 100644
--- a/nixos/tests/cassandra.nix
+++ b/nixos/tests/cassandra.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
let
# Change this to test a different version of Cassandra:
testPackage = pkgs.cassandra;
@@ -9,13 +9,16 @@ let
jmxRolesFile = ./cassandra-jmx-roles;
jmxAuthArgs = "-u ${(builtins.elemAt jmxRoles 0).username} -pw ${(builtins.elemAt jmxRoles 0).password}";
jmxPort = 7200; # Non-standard port so it doesn't accidentally work
+ jmxPortStr = toString jmxPort;
- # Would usually be assigned to 512M
+ # Would usually be assigned to 512M.
+ # Set it to a different value, so that we can check whether our config
+ # actually changes it.
numMaxHeapSize = "400";
getHeapLimitCommand = ''
- nodetool info -p ${toString jmxPort} | grep "^Heap Memory" | awk \'{print $NF}\'
+ nodetool info -p ${jmxPortStr} | grep "^Heap Memory" | awk '{print $NF}'
'';
- checkHeapLimitCommand = ''
+ checkHeapLimitCommand = pkgs.writeShellScript "check-heap-limit.sh" ''
[ 1 -eq "$(echo "$(${getHeapLimitCommand}) < ${numMaxHeapSize}" | ${pkgs.bc}/bin/bc)" ]
'';
@@ -44,7 +47,10 @@ let
};
in
{
- name = "cassandra-ci";
+ name = "cassandra";
+ meta = {
+ maintainers = with lib.maintainers; [ johnazoidberg ];
+ };
nodes = {
cass0 = nodeCfg "192.168.1.1" {};
@@ -52,66 +58,74 @@ in
cass2 = nodeCfg "192.168.1.3" { jvmOpts = [ "-Dcassandra.replace_address=cass1" ]; };
};
- testScript = let
- jmxPortS = toString jmxPort;
- in ''
+ testScript = ''
# Check configuration
- subtest "Timers exist", sub {
- $cass0->succeed("systemctl list-timers | grep cassandra-full-repair.timer");
- $cass0->succeed("systemctl list-timers | grep cassandra-incremental-repair.timer");
- };
- subtest "Can connect via cqlsh", sub {
- $cass0->waitForUnit("cassandra.service");
- $cass0->waitUntilSucceeds("nc -z cass0 9042");
- $cass0->succeed("echo 'show version;' | cqlsh cass0");
- };
- subtest "Nodetool is operational", sub {
- $cass0->waitForUnit("cassandra.service");
- $cass0->waitUntilSucceeds("nc -z localhost ${jmxPortS}");
- $cass0->succeed("nodetool status -p ${jmxPortS} --resolve-ip | egrep '^UN[[:space:]]+cass0'");
- };
- subtest "Cluster name was set", sub {
- $cass0->waitForUnit("cassandra.service");
- $cass0->waitUntilSucceeds("nc -z localhost ${jmxPortS}");
- $cass0->waitUntilSucceeds("nodetool describecluster -p ${jmxPortS} | grep 'Name: ${clusterName}'");
- };
- subtest "Heap limit set correctly", sub {
- # Nodetool takes a while until it can display info
- $cass0->waitUntilSucceeds('nodetool info -p ${jmxPortS}');
- $cass0->succeed('${checkHeapLimitCommand}');
- };
+ with subtest("Timers exist"):
+ cass0.succeed("systemctl list-timers | grep cassandra-full-repair.timer")
+ cass0.succeed("systemctl list-timers | grep cassandra-incremental-repair.timer")
+
+ with subtest("Can connect via cqlsh"):
+ cass0.wait_for_unit("cassandra.service")
+ cass0.wait_until_succeeds("nc -z cass0 9042")
+ cass0.succeed("echo 'show version;' | cqlsh cass0")
+
+ with subtest("Nodetool is operational"):
+ cass0.wait_for_unit("cassandra.service")
+ cass0.wait_until_succeeds("nc -z localhost ${jmxPortStr}")
+ cass0.succeed("nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass0'")
+
+ with subtest("Cluster name was set"):
+ cass0.wait_for_unit("cassandra.service")
+ cass0.wait_until_succeeds("nc -z localhost ${jmxPortStr}")
+ cass0.wait_until_succeeds(
+ "nodetool describecluster -p ${jmxPortStr} | grep 'Name: ${clusterName}'"
+ )
+
+ with subtest("Heap limit set correctly"):
+ # Nodetool takes a while until it can display info
+ cass0.wait_until_succeeds("nodetool info -p ${jmxPortStr}")
+ cass0.succeed("${checkHeapLimitCommand}")
# Check cluster interaction
- subtest "Bring up cluster", sub {
- $cass1->waitForUnit("cassandra.service");
- $cass1->waitUntilSucceeds("nodetool -p ${jmxPortS} ${jmxAuthArgs} status | egrep -c '^UN' | grep 2");
- $cass0->succeed("nodetool status -p ${jmxPortS} --resolve-ip | egrep '^UN[[:space:]]+cass1'");
- };
+ with subtest("Bring up cluster"):
+ cass1.wait_for_unit("cassandra.service")
+ cass1.wait_until_succeeds(
+ "nodetool -p ${jmxPortStr} ${jmxAuthArgs} status | egrep -c '^UN' | grep 2"
+ )
+ cass0.succeed("nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass1'")
'' + lib.optionalString testRemoteAuth ''
- subtest "Remote authenticated jmx", sub {
- # Doesn't work if not enabled
- $cass0->waitUntilSucceeds("nc -z localhost ${jmxPortS}");
- $cass1->fail("nc -z 192.168.1.1 ${toString jmxPort}");
- $cass1->fail("nodetool -p ${jmxPortS} -h 192.168.1.1 status");
+ with subtest("Remote authenticated jmx"):
+ # Doesn't work if not enabled
+ cass0.wait_until_succeeds("nc -z localhost ${jmxPortStr}")
+ cass1.fail("nc -z 192.168.1.1 ${jmxPortStr}")
+ cass1.fail("nodetool -p ${jmxPortStr} -h 192.168.1.1 status")
- # Works if enabled
- $cass1->waitUntilSucceeds("nc -z localhost ${toString jmxPort}");
- $cass0->succeed("nodetool -p ${jmxPortS} -h 192.168.1.2 ${jmxAuthArgs} status");
- };
+ # Works if enabled
+ cass1.wait_until_succeeds("nc -z localhost ${jmxPortStr}")
+ cass0.succeed("nodetool -p ${jmxPortStr} -h 192.168.1.2 ${jmxAuthArgs} status")
'' + ''
- subtest "Break and fix node", sub {
- $cass1->block;
- $cass0->waitUntilSucceeds("nodetool status -p ${jmxPortS} --resolve-ip | egrep -c '^DN[[:space:]]+cass1'");
- $cass0->succeed("nodetool status -p ${jmxPortS} | egrep -c '^UN' | grep 1");
- $cass1->unblock;
- $cass1->waitUntilSucceeds("nodetool -p ${jmxPortS} ${jmxAuthArgs} status | egrep -c '^UN' | grep 2");
- $cass0->succeed("nodetool status -p ${jmxPortS} | egrep -c '^UN' | grep 2");
- };
- subtest "Replace crashed node", sub {
- $cass1->crash;
- $cass2->waitForUnit("cassandra.service");
- $cass0->waitUntilFails("nodetool status -p ${jmxPortS} --resolve-ip | egrep '^UN[[:space:]]+cass1'");
- $cass0->waitUntilSucceeds("nodetool status -p ${jmxPortS} --resolve-ip | egrep '^UN[[:space:]]+cass2'");
- };
+ with subtest("Break and fix node"):
+ cass1.block()
+ cass0.wait_until_succeeds(
+ "nodetool status -p ${jmxPortStr} --resolve-ip | egrep -c '^DN[[:space:]]+cass1'"
+ )
+ cass0.succeed("nodetool status -p ${jmxPortStr} | egrep -c '^UN' | grep 1")
+ cass1.unblock()
+ cass1.wait_until_succeeds(
+ "nodetool -p ${jmxPortStr} ${jmxAuthArgs} status | egrep -c '^UN' | grep 2"
+ )
+ cass0.succeed("nodetool status -p ${jmxPortStr} | egrep -c '^UN' | grep 2")
+
+ with subtest("Replace crashed node"):
+ cass1.block() # .crash() waits until it's fully shutdown
+ cass2.start()
+ cass0.wait_until_fails(
+ "nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass1'"
+ )
+
+ cass2.wait_for_unit("cassandra.service")
+ cass0.wait_until_succeeds(
+ "nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass2'"
+ )
'';
})
diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix
index 6698aac3f271..52a0b5caf235 100644
--- a/nixos/tests/ceph-multi-node.nix
+++ b/nixos/tests/ceph-multi-node.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({pkgs, lib, ...}:
+import ./make-test-python.nix ({pkgs, lib, ...}:
let
cfg = {
@@ -49,9 +49,6 @@ let
boot.kernelModules = [ "xfs" ];
services.ceph = cephConfig;
-
- # So that we don't have to battle systemd when bootstraping
- systemd.targets.ceph.wantedBy = lib.mkForce [];
};
networkMonA = {
@@ -107,129 +104,110 @@ let
};
}; };
+ # Following deployment is based on the manual deployment described here:
+ # https://docs.ceph.com/docs/master/install/manual-deployment/
+ # For other ways to deploy a ceph cluster, look at the documentation at
+ # https://docs.ceph.com/docs/master/
testscript = { ... }: ''
- startAll;
+ start_all()
- $monA->waitForUnit("network.target");
- $osd0->waitForUnit("network.target");
- $osd1->waitForUnit("network.target");
-
- # Create the ceph-related directories
- $monA->mustSucceed(
- "mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}",
- "mkdir -p /var/lib/ceph/mon/ceph-${cfg.monA.name}",
- "chown ceph:ceph -R /var/lib/ceph/",
- "mkdir -p /etc/ceph",
- "chown ceph:ceph -R /etc/ceph"
- );
- $osd0->mustSucceed(
- "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
- "chown ceph:ceph -R /var/lib/ceph/",
- "mkdir -p /etc/ceph",
- "chown ceph:ceph -R /etc/ceph"
- );
- $osd1->mustSucceed(
- "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
- "chown ceph:ceph -R /var/lib/ceph/",
- "mkdir -p /etc/ceph",
- "chown ceph:ceph -R /etc/ceph"
- );
+ monA.wait_for_unit("network.target")
+ osd0.wait_for_unit("network.target")
+ osd1.wait_for_unit("network.target")
# Bootstrap ceph-mon daemon
- $monA->mustSucceed(
- "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'",
- "sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
- "sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
- "monmaptool --create --add ${cfg.monA.name} ${cfg.monA.ip} --fsid ${cfg.clusterId} /tmp/monmap",
- "sudo -u ceph ceph-mon --mkfs -i ${cfg.monA.name} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring",
- "sudo -u ceph touch /var/lib/ceph/mon/ceph-${cfg.monA.name}/done",
- "systemctl start ceph-mon-${cfg.monA.name}"
- );
- $monA->waitForUnit("ceph-mon-${cfg.monA.name}");
- $monA->mustSucceed("ceph mon enable-msgr2");
+ monA.succeed(
+ "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'",
+ "sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
+ "sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
+ "monmaptool --create --add ${cfg.monA.name} ${cfg.monA.ip} --fsid ${cfg.clusterId} /tmp/monmap",
+ "sudo -u ceph ceph-mon --mkfs -i ${cfg.monA.name} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring",
+ "sudo -u ceph mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}/",
+ "sudo -u ceph touch /var/lib/ceph/mon/ceph-${cfg.monA.name}/done",
+ "systemctl start ceph-mon-${cfg.monA.name}",
+ )
+ monA.wait_for_unit("ceph-mon-${cfg.monA.name}")
+ monA.succeed("ceph mon enable-msgr2")
# Can't check ceph status until a mon is up
- $monA->succeed("ceph -s | grep 'mon: 1 daemons'");
+ monA.succeed("ceph -s | grep 'mon: 1 daemons'")
# Start the ceph-mgr daemon, it has no deps and hardly any setup
- $monA->mustSucceed(
- "ceph auth get-or-create mgr.${cfg.monA.name} mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-${cfg.monA.name}/keyring",
- "systemctl start ceph-mgr-${cfg.monA.name}"
- );
- $monA->waitForUnit("ceph-mgr-a");
- $monA->waitUntilSucceeds("ceph -s | grep 'quorum ${cfg.monA.name}'");
- $monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
+ monA.succeed(
+ "ceph auth get-or-create mgr.${cfg.monA.name} mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-${cfg.monA.name}/keyring",
+ "systemctl start ceph-mgr-${cfg.monA.name}",
+ )
+ monA.wait_for_unit("ceph-mgr-a")
+ monA.wait_until_succeeds("ceph -s | grep 'quorum ${cfg.monA.name}'")
+ monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'")
# Send the admin keyring to the OSD machines
- $monA->mustSucceed("cp /etc/ceph/ceph.client.admin.keyring /tmp/shared");
- $osd0->mustSucceed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph");
- $osd1->mustSucceed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph");
+ monA.succeed("cp /etc/ceph/ceph.client.admin.keyring /tmp/shared")
+ osd0.succeed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph")
+ osd1.succeed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph")
# Bootstrap both OSDs
- $osd0->mustSucceed(
- "mkfs.xfs /dev/vdb",
- "mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
- "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd0.name}/keyring --name osd.${cfg.osd0.name} --add-key ${cfg.osd0.key}",
- "echo '{\"cephx_secret\": \"${cfg.osd0.key}\"}' | ceph osd new ${cfg.osd0.uuid} -i -",
- );
- $osd1->mustSucceed(
- "mkfs.xfs /dev/vdb",
- "mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
- "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd1.name}/keyring --name osd.${cfg.osd1.name} --add-key ${cfg.osd1.key}",
- "echo '{\"cephx_secret\": \"${cfg.osd1.key}\"}' | ceph osd new ${cfg.osd1.uuid} -i -"
- );
+ osd0.succeed(
+ "mkfs.xfs /dev/vdb",
+ "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
+ "mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
+ "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd0.name}/keyring --name osd.${cfg.osd0.name} --add-key ${cfg.osd0.key}",
+ 'echo \'{"cephx_secret": "${cfg.osd0.key}"}\' | ceph osd new ${cfg.osd0.uuid} -i -',
+ )
+ osd1.succeed(
+ "mkfs.xfs /dev/vdb",
+ "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
+ "mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
+ "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd1.name}/keyring --name osd.${cfg.osd1.name} --add-key ${cfg.osd1.key}",
+ 'echo \'{"cephx_secret": "${cfg.osd1.key}"}\' | ceph osd new ${cfg.osd1.uuid} -i -',
+ )
# Initialize the OSDs with regular filestore
- $osd0->mustSucceed(
- "ceph-osd -i ${cfg.osd0.name} --mkfs --osd-uuid ${cfg.osd0.uuid}",
- "chown -R ceph:ceph /var/lib/ceph/osd",
- "systemctl start ceph-osd-${cfg.osd0.name}",
- );
- $osd1->mustSucceed(
- "ceph-osd -i ${cfg.osd1.name} --mkfs --osd-uuid ${cfg.osd1.uuid}",
- "chown -R ceph:ceph /var/lib/ceph/osd",
- "systemctl start ceph-osd-${cfg.osd1.name}"
- );
- $monA->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
- $monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
- $monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
+ osd0.succeed(
+ "ceph-osd -i ${cfg.osd0.name} --mkfs --osd-uuid ${cfg.osd0.uuid}",
+ "chown -R ceph:ceph /var/lib/ceph/osd",
+ "systemctl start ceph-osd-${cfg.osd0.name}",
+ )
+ osd1.succeed(
+ "ceph-osd -i ${cfg.osd1.name} --mkfs --osd-uuid ${cfg.osd1.uuid}",
+ "chown -R ceph:ceph /var/lib/ceph/osd",
+ "systemctl start ceph-osd-${cfg.osd1.name}",
+ )
+ monA.wait_until_succeeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'")
+ monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'")
+ monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
- $monA->mustSucceed(
- "ceph osd pool create multi-node-test 100 100",
- "ceph osd pool ls | grep 'multi-node-test'",
- "ceph osd pool rename multi-node-test multi-node-other-test",
- "ceph osd pool ls | grep 'multi-node-other-test'"
- );
- $monA->waitUntilSucceeds("ceph -s | grep '1 pools, 100 pgs'");
- $monA->mustSucceed("ceph osd pool set multi-node-other-test size 2");
- $monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
- $monA->waitUntilSucceeds("ceph -s | grep '100 active+clean'");
- $monA->mustFail(
- "ceph osd pool ls | grep 'multi-node-test'",
- "ceph osd pool delete multi-node-other-test multi-node-other-test --yes-i-really-really-mean-it"
- );
+ monA.succeed(
+ "ceph osd pool create multi-node-test 100 100",
+ "ceph osd pool ls | grep 'multi-node-test'",
+ "ceph osd pool rename multi-node-test multi-node-other-test",
+ "ceph osd pool ls | grep 'multi-node-other-test'",
+ )
+ monA.wait_until_succeeds("ceph -s | grep '1 pools, 100 pgs'")
+ monA.succeed("ceph osd pool set multi-node-other-test size 2")
+ monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
+ monA.wait_until_succeeds("ceph -s | grep '100 active+clean'")
+ monA.fail(
+ "ceph osd pool ls | grep 'multi-node-test'",
+ "ceph osd pool delete multi-node-other-test multi-node-other-test --yes-i-really-really-mean-it",
+ )
- # As we disable the target in the config, we still want to test that it works as intended
- $osd0->mustSucceed("systemctl stop ceph-osd-${cfg.osd0.name}");
- $osd1->mustSucceed("systemctl stop ceph-osd-${cfg.osd1.name}");
- $monA->mustSucceed(
- "systemctl stop ceph-mgr-${cfg.monA.name}",
- "systemctl stop ceph-mon-${cfg.monA.name}"
- );
-
- $monA->succeed("systemctl start ceph.target");
- $monA->waitForUnit("ceph-mon-${cfg.monA.name}");
- $monA->waitForUnit("ceph-mgr-${cfg.monA.name}");
- $osd0->succeed("systemctl start ceph.target");
- $osd0->waitForUnit("ceph-osd-${cfg.osd0.name}");
- $osd1->succeed("systemctl start ceph.target");
- $osd1->waitForUnit("ceph-osd-${cfg.osd1.name}");
-
- $monA->succeed("ceph -s | grep 'mon: 1 daemons'");
- $monA->waitUntilSucceeds("ceph -s | grep 'quorum ${cfg.monA.name}'");
- $monA->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
- $monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
- $monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
+ # Shut down ceph on all machines in a very unpolite way
+ monA.crash()
+ osd0.crash()
+ osd1.crash()
+
+ # Start it up
+ osd0.start()
+ osd1.start()
+ monA.start()
+
+ # Ensure the cluster comes back up again
+ monA.succeed("ceph -s | grep 'mon: 1 daemons'")
+ monA.wait_until_succeeds("ceph -s | grep 'quorum ${cfg.monA.name}'")
+ monA.wait_until_succeeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'")
+ monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'")
+ monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
'';
in {
name = "basic-multi-node-ceph-cluster";
diff --git a/nixos/tests/ceph-single-node.nix b/nixos/tests/ceph-single-node.nix
index 10b77cff5a31..da92a73e14d9 100644
--- a/nixos/tests/ceph-single-node.nix
+++ b/nixos/tests/ceph-single-node.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({pkgs, lib, ...}:
+import ./make-test-python.nix ({pkgs, lib, ...}:
let
cfg = {
@@ -46,9 +46,6 @@ let
boot.kernelModules = [ "xfs" ];
services.ceph = cephConfig;
-
- # So that we don't have to battle systemd when bootstraping
- systemd.targets.ceph.wantedBy = lib.mkForce [];
};
networkMonA = {
@@ -72,112 +69,105 @@ let
};
}; };
+ # Following deployment is based on the manual deployment described here:
+ # https://docs.ceph.com/docs/master/install/manual-deployment/
+ # For other ways to deploy a ceph cluster, look at the documentation at
+ # https://docs.ceph.com/docs/master/
testscript = { ... }: ''
- startAll;
+ start_all()
- $monA->waitForUnit("network.target");
-
- # Create the ceph-related directories
- $monA->mustSucceed(
- "mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}",
- "mkdir -p /var/lib/ceph/mon/ceph-${cfg.monA.name}",
- "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
- "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
- "mkdir -p /etc/ceph",
- "chown ceph:ceph -R /etc/ceph",
- "chown ceph:ceph -R /var/lib/ceph/",
- );
+ monA.wait_for_unit("network.target")
# Bootstrap ceph-mon daemon
- $monA->mustSucceed(
- "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'",
- "sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
- "sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
- "monmaptool --create --add ${cfg.monA.name} ${cfg.monA.ip} --fsid ${cfg.clusterId} /tmp/monmap",
- "sudo -u ceph ceph-mon --mkfs -i ${cfg.monA.name} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring",
- "sudo -u ceph touch /var/lib/ceph/mon/ceph-${cfg.monA.name}/done",
- "systemctl start ceph-mon-${cfg.monA.name}"
- );
- $monA->waitForUnit("ceph-mon-${cfg.monA.name}");
- $monA->mustSucceed("ceph mon enable-msgr2");
+ monA.succeed(
+ "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'",
+ "sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
+ "sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
+ "monmaptool --create --add ${cfg.monA.name} ${cfg.monA.ip} --fsid ${cfg.clusterId} /tmp/monmap",
+ "sudo -u ceph ceph-mon --mkfs -i ${cfg.monA.name} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring",
+ "sudo -u ceph touch /var/lib/ceph/mon/ceph-${cfg.monA.name}/done",
+ "systemctl start ceph-mon-${cfg.monA.name}",
+ )
+ monA.wait_for_unit("ceph-mon-${cfg.monA.name}")
+ monA.succeed("ceph mon enable-msgr2")
# Can't check ceph status until a mon is up
- $monA->succeed("ceph -s | grep 'mon: 1 daemons'");
+ monA.succeed("ceph -s | grep 'mon: 1 daemons'")
- # Start the ceph-mgr daemon, it has no deps and hardly any setup
- $monA->mustSucceed(
- "ceph auth get-or-create mgr.${cfg.monA.name} mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-${cfg.monA.name}/keyring",
- "systemctl start ceph-mgr-${cfg.monA.name}"
- );
- $monA->waitForUnit("ceph-mgr-a");
- $monA->waitUntilSucceeds("ceph -s | grep 'quorum ${cfg.monA.name}'");
- $monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
+ # Start the ceph-mgr daemon, after copying in the keyring
+ monA.succeed(
+ "sudo -u ceph mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}/",
+ "ceph auth get-or-create mgr.${cfg.monA.name} mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-${cfg.monA.name}/keyring",
+ "systemctl start ceph-mgr-${cfg.monA.name}",
+ )
+ monA.wait_for_unit("ceph-mgr-a")
+ monA.wait_until_succeeds("ceph -s | grep 'quorum ${cfg.monA.name}'")
+ monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'")
# Bootstrap both OSDs
- $monA->mustSucceed(
- "mkfs.xfs /dev/vdb",
- "mkfs.xfs /dev/vdc",
- "mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
- "mount /dev/vdc /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
- "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd0.name}/keyring --name osd.${cfg.osd0.name} --add-key ${cfg.osd0.key}",
- "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd1.name}/keyring --name osd.${cfg.osd1.name} --add-key ${cfg.osd1.key}",
- "echo '{\"cephx_secret\": \"${cfg.osd0.key}\"}' | ceph osd new ${cfg.osd0.uuid} -i -",
- "echo '{\"cephx_secret\": \"${cfg.osd1.key}\"}' | ceph osd new ${cfg.osd1.uuid} -i -"
- );
+ monA.succeed(
+ "mkfs.xfs /dev/vdb",
+ "mkfs.xfs /dev/vdc",
+ "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
+ "mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
+ "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
+ "mount /dev/vdc /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
+ "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd0.name}/keyring --name osd.${cfg.osd0.name} --add-key ${cfg.osd0.key}",
+ "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd1.name}/keyring --name osd.${cfg.osd1.name} --add-key ${cfg.osd1.key}",
+ 'echo \'{"cephx_secret": "${cfg.osd0.key}"}\' | ceph osd new ${cfg.osd0.uuid} -i -',
+ 'echo \'{"cephx_secret": "${cfg.osd1.key}"}\' | ceph osd new ${cfg.osd1.uuid} -i -',
+ )
# Initialize the OSDs with regular filestore
- $monA->mustSucceed(
- "ceph-osd -i ${cfg.osd0.name} --mkfs --osd-uuid ${cfg.osd0.uuid}",
- "ceph-osd -i ${cfg.osd1.name} --mkfs --osd-uuid ${cfg.osd1.uuid}",
- "chown -R ceph:ceph /var/lib/ceph/osd",
- "systemctl start ceph-osd-${cfg.osd0.name}",
- "systemctl start ceph-osd-${cfg.osd1.name}"
- );
- $monA->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
- $monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
- $monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
+ monA.succeed(
+ "ceph-osd -i ${cfg.osd0.name} --mkfs --osd-uuid ${cfg.osd0.uuid}",
+ "ceph-osd -i ${cfg.osd1.name} --mkfs --osd-uuid ${cfg.osd1.uuid}",
+ "chown -R ceph:ceph /var/lib/ceph/osd",
+ "systemctl start ceph-osd-${cfg.osd0.name}",
+ "systemctl start ceph-osd-${cfg.osd1.name}",
+ )
+ monA.wait_until_succeeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'")
+ monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'")
+ monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
- $monA->mustSucceed(
- "ceph osd pool create single-node-test 100 100",
- "ceph osd pool ls | grep 'single-node-test'",
- "ceph osd pool rename single-node-test single-node-other-test",
- "ceph osd pool ls | grep 'single-node-other-test'"
- );
- $monA->waitUntilSucceeds("ceph -s | grep '1 pools, 100 pgs'");
- $monA->mustSucceed(
- "ceph osd getcrushmap -o crush",
- "crushtool -d crush -o decrushed",
- "sed 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type osd/' decrushed > modcrush",
- "crushtool -c modcrush -o recrushed",
- "ceph osd setcrushmap -i recrushed",
- "ceph osd pool set single-node-other-test size 2"
- );
- $monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
- $monA->waitUntilSucceeds("ceph -s | grep '100 active+clean'");
- $monA->mustFail(
- "ceph osd pool ls | grep 'multi-node-test'",
- "ceph osd pool delete single-node-other-test single-node-other-test --yes-i-really-really-mean-it"
- );
+ monA.succeed(
+ "ceph osd pool create single-node-test 100 100",
+ "ceph osd pool ls | grep 'single-node-test'",
+ "ceph osd pool rename single-node-test single-node-other-test",
+ "ceph osd pool ls | grep 'single-node-other-test'",
+ )
+ monA.wait_until_succeeds("ceph -s | grep '1 pools, 100 pgs'")
+ monA.succeed(
+ "ceph osd getcrushmap -o crush",
+ "crushtool -d crush -o decrushed",
+ "sed 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type osd/' decrushed > modcrush",
+ "crushtool -c modcrush -o recrushed",
+ "ceph osd setcrushmap -i recrushed",
+ "ceph osd pool set single-node-other-test size 2",
+ )
+ monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
+ monA.wait_until_succeeds("ceph -s | grep '100 active+clean'")
+ monA.fail(
+ "ceph osd pool ls | grep 'multi-node-test'",
+ "ceph osd pool delete single-node-other-test single-node-other-test --yes-i-really-really-mean-it",
+ )
- # As we disable the target in the config, we still want to test that it works as intended
- $monA->mustSucceed(
- "systemctl stop ceph-osd-${cfg.osd0.name}",
- "systemctl stop ceph-osd-${cfg.osd1.name}",
- "systemctl stop ceph-mgr-${cfg.monA.name}",
- "systemctl stop ceph-mon-${cfg.monA.name}"
- );
-
- $monA->succeed("systemctl start ceph.target");
- $monA->waitForUnit("ceph-mon-${cfg.monA.name}");
- $monA->waitForUnit("ceph-mgr-${cfg.monA.name}");
- $monA->waitForUnit("ceph-osd-${cfg.osd0.name}");
- $monA->waitForUnit("ceph-osd-${cfg.osd1.name}");
-
- $monA->succeed("ceph -s | grep 'mon: 1 daemons'");
- $monA->waitUntilSucceeds("ceph -s | grep 'quorum ${cfg.monA.name}'");
- $monA->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
- $monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
- $monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
+ # Shut down ceph by stopping ceph.target.
+ monA.succeed("systemctl stop ceph.target")
+
+ # Start it up
+ monA.succeed("systemctl start ceph.target")
+ monA.wait_for_unit("ceph-mon-${cfg.monA.name}")
+ monA.wait_for_unit("ceph-mgr-${cfg.monA.name}")
+ monA.wait_for_unit("ceph-osd-${cfg.osd0.name}")
+ monA.wait_for_unit("ceph-osd-${cfg.osd1.name}")
+
+ # Ensure the cluster comes back up again
+ monA.succeed("ceph -s | grep 'mon: 1 daemons'")
+ monA.wait_until_succeeds("ceph -s | grep 'quorum ${cfg.monA.name}'")
+ monA.wait_until_succeeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'")
+ monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'")
+ monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'")
'';
in {
name = "basic-single-node-ceph-cluster";
diff --git a/nixos/tests/certmgr.nix b/nixos/tests/certmgr.nix
index fe67833808ce..cb69f35e862f 100644
--- a/nixos/tests/certmgr.nix
+++ b/nixos/tests/certmgr.nix
@@ -3,7 +3,7 @@
pkgs ? import ../.. { inherit system config; }
}:
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
let
mkSpec = { host, service ? null, action }: {
inherit action;
@@ -123,17 +123,17 @@ in
)));
};
testScript = ''
- $machine->waitForUnit('cfssl.service');
- $machine->waitUntilSucceeds('ls /tmp/decl.example.org-ca.pem');
- $machine->waitUntilSucceeds('ls /tmp/decl.example.org-key.pem');
- $machine->waitUntilSucceeds('ls /tmp/decl.example.org-cert.pem');
- $machine->waitUntilSucceeds('ls /tmp/imp.example.org-ca.pem');
- $machine->waitUntilSucceeds('ls /tmp/imp.example.org-key.pem');
- $machine->waitUntilSucceeds('ls /tmp/imp.example.org-cert.pem');
- $machine->waitForUnit('nginx.service');
- $machine->succeed('[ "1" -lt "$(journalctl -u nginx | grep "Starting Nginx" | wc -l)" ]');
- $machine->succeed('curl --cacert /tmp/imp.example.org-ca.pem https://imp.example.org');
- $machine->succeed('curl --cacert /tmp/decl.example.org-ca.pem https://decl.example.org');
+ machine.wait_for_unit("cfssl.service")
+ machine.wait_until_succeeds("ls /tmp/decl.example.org-ca.pem")
+ machine.wait_until_succeeds("ls /tmp/decl.example.org-key.pem")
+ machine.wait_until_succeeds("ls /tmp/decl.example.org-cert.pem")
+ machine.wait_until_succeeds("ls /tmp/imp.example.org-ca.pem")
+ machine.wait_until_succeeds("ls /tmp/imp.example.org-key.pem")
+ machine.wait_until_succeeds("ls /tmp/imp.example.org-cert.pem")
+ machine.wait_for_unit("nginx.service")
+ assert 1 < int(machine.succeed('journalctl -u nginx | grep "Starting Nginx" | wc -l'))
+ machine.succeed("curl --cacert /tmp/imp.example.org-ca.pem https://imp.example.org")
+ machine.succeed("curl --cacert /tmp/decl.example.org-ca.pem https://decl.example.org")
'';
};
@@ -143,8 +143,8 @@ in
test = mkSpec { host = "command.example.org"; action = "touch /tmp/command.executed"; };
};
testScript = ''
- $machine->waitForUnit('cfssl.service');
- $machine->waitUntilSucceeds('stat /tmp/command.executed');
+ machine.wait_for_unit("cfssl.service")
+ machine.wait_until_succeeds("stat /tmp/command.executed")
'';
};
diff --git a/nixos/tests/cfssl.nix b/nixos/tests/cfssl.nix
index 513ed8c45741..e291fc285fba 100644
--- a/nixos/tests/cfssl.nix
+++ b/nixos/tests/cfssl.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "cfssl";
machine = { config, lib, pkgs, ... }:
@@ -60,8 +60,8 @@ import ./make-test.nix ({ pkgs, ...} : {
});
in
''
- $machine->waitForUnit('cfssl.service');
- $machine->waitUntilSucceeds('${cfsslrequest}');
- $machine->succeed('ls /tmp/certificate-key.pem');
+ machine.wait_for_unit("cfssl.service")
+ machine.wait_until_succeeds("${cfsslrequest}")
+ machine.succeed("ls /tmp/certificate-key.pem")
'';
})
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index 6660eecf05b9..d72236d415d4 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -17,7 +17,7 @@ let
in
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "cjdns";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ehmry ];
@@ -83,36 +83,39 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- startAll;
+ import re
- $alice->waitForUnit("cjdns.service");
- $bob->waitForUnit("cjdns.service");
- $carol->waitForUnit("cjdns.service");
+ start_all()
- sub cjdnsIp {
- my ($machine) = @_;
- my $ip = (split /[ \/]+/, $machine->succeed("ip -o -6 addr show dev tun0"))[3];
- $machine->log("has ip $ip");
- return $ip;
- }
+ alice.wait_for_unit("cjdns.service")
+ bob.wait_for_unit("cjdns.service")
+ carol.wait_for_unit("cjdns.service")
- my $aliceIp6 = cjdnsIp $alice;
- my $bobIp6 = cjdnsIp $bob;
- my $carolIp6 = cjdnsIp $carol;
+
+ def cjdns_ip(machine):
+ res = machine.succeed("ip -o -6 addr show dev tun0")
+ ip = re.split("\s+|/", res)[3]
+ machine.log("has ip {}".format(ip))
+ return ip
+
+
+ alice_ip6 = cjdns_ip(alice)
+ bob_ip6 = cjdns_ip(bob)
+ carol_ip6 = cjdns_ip(carol)
# ping a few times each to let the routing table establish itself
- $alice->succeed("ping -c 4 $carolIp6");
- $bob->succeed("ping -c 4 $carolIp6");
+ alice.succeed("ping -c 4 {}".format(carol_ip6))
+ bob.succeed("ping -c 4 {}".format(carol_ip6))
- $carol->succeed("ping -c 4 $aliceIp6");
- $carol->succeed("ping -c 4 $bobIp6");
+ carol.succeed("ping -c 4 {}".format(alice_ip6))
+ carol.succeed("ping -c 4 {}".format(bob_ip6))
- $alice->succeed("ping -c 4 $bobIp6");
- $bob->succeed("ping -c 4 $aliceIp6");
+ alice.succeed("ping -c 4 {}".format(bob_ip6))
+ bob.succeed("ping -c 4 {}".format(alice_ip6))
- $alice->waitForUnit("httpd.service");
+ alice.wait_for_unit("httpd.service")
- $bob->succeed("curl --fail -g http://[$aliceIp6]");
+ bob.succeed("curl --fail -g http://[{}]".format(alice_ip6))
'';
})
diff --git a/nixos/tests/clickhouse.nix b/nixos/tests/clickhouse.nix
index 7d835069ec4d..2d8a7cf7aa9f 100644
--- a/nixos/tests/clickhouse.nix
+++ b/nixos/tests/clickhouse.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "clickhouse";
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
@@ -14,12 +14,18 @@ import ./make-test.nix ({ pkgs, ... }: {
selectQuery = pkgs.writeText "select.sql" "SELECT * from `demo`";
in
''
- $machine->start();
- $machine->waitForUnit("clickhouse.service");
- $machine->waitForOpenPort(9000);
+ machine.start()
+ machine.wait_for_unit("clickhouse.service")
+ machine.wait_for_open_port(9000)
- $machine->succeed("cat ${tableDDL} | clickhouse-client");
- $machine->succeed("cat ${insertQuery} | clickhouse-client");
- $machine->succeed("cat ${selectQuery} | clickhouse-client | grep foo");
+ machine.succeed(
+ "cat ${tableDDL} | clickhouse-client"
+ )
+ machine.succeed(
+ "cat ${insertQuery} | clickhouse-client"
+ )
+ machine.succeed(
+ "cat ${selectQuery} | clickhouse-client | grep foo"
+ )
'';
})
diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix
index 516d29c9036b..aafa6e24e84a 100644
--- a/nixos/tests/cloud-init.nix
+++ b/nixos/tests/cloud-init.nix
@@ -3,7 +3,7 @@
pkgs ? import ../.. { inherit system config; }
}:
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
let
@@ -30,6 +30,7 @@ let
'';
};
in makeTest {
+ name = "cloud-init";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ lewo ];
};
@@ -40,10 +41,12 @@ in makeTest {
services.cloud-init.enable = true;
};
testScript = ''
- $machine->start;
- $machine->waitForUnit("cloud-init.service");
- $machine->succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'");
+ machine.start()
+ machine.wait_for_unit("cloud-init.service")
+ machine.succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'")
- $machine->waitUntilSucceeds("cat /root/.ssh/authorized_keys | grep -q 'should be a key!'");
+ machine.wait_until_succeeds(
+ "cat /root/.ssh/authorized_keys | grep -q 'should be a key!'"
+ )
'';
}
diff --git a/nixos/tests/codimd.nix b/nixos/tests/codimd.nix
index 562f6f24f999..b1acbf4a8322 100644
--- a/nixos/tests/codimd.nix
+++ b/nixos/tests/codimd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
{
name = "codimd";
@@ -35,20 +35,18 @@ import ./make-test.nix ({ pkgs, lib, ... }:
};
testScript = ''
- startAll();
+ start_all()
- subtest "CodiMD sqlite", sub {
- $codimdSqlite->waitForUnit("codimd.service");
- $codimdSqlite->waitForOpenPort(3000);
- $codimdSqlite->waitUntilSucceeds("curl -sSf http://localhost:3000/new");
- };
+ with subtest("CodiMD sqlite"):
+ codimdSqlite.wait_for_unit("codimd.service")
+ codimdSqlite.wait_for_open_port(3000)
+ codimdSqlite.wait_until_succeeds("curl -sSf http://localhost:3000/new")
- subtest "CodiMD postgres", sub {
- $codimdPostgres->waitForUnit("postgresql.service");
- $codimdPostgres->waitForUnit("codimd.service");
- $codimdPostgres->waitForOpenPort(5432);
- $codimdPostgres->waitForOpenPort(3000);
- $codimdPostgres->waitUntilSucceeds("curl -sSf http://localhost:3000/new");
- };
+ with subtest("CodiMD postgres"):
+ codimdPostgres.wait_for_unit("postgresql.service")
+ codimdPostgres.wait_for_unit("codimd.service")
+ codimdPostgres.wait_for_open_port(5432)
+ codimdPostgres.wait_for_open_port(3000)
+ codimdPostgres.wait_until_succeeds("curl -sSf http://localhost:3000/new")
'';
})
diff --git a/nixos/tests/colord.nix b/nixos/tests/colord.nix
deleted file mode 100644
index ce38aaca4bf2..000000000000
--- a/nixos/tests/colord.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, ... }:
-
-{
- name = "colord";
-
- meta = {
- maintainers = pkgs.colord.meta.maintainers;
- };
-
- machine = { pkgs, ... }: {
- environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
- };
-
- testScript = ''
- $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.colord.installedTests}/share'");
- '';
-})
diff --git a/nixos/tests/common/x11.nix b/nixos/tests/common/x11.nix
index c5a7c165d126..5ad0ac20fac8 100644
--- a/nixos/tests/common/x11.nix
+++ b/nixos/tests/common/x11.nix
@@ -1,12 +1,12 @@
+{ lib, ... }:
+
{ services.xserver.enable = true;
# Automatically log in.
services.xserver.displayManager.auto.enable = true;
# Use IceWM as the window manager.
- services.xserver.windowManager.default = "icewm";
- services.xserver.windowManager.icewm.enable = true;
-
# Don't use a desktop manager.
- services.xserver.desktopManager.default = "none";
+ services.xserver.displayManager.defaultSession = lib.mkDefault "none+icewm";
+ services.xserver.windowManager.icewm.enable = true;
}
diff --git a/nixos/tests/consul.nix b/nixos/tests/consul.nix
new file mode 100644
index 000000000000..6600dae4770b
--- /dev/null
+++ b/nixos/tests/consul.nix
@@ -0,0 +1,143 @@
+import ./make-test-python.nix ({pkgs, lib, ...}:
+
+let
+ # Settings for both servers and agents
+ webUi = true;
+ retry_interval = "1s";
+ raft_multiplier = 1;
+
+ defaultExtraConfig = {
+ inherit retry_interval;
+ performance = {
+ inherit raft_multiplier;
+ };
+ };
+
+ allConsensusServerHosts = [
+ "192.168.1.1"
+ "192.168.1.2"
+ "192.168.1.3"
+ ];
+
+ allConsensusClientHosts = [
+ "192.168.2.1"
+ "192.168.2.2"
+ ];
+
+ firewallSettings = {
+ # See https://www.consul.io/docs/install/ports.html
+ allowedTCPPorts = [ 8301 8302 8600 8500 8300 ];
+ allowedUDPPorts = [ 8301 8302 8600 ];
+ };
+
+ client = index: { pkgs, ... }:
+ let
+ ip = builtins.elemAt allConsensusClientHosts index;
+ in
+ {
+ environment.systemPackages = [ pkgs.consul ];
+
+ networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
+ { address = ip; prefixLength = 16; }
+ ];
+ networking.firewall = firewallSettings;
+
+ services.consul = {
+ enable = true;
+ inherit webUi;
+ extraConfig = defaultExtraConfig // {
+ server = false;
+ retry_join = allConsensusServerHosts;
+ bind_addr = ip;
+ };
+ };
+ };
+
+ server = index: { pkgs, ... }:
+ let
+ ip = builtins.elemAt allConsensusServerHosts index;
+ in
+ {
+ networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
+ { address = builtins.elemAt allConsensusServerHosts index; prefixLength = 16; }
+ ];
+ networking.firewall = firewallSettings;
+
+ services.consul =
+ let
+ thisConsensusServerHost = builtins.elemAt allConsensusServerHosts index;
+ in
+ assert builtins.elem thisConsensusServerHost allConsensusServerHosts;
+ {
+ enable = true;
+ inherit webUi;
+ extraConfig = defaultExtraConfig // {
+ server = true;
+ bootstrap_expect = builtins.length allConsensusServerHosts;
+ retry_join =
+ # If there's only 1 node in the network, we allow self-join;
+ # otherwise, the node must not try to join itself, and join only the other servers.
+ # See https://github.com/hashicorp/consul/issues/2868
+ if builtins.length allConsensusServerHosts == 1
+ then allConsensusServerHosts
+ else builtins.filter (h: h != thisConsensusServerHost) allConsensusServerHosts;
+ bind_addr = ip;
+ };
+ };
+ };
+in {
+ name = "consul";
+
+ nodes = {
+ server1 = server 0;
+ server2 = server 1;
+ server3 = server 2;
+
+ client1 = client 0;
+ client2 = client 1;
+ };
+
+ testScript = ''
+ servers = [server1, server2, server3]
+ machines = [server1, server2, server3, client1, client2]
+
+ for m in machines:
+ m.wait_for_unit("consul.service")
+
+ for m in machines:
+ m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]")
+
+ client1.succeed("consul kv put testkey 42")
+ client2.succeed("[ $(consul kv get testkey) == 42 ]")
+
+ # Test that the cluster can tolearate failures of any single server:
+ for server in servers:
+ server.crash()
+
+ # For each client, wait until they have connection again
+ # using `kv get -recurse` before issuing commands.
+ client1.wait_until_succeeds("consul kv get -recurse")
+ client2.wait_until_succeeds("consul kv get -recurse")
+
+ # Do some consul actions while one server is down.
+ client1.succeed("consul kv put testkey 43")
+ client2.succeed("[ $(consul kv get testkey) == 43 ]")
+ client2.succeed("consul kv delete testkey")
+
+ # Restart crashed machine.
+ server.start()
+
+ # Wait for recovery.
+ for m in machines:
+ m.wait_until_succeeds("[ $(consul members | grep -o alive | wc -l) == 5 ]")
+
+ # Wait for client connections.
+ client1.wait_until_succeeds("consul kv get -recurse")
+ client2.wait_until_succeeds("consul kv get -recurse")
+
+ # Do some consul actions with server back up.
+ client1.succeed("consul kv put testkey 44")
+ client2.succeed("[ $(consul kv get testkey) == 44 ]")
+ client2.succeed("consul kv delete testkey")
+ '';
+})
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix
index 38db64eb7931..2c8e8fa5370f 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixos/tests/containers-bridge.nix
@@ -7,7 +7,7 @@ let
containerIp6 = "fc00::2/7";
in
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-bridge";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aristid aszlig eelco kampfschlaefer ];
@@ -61,43 +61,42 @@ import ./make-test.nix ({ pkgs, ...} : {
virtualisation.pathsInNixDB = [ pkgs.stdenv ];
};
- testScript =
- ''
- $machine->waitForUnit("default.target");
- $machine->succeed("nixos-container list") =~ /webserver/ or die;
+ testScript = ''
+ machine.wait_for_unit("default.target")
+ assert "webserver" in machine.succeed("nixos-container list")
- # Start the webserver container.
- $machine->succeed("nixos-container status webserver") =~ /up/ or die;
+ with subtest("Start the webserver container"):
+ assert "up" in machine.succeed("nixos-container status webserver")
- # Check if bridges exist inside containers
- $machine->succeed("nixos-container run webserver -- ip link show eth0");
- $machine->succeed("nixos-container run web-noip -- ip link show eth0");
+ with subtest("Bridges exist inside containers"):
+ machine.succeed(
+ "nixos-container run webserver -- ip link show eth0",
+ "nixos-container run web-noip -- ip link show eth0",
+ )
- "${containerIp}" =~ /([^\/]+)\/([0-9+])/;
- my $ip = $1;
- chomp $ip;
- $machine->succeed("ping -n -c 1 $ip");
- $machine->succeed("curl --fail http://$ip/ > /dev/null");
+ ip = "${containerIp}".split("/")[0]
+ machine.succeed(f"ping -n -c 1 {ip}")
+ machine.succeed(f"curl --fail http://{ip}/ > /dev/null")
- "${containerIp6}" =~ /([^\/]+)\/([0-9+])/;
- my $ip6 = $1;
- chomp $ip6;
- $machine->succeed("ping -n -c 1 $ip6");
- $machine->succeed("curl --fail http://[$ip6]/ > /dev/null");
+ ip6 = "${containerIp6}".split("/")[0]
+ machine.succeed(f"ping -n -c 1 {ip6}")
+ machine.succeed(f"curl --fail http://[{ip6}]/ > /dev/null")
- # Check that nixos-container show-ip works in case of an ipv4 address with
- # subnetmask in CIDR notation.
- my $result = $machine->succeed("nixos-container show-ip webserver");
- chomp $result;
- $result eq $ip or die;
+ with subtest(
+ "nixos-container show-ip works in case of an ipv4 address "
+ + "with subnetmask in CIDR notation."
+ ):
+ result = machine.succeed("nixos-container show-ip webserver").rstrip()
+ assert result == ip
- # Stop the container.
- $machine->succeed("nixos-container stop webserver");
- $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
- $machine->fail("curl --fail --connect-timeout 2 http://[$ip6]/ > /dev/null");
-
- # Destroying a declarative container should fail.
- $machine->fail("nixos-container destroy webserver");
- '';
+ with subtest("Stop the container"):
+ machine.succeed("nixos-container stop webserver")
+ machine.fail(
+ f"curl --fail --connect-timeout 2 http://{ip}/ > /dev/null",
+ f"curl --fail --connect-timeout 2 http://[{ip6}]/ > /dev/null",
+ )
+ # Destroying a declarative container should fail.
+ machine.fail("nixos-container destroy webserver")
+ '';
})
diff --git a/nixos/tests/containers-ephemeral.nix b/nixos/tests/containers-ephemeral.nix
index 1ef8717d9a0e..692554ac0ba2 100644
--- a/nixos/tests/containers-ephemeral.nix
+++ b/nixos/tests/containers-ephemeral.nix
@@ -1,6 +1,6 @@
# Test for NixOS' container support.
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-ephemeral";
machine = { pkgs, ... }: {
@@ -16,10 +16,10 @@ import ./make-test.nix ({ pkgs, ...} : {
services.nginx = {
enable = true;
virtualHosts.localhost = {
- root = (pkgs.runCommand "localhost" {} ''
+ root = pkgs.runCommand "localhost" {} ''
mkdir "$out"
echo hello world > "$out/index.html"
- '');
+ '';
};
};
networking.firewall.allowedTCPPorts = [ 80 ];
@@ -28,29 +28,27 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- $machine->succeed("nixos-container list") =~ /webserver/ or die;
+ assert "webserver" in machine.succeed("nixos-container list")
- # Start the webserver container.
- $machine->succeed("nixos-container start webserver");
+ machine.succeed("nixos-container start webserver")
- # Check that container got its own root folder
- $machine->succeed("ls /run/containers/webserver");
+ with subtest("Container got its own root folder"):
+ machine.succeed("ls /run/containers/webserver")
- # Check that container persistent directory is not created
- $machine->fail("ls /var/lib/containers/webserver");
+ with subtest("Container persistent directory is not created"):
+ machine.fail("ls /var/lib/containers/webserver")
# Since "start" returns after the container has reached
# multi-user.target, we should now be able to access it.
- my $ip = $machine->succeed("nixos-container show-ip webserver");
- chomp $ip;
- $machine->succeed("ping -n -c1 $ip");
- $machine->succeed("curl --fail http://$ip/ > /dev/null");
+ ip = machine.succeed("nixos-container show-ip webserver").rstrip()
+ machine.succeed(f"ping -n -c1 {ip}")
+ machine.succeed(f"curl --fail http://{ip}/ > /dev/null")
- # Stop the container.
- $machine->succeed("nixos-container stop webserver");
- $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
+ with subtest("Stop the container"):
+ machine.succeed("nixos-container stop webserver")
+ machine.fail(f"curl --fail --connect-timeout 2 http://{ip}/ > /dev/null")
- # Check that container's root folder was removed
- $machine->fail("ls /run/containers/webserver");
+ with subtest("Container's root folder was removed"):
+ machine.fail("ls /run/containers/webserver")
'';
})
diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix
index b3d3bce87579..7d30b3f76cd7 100644
--- a/nixos/tests/containers-extra_veth.nix
+++ b/nixos/tests/containers-extra_veth.nix
@@ -1,7 +1,7 @@
# Test for NixOS' container support.
-import ./make-test.nix ({ pkgs, ...} : {
- name = "containers-bridge";
+import ./make-test-python.nix ({ pkgs, ...} : {
+ name = "containers-extra_veth";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ kampfschlaefer ];
};
@@ -52,52 +52,43 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- $machine->waitForUnit("default.target");
- $machine->succeed("nixos-container list") =~ /webserver/ or die;
+ machine.wait_for_unit("default.target")
+ assert "webserver" in machine.succeed("nixos-container list")
- # Status of the webserver container.
- $machine->succeed("nixos-container status webserver") =~ /up/ or die;
+ with subtest("Status of the webserver container is up"):
+ assert "up" in machine.succeed("nixos-container status webserver")
- # Debug
- #$machine->succeed("nixos-container run webserver -- ip link >&2");
+ with subtest("Ensure that the veths are inside the container"):
+ assert "state UP" in machine.succeed(
+ "nixos-container run webserver -- ip link show veth1"
+ )
+ assert "state UP" in machine.succeed(
+ "nixos-container run webserver -- ip link show veth2"
+ )
- # Ensure that the veths are inside the container
- $machine->succeed("nixos-container run webserver -- ip link show veth1") =~ /state UP/ or die;
- $machine->succeed("nixos-container run webserver -- ip link show veth2") =~ /state UP/ or die;
+ with subtest("Ensure the presence of the extra veths"):
+ assert "state UP" in machine.succeed("ip link show veth1")
+ assert "state UP" in machine.succeed("ip link show veth2")
- # Debug
- #$machine->succeed("ip link >&2");
+ with subtest("Ensure the veth1 is part of br1 on the host"):
+ assert "master br1" in machine.succeed("ip link show veth1")
- # Ensure the presence of the extra veths
- $machine->succeed("ip link show veth1") =~ /state UP/ or die;
- $machine->succeed("ip link show veth2") =~ /state UP/ or die;
+ with subtest("Ping on main veth"):
+ machine.succeed("ping -n -c 1 192.168.0.100")
+ machine.succeed("ping -n -c 1 fc00::2")
- # Ensure the veth1 is part of br1 on the host
- $machine->succeed("ip link show veth1") =~ /master br1/ or die;
+ with subtest("Ping on the first extra veth"):
+ machine.succeed("ping -n -c 1 192.168.1.100 >&2")
- # Debug
- #$machine->succeed("ip -4 a >&2");
- #$machine->succeed("ip -4 r >&2");
- #$machine->succeed("nixos-container run webserver -- ip link >&2");
- #$machine->succeed("nixos-container run webserver -- ip -4 a >&2");
- #$machine->succeed("nixos-container run webserver -- ip -4 r >&2");
+ with subtest("Ping on the second extra veth"):
+ machine.succeed("ping -n -c 1 192.168.2.100 >&2")
- # Ping on main veth
- $machine->succeed("ping -n -c 1 192.168.0.100");
- $machine->succeed("ping -n -c 1 fc00::2");
+ with subtest("Container can be stopped"):
+ machine.succeed("nixos-container stop webserver")
+ machine.fail("ping -n -c 1 192.168.1.100 >&2")
+ machine.fail("ping -n -c 1 192.168.2.100 >&2")
- # Ping on the first extra veth
- $machine->succeed("ping -n -c 1 192.168.1.100 >&2");
-
- # Ping on the second extra veth
- $machine->succeed("ping -n -c 1 192.168.2.100 >&2");
-
- # Stop the container.
- $machine->succeed("nixos-container stop webserver");
- $machine->fail("ping -n -c 1 192.168.1.100 >&2");
- $machine->fail("ping -n -c 1 192.168.2.100 >&2");
-
- # Destroying a declarative container should fail.
- $machine->fail("nixos-container destroy webserver");
+ with subtest("Destroying a declarative container should fail"):
+ machine.fail("nixos-container destroy webserver")
'';
})
diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix
index 8cf298c62258..d6fb4a761eef 100644
--- a/nixos/tests/containers-hosts.nix
+++ b/nixos/tests/containers-hosts.nix
@@ -1,6 +1,6 @@
# Test for NixOS' container support.
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-hosts";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ montag451 ];
@@ -42,11 +42,11 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
- $machine->waitForUnit("default.target");
+ start_all()
+ machine.wait_for_unit("default.target")
- # Ping the containers using the entries added in /etc/hosts
- $machine->succeed("ping -n -c 1 simple.containers");
- $machine->succeed("ping -n -c 1 netmask.containers");
+ with subtest("Ping the containers using the entries added in /etc/hosts"):
+ for host in "simple.containers", "netmask.containers":
+ machine.succeed(f"ping -n -c 1 {host}")
'';
})
diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 2e7e4b2f1d69..61df74042cb3 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -1,6 +1,6 @@
# Test for NixOS' container support.
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-imperative";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aristid aszlig eelco kampfschlaefer ];
@@ -36,95 +36,99 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = let
- tmpfilesContainerConfig = pkgs.writeText "container-config-tmpfiles" ''
- {
- systemd.tmpfiles.rules = [ "d /foo - - - - -" ];
- systemd.services.foo = {
- serviceConfig.Type = "oneshot";
- script = "ls -al /foo";
- wantedBy = [ "multi-user.target" ];
- };
- }
- ''; in
- ''
- # Make sure we have a NixOS tree (required by ‘nixos-container create’).
- $machine->succeed("PAGER=cat nix-env -qa -A nixos.hello >&2");
+ tmpfilesContainerConfig = pkgs.writeText "container-config-tmpfiles" ''
+ {
+ systemd.tmpfiles.rules = [ "d /foo - - - - -" ];
+ systemd.services.foo = {
+ serviceConfig.Type = "oneshot";
+ script = "ls -al /foo";
+ wantedBy = [ "multi-user.target" ];
+ };
+ }
+ '';
+ in ''
+ with subtest("Make sure we have a NixOS tree (required by ‘nixos-container create’)"):
+ machine.succeed("PAGER=cat nix-env -qa -A nixos.hello >&2")
- # Create some containers imperatively.
- my $id1 = $machine->succeed("nixos-container create foo --ensure-unique-name");
- chomp $id1;
- $machine->log("created container $id1");
+ id1, id2 = None, None
- my $id2 = $machine->succeed("nixos-container create foo --ensure-unique-name");
- chomp $id2;
- $machine->log("created container $id2");
+ with subtest("Create some containers imperatively"):
+ id1 = machine.succeed("nixos-container create foo --ensure-unique-name").rstrip()
+ machine.log(f"created container {id1}")
- die if $id1 eq $id2;
+ id2 = machine.succeed("nixos-container create foo --ensure-unique-name").rstrip()
+ machine.log(f"created container {id2}")
- # Put the root of $id2 into a bind mount.
- $machine->succeed(
- "mv /var/lib/containers/$id2 /id2-bindmount",
- "mount --bind /id2-bindmount /var/lib/containers/$id1"
- );
+ assert id1 != id2
- my $ip1 = $machine->succeed("nixos-container show-ip $id1");
- chomp $ip1;
- my $ip2 = $machine->succeed("nixos-container show-ip $id2");
- chomp $ip2;
- die if $ip1 eq $ip2;
+ with subtest(f"Put the root of {id2} into a bind mount"):
+ machine.succeed(
+ f"mv /var/lib/containers/{id2} /id2-bindmount",
+ f"mount --bind /id2-bindmount /var/lib/containers/{id1}",
+ )
- # Create a directory and a file we can later check if it still exists
- # after destruction of the container.
- $machine->succeed(
- "mkdir /nested-bindmount",
- "echo important data > /nested-bindmount/dummy",
- );
+ ip1 = machine.succeed(f"nixos-container show-ip {id1}").rstrip()
+ ip2 = machine.succeed(f"nixos-container show-ip {id2}").rstrip()
+ assert ip1 != ip2
- # Create a directory with a dummy file and bind-mount it into both
- # containers.
- foreach ($id1, $id2) {
- my $importantPath = "/var/lib/containers/$_/very/important/data";
- $machine->succeed(
- "mkdir -p $importantPath",
- "mount --bind /nested-bindmount $importantPath"
- );
- }
+ with subtest(
+ "Create a directory and a file we can later check if it still exists "
+ + "after destruction of the container"
+ ):
+ machine.succeed("mkdir /nested-bindmount")
+ machine.succeed("echo important data > /nested-bindmount/dummy")
- # Start one of them.
- $machine->succeed("nixos-container start $id1");
+ with subtest(
+ "Create a directory with a dummy file and bind-mount it into both containers."
+ ):
+ for id in id1, id2:
+ important_path = f"/var/lib/containers/{id}/very/important/data"
+ machine.succeed(
+ f"mkdir -p {important_path}",
+ f"mount --bind /nested-bindmount {important_path}",
+ )
- # Execute commands via the root shell.
- $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die;
+ with subtest("Start one of them"):
+ machine.succeed(f"nixos-container start {id1}")
- # Execute a nix command via the root shell. (regression test for #40355)
- $machine->succeed("nixos-container run $id1 -- nix-instantiate -E 'derivation { name = \"empty\"; builder = \"false\"; system = \"false\"; }'");
+ with subtest("Execute commands via the root shell"):
+ assert "Linux" in machine.succeed(f"nixos-container run {id1} -- uname")
- # Stop and start (regression test for #4989)
- $machine->succeed("nixos-container stop $id1");
- $machine->succeed("nixos-container start $id1");
+ with subtest("Execute a nix command via the root shell. (regression test for #40355)"):
+ machine.succeed(
+ f"nixos-container run {id1} -- nix-instantiate -E "
+ + '\'derivation { name = "empty"; builder = "false"; system = "false"; }\' '
+ )
- # Ensure tmpfiles are present
- $machine->log("creating container tmpfiles");
- $machine->succeed("nixos-container create tmpfiles --config-file ${tmpfilesContainerConfig}");
- $machine->log("created, starting…");
- $machine->succeed("nixos-container start tmpfiles");
- $machine->log("done starting, investigating…");
- $machine->succeed("echo \$(nixos-container run tmpfiles -- systemctl is-active foo.service) | grep -q active;");
- $machine->succeed("nixos-container destroy tmpfiles");
+ with subtest("Stop and start (regression test for #4989)"):
+ machine.succeed(f"nixos-container stop {id1}")
+ machine.succeed(f"nixos-container start {id1}")
- # Execute commands via the root shell.
- $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die;
+ with subtest("tmpfiles are present"):
+ machine.log("creating container tmpfiles")
+ machine.succeed(
+ "nixos-container create tmpfiles --config-file ${tmpfilesContainerConfig}"
+ )
+ machine.log("created, starting…")
+ machine.succeed("nixos-container start tmpfiles")
+ machine.log("done starting, investigating…")
+ machine.succeed(
+ "echo $(nixos-container run tmpfiles -- systemctl is-active foo.service) | grep -q active;"
+ )
+ machine.succeed("nixos-container destroy tmpfiles")
- # Destroy the containers.
- $machine->succeed("nixos-container destroy $id1");
- $machine->succeed("nixos-container destroy $id2");
+ with subtest("Execute commands via the root shell"):
+ assert "Linux" in machine.succeed(f"nixos-container run {id1} -- uname")
- $machine->succeed(
- # Check whether destruction of any container has killed important data
- "grep -qF 'important data' /nested-bindmount/dummy",
- # Ensure that the container path is gone
- "test ! -e /var/lib/containers/$id1"
- );
+ with subtest("Destroy the containers"):
+ for id in id1, id2:
+ machine.succeed(f"nixos-container destroy {id}")
+
+ with subtest("Check whether destruction of any container has killed important data"):
+ machine.succeed("grep -qF 'important data' /nested-bindmount/dummy")
+
+ with subtest("Ensure that the container path is gone"):
+ print(machine.succeed("ls -lsa /var/lib/containers"))
+ machine.succeed(f"test ! -e /var/lib/containers/{id1}")
'';
-
})
diff --git a/nixos/tests/containers-ip.nix b/nixos/tests/containers-ip.nix
new file mode 100644
index 000000000000..8583a08c6258
--- /dev/null
+++ b/nixos/tests/containers-ip.nix
@@ -0,0 +1,77 @@
+# Test for NixOS' container support.
+
+let
+ webserverFor = hostAddress: localAddress: {
+ inherit hostAddress localAddress;
+ privateNetwork = true;
+ config = {
+ services.httpd = {
+ enable = true;
+ adminAddr = "foo@example.org";
+ };
+ networking.firewall.allowedTCPPorts = [ 80 ];
+ };
+ };
+
+in import ./make-test-python.nix ({ pkgs, ...} : {
+ name = "containers-ipv4-ipv6";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ aristid aszlig eelco kampfschlaefer ];
+ };
+
+ machine =
+ { pkgs, ... }: {
+ imports = [ ../modules/installer/cd-dvd/channel.nix ];
+ virtualisation = {
+ writableStore = true;
+ memorySize = 768;
+ };
+
+ containers.webserver4 = webserverFor "10.231.136.1" "10.231.136.2";
+ containers.webserver6 = webserverFor "fc00::2" "fc00::1";
+ virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+ };
+
+ testScript = { nodes, ... }: ''
+ import time
+
+
+ def curl_host(ip):
+ # put [] around ipv6 addresses for curl
+ host = ip if ":" not in ip else f"[{ip}]"
+ return f"curl --fail --connect-timeout 2 http://{host}/ > /dev/null"
+
+
+ def get_ip(container):
+ # need to distinguish because show-ip won't work for ipv6
+ if container == "webserver4":
+ ip = machine.succeed(f"nixos-container show-ip {container}").rstrip()
+ assert ip == "${nodes.machine.config.containers.webserver4.localAddress}"
+ return ip
+ return "${nodes.machine.config.containers.webserver6.localAddress}"
+
+
+ for container in "webserver4", "webserver6":
+ assert container in machine.succeed("nixos-container list")
+
+ with subtest(f"Start container {container}"):
+ machine.succeed(f"nixos-container start {container}")
+ # wait 2s for container to start and network to be up
+ time.sleep(2)
+
+ # Since "start" returns after the container has reached
+ # multi-user.target, we should now be able to access it.
+
+ ip = get_ip(container)
+ with subtest(f"{container} reacts to pings and HTTP requests"):
+ machine.succeed(f"ping -n -c1 {ip}")
+ machine.succeed(curl_host(ip))
+
+ with subtest(f"Stop container {container}"):
+ machine.succeed(f"nixos-container stop {container}")
+ machine.fail(curl_host(ip))
+
+ # Destroying a declarative container should fail.
+ machine.fail(f"nixos-container destroy {container}")
+ '';
+})
diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix
deleted file mode 100644
index ace68ff2df8b..000000000000
--- a/nixos/tests/containers-ipv4.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-# Test for NixOS' container support.
-
-import ./make-test.nix ({ pkgs, ...} : {
- name = "containers-ipv4";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ aristid aszlig eelco kampfschlaefer ];
- };
-
- machine =
- { pkgs, ... }:
- { imports = [ ../modules/installer/cd-dvd/channel.nix ];
- virtualisation.writableStore = true;
- virtualisation.memorySize = 768;
-
- containers.webserver =
- { privateNetwork = true;
- hostAddress = "10.231.136.1";
- localAddress = "10.231.136.2";
- config =
- { services.httpd.enable = true;
- services.httpd.adminAddr = "foo@example.org";
- networking.firewall.allowedTCPPorts = [ 80 ];
- system.stateVersion = "18.03";
- };
- };
-
- virtualisation.pathsInNixDB = [ pkgs.stdenv ];
- };
-
- testScript =
- ''
- $machine->succeed("nixos-container list") =~ /webserver/ or die;
-
- # Start the webserver container.
- $machine->succeed("nixos-container start webserver");
-
- # wait two seconds for the container to start and the network to be up
- sleep 2;
-
- # Since "start" returns after the container has reached
- # multi-user.target, we should now be able to access it.
- my $ip = $machine->succeed("nixos-container show-ip webserver");
- chomp $ip;
- $machine->succeed("ping -n -c1 $ip");
- $machine->succeed("curl --fail http://$ip/ > /dev/null");
-
- # Stop the container.
- $machine->succeed("nixos-container stop webserver");
- $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
-
- # Destroying a declarative container should fail.
- $machine->fail("nixos-container destroy webserver");
- '';
-
-})
diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix
deleted file mode 100644
index a9499d192bd4..000000000000
--- a/nixos/tests/containers-ipv6.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-# Test for NixOS' container support.
-
-let
- hostIp = "fc00::2";
- localIp = "fc00::1";
-in
-
-import ./make-test.nix ({ pkgs, ...} : {
- name = "containers-ipv6";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ aristid aszlig eelco kampfschlaefer ];
- };
-
- machine =
- { pkgs, ... }:
- { imports = [ ../modules/installer/cd-dvd/channel.nix ];
- virtualisation.writableStore = true;
- virtualisation.memorySize = 768;
-
- containers.webserver =
- { privateNetwork = true;
- hostAddress6 = hostIp;
- localAddress6 = localIp;
- config =
- { services.httpd.enable = true;
- services.httpd.adminAddr = "foo@example.org";
- networking.firewall.allowedTCPPorts = [ 80 ];
- };
- };
-
- virtualisation.pathsInNixDB = [ pkgs.stdenv ];
- };
-
- testScript =
- ''
- $machine->waitForUnit("default.target");
- $machine->succeed("nixos-container list") =~ /webserver/ or die;
-
- # Start the webserver container.
- $machine->succeed("nixos-container start webserver");
-
- # wait two seconds for the container to start and the network to be up
- sleep 2;
-
- # Since "start" returns after the container has reached
- # multi-user.target, we should now be able to access it.
- my $ip = "${localIp}";
- chomp $ip;
- $machine->succeed("ping -n -c 1 $ip");
- $machine->succeed("curl --fail http://[$ip]/ > /dev/null");
-
- # Stop the container.
- $machine->succeed("nixos-container stop webserver");
- $machine->fail("curl --fail --connect-timeout 2 http://[$ip]/ > /dev/null");
-
- # Destroying a declarative container should fail.
- $machine->fail("nixos-container destroy webserver");
- '';
-
-})
diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix
index 2bdb926a8e2b..0e8f67bc76f0 100644
--- a/nixos/tests/containers-macvlans.nix
+++ b/nixos/tests/containers-macvlans.nix
@@ -6,7 +6,7 @@ let
containerIp2 = "192.168.1.254";
in
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-macvlans";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ montag451 ];
@@ -64,19 +64,23 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
- $machine1->waitForUnit("default.target");
- $machine2->waitForUnit("default.target");
+ start_all()
+ machine1.wait_for_unit("default.target")
+ machine2.wait_for_unit("default.target")
- # Ping between containers to check that macvlans are created in bridge mode
- $machine1->succeed("nixos-container run test1 -- ping -n -c 1 ${containerIp2}");
+ with subtest(
+ "Ping between containers to check that macvlans are created in bridge mode"
+ ):
+ machine1.succeed("nixos-container run test1 -- ping -n -c 1 ${containerIp2}")
- # Ping containers from the host (machine1)
- $machine1->succeed("ping -n -c 1 ${containerIp1}");
- $machine1->succeed("ping -n -c 1 ${containerIp2}");
+ with subtest("Ping containers from the host (machine1)"):
+ machine1.succeed("ping -n -c 1 ${containerIp1}")
+ machine1.succeed("ping -n -c 1 ${containerIp2}")
- # Ping containers from the second machine to check that containers are reachable from the outside
- $machine2->succeed("ping -n -c 1 ${containerIp1}");
- $machine2->succeed("ping -n -c 1 ${containerIp2}");
+ with subtest(
+ "Ping containers from the second machine to check that containers are reachable from the outside"
+ ):
+ machine2.succeed("ping -n -c 1 ${containerIp1}")
+ machine2.succeed("ping -n -c 1 ${containerIp2}")
'';
})
diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix
index 1e312f59f437..e800751a23c2 100644
--- a/nixos/tests/containers-physical_interfaces.nix
+++ b/nixos/tests/containers-physical_interfaces.nix
@@ -1,5 +1,5 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-physical_interfaces";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ kampfschlaefer ];
@@ -86,48 +86,51 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ start_all()
- subtest "prepare server", sub {
- $server->waitForUnit("default.target");
- $server->succeed("ip link show dev eth1 >&2");
- };
+ with subtest("Prepare server"):
+ server.wait_for_unit("default.target")
+ server.succeed("ip link show dev eth1 >&2")
- subtest "simple physical interface", sub {
- $server->succeed("nixos-container start server");
- $server->waitForUnit("container\@server");
- $server->succeed("systemctl -M server list-dependencies network-addresses-eth1.service >&2");
+ with subtest("Simple physical interface is up"):
+ server.succeed("nixos-container start server")
+ server.wait_for_unit("container@server")
+ server.succeed(
+ "systemctl -M server list-dependencies network-addresses-eth1.service >&2"
+ )
- # The other tests will ping this container on its ip. Here we just check
- # that the device is present in the container.
- $server->succeed("nixos-container run server -- ip a show dev eth1 >&2");
- };
+ # The other tests will ping this container on its ip. Here we just check
+ # that the device is present in the container.
+ server.succeed("nixos-container run server -- ip a show dev eth1 >&2")
- subtest "physical device in bridge in container", sub {
- $bridged->waitForUnit("default.target");
- $bridged->succeed("nixos-container start bridged");
- $bridged->waitForUnit("container\@bridged");
- $bridged->succeed("systemctl -M bridged list-dependencies network-addresses-br0.service >&2");
- $bridged->succeed("systemctl -M bridged status -n 30 -l network-addresses-br0.service");
- $bridged->succeed("nixos-container run bridged -- ping -w 10 -c 1 -n 10.10.0.1");
- };
+ with subtest("Physical device in bridge in container can ping server"):
+ bridged.wait_for_unit("default.target")
+ bridged.succeed("nixos-container start bridged")
+ bridged.wait_for_unit("container@bridged")
+ bridged.succeed(
+ "systemctl -M bridged list-dependencies network-addresses-br0.service >&2",
+ "systemctl -M bridged status -n 30 -l network-addresses-br0.service",
+ "nixos-container run bridged -- ping -w 10 -c 1 -n 10.10.0.1",
+ )
- subtest "physical device in bond in container", sub {
- $bonded->waitForUnit("default.target");
- $bonded->succeed("nixos-container start bonded");
- $bonded->waitForUnit("container\@bonded");
- $bonded->succeed("systemctl -M bonded list-dependencies network-addresses-bond0 >&2");
- $bonded->succeed("systemctl -M bonded status -n 30 -l network-addresses-bond0 >&2");
- $bonded->succeed("nixos-container run bonded -- ping -w 10 -c 1 -n 10.10.0.1");
- };
+ with subtest("Physical device in bond in container can ping server"):
+ bonded.wait_for_unit("default.target")
+ bonded.succeed("nixos-container start bonded")
+ bonded.wait_for_unit("container@bonded")
+ bonded.succeed(
+ "systemctl -M bonded list-dependencies network-addresses-bond0 >&2",
+ "systemctl -M bonded status -n 30 -l network-addresses-bond0 >&2",
+ "nixos-container run bonded -- ping -w 10 -c 1 -n 10.10.0.1",
+ )
- subtest "physical device in bond in bridge in container", sub {
- $bridgedbond->waitForUnit("default.target");
- $bridgedbond->succeed("nixos-container start bridgedbond");
- $bridgedbond->waitForUnit("container\@bridgedbond");
- $bridgedbond->succeed("systemctl -M bridgedbond list-dependencies network-addresses-br0.service >&2");
- $bridgedbond->succeed("systemctl -M bridgedbond status -n 30 -l network-addresses-br0.service");
- $bridgedbond->succeed("nixos-container run bridgedbond -- ping -w 10 -c 1 -n 10.10.0.1");
- };
+ with subtest("Physical device in bond in bridge in container can ping server"):
+ bridgedbond.wait_for_unit("default.target")
+ bridgedbond.succeed("nixos-container start bridgedbond")
+ bridgedbond.wait_for_unit("container@bridgedbond")
+ bridgedbond.succeed(
+ "systemctl -M bridgedbond list-dependencies network-addresses-br0.service >&2",
+ "systemctl -M bridgedbond status -n 30 -l network-addresses-br0.service",
+ "nixos-container run bridgedbond -- ping -w 10 -c 1 -n 10.10.0.1",
+ )
'';
})
diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix
index ec8e9629c21d..fc90e151bd9e 100644
--- a/nixos/tests/containers-portforward.nix
+++ b/nixos/tests/containers-portforward.nix
@@ -7,7 +7,7 @@ let
containerPort = 80;
in
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-portforward";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aristid aszlig eelco kampfschlaefer ianwookim ];
@@ -36,27 +36,27 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- $machine->succeed("nixos-container list") =~ /webserver/ or die;
+ container_list = machine.succeed("nixos-container list")
+ assert "webserver" in container_list
# Start the webserver container.
- $machine->succeed("nixos-container start webserver");
+ machine.succeed("nixos-container start webserver")
# wait two seconds for the container to start and the network to be up
- sleep 2;
+ machine.sleep(2)
# Since "start" returns after the container has reached
# multi-user.target, we should now be able to access it.
- #my $ip = $machine->succeed("nixos-container show-ip webserver");
- #chomp $ip;
- $machine->succeed("ping -n -c1 ${hostIp}");
- $machine->succeed("curl --fail http://${hostIp}:${toString hostPort}/ > /dev/null");
+ # ip = machine.succeed("nixos-container show-ip webserver").strip()
+ machine.succeed("ping -n -c1 ${hostIp}")
+ machine.succeed("curl --fail http://${hostIp}:${toString hostPort}/ > /dev/null")
# Stop the container.
- $machine->succeed("nixos-container stop webserver");
- $machine->fail("curl --fail --connect-timeout 2 http://${hostIp}:${toString hostPort}/ > /dev/null");
+ machine.succeed("nixos-container stop webserver")
+ machine.fail("curl --fail --connect-timeout 2 http://${hostIp}:${toString hostPort}/ > /dev/null")
# Destroying a declarative container should fail.
- $machine->fail("nixos-container destroy webserver");
+ machine.fail("nixos-container destroy webserver")
'';
})
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
index f41dea91b1e4..35aff91e85b5 100644
--- a/nixos/tests/containers-reloadable.nix
+++ b/nixos/tests/containers-reloadable.nix
@@ -1,7 +1,7 @@
-import ./make-test.nix ({ pkgs, lib, ...} :
+import ./make-test-python.nix ({ pkgs, lib, ...} :
let
client_base = {
-
+
containers.test1 = {
autoStart = true;
config = {
@@ -48,18 +48,25 @@ in {
c1System = nodes.client_c1.config.system.build.toplevel;
c2System = nodes.client_c2.config.system.build.toplevel;
in ''
- $client->start();
- $client->waitForUnit("default.target");
- $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_base ]] >&2");
+ client.start()
+ client.wait_for_unit("default.target")
- $client->succeed("${c1System}/bin/switch-to-configuration test >&2");
- $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_c1 ]] >&2");
- $client->succeed("systemctl status httpd -M test1 >&2");
+ assert "client_base" in client.succeed("nixos-container run test1 cat /etc/check")
- $client->succeed("${c2System}/bin/switch-to-configuration test >&2");
- $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_c2 ]] >&2");
- $client->fail("systemctl status httpd -M test1 >&2");
- $client->succeed("systemctl status nginx -M test1 >&2");
+ with subtest("httpd is available after activating config1"):
+ client.succeed(
+ "${c1System}/bin/switch-to-configuration test >&2",
+ "[[ $(nixos-container run test1 cat /etc/check) == client_c1 ]] >&2",
+ "systemctl status httpd -M test1 >&2",
+ )
+
+ with subtest("httpd is not available any longer after switching to config2"):
+ client.succeed(
+ "${c2System}/bin/switch-to-configuration test >&2",
+ "[[ $(nixos-container run test1 cat /etc/check) == client_c2 ]] >&2",
+ "systemctl status nginx -M test1 >&2",
+ )
+ client.fail("systemctl status httpd -M test1 >&2")
'';
})
diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix
index df15f5b2f455..b50dadd13e47 100644
--- a/nixos/tests/containers-restart_networking.nix
+++ b/nixos/tests/containers-restart_networking.nix
@@ -16,7 +16,7 @@ let
};
};
};
-in import ./make-test.nix ({ pkgs, ...} :
+in import ./make-test-python.nix ({ pkgs, ...} :
{
name = "containers-restart_networking";
meta = with pkgs.stdenv.lib.maintainers; {
@@ -64,50 +64,52 @@ in import ./make-test.nix ({ pkgs, ...} :
eth1_bridged = nodes.client_eth1.config.system.build.toplevel;
eth1_rstp = nodes.client_eth1_rstp.config.system.build.toplevel;
in ''
- $client->start();
+ client.start()
- $client->waitForUnit("default.target");
+ client.wait_for_unit("default.target")
- subtest "initial state", sub {
- $client->succeed("ping 192.168.1.122 -c 1 -n >&2");
- $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2");
+ with subtest("Initial configuration connectivity check"):
+ client.succeed("ping 192.168.1.122 -c 1 -n >&2")
+ client.succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2")
- $client->fail("ip l show eth1 |grep \"master br0\" >&2");
- $client->fail("grep eth1 /run/br0.interfaces >&2");
- };
+ client.fail("ip l show eth1 |grep 'master br0' >&2")
+ client.fail("grep eth1 /run/br0.interfaces >&2")
- subtest "interfaces without stp", sub {
- $client->succeed("${eth1_bridged}/bin/switch-to-configuration test >&2");
+ with subtest("Bridged configuration without STP preserves connectivity"):
+ client.succeed(
+ "${eth1_bridged}/bin/switch-to-configuration test >&2"
+ )
- $client->succeed("ping 192.168.1.122 -c 1 -n >&2");
- $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2");
+ client.succeed(
+ "ping 192.168.1.122 -c 1 -n >&2",
+ "nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2",
+ "ip l show eth1 |grep 'master br0' >&2",
+ "grep eth1 /run/br0.interfaces >&2",
+ )
- $client->succeed("ip l show eth1 |grep \"master br0\" >&2");
- $client->succeed("grep eth1 /run/br0.interfaces >&2");
- };
-
- # activating rstp needs another service, therefor the bridge will restart and the container will loose its connectivity
- #subtest "interfaces with rstp", sub {
- # $client->succeed("${eth1_rstp}/bin/switch-to-configuration test >&2");
- # $client->execute("ip -4 a >&2");
- # $client->execute("ip l >&2");
+ # activating rstp needs another service, therefore the bridge will restart and the container will lose its connectivity
+ # with subtest("Bridged configuration with STP"):
+ # client.succeed("${eth1_rstp}/bin/switch-to-configuration test >&2")
+ # client.execute("ip -4 a >&2")
+ # client.execute("ip l >&2")
#
- # $client->succeed("ping 192.168.1.122 -c 1 -n >&2");
- # $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2");
- #
- # $client->succeed("ip l show eth1 |grep \"master br0\" >&2");
- # $client->succeed("grep eth1 /run/br0.interfaces >&2");
- #};
+ # client.succeed(
+ # "ping 192.168.1.122 -c 1 -n >&2",
+ # "nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2",
+ # "ip l show eth1 |grep 'master br0' >&2",
+ # "grep eth1 /run/br0.interfaces >&2",
+ # )
- subtest "back to no interfaces and no stp", sub {
- $client->succeed("${originalSystem}/bin/switch-to-configuration test >&2");
+ with subtest("Reverting to initial configuration preserves connectivity"):
+ client.succeed(
+ "${originalSystem}/bin/switch-to-configuration test >&2"
+ )
- $client->succeed("ping 192.168.1.122 -c 1 -n >&2");
- $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2");
+ client.succeed("ping 192.168.1.122 -c 1 -n >&2")
+ client.succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2")
- $client->fail("ip l show eth1 |grep \"master br0\" >&2");
- $client->fail("grep eth1 /run/br0.interfaces >&2");
- };
+ client.fail("ip l show eth1 |grep 'master br0' >&2")
+ client.fail("grep eth1 /run/br0.interfaces >&2")
'';
})
diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix
index e29fe6bbf032..171e8f01c7b9 100644
--- a/nixos/tests/containers-tmpfs.nix
+++ b/nixos/tests/containers-tmpfs.nix
@@ -1,6 +1,6 @@
# Test for NixOS' container support.
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "containers-tmpfs";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ kampka ];
@@ -31,49 +31,63 @@ import ./make-test.nix ({ pkgs, ...} : {
virtualisation.pathsInNixDB = [ pkgs.stdenv ];
};
- testScript =
- ''
- $machine->waitForUnit("default.target");
- $machine->succeed("nixos-container list") =~ /tmpfs/ or die;
+ testScript = ''
+ machine.wait_for_unit("default.target")
+ assert "tmpfs" in machine.succeed("nixos-container list")
- # Start the tmpfs container.
- #$machine->succeed("nixos-container status tmpfs") =~ /up/ or die;
-
- # Verify that /var is mounted as a tmpfs
- #$machine->succeed("nixos-container run tmpfs -- systemctl status var.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die;
- $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var 2>/dev/null");
-
- # Verify that /var/log is mounted as a tmpfs
- $machine->succeed("nixos-container run tmpfs -- systemctl status var-log.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die;
- $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var/log 2>/dev/null");
-
- # Verify that /some/random/path is mounted as a tmpfs
- $machine->succeed("nixos-container run tmpfs -- systemctl status some-random-path.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die;
- $machine->succeed("nixos-container run tmpfs -- mountpoint -q /some/random/path 2>/dev/null");
-
- # Verify that files created in the container in a non-tmpfs directory are visible on the host.
- # This establishes legitimacy for the following tests
- $machine->succeed("nixos-container run tmpfs -- touch /root/test.file 2>/dev/null");
- $machine->succeed("nixos-container run tmpfs -- ls -l /root | grep -q test.file 2>/dev/null");
- $machine->succeed("test -e /var/lib/containers/tmpfs/root/test.file");
+ with subtest("tmpfs container is up"):
+ assert "up" in machine.succeed("nixos-container status tmpfs")
- # Verify that /some/random/path is writable and that files created there
- # are not in the hosts container dir but in the tmpfs
- $machine->succeed("nixos-container run tmpfs -- touch /some/random/path/test.file 2>/dev/null");
- $machine->succeed("nixos-container run tmpfs -- test -e /some/random/path/test.file 2>/dev/null");
+ def tmpfs_cmd(command):
+ return f"nixos-container run tmpfs -- {command} 2>/dev/null"
- $machine->fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file");
- # Verify that files created in the hosts container dir in a path where a tmpfs file system has been mounted
- # are not visible to the container as the do not exist in the tmpfs
- $machine->succeed("touch /var/lib/containers/tmpfs/var/test.file");
+ with subtest("/var is mounted as a tmpfs"):
+ machine.succeed(tmpfs_cmd("mountpoint -q /var"))
- $machine->succeed("test -e /var/lib/containers/tmpfs/var/test.file");
- $machine->succeed("ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null");
+ with subtest("/var/log is mounted as a tmpfs"):
+ assert "What: tmpfs" in machine.succeed(
+ tmpfs_cmd("systemctl status var-log.mount --no-pager")
+ )
+ machine.succeed(tmpfs_cmd("mountpoint -q /var/log"))
- $machine->fail("nixos-container run tmpfs -- ls -l /var | grep -q test.file 2>/dev/null");
+ with subtest("/some/random/path is mounted as a tmpfs"):
+ assert "What: tmpfs" in machine.succeed(
+ tmpfs_cmd("systemctl status some-random-path.mount --no-pager")
+ )
+ machine.succeed(tmpfs_cmd("mountpoint -q /some/random/path"))
+ with subtest(
+ "files created in the container in a non-tmpfs directory are visible on the host."
+ ):
+ # This establishes legitimacy for the following tests
+ machine.succeed(
+ tmpfs_cmd("touch /root/test.file"),
+ tmpfs_cmd("ls -l /root | grep -q test.file"),
+ "test -e /var/lib/containers/tmpfs/root/test.file",
+ )
+
+ with subtest(
+ "/some/random/path is writable and that files created there are not "
+ + "in the hosts container dir but in the tmpfs"
+ ):
+ machine.succeed(
+ tmpfs_cmd("touch /some/random/path/test.file"),
+ tmpfs_cmd("test -e /some/random/path/test.file"),
+ )
+ machine.fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file")
+
+ with subtest(
+ "files created in the hosts container dir in a path where a tmpfs "
+ + "file system has been mounted are not visible to the container as "
+ + "the do not exist in the tmpfs"
+ ):
+ machine.succeed(
+ "touch /var/lib/containers/tmpfs/var/test.file",
+ "test -e /var/lib/containers/tmpfs/var/test.file",
+ "ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null",
+ )
+ machine.fail(tmpfs_cmd("ls -l /var | grep -q test.file"))
'';
-
})
diff --git a/nixos/tests/couchdb.nix b/nixos/tests/couchdb.nix
index 48ea48eebbb3..10e95701acdb 100644
--- a/nixos/tests/couchdb.nix
+++ b/nixos/tests/couchdb.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ...}:
+import ./make-test-python.nix ({ pkgs, lib, ...}:
with lib;
@@ -35,22 +35,42 @@ with lib;
fi
'';
in ''
- startAll;
+ start_all()
- $couchdb1->waitForUnit("couchdb.service");
- $couchdb1->waitUntilSucceeds("${curlJqCheck "GET" "" ".couchdb" "Welcome"}");
- $couchdb1->waitUntilSucceeds("${curlJqCheck "GET" "_all_dbs" ". | length" "2"}");
- $couchdb1->succeed("${curlJqCheck "PUT" "foo" ".ok" "true"}");
- $couchdb1->succeed("${curlJqCheck "GET" "_all_dbs" ". | length" "3"}");
- $couchdb1->succeed("${curlJqCheck "DELETE" "foo" ".ok" "true"}");
- $couchdb1->succeed("${curlJqCheck "GET" "_all_dbs" ". | length" "2"}");
+ couchdb1.wait_for_unit("couchdb.service")
+ couchdb1.wait_until_succeeds(
+ "${curlJqCheck "GET" "" ".couchdb" "Welcome"}"
+ )
+ couchdb1.wait_until_succeeds(
+ "${curlJqCheck "GET" "_all_dbs" ". | length" "2"}"
+ )
+ couchdb1.succeed("${curlJqCheck "PUT" "foo" ".ok" "true"}")
+ couchdb1.succeed(
+ "${curlJqCheck "GET" "_all_dbs" ". | length" "3"}"
+ )
+ couchdb1.succeed(
+ "${curlJqCheck "DELETE" "foo" ".ok" "true"}"
+ )
+ couchdb1.succeed(
+ "${curlJqCheck "GET" "_all_dbs" ". | length" "2"}"
+ )
- $couchdb2->waitForUnit("couchdb.service");
- $couchdb2->waitUntilSucceeds("${curlJqCheck "GET" "" ".couchdb" "Welcome"}");
- $couchdb2->waitUntilSucceeds("${curlJqCheck "GET" "_all_dbs" ". | length" "0"}");
- $couchdb2->succeed("${curlJqCheck "PUT" "foo" ".ok" "true"}");
- $couchdb2->succeed("${curlJqCheck "GET" "_all_dbs" ". | length" "1"}");
- $couchdb2->succeed("${curlJqCheck "DELETE" "foo" ".ok" "true"}");
- $couchdb2->succeed("${curlJqCheck "GET" "_all_dbs" ". | length" "0"}");
+ couchdb2.wait_for_unit("couchdb.service")
+ couchdb2.wait_until_succeeds(
+ "${curlJqCheck "GET" "" ".couchdb" "Welcome"}"
+ )
+ couchdb2.wait_until_succeeds(
+ "${curlJqCheck "GET" "_all_dbs" ". | length" "0"}"
+ )
+ couchdb2.succeed("${curlJqCheck "PUT" "foo" ".ok" "true"}")
+ couchdb2.succeed(
+ "${curlJqCheck "GET" "_all_dbs" ". | length" "1"}"
+ )
+ couchdb2.succeed(
+ "${curlJqCheck "DELETE" "foo" ".ok" "true"}"
+ )
+ couchdb2.succeed(
+ "${curlJqCheck "GET" "_all_dbs" ". | length" "0"}"
+ )
'';
})
diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix
index b58030409b5c..37689c3d9137 100644
--- a/nixos/tests/deluge.nix
+++ b/nixos/tests/deluge.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "deluge";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ flokli ];
@@ -45,18 +45,20 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ start_all()
- $simple->waitForUnit("deluged");
- $simple->waitForUnit("delugeweb");
- $simple->waitForOpenPort("8112");
- $declarative->waitForUnit("network.target");
- $declarative->waitUntilSucceeds("curl --fail http://simple:8112");
+ simple.wait_for_unit("deluged")
+ simple.wait_for_unit("delugeweb")
+ simple.wait_for_open_port("8112")
+ declarative.wait_for_unit("network.target")
+ declarative.wait_until_succeeds("curl --fail http://simple:8112")
- $declarative->waitForUnit("deluged");
- $declarative->waitForUnit("delugeweb");
- $declarative->waitUntilSucceeds("curl --fail http://declarative:3142");
- $declarative->succeed("deluge-console 'help' | grep -q 'rm - Remove a torrent'");
- $declarative->succeed("deluge-console 'connect 127.0.0.1:58846 andrew password; help' | grep -q 'rm - Remove a torrent'");
+ declarative.wait_for_unit("deluged")
+ declarative.wait_for_unit("delugeweb")
+ declarative.wait_until_succeeds("curl --fail http://declarative:3142")
+ declarative.succeed("deluge-console 'help' | grep -q 'rm - Remove a torrent'")
+ declarative.succeed(
+ "deluge-console 'connect 127.0.0.1:58846 andrew password; help' | grep -q 'rm - Remove a torrent'"
+ )
'';
})
diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix
index d11dfeec5d0c..a0de2911777c 100644
--- a/nixos/tests/dhparams.nix
+++ b/nixos/tests/dhparams.nix
@@ -4,7 +4,7 @@ let
environment.systemPackages = [ pkgs.openssl ];
};
-in import ./make-test.nix {
+in import ./make-test-python.nix {
name = "dhparams";
nodes.generation1 = { pkgs, config, ... }: {
@@ -66,79 +66,77 @@ in import ./make-test.nix {
node = "generation${toString gen}";
in nodes.${node}.config.security.dhparams.params.${name}.path;
- assertParamBits = gen: name: bits: let
- path = getParamPath gen name;
- in ''
- $machine->nest('check bit size of ${path}', sub {
- my $out = $machine->succeed('openssl dhparam -in ${path} -text');
- $out =~ /^\s*DH Parameters:\s+\((\d+)\s+bit\)\s*$/m;
- die "bit size should be ${toString bits} but it is $1 instead."
- if $1 != ${toString bits};
- });
- '';
-
switchToGeneration = gen: let
node = "generation${toString gen}";
inherit (nodes.${node}.config.system.build) toplevel;
switchCmd = "${toplevel}/bin/switch-to-configuration test";
in ''
- $machine->nest('switch to generation ${toString gen}', sub {
- $machine->succeed('${switchCmd}');
- $main::machine = ''$${node};
- });
+ with machine.nested("switch to generation ${toString gen}"):
+ machine.succeed(
+ "${switchCmd}"
+ )
+ machine = ${node}
'';
in ''
- my $machine = $generation1;
+ import re
- $machine->waitForUnit('multi-user.target');
- subtest "verify startup order", sub {
- $machine->succeed('systemctl is-active foo.service');
- };
+ def assert_param_bits(path, bits):
+ with machine.nested(f"check bit size of {path}"):
+ output = machine.succeed(f"openssl dhparam -in {path} -text")
+ pattern = re.compile(r"^\s*DH Parameters:\s+\((\d+)\s+bit\)\s*$", re.M)
+ match = pattern.match(output)
+ if match is None:
+ raise Exception("bla")
+ if match[1] != str(bits):
+ raise Exception(f"bit size should be {bits} but it is {match[1]} instead.")
- subtest "check bit sizes of dhparam files", sub {
- ${assertParamBits 1 "foo" 16}
- ${assertParamBits 1 "bar" 17}
- };
+
+ machine = generation1
+
+ machine.wait_for_unit("multi-user.target")
+
+ with subtest("verify startup order"):
+ machine.succeed("systemctl is-active foo.service")
+
+ with subtest("check bit sizes of dhparam files"):
+ assert_param_bits("${getParamPath 1 "foo"}", 16)
+ assert_param_bits("${getParamPath 1 "bar"}", 17)
${switchToGeneration 2}
- subtest "check whether bit size has changed", sub {
- ${assertParamBits 2 "foo" 18}
- };
+ with subtest("check whether bit size has changed"):
+ assert_param_bits("${getParamPath 2 "foo"}", 18)
- subtest "ensure that dhparams file for 'bar' was deleted", sub {
- $machine->fail('test -e ${getParamPath 1 "bar"}');
- };
+ with subtest("ensure that dhparams file for 'bar' was deleted"):
+ machine.fail("test -e ${getParamPath 1 "bar"}")
${switchToGeneration 3}
- subtest "ensure that 'security.dhparams.path' has been deleted", sub {
- $machine->fail(
- 'test -e ${nodes.generation3.config.security.dhparams.path}'
- );
- };
+ with subtest("ensure that 'security.dhparams.path' has been deleted"):
+ machine.fail("test -e ${nodes.generation3.config.security.dhparams.path}")
${switchToGeneration 4}
- subtest "check bit sizes dhparam files", sub {
- ${assertParamBits 4 "foo2" 18}
- ${assertParamBits 4 "bar2" 19}
- };
+ with subtest("check bit sizes dhparam files"):
+ assert_param_bits(
+ "${getParamPath 4 "foo2"}", 18
+ )
+ assert_param_bits(
+ "${getParamPath 4 "bar2"}", 19
+ )
- subtest "check whether dhparam files are in the Nix store", sub {
- $machine->succeed(
- 'expr match ${getParamPath 4 "foo2"} ${builtins.storeDir}',
- 'expr match ${getParamPath 4 "bar2"} ${builtins.storeDir}',
- );
- };
+ with subtest("check whether dhparam files are in the Nix store"):
+ machine.succeed(
+ "expr match ${getParamPath 4 "foo2"} ${builtins.storeDir}",
+ "expr match ${getParamPath 4 "bar2"} ${builtins.storeDir}",
+ )
${switchToGeneration 5}
- subtest "check whether defaultBitSize works as intended", sub {
- ${assertParamBits 5 "foo3" 30}
- ${assertParamBits 5 "bar3" 30}
- };
+ with subtest("check whether defaultBitSize works as intended"):
+ assert_param_bits("${getParamPath 5 "foo3"}", 30)
+ assert_param_bits("${getParamPath 5 "bar3"}", 30)
'';
}
diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix
index 13bc9d3d9168..98153d5c9047 100644
--- a/nixos/tests/dnscrypt-proxy.nix
+++ b/nixos/tests/dnscrypt-proxy.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "dnscrypt-proxy";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ joachifm ];
@@ -23,11 +23,13 @@ import ./make-test.nix ({ pkgs, ... }: {
};
testScript = ''
- $client->waitForUnit("dnsmasq");
+ client.wait_for_unit("dnsmasq")
# The daemon is socket activated; sending a single ping should activate it.
- $client->fail("systemctl is-active dnscrypt-proxy");
- $client->execute("${pkgs.iputils}/bin/ping -c1 example.com");
- $client->waitUntilSucceeds("systemctl is-active dnscrypt-proxy");
+ client.fail("systemctl is-active dnscrypt-proxy")
+ client.execute(
+ "${pkgs.iputils}/bin/ping -c1 example.com"
+ )
+ client.wait_until_succeeds("systemctl is-active dnscrypt-proxy")
'';
})
diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix
index b306c149be91..96de885a554a 100644
--- a/nixos/tests/docker-edge.nix
+++ b/nixos/tests/docker-edge.nix
@@ -1,6 +1,6 @@
# This test runs docker and checks if simple container starts
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "docker";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus offline ];
@@ -31,17 +31,19 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ start_all()
- $docker->waitForUnit("sockets.target");
- $docker->succeed("tar cv --files-from /dev/null | docker import - scratchimg");
- $docker->succeed("docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10");
- $docker->succeed("docker ps | grep sleeping");
- $docker->succeed("sudo -u hasprivs docker ps");
- $docker->fail("sudo -u noprivs docker ps");
- $docker->succeed("docker stop sleeping");
+ docker.wait_for_unit("sockets.target")
+ docker.succeed("tar cv --files-from /dev/null | docker import - scratchimg")
+ docker.succeed(
+ "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
+ )
+ docker.succeed("docker ps | grep sleeping")
+ docker.succeed("sudo -u hasprivs docker ps")
+ docker.fail("sudo -u noprivs docker ps")
+ docker.succeed("docker stop sleeping")
# Must match version twice to ensure client and server versions are correct
- $docker->succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "2" ]');
+ docker.succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "2" ]')
'';
})
diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix
index 8936421072a9..2928fd8141a4 100644
--- a/nixos/tests/docker-registry.nix
+++ b/nixos/tests/docker-registry.nix
@@ -1,6 +1,6 @@
# This test runs docker-registry and check if it works
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "docker-registry";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ globin ma27 ironpinguin ];
@@ -28,36 +28,34 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- $client1->start();
- $client1->waitForUnit("docker.service");
- $client1->succeed("tar cv --files-from /dev/null | docker import - scratch");
- $client1->succeed("docker tag scratch registry:8080/scratch");
+ client1.start()
+ client1.wait_for_unit("docker.service")
+ client1.succeed("tar cv --files-from /dev/null | docker import - scratch")
+ client1.succeed("docker tag scratch registry:8080/scratch")
- $registry->start();
- $registry->waitForUnit("docker-registry.service");
- $registry->waitForOpenPort("8080");
- $client1->succeed("docker push registry:8080/scratch");
+ registry.start()
+ registry.wait_for_unit("docker-registry.service")
+ registry.wait_for_open_port("8080")
+ client1.succeed("docker push registry:8080/scratch")
- $client2->start();
- $client2->waitForUnit("docker.service");
- $client2->succeed("docker pull registry:8080/scratch");
- $client2->succeed("docker images | grep scratch");
+ client2.start()
+ client2.wait_for_unit("docker.service")
+ client2.succeed("docker pull registry:8080/scratch")
+ client2.succeed("docker images | grep scratch")
- $client2->succeed(
- 'curl -fsS -X DELETE registry:8080/v2/scratch/manifests/$(curl -fsS -I -H"Accept: application/vnd.docker.distribution.manifest.v2+json" registry:8080/v2/scratch/manifests/latest | grep Docker-Content-Digest | sed -e \'s/Docker-Content-Digest: //\' | tr -d \'\r\')'
- );
+ client2.succeed(
+ "curl -fsS -X DELETE registry:8080/v2/scratch/manifests/$(curl -fsS -I -H\"Accept: application/vnd.docker.distribution.manifest.v2+json\" registry:8080/v2/scratch/manifests/latest | grep Docker-Content-Digest | sed -e 's/Docker-Content-Digest: //' | tr -d '\\r')"
+ )
- $registry->systemctl("start docker-registry-garbage-collect.service");
- $registry->waitUntilFails("systemctl status docker-registry-garbage-collect.service");
- $registry->waitForUnit("docker-registry.service");
+ registry.systemctl("start docker-registry-garbage-collect.service")
+ registry.wait_until_fails("systemctl status docker-registry-garbage-collect.service")
+ registry.wait_for_unit("docker-registry.service")
- $registry->fail(
- 'ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data'
- );
+ registry.fail("ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data")
- $client1->succeed("docker push registry:8080/scratch");
- $registry->succeed(
- 'ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data'
- );
+ client1.succeed("docker push registry:8080/scratch")
+ registry.succeed(
+ "ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data"
+ )
'';
})
diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix
index 637957bd3e8b..1a0e0ea67750 100644
--- a/nixos/tests/docker-tools-overlay.nix
+++ b/nixos/tests/docker-tools-overlay.nix
@@ -1,6 +1,6 @@
# this test creates a simple GNU image with docker tools and sees if it executes
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
{
name = "docker-tools-overlay";
meta = with pkgs.stdenv.lib.maintainers; {
@@ -16,17 +16,18 @@ import ./make-test.nix ({ pkgs, ... }:
};
};
- testScript =
- ''
- $docker->waitForUnit("sockets.target");
+ testScript = ''
+ docker.wait_for_unit("sockets.target")
- $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'");
- $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version");
+ docker.succeed(
+ "docker load --input='${pkgs.dockerTools.examples.bash}'",
+ "docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version",
+ )
# Check if the nix store has correct user permissions depending on what
# storage driver is used, incorrectly built images can show up as readonly.
# drw------- 3 0 0 3 Apr 14 11:36 /nix
# drw------- 99 0 0 100 Apr 14 11:36 /nix/store
- $docker->succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version");
+ docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version")
'';
})
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index d67b2f8743d8..8fda7c1395ef 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -1,6 +1,6 @@
# This test runs docker and checks if simple container starts
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "docker";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus offline ];
@@ -31,17 +31,19 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ start_all()
- $docker->waitForUnit("sockets.target");
- $docker->succeed("tar cv --files-from /dev/null | docker import - scratchimg");
- $docker->succeed("docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10");
- $docker->succeed("docker ps | grep sleeping");
- $docker->succeed("sudo -u hasprivs docker ps");
- $docker->fail("sudo -u noprivs docker ps");
- $docker->succeed("docker stop sleeping");
+ docker.wait_for_unit("sockets.target")
+ docker.succeed("tar cv --files-from /dev/null | docker import - scratchimg")
+ docker.succeed(
+ "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
+ )
+ docker.succeed("docker ps | grep sleeping")
+ docker.succeed("sudo -u hasprivs docker ps")
+ docker.fail("sudo -u noprivs docker ps")
+ docker.succeed("docker stop sleeping")
# Must match version twice to ensure client and server versions are correct
- $docker->succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "2" ]');
+ docker.succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "2" ]')
'';
})
diff --git a/nixos/tests/documize.nix b/nixos/tests/documize.nix
index 8b852a4f7795..3be20a780d31 100644
--- a/nixos/tests/documize.nix
+++ b/nixos/tests/documize.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "documize";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ma27 ];
@@ -29,30 +29,34 @@ import ./make-test.nix ({ pkgs, lib, ...} : {
};
testScript = ''
- startAll;
+ start_all()
- $machine->waitForUnit("documize-server.service");
- $machine->waitForOpenPort(3000);
+ machine.wait_for_unit("documize-server.service")
+ machine.wait_for_open_port(3000)
- my $dbhash = $machine->succeed("curl -f localhost:3000 "
- . " | grep 'property=\"dbhash' "
- . " | grep -Po 'content=\"\\K[^\"]*'"
- );
+ dbhash = machine.succeed(
+ "curl -f localhost:3000 | grep 'property=\"dbhash' | grep -Po 'content=\"\\K[^\"]*'"
+ )
- chomp($dbhash);
+ dbhash = dbhash.strip()
- $machine->succeed("curl -X POST "
- . "--data 'dbname=documize' "
- . "--data 'dbhash=$dbhash' "
- . "--data 'title=NixOS' "
- . "--data 'message=Docs' "
- . "--data 'firstname=John' "
- . "--data 'lastname=Doe' "
- . "--data 'email=john.doe\@nixos.org' "
- . "--data 'password=verysafe' "
- . "-f localhost:3000/api/setup"
- );
+ machine.succeed(
+ (
+ "curl -X POST"
+ " --data 'dbname=documize'"
+ " --data 'dbhash={}'"
+ " --data 'title=NixOS'"
+ " --data 'message=Docs'"
+ " --data 'firstname=John'"
+ " --data 'lastname=Doe'"
+ " --data 'email=john.doe@nixos.org'"
+ " --data 'password=verysafe'"
+ " -f localhost:3000/api/setup"
+ ).format(dbhash)
+ )
- $machine->succeed('test "$(curl -f localhost:3000/api/public/meta | jq ".title" | xargs echo)" = "NixOS"');
+ machine.succeed(
+ 'test "$(curl -f localhost:3000/api/public/meta | jq ".title" | xargs echo)" = "NixOS"'
+ )
'';
})
diff --git a/nixos/tests/dovecot.nix b/nixos/tests/dovecot.nix
index 156079d1d585..c19850f418bc 100644
--- a/nixos/tests/dovecot.nix
+++ b/nixos/tests/dovecot.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix {
+import ./make-test-python.nix {
name = "dovecot";
machine = { pkgs, ... }: {
@@ -66,12 +66,12 @@ import ./make-test.nix {
};
testScript = ''
- $machine->waitForUnit('postfix.service');
- $machine->waitForUnit('dovecot2.service');
- $machine->succeed('send-testmail');
- $machine->succeed('send-lda');
- $machine->waitUntilFails('[ "$(postqueue -p)" != "Mail queue is empty" ]');
- $machine->succeed('test-imap');
- $machine->succeed('test-pop');
+ machine.wait_for_unit("postfix.service")
+ machine.wait_for_unit("dovecot2.service")
+ machine.succeed("send-testmail")
+ machine.succeed("send-lda")
+ machine.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]')
+ machine.succeed("test-imap")
+ machine.succeed("test-pop")
'';
}
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index 384fce67c227..c649ce852dad 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -113,7 +113,7 @@ in {
services.httpd = {
enable = true;
adminAddr = "test@example.org";
- documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
+ virtualHosts.localhost.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
};
networking.firewall.allowedTCPPorts = [ 80 ];
}
diff --git a/nixos/tests/ecryptfs.nix b/nixos/tests/ecryptfs.nix
index 3f02cecb8662..ef7bd13eb92c 100644
--- a/nixos/tests/ecryptfs.nix
+++ b/nixos/tests/ecryptfs.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ ... }:
+import ./make-test-python.nix ({ ... }:
{
name = "ecryptfs";
@@ -10,75 +10,76 @@ import ./make-test.nix ({ ... }:
};
testScript = ''
- $machine->waitForUnit("default.target");
+ def login_as_alice():
+ machine.wait_until_tty_matches(1, "login: ")
+ machine.send_chars("alice\n")
+ machine.wait_until_tty_matches(1, "Password: ")
+ machine.send_chars("foobar\n")
+ machine.wait_until_tty_matches(1, "alice\@machine")
- # Set alice up with a password and a home
- $machine->succeed("(echo foobar; echo foobar) | passwd alice");
- $machine->succeed("chown -R alice.users ~alice");
- # Migrate alice's home
- my $out = $machine->succeed("echo foobar | ecryptfs-migrate-home -u alice");
- $machine->log("ecryptfs-migrate-home said: $out");
+ def logout():
+ machine.send_chars("logout\n")
+ machine.wait_until_tty_matches(1, "login: ")
- # Log alice in (ecryptfs passwhrase is wrapped during first login)
- $machine->waitUntilTTYMatches(1, "login: ");
- $machine->sendChars("alice\n");
- $machine->waitUntilTTYMatches(1, "Password: ");
- $machine->sendChars("foobar\n");
- $machine->waitUntilTTYMatches(1, "alice\@machine");
- $machine->sendChars("logout\n");
- $machine->waitUntilTTYMatches(1, "login: ");
+
+ machine.wait_for_unit("default.target")
+
+ with subtest("Set alice up with a password and a home"):
+ machine.succeed("(echo foobar; echo foobar) | passwd alice")
+ machine.succeed("chown -R alice.users ~alice")
+
+ with subtest("Migrate alice's home"):
+ out = machine.succeed("echo foobar | ecryptfs-migrate-home -u alice")
+ machine.log(f"ecryptfs-migrate-home said: {out}")
+
+ with subtest("Log alice in (ecryptfs passwhrase is wrapped during first login)"):
+ login_as_alice()
+ machine.send_chars("logout\n")
+ machine.wait_until_tty_matches(1, "login: ")
# Why do I need to do this??
- $machine->succeed("su alice -c ecryptfs-umount-private || true");
- $machine->sleep(1);
- $machine->fail("mount | grep ecryptfs"); # check that encrypted home is not mounted
+ machine.succeed("su alice -c ecryptfs-umount-private || true")
+ machine.sleep(1)
- # Show contents of the user keyring
- my $out = $machine->succeed("su - alice -c 'keyctl list \@u'");
- $machine->log("keyctl unlink said: " . $out);
+ with subtest("check that encrypted home is not mounted"):
+ machine.fail("mount | grep ecryptfs")
- # Log alice again
- $machine->waitUntilTTYMatches(1, "login: ");
- $machine->sendChars("alice\n");
- $machine->waitUntilTTYMatches(1, "Password: ");
- $machine->sendChars("foobar\n");
- $machine->waitUntilTTYMatches(1, "alice\@machine");
+ with subtest("Show contents of the user keyring"):
+ out = machine.succeed("su - alice -c 'keyctl list \@u'")
+ machine.log(f"keyctl unlink said: {out}")
- # Create some files in encrypted home
- $machine->succeed("su alice -c 'touch ~alice/a'");
- $machine->succeed("su alice -c 'echo c > ~alice/b'");
+ with subtest("Log alice again"):
+ login_as_alice()
- # Logout
- $machine->sendChars("logout\n");
- $machine->waitUntilTTYMatches(1, "login: ");
+ with subtest("Create some files in encrypted home"):
+ machine.succeed("su alice -c 'touch ~alice/a'")
+ machine.succeed("su alice -c 'echo c > ~alice/b'")
+
+ with subtest("Logout"):
+ logout()
# Why do I need to do this??
- $machine->succeed("su alice -c ecryptfs-umount-private || true");
- $machine->sleep(1);
+ machine.succeed("su alice -c ecryptfs-umount-private || true")
+ machine.sleep(1)
- # Check that the filesystem is not accessible
- $machine->fail("mount | grep ecryptfs");
- $machine->succeed("su alice -c 'test \! -f ~alice/a'");
- $machine->succeed("su alice -c 'test \! -f ~alice/b'");
+ with subtest("Check that the filesystem is not accessible"):
+ machine.fail("mount | grep ecryptfs")
+ machine.succeed("su alice -c 'test \! -f ~alice/a'")
+ machine.succeed("su alice -c 'test \! -f ~alice/b'")
- # Log alice once more
- $machine->waitUntilTTYMatches(1, "login: ");
- $machine->sendChars("alice\n");
- $machine->waitUntilTTYMatches(1, "Password: ");
- $machine->sendChars("foobar\n");
- $machine->waitUntilTTYMatches(1, "alice\@machine");
+ with subtest("Log alice once more"):
+ login_as_alice()
- # Check that the files are there
- $machine->sleep(1);
- $machine->succeed("su alice -c 'test -f ~alice/a'");
- $machine->succeed("su alice -c 'test -f ~alice/b'");
- $machine->succeed(qq%test "\$(cat ~alice/b)" = "c"%);
+ with subtest("Check that the files are there"):
+ machine.sleep(1)
+ machine.succeed("su alice -c 'test -f ~alice/a'")
+ machine.succeed("su alice -c 'test -f ~alice/b'")
+ machine.succeed('test "$(cat ~alice/b)" = "c"')
- # Catch https://github.com/NixOS/nixpkgs/issues/16766
- $machine->succeed("su alice -c 'ls -lh ~alice/'");
+ with subtest("Catch https://github.com/NixOS/nixpkgs/issues/16766"):
+ machine.succeed("su alice -c 'ls -lh ~alice/'")
- $machine->sendChars("logout\n");
- $machine->waitUntilTTYMatches(1, "login: ");
+ logout()
'';
})
diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix
index 6c681905b19f..e603338e489b 100644
--- a/nixos/tests/env.nix
+++ b/nixos/tests/env.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "environment";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
@@ -20,16 +20,17 @@ import ./make-test.nix ({ pkgs, ...} : {
};
};
- testScript =
- ''
- $machine->succeed('[ -L "/etc/plainFile" ]');
- $machine->succeed('cat "/etc/plainFile" | grep "Hello World"');
- $machine->succeed('[ -d "/etc/folder" ]');
- $machine->succeed('[ -d "/etc/folder/with" ]');
- $machine->succeed('[ -L "/etc/folder/with/file" ]');
- $machine->succeed('cat "/etc/plainFile" | grep "Hello World"');
+ testScript = ''
+ machine.succeed('[ -L "/etc/plainFile" ]')
+ assert "Hello World" in machine.succeed('cat "/etc/plainFile"')
+ machine.succeed('[ -d "/etc/folder" ]')
+ machine.succeed('[ -d "/etc/folder/with" ]')
+ machine.succeed('[ -L "/etc/folder/with/file" ]')
+ assert "Hello World" in machine.succeed('cat "/etc/plainFile"')
- $machine->succeed('echo ''${TERMINFO_DIRS} | grep "/run/current-system/sw/share/terminfo"');
- $machine->succeed('echo ''${NIXCON} | grep "awesome"');
- '';
+ assert "/run/current-system/sw/share/terminfo" in machine.succeed(
+ "echo ''${TERMINFO_DIRS}"
+ )
+ assert "awesome" in machine.succeed("echo ''${NIXCON}")
+ '';
})
diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix
index 43fde7d59205..19c5d9158236 100644
--- a/nixos/tests/etcd-cluster.nix
+++ b/nixos/tests/etcd-cluster.nix
@@ -1,6 +1,6 @@
# This test runs simple etcd cluster
-import ./make-test.nix ({ pkgs, ... } : let
+import ./make-test-python.nix ({ pkgs, ... } : let
runWithOpenSSL = file: cmd: pkgs.runCommand file {
buildInputs = [ pkgs.openssl ];
@@ -129,29 +129,26 @@ in {
};
testScript = ''
- subtest "should start etcd cluster", sub {
- $node1->start();
- $node2->start();
- $node1->waitForUnit("etcd.service");
- $node2->waitForUnit("etcd.service");
- $node2->waitUntilSucceeds("etcdctl cluster-health");
- $node1->succeed("etcdctl set /foo/bar 'Hello world'");
- $node2->succeed("etcdctl get /foo/bar | grep 'Hello world'");
- };
+ with subtest("should start etcd cluster"):
+ node1.start()
+ node2.start()
+ node1.wait_for_unit("etcd.service")
+ node2.wait_for_unit("etcd.service")
+ node2.wait_until_succeeds("etcdctl cluster-health")
+ node1.succeed("etcdctl set /foo/bar 'Hello world'")
+ node2.succeed("etcdctl get /foo/bar | grep 'Hello world'")
- subtest "should add another member", sub {
- $node1->waitUntilSucceeds("etcdctl member add node3 https://node3:2380");
- $node3->start();
- $node3->waitForUnit("etcd.service");
- $node3->waitUntilSucceeds("etcdctl member list | grep 'node3'");
- $node3->succeed("etcdctl cluster-health");
- };
+ with subtest("should add another member"):
+ node1.wait_until_succeeds("etcdctl member add node3 https://node3:2380")
+ node3.start()
+ node3.wait_for_unit("etcd.service")
+ node3.wait_until_succeeds("etcdctl member list | grep 'node3'")
+ node3.succeed("etcdctl cluster-health")
- subtest "should survive member crash", sub {
- $node3->crash;
- $node1->succeed("etcdctl cluster-health");
- $node1->succeed("etcdctl set /foo/bar 'Hello degraded world'");
- $node1->succeed("etcdctl get /foo/bar | grep 'Hello degraded world'");
- };
+ with subtest("should survive member crash"):
+ node3.crash()
+ node1.succeed("etcdctl cluster-health")
+ node1.succeed("etcdctl set /foo/bar 'Hello degraded world'")
+ node1.succeed("etcdctl get /foo/bar | grep 'Hello degraded world'")
'';
})
diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix
index 6c23b31779bc..842724343841 100644
--- a/nixos/tests/etcd.nix
+++ b/nixos/tests/etcd.nix
@@ -1,6 +1,6 @@
# This test runs simple etcd node
-import ./make-test.nix ({ pkgs, ... } : {
+import ./make-test-python.nix ({ pkgs, ... } : {
name = "etcd";
meta = with pkgs.stdenv.lib.maintainers; {
@@ -14,14 +14,12 @@ import ./make-test.nix ({ pkgs, ... } : {
};
testScript = ''
- subtest "should start etcd node", sub {
- $node->start();
- $node->waitForUnit("etcd.service");
- };
+ with subtest("should start etcd node"):
+ node.start()
+ node.wait_for_unit("etcd.service")
- subtest "should write and read some values to etcd", sub {
- $node->succeed("etcdctl set /foo/bar 'Hello world'");
- $node->succeed("etcdctl get /foo/bar | grep 'Hello world'");
- }
+ with subtest("should write and read some values to etcd"):
+ node.succeed("etcdctl set /foo/bar 'Hello world'")
+ node.succeed("etcdctl get /foo/bar | grep 'Hello world'")
'';
})
diff --git a/nixos/tests/fancontrol.nix b/nixos/tests/fancontrol.nix
index 83ddbb54c5bb..356cd57ffa1a 100644
--- a/nixos/tests/fancontrol.nix
+++ b/nixos/tests/fancontrol.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... } : {
+import ./make-test-python.nix ({ pkgs, ... } : {
name = "fancontrol";
machine =
@@ -19,7 +19,10 @@ import ./make-test.nix ({ pkgs, ... } : {
# This configuration cannot be valid for the test VM, so it's expected to get an 'outdated' error.
testScript = ''
- $machine->waitForUnit("fancontrol.service");
- $machine->waitUntilSucceeds("journalctl -eu fancontrol | grep 'Configuration appears to be outdated'");
+ start_all()
+ machine.wait_for_unit("fancontrol.service")
+ machine.wait_until_succeeds(
+ "journalctl -eu fancontrol | grep 'Configuration appears to be outdated'"
+ )
'';
})
diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index edf9c8036aca..a73c9ce739cf 100644
--- a/nixos/tests/ferm.nix
+++ b/nixos/tests/ferm.nix
@@ -1,5 +1,5 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "ferm";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ mic92 ];
@@ -53,24 +53,22 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- startAll;
+ start_all()
- $client->waitForUnit("network-online.target");
- $server->waitForUnit("ferm.service");
- $server->waitForUnit("nginx.service");
- $server->waitUntilSucceeds("ss -ntl | grep -q 80");
+ client.wait_for_unit("network-online.target")
+ server.wait_for_unit("ferm.service")
+ server.wait_for_unit("nginx.service")
+ server.wait_until_succeeds("ss -ntl | grep -q 80")
- subtest "port 80 is allowed", sub {
- $client->succeed("curl --fail -g http://192.168.1.1:80/status");
- $client->succeed("curl --fail -g http://[fd00::1]:80/status");
- };
+ with subtest("port 80 is allowed"):
+ client.succeed("curl --fail -g http://192.168.1.1:80/status")
+ client.succeed("curl --fail -g http://[fd00::1]:80/status")
- subtest "port 8080 is not allowed", sub {
- $server->succeed("curl --fail -g http://192.168.1.1:8080/status");
- $server->succeed("curl --fail -g http://[fd00::1]:8080/status");
+ with subtest("port 8080 is not allowed"):
+ server.succeed("curl --fail -g http://192.168.1.1:8080/status")
+ server.succeed("curl --fail -g http://[fd00::1]:8080/status")
- $client->fail("curl --fail -g http://192.168.1.1:8080/status");
- $client->fail("curl --fail -g http://[fd00::1]:8080/status");
- };
+ client.fail("curl --fail -g http://192.168.1.1:8080/status")
+ client.fail("curl --fail -g http://[fd00::1]:8080/status")
'';
})
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index f5b946a08810..56ddabbae771 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "firefox";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco shlevy ];
@@ -11,19 +11,27 @@ import ./make-test.nix ({ pkgs, ... }: {
environment.systemPackages = [ pkgs.firefox pkgs.xdotool ];
};
- testScript =
- ''
- $machine->waitForX;
- $machine->execute("xterm -e 'firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' &");
- $machine->waitForWindow(qr/Valgrind/);
- $machine->sleep(40); # wait until Firefox has finished loading the page
- $machine->execute("xdotool key space"); # do I want to make Firefox the
- # default browser? I just want to close the dialog
- $machine->sleep(2); # wait until Firefox hides the default browser window
- $machine->execute("xdotool key F12");
- $machine->sleep(10); # wait until Firefox draws the developer tool panel
- $machine->succeed("xwininfo -root -tree | grep Valgrind");
- $machine->screenshot("screen");
+ testScript = ''
+ machine.wait_for_x()
+
+ with subtest("wait until Firefox has finished loading the Valgrind docs page"):
+ machine.execute(
+ "xterm -e 'firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' &"
+ )
+ machine.wait_for_window("Valgrind")
+ machine.sleep(40)
+
+ with subtest("Close default browser prompt"):
+ machine.execute("xdotool key space")
+
+ with subtest("Hide default browser window"):
+ machine.sleep(2)
+ machine.execute("xdotool key F12")
+
+ with subtest("wait until Firefox draws the developer tool panel"):
+ machine.sleep(10)
+ machine.succeed("xwininfo -root -tree | grep Valgrind")
+ machine.screenshot("screen")
'';
})
diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix
index fcf758910e00..09a1fef852e6 100644
--- a/nixos/tests/firewall.nix
+++ b/nixos/tests/firewall.nix
@@ -1,6 +1,6 @@
# Test the firewall module.
-import ./make-test.nix ( { pkgs, ... } : {
+import ./make-test-python.nix ( { pkgs, ... } : {
name = "firewall";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco ];
@@ -36,30 +36,30 @@ import ./make-test.nix ( { pkgs, ... } : {
testScript = { nodes, ... }: let
newSystem = nodes.walled2.config.system.build.toplevel;
in ''
- $walled->start;
- $attacker->start;
+ start_all()
- $walled->waitForUnit("firewall");
- $walled->waitForUnit("httpd");
- $attacker->waitForUnit("network.target");
+ walled.wait_for_unit("firewall")
+ walled.wait_for_unit("httpd")
+ attacker.wait_for_unit("network.target")
# Local connections should still work.
- $walled->succeed("curl -v http://localhost/ >&2");
+ walled.succeed("curl -v http://localhost/ >&2")
# Connections to the firewalled machine should fail, but ping should succeed.
- $attacker->fail("curl --fail --connect-timeout 2 http://walled/ >&2");
- $attacker->succeed("ping -c 1 walled >&2");
+ attacker.fail("curl --fail --connect-timeout 2 http://walled/ >&2")
+ attacker.succeed("ping -c 1 walled >&2")
# Outgoing connections/pings should still work.
- $walled->succeed("curl -v http://attacker/ >&2");
- $walled->succeed("ping -c 1 attacker >&2");
+ walled.succeed("curl -v http://attacker/ >&2")
+ walled.succeed("ping -c 1 attacker >&2")
# If we stop the firewall, then connections should succeed.
- $walled->stopJob("firewall");
- $attacker->succeed("curl -v http://walled/ >&2");
+ walled.stop_job("firewall")
+ attacker.succeed("curl -v http://walled/ >&2")
# Check whether activation of a new configuration reloads the firewall.
- $walled->succeed("${newSystem}/bin/switch-to-configuration test 2>&1" .
- " | grep -qF firewall.service");
+ walled.succeed(
+ "${newSystem}/bin/switch-to-configuration test 2>&1 | grep -qF firewall.service"
+ )
'';
})
diff --git a/nixos/tests/fish.nix b/nixos/tests/fish.nix
index 97c4e8e37ac1..68fba428439b 100644
--- a/nixos/tests/fish.nix
+++ b/nixos/tests/fish.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "fish";
machine =
@@ -14,8 +14,11 @@ import ./make-test.nix ({ pkgs, ... }: {
testScript =
''
- $machine->waitForFile("/etc/fish/generated_completions/coreutils.fish");
- $machine->waitForFile("/etc/fish/generated_completions/kill.fish");
- $machine->succeed("fish -ic 'echo \$fish_complete_path' | grep -q '/share/fish/completions /etc/fish/generated_completions /root/.local/share/fish/generated_completions\$'");
+ start_all()
+ machine.wait_for_file("/etc/fish/generated_completions/coreutils.fish")
+ machine.wait_for_file("/etc/fish/generated_completions/kill.fish")
+ machine.succeed(
+ "fish -ic 'echo $fish_complete_path' | grep -q '/share/fish/completions /etc/fish/generated_completions /root/.local/share/fish/generated_completions$'"
+ )
'';
})
diff --git a/nixos/tests/flatpak-builder.nix b/nixos/tests/flatpak-builder.nix
deleted file mode 100644
index 49b97e8ca99e..000000000000
--- a/nixos/tests/flatpak-builder.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, ... }:
-
-{
- name = "flatpak-builder";
- meta = {
- maintainers = pkgs.flatpak-builder.meta.maintainers;
- };
-
- machine = { pkgs, ... }: {
- services.flatpak.enable = true;
- xdg.portal.enable = true;
- environment.systemPackages = with pkgs; [ gnome-desktop-testing flatpak-builder ] ++ flatpak-builder.installedTestsDependencies;
- virtualisation.diskSize = 2048;
- };
-
- testScript = ''
- $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.flatpak-builder.installedTests}/share' --timeout 3600");
- '';
-})
diff --git a/nixos/tests/flatpak.nix b/nixos/tests/flatpak.nix
deleted file mode 100644
index b0c61830d05a..000000000000
--- a/nixos/tests/flatpak.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, ... }:
-
-{
- name = "flatpak";
- meta = {
- maintainers = pkgs.flatpak.meta.maintainers;
- };
-
- machine = { pkgs, ... }: {
- imports = [ ./common/x11.nix ];
- services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work
- # common/x11.nix enables the auto display manager (lightdm)
- services.xserver.displayManager.gdm.enable = false;
- environment.gnome3.excludePackages = pkgs.gnome3.optionalPackages;
- services.flatpak.enable = true;
- environment.systemPackages = with pkgs; [ gnupg gnome-desktop-testing ostree python2 ];
- virtualisation.memorySize = 2047;
- virtualisation.diskSize = 1024;
- };
-
- testScript = ''
- $machine->waitForX();
- $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.flatpak.installedTests}/share' --timeout 3600");
- '';
-})
diff --git a/nixos/tests/fluentd.nix b/nixos/tests/fluentd.nix
index e5c4c3d21631..918f2f87db17 100644
--- a/nixos/tests/fluentd.nix
+++ b/nixos/tests/fluentd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }: {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "fluentd";
machine = { pkgs, ... }: {
@@ -33,14 +33,17 @@ import ./make-test.nix ({ pkgs, lib, ... }: {
inherit testMessage;
});
in ''
- $machine->start;
- $machine->waitForUnit('fluentd.service');
- $machine->waitForOpenPort(9880);
+ machine.start()
+ machine.wait_for_unit("fluentd.service")
+ machine.wait_for_open_port(9880)
- $machine->succeed("curl -fsSL -X POST -H 'Content-type: application/json' -d @${payload} http://localhost:9880/test.tag");
+ machine.succeed(
+ "curl -fsSL -X POST -H 'Content-type: application/json' -d @${payload} http://localhost:9880/test.tag"
+ )
- $machine->succeed("systemctl stop fluentd"); # blocking flush
+ # blocking flush
+ machine.succeed("systemctl stop fluentd")
- $machine->succeed("grep '${testMessage}' /tmp/current-log");
+ machine.succeed("grep '${testMessage}' /tmp/current-log")
'';
})
diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix
index 1991cec92189..68c6ac9e9c83 100644
--- a/nixos/tests/fontconfig-default-fonts.nix
+++ b/nixos/tests/fontconfig-default-fonts.nix
@@ -1,7 +1,12 @@
-import ./make-test.nix ({ lib, ... }:
+import ./make-test-python.nix ({ lib, ... }:
{
name = "fontconfig-default-fonts";
+ meta.maintainers = with lib.maintainers; [
+ jtojnar
+ worldofpeace
+ ];
+
machine = { config, pkgs, ... }: {
fonts.enableDefaultFonts = true; # Background fonts
fonts.fonts = with pkgs; [
@@ -20,9 +25,9 @@ import ./make-test.nix ({ lib, ... }:
};
testScript = ''
- $machine->succeed("fc-match serif | grep '\"Gentium Plus\"'");
- $machine->succeed("fc-match sans-serif | grep '\"Cantarell\"'");
- $machine->succeed("fc-match monospace | grep '\"Source Code Pro\"'");
- $machine->succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'");
+ machine.succeed("fc-match serif | grep '\"Gentium Plus\"'")
+ machine.succeed("fc-match sans-serif | grep '\"Cantarell\"'")
+ machine.succeed("fc-match monospace | grep '\"Source Code Pro\"'")
+ machine.succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'")
'';
})
diff --git a/nixos/tests/fsck.nix b/nixos/tests/fsck.nix
index f943bb7f2350..e522419fde2b 100644
--- a/nixos/tests/fsck.nix
+++ b/nixos/tests/fsck.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix {
+import ./make-test-python.nix {
name = "fsck";
machine = { lib, ... }: {
@@ -14,16 +14,18 @@ import ./make-test.nix {
};
testScript = ''
- $machine->waitForUnit('default.target');
+ machine.wait_for_unit("default.target")
- subtest "root fs is fsckd", sub {
- $machine->succeed('journalctl -b | grep "fsck.ext4.*/dev/vda"');
- };
+ with subtest("root fs is fsckd"):
+ machine.succeed("journalctl -b | grep 'fsck.ext4.*/dev/vda'")
- subtest "mnt fs is fsckd", sub {
- $machine->succeed('journalctl -b | grep "fsck.*/dev/vdb.*clean"');
- $machine->succeed('grep "Requires=systemd-fsck@dev-vdb.service" /run/systemd/generator/mnt.mount');
- $machine->succeed('grep "After=systemd-fsck@dev-vdb.service" /run/systemd/generator/mnt.mount');
- };
+ with subtest("mnt fs is fsckd"):
+ machine.succeed("journalctl -b | grep 'fsck.*/dev/vdb.*clean'")
+ machine.succeed(
+ "grep 'Requires=systemd-fsck@dev-vdb.service' /run/systemd/generator/mnt.mount"
+ )
+ machine.succeed(
+ "grep 'After=systemd-fsck@dev-vdb.service' /run/systemd/generator/mnt.mount"
+ )
'';
}
diff --git a/nixos/tests/fwupd.nix b/nixos/tests/fwupd.nix
deleted file mode 100644
index 88dac8ccbcdb..000000000000
--- a/nixos/tests/fwupd.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, ... }: {
- name = "fwupd";
-
- meta = {
- maintainers = pkgs.fwupd.meta.maintainers;
- };
-
- machine = { pkgs, ... }: {
- services.fwupd.enable = true;
- services.fwupd.blacklistPlugins = []; # don't blacklist test plugin
- services.fwupd.enableTestRemote = true;
- environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
- environment.variables.XDG_DATA_DIRS = [ "${pkgs.fwupd.installedTests}/share" ];
- virtualisation.memorySize = 768;
- };
-
- testScript = ''
- $machine->succeed("gnome-desktop-testing-runner");
- '';
-})
diff --git a/nixos/tests/gdk-pixbuf.nix b/nixos/tests/gdk-pixbuf.nix
deleted file mode 100644
index 9a62b593f46d..000000000000
--- a/nixos/tests/gdk-pixbuf.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, ... }: {
- name = "gdk-pixbuf";
-
- meta = {
- maintainers = pkgs.gdk-pixbuf.meta.maintainers;
- };
-
- machine = { pkgs, ... }: {
- environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
- environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk-pixbuf.installedTests}/share" ];
-
- # Tests allocate a lot of memory trying to exploit a CVE
- # but qemu-system-i386 has a 2047M memory limit
- virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096;
- };
-
- testScript = ''
- $machine->succeed("gnome-desktop-testing-runner -t 1800"); # increase timeout to 1800s
- '';
-})
diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix
index ffbc07cfbb21..aaed2486421f 100644
--- a/nixos/tests/gitea.nix
+++ b/nixos/tests/gitea.nix
@@ -6,64 +6,104 @@
with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
-{
- mysql = makeTest {
- name = "gitea-mysql";
- meta.maintainers = with maintainers; [ aanderse kolaente ];
+let
+ supportedDbTypes = [ "mysql" "postgres" "sqlite3" ];
+ makeGiteaTest = type: nameValuePair type (makeTest {
+ name = "gitea-${type}";
+ meta.maintainers = with maintainers; [ aanderse kolaente ma27 ];
- machine =
- { config, pkgs, ... }:
- { services.gitea.enable = true;
- services.gitea.database.type = "mysql";
+ nodes = {
+ server = { config, pkgs, ... }: {
+ services.gitea = {
+ enable = true;
+ database = { inherit type; };
+ disableRegistration = true;
+ };
+ environment.systemPackages = [ pkgs.gitea pkgs.jq ];
+ services.openssh.enable = true;
};
+ client1 = { config, pkgs, ... }: {
+ environment.systemPackages = [ pkgs.git ];
+ };
+ client2 = { config, pkgs, ... }: {
+ environment.systemPackages = [ pkgs.git ];
+ };
+ };
+
+ testScript = let
+ inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
+ in ''
+ GIT_SSH_COMMAND = "ssh -i $HOME/.ssh/privk -o StrictHostKeyChecking=no"
+ REPO = "gitea@server:test/repo"
+ PRIVK = "${snakeOilPrivateKey}"
- testScript = ''
start_all()
- machine.wait_for_unit("gitea.service")
- machine.wait_for_open_port(3000)
- machine.succeed("curl --fail http://localhost:3000/")
- '';
- };
+ client1.succeed("mkdir /tmp/repo")
+ client1.succeed("mkdir -p $HOME/.ssh")
+ client1.succeed(f"cat {PRIVK} > $HOME/.ssh/privk")
+ client1.succeed("chmod 0400 $HOME/.ssh/privk")
+ client1.succeed("git -C /tmp/repo init")
+ client1.succeed("echo hello world > /tmp/repo/testfile")
+ client1.succeed("git -C /tmp/repo add .")
+ client1.succeed("git config --global user.email test@localhost")
+ client1.succeed("git config --global user.name test")
+ client1.succeed("git -C /tmp/repo commit -m 'Initial import'")
+ client1.succeed(f"git -C /tmp/repo remote add origin {REPO}")
- postgres = makeTest {
- name = "gitea-postgres";
- meta.maintainers = [ maintainers.aanderse ];
+ server.wait_for_unit("gitea.service")
+ server.wait_for_open_port(3000)
+ server.succeed("curl --fail http://localhost:3000/")
- machine =
- { config, pkgs, ... }:
- { services.gitea.enable = true;
- services.gitea.database.type = "postgres";
- };
-
- testScript = ''
- start_all()
-
- machine.wait_for_unit("gitea.service")
- machine.wait_for_open_port(3000)
- machine.succeed("curl --fail http://localhost:3000/")
- '';
- };
-
- sqlite = makeTest {
- name = "gitea-sqlite";
- meta.maintainers = [ maintainers.aanderse ];
-
- machine =
- { config, pkgs, ... }:
- { services.gitea.enable = true;
- services.gitea.disableRegistration = true;
- };
-
- testScript = ''
- start_all()
-
- machine.wait_for_unit("gitea.service")
- machine.wait_for_open_port(3000)
- machine.succeed("curl --fail http://localhost:3000/")
- machine.succeed(
- "curl --fail http://localhost:3000/user/sign_up | grep 'Registration is disabled. Please contact your site administrator.'"
+ server.succeed(
+ "curl --fail http://localhost:3000/user/sign_up | grep 'Registration is disabled. "
+ + "Please contact your site administrator.'"
)
+ server.succeed(
+ "su -l gitea -c 'GITEA_WORK_DIR=/var/lib/gitea gitea admin create-user "
+ + "--username test --password totallysafe --email test@localhost'"
+ )
+
+ api_token = server.succeed(
+ "curl --fail -X POST http://test:totallysafe@localhost:3000/api/v1/users/test/tokens "
+ + "-H 'Accept: application/json' -H 'Content-Type: application/json' -d "
+ + "'{\"name\":\"token\"}' | jq '.sha1' | xargs echo -n"
+ )
+
+ server.succeed(
+ "curl --fail -X POST http://localhost:3000/api/v1/user/repos "
+ + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
+ + f"-H 'Authorization: token {api_token}'"
+ + ' -d \'{"auto_init":false, "description":"string", "license":"mit", "name":"repo", "private":false}\'''
+ )
+
+ server.succeed(
+ "curl --fail -X POST http://localhost:3000/api/v1/user/keys "
+ + "-H 'Accept: application/json' -H 'Content-Type: application/json' "
+ + f"-H 'Authorization: token {api_token}'"
+ + ' -d \'{"key":"${snakeOilPublicKey}","read_only":true,"title":"SSH"}\'''
+ )
+
+ client1.succeed(
+ f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git -C /tmp/repo push origin master"
+ )
+
+ client2.succeed("mkdir -p $HOME/.ssh")
+ client2.succeed(f"cat {PRIVK} > $HOME/.ssh/privk")
+ client2.succeed("chmod 0400 $HOME/.ssh/privk")
+ client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git clone {REPO}")
+ client2.succeed('test "$(cat repo/testfile | xargs echo -n)" = "hello world"')
+
+ server.succeed(
+ 'test "$(curl http://localhost:3000/api/v1/repos/test/repo/commits '
+ + '-H "Accept: application/json" | jq length)" = "1"'
+ )
+
+ client1.shutdown()
+ client2.shutdown()
+ server.shutdown()
'';
- };
-}
+ });
+in
+
+listToAttrs (map makeGiteaTest supportedDbTypes)
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index be0b3c8746a9..7e4e8bcef92d 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -3,7 +3,7 @@
let
initialRootPassword = "notproduction";
in
-import ./make-test.nix ({ pkgs, lib, ...} : with lib; {
+import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
name = "gitlab";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ globin ];
@@ -63,21 +63,35 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; {
});
in
''
- $gitlab->start();
- $gitlab->waitForUnit("gitaly.service");
- $gitlab->waitForUnit("gitlab-workhorse.service");
- $gitlab->waitForUnit("gitlab.service");
- $gitlab->waitForUnit("gitlab-sidekiq.service");
- $gitlab->waitForFile("/var/gitlab/state/tmp/sockets/gitlab.socket");
- $gitlab->waitUntilSucceeds("curl -sSf http://gitlab/users/sign_in");
- $gitlab->succeed("curl -isSf http://gitlab | grep -i location | grep -q http://gitlab/users/sign_in");
- $gitlab->succeed("${pkgs.sudo}/bin/sudo -u gitlab -H gitlab-rake gitlab:check 1>&2");
- $gitlab->succeed("echo \"Authorization: Bearer \$(curl -X POST -H 'Content-Type: application/json' -d @${auth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers");
- $gitlab->succeed("curl -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createProject} http://gitlab/api/v4/projects");
- $gitlab->succeed("curl -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${putFile} http://gitlab/api/v4/projects/1/repository/files/some-file.txt");
- $gitlab->succeed("curl -H @/tmp/headers http://gitlab/api/v4/projects/1/repository/archive.tar.gz > /tmp/archive.tar.gz");
- $gitlab->succeed("curl -H @/tmp/headers http://gitlab/api/v4/projects/1/repository/archive.tar.bz2 > /tmp/archive.tar.bz2");
- $gitlab->succeed("test -s /tmp/archive.tar.gz");
- $gitlab->succeed("test -s /tmp/archive.tar.bz2");
+ gitlab.start()
+ gitlab.wait_for_unit("gitaly.service")
+ gitlab.wait_for_unit("gitlab-workhorse.service")
+ gitlab.wait_for_unit("gitlab.service")
+ gitlab.wait_for_unit("gitlab-sidekiq.service")
+ gitlab.wait_for_file("/var/gitlab/state/tmp/sockets/gitlab.socket")
+ gitlab.wait_until_succeeds("curl -sSf http://gitlab/users/sign_in")
+ gitlab.succeed(
+ "curl -isSf http://gitlab | grep -i location | grep -q http://gitlab/users/sign_in"
+ )
+ gitlab.succeed(
+ "${pkgs.sudo}/bin/sudo -u gitlab -H gitlab-rake gitlab:check 1>&2"
+ )
+ gitlab.succeed(
+ "echo \"Authorization: Bearer \$(curl -X POST -H 'Content-Type: application/json' -d @${auth} http://gitlab/oauth/token | ${pkgs.jq}/bin/jq -r '.access_token')\" >/tmp/headers"
+ )
+ gitlab.succeed(
+ "curl -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${createProject} http://gitlab/api/v4/projects"
+ )
+ gitlab.succeed(
+ "curl -X POST -H 'Content-Type: application/json' -H @/tmp/headers -d @${putFile} http://gitlab/api/v4/projects/1/repository/files/some-file.txt"
+ )
+ gitlab.succeed(
+ "curl -H @/tmp/headers http://gitlab/api/v4/projects/1/repository/archive.tar.gz > /tmp/archive.tar.gz"
+ )
+ gitlab.succeed(
+ "curl -H @/tmp/headers http://gitlab/api/v4/projects/1/repository/archive.tar.bz2 > /tmp/archive.tar.bz2"
+ )
+ gitlab.succeed("test -s /tmp/archive.tar.gz")
+ gitlab.succeed("test -s /tmp/archive.tar.bz2")
'';
})
diff --git a/nixos/tests/gitolite-fcgiwrap.nix b/nixos/tests/gitolite-fcgiwrap.nix
new file mode 100644
index 000000000000..414b7d6fe7ef
--- /dev/null
+++ b/nixos/tests/gitolite-fcgiwrap.nix
@@ -0,0 +1,93 @@
+import ./make-test-python.nix (
+ { pkgs, ... }:
+
+ let
+ user = "gitolite-admin";
+ password = "some_password";
+
+ # not used but needed to setup gitolite
+ adminPublicKey = ''
+ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO7urFhAA90BTpGuEHeWWTY3W/g9PBxXNxfWhfbrm4Le root@client
+ '';
+ in
+ {
+ name = "gitolite-fcgiwrap";
+
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ bbigras ];
+ };
+
+ nodes = {
+
+ server =
+ { ... }:
+ {
+ networking.firewall.allowedTCPPorts = [ 80 ];
+
+ services.fcgiwrap.enable = true;
+ services.gitolite = {
+ enable = true;
+ adminPubkey = adminPublicKey;
+ };
+
+ services.nginx = {
+ enable = true;
+ recommendedProxySettings = true;
+ virtualHosts."server".locations."/git".extraConfig = ''
+ # turn off gzip as git objects are already well compressed
+ gzip off;
+
+ # use file based basic authentication
+ auth_basic "Git Repository Authentication";
+ auth_basic_user_file /etc/gitolite/htpasswd;
+
+ # common FastCGI parameters are required
+ include ${pkgs.nginx}/conf/fastcgi_params;
+
+ # strip the CGI program prefix
+ fastcgi_split_path_info ^(/git)(.*)$;
+ fastcgi_param PATH_INFO $fastcgi_path_info;
+
+ # pass authenticated user login(mandatory) to Gitolite
+ fastcgi_param REMOTE_USER $remote_user;
+
+ # pass git repository root directory and hosting user directory
+ # these env variables can be set in a wrapper script
+ fastcgi_param GIT_HTTP_EXPORT_ALL "";
+ fastcgi_param GIT_PROJECT_ROOT /var/lib/gitolite/repositories;
+ fastcgi_param GITOLITE_HTTP_HOME /var/lib/gitolite;
+ fastcgi_param SCRIPT_FILENAME ${pkgs.gitolite}/bin/gitolite-shell;
+
+ # use Unix domain socket or inet socket
+ fastcgi_pass unix:/run/fcgiwrap.sock;
+ '';
+ };
+
+ # WARNING: DON'T DO THIS IN PRODUCTION!
+ # This puts unhashed secrets directly into the Nix store for ease of testing.
+ environment.etc."gitolite/htpasswd".source = pkgs.runCommand "htpasswd" {} ''
+ ${pkgs.apacheHttpd}/bin/htpasswd -bc "$out" ${user} ${password}
+ '';
+ };
+
+ client =
+ { pkgs, ... }:
+ {
+ environment.systemPackages = [ pkgs.git ];
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ server.wait_for_unit("gitolite-init.service")
+ server.wait_for_unit("nginx.service")
+ server.wait_for_file("/run/fcgiwrap.sock")
+
+ client.wait_for_unit("multi-user.target")
+ client.succeed(
+ "git clone http://${user}:${password}@server/git/gitolite-admin.git"
+ )
+ '';
+ }
+)
diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix
index 690e456ed7c8..a928645bd80f 100644
--- a/nixos/tests/gitolite.nix
+++ b/nixos/tests/gitolite.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...}:
+import ./make-test-python.nix ({ pkgs, ...}:
let
adminPrivateKey = pkgs.writeText "id_ed25519" ''
@@ -43,7 +43,7 @@ let
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJZNonUP1ePHLrvn0W9D2hdN6zWWZYFyJc+QR6pOKQEw bob@client
'';
- gitoliteAdminConfSnippet = ''
+ gitoliteAdminConfSnippet = pkgs.writeText "gitolite-admin-conf-snippet" ''
repo alice-project
RW+ = alice
'';
@@ -85,55 +85,54 @@ in
};
testScript = ''
- startAll;
+ start_all()
- subtest "can setup ssh keys on system", sub {
- $client->mustSucceed("mkdir -p ~root/.ssh");
- $client->mustSucceed("cp ${adminPrivateKey} ~root/.ssh/id_ed25519");
- $client->mustSucceed("chmod 600 ~root/.ssh/id_ed25519");
+ with subtest("can setup ssh keys on system"):
+ client.succeed(
+ "mkdir -p ~root/.ssh",
+ "cp ${adminPrivateKey} ~root/.ssh/id_ed25519",
+ "chmod 600 ~root/.ssh/id_ed25519",
+ )
+ client.succeed(
+ "sudo -u alice mkdir -p ~alice/.ssh",
+ "sudo -u alice cp ${alicePrivateKey} ~alice/.ssh/id_ed25519",
+ "sudo -u alice chmod 600 ~alice/.ssh/id_ed25519",
+ )
+ client.succeed(
+ "sudo -u bob mkdir -p ~bob/.ssh",
+ "sudo -u bob cp ${bobPrivateKey} ~bob/.ssh/id_ed25519",
+ "sudo -u bob chmod 600 ~bob/.ssh/id_ed25519",
+ )
- $client->mustSucceed("sudo -u alice mkdir -p ~alice/.ssh");
- $client->mustSucceed("sudo -u alice cp ${alicePrivateKey} ~alice/.ssh/id_ed25519");
- $client->mustSucceed("sudo -u alice chmod 600 ~alice/.ssh/id_ed25519");
+ with subtest("gitolite server starts"):
+ server.wait_for_unit("gitolite-init.service")
+ server.wait_for_unit("sshd.service")
+ client.succeed("ssh gitolite@server info")
- $client->mustSucceed("sudo -u bob mkdir -p ~bob/.ssh");
- $client->mustSucceed("sudo -u bob cp ${bobPrivateKey} ~bob/.ssh/id_ed25519");
- $client->mustSucceed("sudo -u bob chmod 600 ~bob/.ssh/id_ed25519");
- };
+ with subtest("admin can clone and configure gitolite-admin.git"):
+ client.succeed(
+ "git clone gitolite@server:gitolite-admin.git",
+ "git config --global user.name 'System Administrator'",
+ "git config --global user.email root\@domain.example",
+ "cp ${alicePublicKey} gitolite-admin/keydir/alice.pub",
+ "cp ${bobPublicKey} gitolite-admin/keydir/bob.pub",
+ "(cd gitolite-admin && git add . && git commit -m 'Add keys for alice, bob' && git push)",
+ "cat ${gitoliteAdminConfSnippet} >> gitolite-admin/conf/gitolite.conf",
+ "(cd gitolite-admin && git add . && git commit -m 'Add repo for alice' && git push)",
+ )
- subtest "gitolite server starts", sub {
- $server->waitForUnit("gitolite-init.service");
- $server->waitForUnit("sshd.service");
- $client->mustSucceed('ssh gitolite@server info');
- };
+ with subtest("non-admins cannot clone gitolite-admin.git"):
+ client.fail("sudo -i -u alice git clone gitolite@server:gitolite-admin.git")
+ client.fail("sudo -i -u bob git clone gitolite@server:gitolite-admin.git")
- subtest "admin can clone and configure gitolite-admin.git", sub {
- $client->mustSucceed('git clone gitolite@server:gitolite-admin.git');
- $client->mustSucceed("git config --global user.name 'System Administrator'");
- $client->mustSucceed("git config --global user.email root\@domain.example");
- $client->mustSucceed("cp ${alicePublicKey} gitolite-admin/keydir/alice.pub");
- $client->mustSucceed("cp ${bobPublicKey} gitolite-admin/keydir/bob.pub");
- $client->mustSucceed('(cd gitolite-admin && git add . && git commit -m "Add keys for alice, bob" && git push)');
- $client->mustSucceed("printf '${gitoliteAdminConfSnippet}' >> gitolite-admin/conf/gitolite.conf");
- $client->mustSucceed('(cd gitolite-admin && git add . && git commit -m "Add repo for alice" && git push)');
- };
+ with subtest("non-admins can clone testing.git"):
+ client.succeed("sudo -i -u alice git clone gitolite@server:testing.git")
+ client.succeed("sudo -i -u bob git clone gitolite@server:testing.git")
- subtest "non-admins cannot clone gitolite-admin.git", sub {
- $client->mustFail('sudo -i -u alice git clone gitolite@server:gitolite-admin.git');
- $client->mustFail('sudo -i -u bob git clone gitolite@server:gitolite-admin.git');
- };
+ with subtest("alice can clone alice-project.git"):
+ client.succeed("sudo -i -u alice git clone gitolite@server:alice-project.git")
- subtest "non-admins can clone testing.git", sub {
- $client->mustSucceed('sudo -i -u alice git clone gitolite@server:testing.git');
- $client->mustSucceed('sudo -i -u bob git clone gitolite@server:testing.git');
- };
-
- subtest "alice can clone alice-project.git", sub {
- $client->mustSucceed('sudo -i -u alice git clone gitolite@server:alice-project.git');
- };
-
- subtest "bob cannot clone alice-project.git", sub {
- $client->mustFail('sudo -i -u bob git clone gitolite@server:alice-project.git');
- };
+ with subtest("bob cannot clone alice-project.git"):
+ client.fail("sudo -i -u bob git clone gitolite@server:alice-project.git")
'';
})
diff --git a/nixos/tests/gjs.nix b/nixos/tests/gjs.nix
deleted file mode 100644
index e6002ef98dd0..000000000000
--- a/nixos/tests/gjs.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, ... }: {
- name = "gjs";
-
- meta = {
- maintainers = pkgs.gnome3.gjs.meta.maintainers;
- };
-
- machine = { pkgs, ... }: {
- imports = [ ./common/x11.nix ];
- environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
- environment.variables.XDG_DATA_DIRS = [ "${pkgs.gnome3.gjs.installedTests}/share" ];
- };
-
- testScript = ''
- $machine->waitForX;
- $machine->succeed("gnome-desktop-testing-runner");
- '';
-})
diff --git a/nixos/tests/glib-networking.nix b/nixos/tests/glib-networking.nix
deleted file mode 100644
index c0bbb2b3554b..000000000000
--- a/nixos/tests/glib-networking.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, ... }:
-
-{
- name = "glib-networking";
- meta = {
- maintainers = pkgs.glib-networking.meta.maintainers;
- };
-
- machine = { pkgs, ... }: {
- environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
- };
-
- testScript = ''
- $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.glib-networking.installedTests}/share'");
- '';
-})
diff --git a/nixos/tests/glusterfs.nix b/nixos/tests/glusterfs.nix
index 9fd8bd2ed129..8f9cb8973d51 100644
--- a/nixos/tests/glusterfs.nix
+++ b/nixos/tests/glusterfs.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ ... } :
+import ./make-test-python.nix ({pkgs, lib, ...}:
let
client = { pkgs, ... } : {
@@ -39,27 +39,29 @@ in {
};
testScript = ''
- $server1->waitForUnit("glusterd.service");
- $server2->waitForUnit("glusterd.service");
+ server1.wait_for_unit("glusterd.service")
+ server2.wait_for_unit("glusterd.service")
+
+ server1.wait_until_succeeds("gluster peer status")
+ server2.wait_until_succeeds("gluster peer status")
# establish initial contact
- $server1->succeed("sleep 2");
- $server1->succeed("gluster peer probe server2");
- $server1->succeed("gluster peer probe server1");
+ server1.succeed("gluster peer probe server2")
+ server1.succeed("gluster peer probe server1")
- $server1->succeed("gluster peer status | grep Connected");
+ server1.succeed("gluster peer status | grep Connected")
# create volumes
- $server1->succeed("mkdir -p /data/vg0");
- $server2->succeed("mkdir -p /data/vg0");
- $server1->succeed("gluster volume create gv0 server1:/data/vg0 server2:/data/vg0");
- $server1->succeed("gluster volume start gv0");
+ server1.succeed("mkdir -p /data/vg0")
+ server2.succeed("mkdir -p /data/vg0")
+ server1.succeed("gluster volume create gv0 server1:/data/vg0 server2:/data/vg0")
+ server1.succeed("gluster volume start gv0")
# test clients
- $client1->waitForUnit("gluster.mount");
- $client2->waitForUnit("gluster.mount");
+ client1.wait_for_unit("gluster.mount")
+ client2.wait_for_unit("gluster.mount")
- $client1->succeed("echo test > /gluster/file1");
- $client2->succeed("grep test /gluster/file1");
+ client1.succeed("echo test > /gluster/file1")
+ client2.succeed("grep test /gluster/file1")
'';
})
diff --git a/nixos/tests/gnome-photos.nix b/nixos/tests/gnome-photos.nix
deleted file mode 100644
index 2ecda1d68ce3..000000000000
--- a/nixos/tests/gnome-photos.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, lib, ... }:
-
-let
-
- # gsettings tool with access to gsettings-desktop-schemas
- desktop-gsettings = with pkgs; stdenv.mkDerivation {
- name = "desktop-gsettings";
- dontUnpack = true;
- nativeBuildInputs = [ glib wrapGAppsHook ];
- buildInputs = [ gsettings-desktop-schemas ];
- installPhase = ''
- runHook preInstall
- mkdir -p $out/bin
- ln -s ${glib.bin}/bin/gsettings $out/bin/desktop-gsettings
- runHook postInstall
- '';
- };
-
-in
-
-{
- name = "gnome-photos";
- meta = {
- maintainers = pkgs.gnome-photos.meta.maintainers;
- };
-
- machine = { pkgs, ... }: {
- imports = [ ./common/x11.nix ];
- programs.dconf.enable = true;
- services.gnome3.at-spi2-core.enable = true; # needed for dogtail
- environment.systemPackages = with pkgs; [ gnome-desktop-testing desktop-gsettings ];
- services.dbus.packages = with pkgs; [ gnome-photos ];
- };
-
- testScript = ''
- $machine->waitForX;
- # dogtail needs accessibility enabled
- $machine->succeed("desktop-gsettings set org.gnome.desktop.interface toolkit-accessibility true 2>&1");
- $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.gnome-photos.installedTests}/share' 2>&1");
- '';
-})
diff --git a/nixos/tests/gnome3-xorg.nix b/nixos/tests/gnome3-xorg.nix
index eb4c376319be..aa03501f6a55 100644
--- a/nixos/tests/gnome3-xorg.nix
+++ b/nixos/tests/gnome3-xorg.nix
@@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : {
services.xserver.displayManager.lightdm.autoLogin.enable = true;
services.xserver.displayManager.lightdm.autoLogin.user = "alice";
services.xserver.desktopManager.gnome3.enable = true;
- services.xserver.desktopManager.default = "gnome-xorg";
+ services.xserver.displayManager.defaultSession = "gnome-xorg";
virtualisation.memorySize = 1024;
};
diff --git a/nixos/tests/gocd-agent.nix b/nixos/tests/gocd-agent.nix
index 50470379576b..5b630a40736e 100644
--- a/nixos/tests/gocd-agent.nix
+++ b/nixos/tests/gocd-agent.nix
@@ -9,14 +9,18 @@ let
header = "Accept: application/vnd.go.cd.v2+json";
in
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "gocd-agent";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ grahamc swarren83 ];
+
+ # gocd agent needs to register with the autoregister key created on first server startup,
+ # but NixOS module doesn't seem to allow to pass during runtime currently
+ broken = true;
};
nodes = {
- gocd_agent =
+ agent =
{ ... }:
{
virtualisation.memorySize = 2046;
@@ -30,11 +34,15 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
- $gocd_agent->waitForUnit("gocd-server");
- $gocd_agent->waitForOpenPort("8153");
- $gocd_agent->waitForUnit("gocd-agent");
- $gocd_agent->waitUntilSucceeds("curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].uuid");
- $gocd_agent->succeed("curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].agent_state | grep -q Idle");
+ start_all()
+ agent.wait_for_unit("gocd-server")
+ agent.wait_for_open_port("8153")
+ agent.wait_for_unit("gocd-agent")
+ agent.wait_until_succeeds(
+ "curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].uuid"
+ )
+ agent.succeed(
+ "curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].agent_state | grep -q Idle"
+ )
'';
})
diff --git a/nixos/tests/gocd-server.nix b/nixos/tests/gocd-server.nix
index 80cf04ed6404..20faf85a1ccd 100644
--- a/nixos/tests/gocd-server.nix
+++ b/nixos/tests/gocd-server.nix
@@ -2,7 +2,7 @@
# 1. GoCD server starts
# 2. GoCD server responds
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test-python.nix ({ pkgs, ...} :
{
name = "gocd-server";
@@ -10,19 +10,19 @@ import ./make-test.nix ({ pkgs, ...} :
maintainers = [ swarren83 ];
};
-nodes = {
- gocd_server =
- { ... }:
- {
- virtualisation.memorySize = 2046;
- services.gocd-server.enable = true;
- };
-};
+ nodes = {
+ server =
+ { ... }:
+ {
+ virtualisation.memorySize = 2046;
+ services.gocd-server.enable = true;
+ };
+ };
testScript = ''
- $gocd_server->start;
- $gocd_server->waitForUnit("gocd-server");
- $gocd_server->waitForOpenPort("8153");
- $gocd_server->waitUntilSucceeds("curl -s -f localhost:8153/go");
+ server.start()
+ server.wait_for_unit("gocd-server")
+ server.wait_for_open_port(8153)
+ server.wait_until_succeeds("curl -s -f localhost:8153/go")
'';
})
diff --git a/nixos/tests/google-oslogin/default.nix b/nixos/tests/google-oslogin/default.nix
index 3b84bba3f985..1977e92e9877 100644
--- a/nixos/tests/google-oslogin/default.nix
+++ b/nixos/tests/google-oslogin/default.nix
@@ -1,7 +1,14 @@
-import ../make-test.nix ({ pkgs, ... } :
+import ../make-test-python.nix ({ pkgs, ... } :
let
inherit (import ./../ssh-keys.nix pkgs)
snakeOilPrivateKey snakeOilPublicKey;
+
+ # don't check host keys or known hosts, use the snakeoil ssh key
+ ssh-config = builtins.toFile "ssh.conf" ''
+ UserKnownHostsFile=/dev/null
+ StrictHostKeyChecking=no
+ IdentityFile=~/.ssh/id_snakeoil
+ '';
in {
name = "google-oslogin";
meta = with pkgs.stdenv.lib.maintainers; {
@@ -15,38 +22,49 @@ in {
client = { ... }: {};
};
testScript = ''
- startAll;
+ start_all()
- $server->waitForUnit("mock-google-metadata.service");
- $server->waitForOpenPort(80);
+ server.wait_for_unit("mock-google-metadata.service")
+ server.wait_for_open_port(80)
# mockserver should return a non-expired ssh key for both mockuser and mockadmin
- $server->succeed('${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys mockuser | grep -q "${snakeOilPublicKey}"');
- $server->succeed('${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys mockadmin | grep -q "${snakeOilPublicKey}"');
+ server.succeed(
+ '${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys mockuser | grep -q "${snakeOilPublicKey}"'
+ )
+ server.succeed(
+ '${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys mockadmin | grep -q "${snakeOilPublicKey}"'
+ )
- # install snakeoil ssh key on the client
- $client->succeed("mkdir -p ~/.ssh");
- $client->succeed("cat ${snakeOilPrivateKey} > ~/.ssh/id_snakeoil");
- $client->succeed("chmod 600 ~/.ssh/id_snakeoil");
+ # install snakeoil ssh key on the client, and provision .ssh/config file
+ client.succeed("mkdir -p ~/.ssh")
+ client.succeed(
+ "cat ${snakeOilPrivateKey} > ~/.ssh/id_snakeoil"
+ )
+ client.succeed("chmod 600 ~/.ssh/id_snakeoil")
+ client.succeed("cp ${ssh-config} ~/.ssh/config")
- $client->waitForUnit("network.target");
- $server->waitForUnit("sshd.service");
+ client.wait_for_unit("network.target")
+ server.wait_for_unit("sshd.service")
# we should not be able to connect as non-existing user
- $client->fail("ssh -o User=ghost -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil 'true'");
+ client.fail("ssh ghost@server 'true'")
# we should be able to connect as mockuser
- $client->succeed("ssh -o User=mockuser -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil 'true'");
+ client.succeed("ssh mockuser@server 'true'")
# but we shouldn't be able to sudo
- $client->fail("ssh -o User=mockuser -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'");
+ client.fail(
+ "ssh mockuser@server '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'"
+ )
# we should also be able to log in as mockadmin
- $client->succeed("ssh -o User=mockadmin -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil 'true'");
+ client.succeed("ssh mockadmin@server 'true'")
# pam_oslogin_admin.so should now have generated a sudoers file
- $server->succeed("find /run/google-sudoers.d | grep -q '/run/google-sudoers.d/mockadmin'");
+ server.succeed("find /run/google-sudoers.d | grep -q '/run/google-sudoers.d/mockadmin'")
# and we should be able to sudo
- $client->succeed("ssh -o User=mockadmin -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server -i ~/.ssh/id_snakeoil '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'");
+ client.succeed(
+ "ssh mockadmin@server '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'"
+ )
'';
})
diff --git a/nixos/tests/gotify-server.nix b/nixos/tests/gotify-server.nix
index 0ffc3138d5a1..c6e00686aed9 100644
--- a/nixos/tests/gotify-server.nix
+++ b/nixos/tests/gotify-server.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "gotify-server";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ma27 ];
@@ -14,32 +14,32 @@ import ./make-test.nix ({ pkgs, lib, ...} : {
};
testScript = ''
- startAll;
+ machine.start()
- $machine->waitForUnit("gotify-server");
- $machine->waitForOpenPort(3000);
+ machine.wait_for_unit("gotify-server.service")
+ machine.wait_for_open_port(3000)
- my $token = $machine->succeed(
- "curl --fail -sS -X POST localhost:3000/application -F name=nixos " .
- '-H "Authorization: Basic $(echo -ne "admin:admin" | base64 --wrap 0)" ' .
- '| jq .token | xargs echo -n'
- );
+ token = machine.succeed(
+ "curl --fail -sS -X POST localhost:3000/application -F name=nixos "
+ + '-H "Authorization: Basic $(echo -ne "admin:admin" | base64 --wrap 0)" '
+ + "| jq .token | xargs echo -n"
+ )
- my $usertoken = $machine->succeed(
- "curl --fail -sS -X POST localhost:3000/client -F name=nixos " .
- '-H "Authorization: Basic $(echo -ne "admin:admin" | base64 --wrap 0)" ' .
- '| jq .token | xargs echo -n'
- );
+ usertoken = machine.succeed(
+ "curl --fail -sS -X POST localhost:3000/client -F name=nixos "
+ + '-H "Authorization: Basic $(echo -ne "admin:admin" | base64 --wrap 0)" '
+ + "| jq .token | xargs echo -n"
+ )
- $machine->succeed(
- "curl --fail -sS -X POST 'localhost:3000/message?token=$token' -H 'Accept: application/json' " .
- '-F title=Gotify -F message=Works'
- );
+ machine.succeed(
+ f"curl --fail -sS -X POST 'localhost:3000/message?token={token}' -H 'Accept: application/json' "
+ + "-F title=Gotify -F message=Works"
+ )
- my $title = $machine->succeed(
- "curl --fail -sS 'localhost:3000/message?since=0&token=$usertoken' | jq '.messages|.[0]|.title' | xargs echo -n"
- );
+ title = machine.succeed(
+ f"curl --fail -sS 'localhost:3000/message?since=0&token={usertoken}' | jq '.messages|.[0]|.title' | xargs echo -n"
+ )
- $title eq "Gotify" or die "Wrong title ($title), expected 'Gotify'!";
+ assert title == "Gotify"
'';
})
diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix
index 7a1b4c8ffbbc..4b453ece7f1e 100644
--- a/nixos/tests/grafana.nix
+++ b/nixos/tests/grafana.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, pkgs, ... }:
+import ./make-test-python.nix ({ lib, pkgs, ... }:
let
inherit (lib) mkMerge nameValuePair maintainers;
@@ -64,28 +64,34 @@ in {
inherit nodes;
testScript = ''
- startAll();
+ start_all()
- subtest "Grafana sqlite", sub {
- $sqlite->waitForUnit("grafana.service");
- $sqlite->waitForOpenPort(3000);
- $sqlite->succeed("curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost");
- };
+ with subtest("Successful API query as admin user with sqlite db"):
+ sqlite.wait_for_unit("grafana.service")
+ sqlite.wait_for_open_port(3000)
+ sqlite.succeed(
+ "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost"
+ )
+ sqlite.shutdown()
- subtest "Grafana postgresql", sub {
- $postgresql->waitForUnit("grafana.service");
- $postgresql->waitForUnit("postgresql.service");
- $postgresql->waitForOpenPort(3000);
- $postgresql->waitForOpenPort(5432);
- $postgresql->succeed("curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost");
- };
+ with subtest("Successful API query as admin user with postgresql db"):
+ postgresql.wait_for_unit("grafana.service")
+ postgresql.wait_for_unit("postgresql.service")
+ postgresql.wait_for_open_port(3000)
+ postgresql.wait_for_open_port(5432)
+ postgresql.succeed(
+ "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost"
+ )
+ postgresql.shutdown()
- subtest "Grafana mysql", sub {
- $mysql->waitForUnit("grafana.service");
- $mysql->waitForUnit("mysql.service");
- $mysql->waitForOpenPort(3000);
- $mysql->waitForOpenPort(3306);
- $mysql->succeed("curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost");
- };
+ with subtest("Successful API query as admin user with mysql db"):
+ mysql.wait_for_unit("grafana.service")
+ mysql.wait_for_unit("mysql.service")
+ mysql.wait_for_open_port(3000)
+ mysql.wait_for_open_port(3306)
+ mysql.succeed(
+ "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep -q testadmin\@localhost"
+ )
+ mysql.shutdown()
'';
})
diff --git a/nixos/tests/graphene.nix b/nixos/tests/graphene.nix
deleted file mode 100644
index 5591bcc30c07..000000000000
--- a/nixos/tests/graphene.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, ... }:
-
-{
- name = "graphene";
-
- meta = {
- maintainers = pkgs.graphene.meta.maintainers;
- };
-
- machine = { pkgs, ... }: {
- environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
- };
-
- testScript = ''
- $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.graphene.installedTests}/share'");
- '';
-})
diff --git a/nixos/tests/graylog.nix b/nixos/tests/graylog.nix
index dc54afd1d26d..2d22012fa7c0 100644
--- a/nixos/tests/graylog.nix
+++ b/nixos/tests/graylog.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }: {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "graylog";
meta.maintainers = with lib.maintainers; [ ma27 ];
@@ -64,48 +64,52 @@ import ./make-test.nix ({ pkgs, lib, ... }: {
facility = "Test";
});
in ''
- $machine->start;
- $machine->waitForUnit("graylog.service");
- $machine->waitForOpenPort(9000);
- $machine->succeed("curl -sSfL http://127.0.0.1:9000/");
+ machine.start()
+ machine.wait_for_unit("graylog.service")
+ machine.wait_for_open_port(9000)
+ machine.succeed("curl -sSfL http://127.0.0.1:9000/")
- my $session = $machine->succeed("curl -X POST "
- . "-sSfL http://127.0.0.1:9000/api/system/sessions "
- . "-d \$(cat ${payloads.login}) "
- . "-H 'Content-Type: application/json' "
- . "-H 'Accept: application/json' "
- . "-H 'x-requested-by: cli' "
- . "| jq .session_id | xargs echo"
- );
+ session = machine.succeed(
+ "curl -X POST "
+ + "-sSfL http://127.0.0.1:9000/api/system/sessions "
+ + "-d $(cat ${payloads.login}) "
+ + "-H 'Content-Type: application/json' "
+ + "-H 'Accept: application/json' "
+ + "-H 'x-requested-by: cli' "
+ + "| jq .session_id | xargs echo"
+ ).rstrip()
- chomp($session);
+ machine.succeed(
+ "curl -X POST "
+ + f"-sSfL http://127.0.0.1:9000/api/system/inputs -u {session}:session "
+ + '-d $(cat ${payloads.input} | sed -e "s,@node@,$(cat /var/lib/graylog/server/node-id),") '
+ + "-H 'Accept: application/json' "
+ + "-H 'Content-Type: application/json' "
+ + "-H 'x-requested-by: cli' "
+ )
- $machine->succeed("curl -X POST "
- . "-sSfL http://127.0.0.1:9000/api/system/inputs -u $session:session "
- . "-d \$(cat ${payloads.input} | sed -e \"s,\@node\@,\$(cat /var/lib/graylog/server/node-id),\") "
- . "-H 'Accept: application/json' "
- . "-H 'Content-Type: application/json' "
- . "-H 'x-requested-by: cli' "
- );
+ machine.wait_until_succeeds(
+ "test \"$(curl -sSfL 'http://127.0.0.1:9000/api/cluster/inputstates' "
+ + f"-u {session}:session "
+ + "-H 'Accept: application/json' "
+ + "-H 'Content-Type: application/json' "
+ + "-H 'x-requested-by: cli'"
+ + "| jq 'to_entries[]|.value|.[0]|.state' | xargs echo"
+ + ')" = "RUNNING"'
+ )
- $machine->waitUntilSucceeds("test \"\$(curl -sSfL 'http://127.0.0.1:9000/api/cluster/inputstates' "
- . "-u $session:session "
- . "-H 'Accept: application/json' "
- . "-H 'Content-Type: application/json' "
- . "-H 'x-requested-by: cli'"
- . "| jq 'to_entries[]|.value|.[0]|.state' | xargs echo"
- . ")\" = \"RUNNING\""
- );
+ machine.succeed(
+ "echo -n $(cat ${payloads.gelf_message}) | nc -w10 -u 127.0.0.1 12201"
+ )
- $machine->succeed("echo -n \$(cat ${payloads.gelf_message}) | nc -w10 -u 127.0.0.1 12201");
-
- $machine->succeed("test \"\$(curl -X GET "
- . "-sSfL 'http://127.0.0.1:9000/api/search/universal/relative?query=*' "
- . "-u $session:session "
- . "-H 'Accept: application/json' "
- . "-H 'Content-Type: application/json' "
- . "-H 'x-requested-by: cli'"
- . " | jq '.total_results' | xargs echo)\" = \"1\""
- );
+ machine.succeed(
+ 'test "$(curl -X GET '
+ + "-sSfL 'http://127.0.0.1:9000/api/search/universal/relative?query=*' "
+ + f"-u {session}:session "
+ + "-H 'Accept: application/json' "
+ + "-H 'Content-Type: application/json' "
+ + "-H 'x-requested-by: cli'"
+ + ' | jq \'.total_results\' | xargs echo)" = "1"'
+ )
'';
})
diff --git a/nixos/tests/gvisor.nix b/nixos/tests/gvisor.nix
new file mode 100644
index 000000000000..4d68a1d8a5f8
--- /dev/null
+++ b/nixos/tests/gvisor.nix
@@ -0,0 +1,49 @@
+# This test runs a container through gvisor and checks if simple container starts
+
+import ./make-test-python.nix ({ pkgs, ...} : {
+ name = "gvisor";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ andrew-d ];
+ };
+
+ nodes = {
+ gvisor =
+ { pkgs, ... }:
+ {
+ virtualisation.docker = {
+ enable = true;
+ extraOptions = "--add-runtime runsc=${pkgs.gvisor}/bin/runsc";
+ };
+
+ networking = {
+ dhcpcd.enable = false;
+ defaultGateway = "192.168.1.1";
+ interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
+ { address = "192.168.1.2"; prefixLength = 24; }
+ ];
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ gvisor.wait_for_unit("network.target")
+ gvisor.wait_for_unit("sockets.target")
+
+ # Start by verifying that gvisor itself works
+ output = gvisor.succeed(
+ "${pkgs.gvisor}/bin/runsc -alsologtostderr do ${pkgs.coreutils}/bin/echo hello world"
+ )
+ assert output.strip() == "hello world"
+
+ # Also test the Docker runtime
+ gvisor.succeed("tar cv --files-from /dev/null | docker import - scratchimg")
+ gvisor.succeed(
+ "docker run -d --name=sleeping --runtime=runsc -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
+ )
+ gvisor.succeed("docker ps | grep sleeping")
+ gvisor.succeed("docker stop sleeping")
+ '';
+})
+
diff --git a/nixos/tests/hadoop/hdfs.nix b/nixos/tests/hadoop/hdfs.nix
index e7d72a56e1e7..85aaab34b158 100644
--- a/nixos/tests/hadoop/hdfs.nix
+++ b/nixos/tests/hadoop/hdfs.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({...}: {
+import ../make-test-python.nix ({...}: {
nodes = {
namenode = {pkgs, ...}: {
services.hadoop = {
@@ -35,20 +35,20 @@ import ../make-test.nix ({...}: {
};
testScript = ''
- startAll
+ start_all()
- $namenode->waitForUnit("hdfs-namenode");
- $namenode->waitForUnit("network.target");
- $namenode->waitForOpenPort(8020);
- $namenode->waitForOpenPort(9870);
+ namenode.wait_for_unit("hdfs-namenode")
+ namenode.wait_for_unit("network.target")
+ namenode.wait_for_open_port(8020)
+ namenode.wait_for_open_port(9870)
- $datanode->waitForUnit("hdfs-datanode");
- $datanode->waitForUnit("network.target");
- $datanode->waitForOpenPort(9864);
- $datanode->waitForOpenPort(9866);
- $datanode->waitForOpenPort(9867);
+ datanode.wait_for_unit("hdfs-datanode")
+ datanode.wait_for_unit("network.target")
+ datanode.wait_for_open_port(9864)
+ datanode.wait_for_open_port(9866)
+ datanode.wait_for_open_port(9867)
- $namenode->succeed("curl http://namenode:9870");
- $datanode->succeed("curl http://datanode:9864");
+ namenode.succeed("curl http://namenode:9870")
+ datanode.succeed("curl http://datanode:9864")
'';
})
diff --git a/nixos/tests/hadoop/yarn.nix b/nixos/tests/hadoop/yarn.nix
index 031592301f17..2264ecaff155 100644
--- a/nixos/tests/hadoop/yarn.nix
+++ b/nixos/tests/hadoop/yarn.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({...}: {
+import ../make-test-python.nix ({...}: {
nodes = {
resourcemanager = {pkgs, ...}: {
services.hadoop.package = pkgs.hadoop_3_1;
@@ -28,19 +28,19 @@ import ../make-test.nix ({...}: {
};
testScript = ''
- startAll;
+ start_all()
- $resourcemanager->waitForUnit("yarn-resourcemanager");
- $resourcemanager->waitForUnit("network.target");
- $resourcemanager->waitForOpenPort(8031);
- $resourcemanager->waitForOpenPort(8088);
+ resourcemanager.wait_for_unit("yarn-resourcemanager")
+ resourcemanager.wait_for_unit("network.target")
+ resourcemanager.wait_for_open_port(8031)
+ resourcemanager.wait_for_open_port(8088)
- $nodemanager->waitForUnit("yarn-nodemanager");
- $nodemanager->waitForUnit("network.target");
- $nodemanager->waitForOpenPort(8042);
- $nodemanager->waitForOpenPort(8041);
+ nodemanager.wait_for_unit("yarn-nodemanager")
+ nodemanager.wait_for_unit("network.target")
+ nodemanager.wait_for_open_port(8042)
+ nodemanager.wait_for_open_port(8041)
- $resourcemanager->succeed("curl http://localhost:8088");
- $nodemanager->succeed("curl http://localhost:8042");
+ resourcemanager.succeed("curl http://localhost:8088")
+ nodemanager.succeed("curl http://localhost:8042")
'';
})
diff --git a/nixos/tests/handbrake.nix b/nixos/tests/handbrake.nix
index ae87e1f69a7d..e5fb6b269b19 100644
--- a/nixos/tests/handbrake.nix
+++ b/nixos/tests/handbrake.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
let
# Download Big Buck Bunny example, licensed under CC Attribution 3.0.
testMkv = pkgs.fetchurl {
@@ -19,7 +19,13 @@ in {
testScript = ''
# Test MP4 and MKV transcoding. Since this is a short clip, transcoding typically
# only takes a few seconds.
- $machine->succeed("HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160");
- $machine->succeed("HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160");
+ start_all()
+
+ machine.succeed(
+ "HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160"
+ )
+ machine.succeed(
+ "HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160"
+ )
'';
})
diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix
index 22a83e9d1eab..79f34b07faf4 100644
--- a/nixos/tests/haproxy.nix
+++ b/nixos/tests/haproxy.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...}: {
+import ./make-test-python.nix ({ pkgs, ...}: {
name = "haproxy";
nodes = {
machine = { ... }: {
@@ -16,26 +16,32 @@ import ./make-test.nix ({ pkgs, ...}: {
frontend http
bind *:80
mode http
+ option http-use-htx
+ http-request use-service prometheus-exporter if { path /metrics }
use_backend http_server
'';
};
services.httpd = {
enable = true;
- documentRoot = pkgs.writeTextDir "index.txt" "We are all good!";
- adminAddr = "notme@yourhost.local";
- listen = [{
- ip = "::1";
- port = 8000;
- }];
+ virtualHosts.localhost = {
+ documentRoot = pkgs.writeTextDir "index.txt" "We are all good!";
+ adminAddr = "notme@yourhost.local";
+ listen = [{
+ ip = "::1";
+ port = 8000;
+ }];
+ };
};
};
};
testScript = ''
- startAll;
- $machine->waitForUnit('multi-user.target');
- $machine->waitForUnit('haproxy.service');
- $machine->waitForUnit('httpd.service');
- $machine->succeed('curl -k http://localhost:80/index.txt | grep "We are all good!"');
-
+ start_all()
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_for_unit("haproxy.service")
+ machine.wait_for_unit("httpd.service")
+ assert "We are all good!" in machine.succeed("curl -k http://localhost:80/index.txt")
+ assert "haproxy_process_pool_allocated_bytes" in machine.succeed(
+ "curl -k http://localhost:80/metrics"
+ )
'';
})
diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix
index 274aa7becc82..8251c6e7ef85 100644
--- a/nixos/tests/hibernate.nix
+++ b/nixos/tests/hibernate.nix
@@ -1,6 +1,6 @@
# Test whether hibernation from partition works.
-import ./make-test.nix (pkgs: {
+import ./make-test-python.nix (pkgs: {
name = "hibernate";
nodes = {
@@ -28,16 +28,17 @@ import ./make-test.nix (pkgs: {
testScript =
''
- $machine->waitForUnit("multi-user.target");
- $machine->succeed("mkswap /dev/vdb");
- $machine->succeed("swapon -a");
- $machine->startJob("listener");
- $machine->waitForOpenPort(4444);
- $machine->succeed("systemctl hibernate &");
- $machine->waitForShutdown;
- $probe->waitForUnit("multi-user.target");
- $machine->start;
- $probe->waitUntilSucceeds("echo test | nc machine 4444 -N");
+ machine.start()
+ machine.wait_for_unit("multi-user.target")
+ machine.succeed("mkswap /dev/vdb")
+ machine.succeed("swapon -a")
+ machine.start_job("listener")
+ machine.wait_for_open_port(4444)
+ machine.succeed("systemctl hibernate &")
+ machine.wait_for_shutdown()
+ probe.wait_for_unit("multi-user.target")
+ machine.start()
+ probe.wait_until_succeeds("echo test | nc machine 4444 -N")
'';
})
diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix
index cb24c4dcffc2..904d12619d70 100644
--- a/nixos/tests/hitch/default.nix
+++ b/nixos/tests/hitch/default.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({ pkgs, ... }:
+import ../make-test-python.nix ({ pkgs, ... }:
{
name = "hitch";
meta = with pkgs.stdenv.lib.maintainers; {
@@ -16,18 +16,18 @@ import ../make-test.nix ({ pkgs, ... }:
services.httpd = {
enable = true;
- documentRoot = ./example;
+ virtualHosts.localhost.documentRoot = ./example;
adminAddr = "noone@testing.nowhere";
};
};
testScript =
''
- startAll;
+ start_all()
- $machine->waitForUnit('multi-user.target');
- $machine->waitForUnit('hitch.service');
- $machine->waitForOpenPort(443);
- $machine->succeed('curl -k https://localhost:443/index.txt | grep "We are all good!"');
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_for_unit("hitch.service")
+ machine.wait_for_open_port(443)
+ assert "We are all good!" in machine.succeed("curl -k https://localhost:443/index.txt")
'';
})
diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix
index cb8e25332c07..27c65abdf27c 100644
--- a/nixos/tests/hound.nix
+++ b/nixos/tests/hound.nix
@@ -1,5 +1,5 @@
# Test whether `houndd` indexes nixpkgs
-import ./make-test.nix ({ pkgs, ... } : {
+import ./make-test-python.nix ({ pkgs, ... } : {
name = "hound";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ grahamc ];
@@ -46,13 +46,14 @@ import ./make-test.nix ({ pkgs, ... } : {
};
};
- testScript =
- '' startAll;
+ testScript = ''
+ start_all()
- $machine->waitForUnit("network.target");
- $machine->waitForUnit("hound.service");
- $machine->waitForOpenPort(6080);
- $machine->waitUntilSucceeds('curl http://127.0.0.1:6080/api/v1/search\?stats\=fosho\&repos\=\*\&rng=%3A20\&q\=hi\&files\=\&i=nope | grep "Filename" | grep "hello"');
-
- '';
+ machine.wait_for_unit("network.target")
+ machine.wait_for_unit("hound.service")
+ machine.wait_for_open_port(6080)
+ machine.wait_until_succeeds(
+ "curl http://127.0.0.1:6080/api/v1/search\?stats\=fosho\&repos\=\*\&rng=%3A20\&q\=hi\&files\=\&i=nope | grep 'Filename' | grep 'hello'"
+ )
+ '';
})
diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix
index 6ca05a2c7797..37e14cb19ccc 100644
--- a/nixos/tests/hydra/default.nix
+++ b/nixos/tests/hydra/default.nix
@@ -34,7 +34,7 @@ let
};
tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix:
- callTest (import ../make-test.nix ({ pkgs, lib, ... }:
+ callTest (import ../make-test-python.nix ({ pkgs, lib, ... }:
{
name = "hydra-with-${name}";
meta = with pkgs.stdenv.lib.maintainers; {
@@ -73,26 +73,30 @@ let
testScript = ''
# let the system boot up
- $machine->waitForUnit("multi-user.target");
+ machine.wait_for_unit("multi-user.target")
# test whether the database is running
- $machine->waitForUnit("postgresql.service");
+ machine.wait_for_unit("postgresql.service")
# test whether the actual hydra daemons are running
- $machine->waitForUnit("hydra-init.service");
- $machine->requireActiveUnit("hydra-queue-runner.service");
- $machine->requireActiveUnit("hydra-evaluator.service");
- $machine->requireActiveUnit("hydra-notify.service");
+ machine.wait_for_unit("hydra-init.service")
+ machine.require_unit_state("hydra-queue-runner.service")
+ machine.require_unit_state("hydra-evaluator.service")
+ machine.require_unit_state("hydra-notify.service")
- $machine->succeed("hydra-create-user admin --role admin --password admin");
+ machine.succeed("hydra-create-user admin --role admin --password admin")
# create a project with a trivial job
- $machine->waitForOpenPort(3000);
+ machine.wait_for_open_port(3000)
# make sure the build as been successfully built
- $machine->succeed("create-trivial-project.sh");
+ machine.succeed("create-trivial-project.sh")
- $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq');
+ machine.wait_until_succeeds(
+ 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'
+ )
- $machine->waitUntilSucceeds('journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"');
+ machine.wait_until_succeeds(
+ 'journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"'
+ )
'';
})));
diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix
index d309f19a0b4a..126178d11879 100644
--- a/nixos/tests/i3wm.nix
+++ b/nixos/tests/i3wm.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "i3wm";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig ];
@@ -7,29 +7,40 @@ import ./make-test.nix ({ pkgs, ...} : {
machine = { lib, ... }: {
imports = [ ./common/x11.nix ./common/user-account.nix ];
services.xserver.displayManager.auto.user = "alice";
- services.xserver.windowManager.default = lib.mkForce "i3";
+ services.xserver.displayManager.defaultSession = lib.mkForce "none+i3";
services.xserver.windowManager.i3.enable = true;
};
testScript = { ... }: ''
- $machine->waitForX;
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow(qr/first configuration/);
- $machine->sleep(2);
- $machine->screenshot("started");
- $machine->sendKeys("ret");
- $machine->sleep(2);
- $machine->sendKeys("alt");
- $machine->sleep(2);
- $machine->screenshot("configured");
- $machine->sendKeys("ret");
- # make sure the config file is created before we continue
- $machine->waitForFile("/home/alice/.config/i3/config");
- $machine->sleep(2);
- $machine->sendKeys("alt-ret");
- $machine->waitForWindow(qr/alice.*machine/);
- $machine->sleep(2);
- $machine->screenshot("terminal");
+ with subtest("ensure x starts"):
+ machine.wait_for_x()
+ machine.wait_for_file("/home/alice/.Xauthority")
+ machine.succeed("xauth merge ~alice/.Xauthority")
+
+ with subtest("ensure we get first configuration window"):
+ machine.wait_for_window(r".*?first configuration.*?")
+ machine.sleep(2)
+ machine.screenshot("started")
+
+ with subtest("ensure we generate and save a config"):
+ # press return to indicate we want to gen a new config
+ machine.send_key("\n")
+ machine.sleep(2)
+ machine.screenshot("preconfig")
+ # press alt then return to indicate we want to use alt as our Mod key
+ machine.send_key("alt")
+ machine.send_key("\n")
+ machine.sleep(2)
+ # make sure the config file is created before we continue
+ machine.wait_for_file("/home/alice/.config/i3/config")
+ machine.screenshot("postconfig")
+ machine.sleep(2)
+
+ with subtest("ensure we can open a new terminal"):
+ machine.send_key("alt-ret")
+ machine.sleep(2)
+ machine.wait_for_window(r"alice.*?machine")
+ machine.sleep(2)
+ machine.screenshot("terminal")
'';
})
diff --git a/nixos/tests/icingaweb2.nix b/nixos/tests/icingaweb2.nix
index ea1b94c526b1..2f65604539c1 100644
--- a/nixos/tests/icingaweb2.nix
+++ b/nixos/tests/icingaweb2.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "icingaweb2";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ das_j ];
@@ -64,8 +64,8 @@ import ./make-test.nix ({ pkgs, ... }: {
};
testScript = ''
- startAll();
- $icingaweb2->waitForUnit("multi-user.target");
- $icingaweb2->succeed("curl -sSf http://icingaweb2/authentication/login");
+ start_all()
+ icingaweb2.wait_for_unit("multi-user.target")
+ icingaweb2.succeed("curl -sSf http://icingaweb2/authentication/login")
'';
})
diff --git a/nixos/tests/iftop.nix b/nixos/tests/iftop.nix
index a4f524ceb27b..8a161027c2ad 100644
--- a/nixos/tests/iftop.nix
+++ b/nixos/tests/iftop.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
with lib;
@@ -18,17 +18,16 @@ with lib;
};
testScript = ''
- subtest "machine with iftop enabled", sub {
- $withIftop->waitForUnit("default.target");
- # limit to eth1 (eth0 is the test driver's control interface)
- # and don't try name lookups
- $withIftop->succeed("su -l alice -c 'iftop -t -s 1 -n -i eth1'");
- };
- subtest "machine without iftop", sub {
- $withoutIftop->waitForUnit("default.target");
- # check that iftop is there but user alice lacks capabilities
- $withoutIftop->succeed("iftop -t -s 1 -n -i eth1");
- $withoutIftop->fail("su -l alice -c 'iftop -t -s 1 -n -i eth1'");
- };
+ with subtest("machine with iftop enabled"):
+ withIftop.wait_for_unit("default.target")
+ # limit to eth1 (eth0 is the test driver's control interface)
+ # and don't try name lookups
+ withIftop.succeed("su -l alice -c 'iftop -t -s 1 -n -i eth1'")
+
+ with subtest("machine without iftop"):
+ withoutIftop.wait_for_unit("default.target")
+ # check that iftop is there but user alice lacks capabilitie
+ withoutIftop.succeed("iftop -t -s 1 -n -i eth1")
+ withoutIftop.fail("su -l alice -c 'iftop -t -s 1 -n -i eth1'")
'';
})
diff --git a/nixos/tests/incron.nix b/nixos/tests/incron.nix
index e39bbb5f096b..b22ee4c9a037 100644
--- a/nixos/tests/incron.nix
+++ b/nixos/tests/incron.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
{
name = "incron";
@@ -19,34 +19,34 @@ import ./make-test.nix ({ pkgs, lib, ... }:
};
testScript = ''
- startAll;
+ start_all()
- $machine->waitForUnit("multi-user.target");
- $machine->waitForUnit("incron.service");
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_for_unit("incron.service")
- $machine->succeed("test -d /test");
+ machine.succeed("test -d /test")
# create some activity for incron to monitor
- $machine->succeed("touch /test/file");
- $machine->succeed("echo foo >> /test/file");
- $machine->succeed("mv /test/file /root");
- $machine->succeed("mv /root/file /test");
+ machine.succeed("touch /test/file")
+ machine.succeed("echo foo >> /test/file")
+ machine.succeed("mv /test/file /root")
+ machine.succeed("mv /root/file /test")
- $machine->sleep(1);
+ machine.sleep(1)
# touch /test/file
- $machine->succeed("grep '/test/file IN_CREATE' /root/incron.log");
+ machine.succeed("grep '/test/file IN_CREATE' /root/incron.log")
# echo foo >> /test/file
- $machine->succeed("grep '/test/file IN_MODIFY' /root/incron.log");
- $machine->succeed("grep '/test/file IN_CLOSE_WRITE' /root/incron.log");
+ machine.succeed("grep '/test/file IN_MODIFY' /root/incron.log")
+ machine.succeed("grep '/test/file IN_CLOSE_WRITE' /root/incron.log")
# mv /test/file /root
- $machine->succeed("grep '/test/file IN_MOVED_FROM' /root/incron.log");
+ machine.succeed("grep '/test/file IN_MOVED_FROM' /root/incron.log")
# mv /root/file /test
- $machine->succeed("grep '/test/file IN_MOVED_TO' /root/incron.log");
+ machine.succeed("grep '/test/file IN_MOVED_TO' /root/incron.log")
# ensure something unexpected is not present
- $machine->fail("grep 'IN_OPEN' /root/incron.log");
+ machine.fail("grep 'IN_OPEN' /root/incron.log")
'';
})
diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix
index 61201202204b..04ef80461010 100644
--- a/nixos/tests/influxdb.nix
+++ b/nixos/tests/influxdb.nix
@@ -1,6 +1,6 @@
# This test runs influxdb and checks if influxdb is up and running
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "influxdb";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ offline ];
@@ -9,25 +9,32 @@ import ./make-test.nix ({ pkgs, ...} : {
nodes = {
one = { ... }: {
services.influxdb.enable = true;
+ environment.systemPackages = [ pkgs.httpie ];
};
};
testScript = ''
- startAll;
-
- $one->waitForUnit("influxdb.service");
+ import shlex
+
+ start_all()
+
+ one.wait_for_unit("influxdb.service")
# create database
- $one->succeed(q~
- curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE test"
- ~);
+ one.succeed(
+ "curl -XPOST http://localhost:8086/query --data-urlencode 'q=CREATE DATABASE test'"
+ )
# write some points and run simple query
- $one->succeed(q~
- curl -XPOST 'http://localhost:8086/write?db=test' --data-binary 'cpu_load_short,host=server01,region=us-west value=0.64 1434055562000000000'
- ~);
- $one->succeed(q~
- curl -GET 'http://localhost:8086/query' --data-urlencode "db=test" --data-urlencode "q=SELECT \"value\" FROM \"cpu_load_short\" WHERE \"region\"='us-west'" | grep "0\.64"
- ~);
+ out = one.succeed(
+ "curl -XPOST 'http://localhost:8086/write?db=test' --data-binary 'cpu_load_short,host=server01,region=us-west value=0.64 1434055562000000000'"
+ )
+
+ qv = "SELECT value FROM cpu_load_short WHERE region='us-west'"
+ cmd = f'curl -GET "http://localhost:8086/query?db=test" --data-urlencode {shlex.quote("q="+ qv)}'
+ out = one.succeed(cmd)
+
+ assert "2015-06-11T20:46:02Z" in out
+ assert "0.64" in out
'';
})
diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix
index 796c50c610e3..73d9f938e226 100644
--- a/nixos/tests/initrd-network-ssh/default.nix
+++ b/nixos/tests/initrd-network-ssh/default.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({ lib, ... }:
+import ../make-test-python.nix ({ lib, ... }:
{
name = "initrd-network-ssh";
@@ -35,25 +35,31 @@ import ../make-test.nix ({ lib, ... }:
client =
{ config, ... }:
{
- environment.etc.knownHosts = {
- text = concatStrings [
- "server,"
- "${toString (head (splitString " " (
- toString (elemAt (splitString "\n" config.networking.extraHosts) 2)
- )))} "
- "${readFile ./dropbear.pub}"
- ];
+ environment.etc = {
+ knownHosts = {
+ text = concatStrings [
+ "server,"
+ "${toString (head (splitString " " (
+ toString (elemAt (splitString "\n" config.networking.extraHosts) 2)
+ )))} "
+ "${readFile ./dropbear.pub}"
+ ];
+ };
+ sshKey = {
+ source = ./openssh.priv; # dont use this anywhere else
+ mode = "0600";
+ };
};
};
};
testScript = ''
- startAll;
- $client->waitForUnit("network.target");
- $client->copyFileFromHost("${./openssh.priv}","/etc/sshKey");
- $client->succeed("chmod 0600 /etc/sshKey");
- $client->waitUntilSucceeds("ping -c 1 server");
- $client->succeed("ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'touch /fnord'");
- $client->shutdown;
+ start_all()
+ client.wait_for_unit("network.target")
+ client.wait_until_succeeds("ping -c 1 server")
+ client.succeed(
+ "ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'touch /fnord'"
+ )
+ client.shutdown()
'';
})
diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix
index ed9b82e2da77..4796ff9b7c8d 100644
--- a/nixos/tests/initrd-network.nix
+++ b/nixos/tests/initrd-network.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "initrd-network";
meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ];
@@ -15,8 +15,8 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- startAll;
- $machine->waitForUnit("multi-user.target");
- $machine->succeed("ip link >&2");
+ start_all()
+ machine.wait_for_unit("multi-user.target")
+ machine.succeed("ip link >&2")
'';
})
diff --git a/nixos/tests/installed-tests/colord.nix b/nixos/tests/installed-tests/colord.nix
new file mode 100644
index 000000000000..77e6b917fe68
--- /dev/null
+++ b/nixos/tests/installed-tests/colord.nix
@@ -0,0 +1,5 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.colord;
+}
diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix
new file mode 100644
index 000000000000..8e997ee4aeb9
--- /dev/null
+++ b/nixos/tests/installed-tests/default.nix
@@ -0,0 +1,96 @@
+# NixOS tests for gnome-desktop-testing-runner using software
+# See https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests
+
+{ system ? builtins.currentSystem,
+ config ? {},
+ pkgs ? import ../../.. { inherit system config; }
+}:
+
+with import ../../lib/testing-python.nix { inherit system pkgs; };
+with pkgs.lib;
+
+let
+
+ callInstalledTest = pkgs.newScope { inherit makeInstalledTest; };
+
+ makeInstalledTest =
+ { # Package to test. Needs to have an installedTests output
+ tested
+
+ # Config to inject into machine
+ , testConfig ? {}
+
+ # Test script snippet to inject before gnome-desktop-testing-runner begins.
+ # This is useful for extra setup the environment may need before the runner begins.
+ , preTestScript ? ""
+
+ # Does test need X11?
+ , withX11 ? false
+
+ # Extra flags to pass to gnome-desktop-testing-runner.
+ , testRunnerFlags ? ""
+
+ # Extra attributes to pass to makeTest.
+ # They will be recursively merged into the attrset created by this function.
+ , ...
+ }@args:
+ makeTest
+ (recursiveUpdate
+ rec {
+ name = tested.name;
+
+ meta = {
+ maintainers = tested.meta.maintainers;
+ };
+
+ machine = { ... }: {
+ imports = [
+ testConfig
+ ] ++ optional withX11 ../common/x11.nix;
+
+ environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
+
+ };
+
+ testScript =
+ optionalString withX11 ''
+ machine.wait_for_x()
+ '' +
+ optionalString (preTestScript != "") ''
+ ${preTestScript}
+ '' +
+ ''
+ machine.succeed(
+ "gnome-desktop-testing-runner ${testRunnerFlags} -d '${tested.installedTests}/share'"
+ )
+ '';
+ }
+
+ (removeAttrs args [
+ "tested"
+ "testConfig"
+ "preTestScript"
+ "withX11"
+ "testRunnerFlags"
+ ])
+ );
+
+in
+
+{
+ colord = callInstalledTest ./colord.nix {};
+ flatpak = callInstalledTest ./flatpak.nix {};
+ flatpak-builder = callInstalledTest ./flatpak-builder.nix {};
+ fwupd = callInstalledTest ./fwupd.nix {};
+ gcab = callInstalledTest ./gcab.nix {};
+ gdk-pixbuf = callInstalledTest ./gdk-pixbuf.nix {};
+ gjs = callInstalledTest ./gjs.nix {};
+ glib-networking = callInstalledTest ./glib-networking.nix {};
+ gnome-photos = callInstalledTest ./gnome-photos.nix {};
+ graphene = callInstalledTest ./graphene.nix {};
+ ibus = callInstalledTest ./ibus.nix {};
+ libgdata = callInstalledTest ./libgdata.nix {};
+ libxmlb = callInstalledTest ./libxmlb.nix {};
+ ostree = callInstalledTest ./ostree.nix {};
+ xdg-desktop-portal = callInstalledTest ./xdg-desktop-portal.nix {};
+}
diff --git a/nixos/tests/installed-tests/flatpak-builder.nix b/nixos/tests/installed-tests/flatpak-builder.nix
new file mode 100644
index 000000000000..31b9f2b258fd
--- /dev/null
+++ b/nixos/tests/installed-tests/flatpak-builder.nix
@@ -0,0 +1,14 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.flatpak-builder;
+
+ testConfig = {
+ services.flatpak.enable = true;
+ xdg.portal.enable = true;
+ environment.systemPackages = with pkgs; [ flatpak-builder ] ++ flatpak-builder.installedTestsDependencies;
+ virtualisation.diskSize = 2048;
+ };
+
+ testRunnerFlags = "--timeout 3600";
+}
diff --git a/nixos/tests/installed-tests/flatpak.nix b/nixos/tests/installed-tests/flatpak.nix
new file mode 100644
index 000000000000..091c99326629
--- /dev/null
+++ b/nixos/tests/installed-tests/flatpak.nix
@@ -0,0 +1,19 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.flatpak;
+ withX11 = true;
+
+ testConfig = {
+ services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work
+ # common/x11.nix enables the auto display manager (lightdm)
+ services.xserver.displayManager.gdm.enable = false;
+ services.gnome3.core-utilities.enable = false;
+ services.flatpak.enable = true;
+ environment.systemPackages = with pkgs; [ gnupg ostree python2 ];
+ virtualisation.memorySize = 2047;
+ virtualisation.diskSize = 1024;
+ };
+
+ testRunnerFlags = "--timeout 3600";
+}
diff --git a/nixos/tests/installed-tests/fwupd.nix b/nixos/tests/installed-tests/fwupd.nix
new file mode 100644
index 000000000000..b9f761e99582
--- /dev/null
+++ b/nixos/tests/installed-tests/fwupd.nix
@@ -0,0 +1,12 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.fwupd;
+
+ testConfig = {
+ services.fwupd.enable = true;
+ services.fwupd.blacklistPlugins = []; # don't blacklist test plugin
+ services.fwupd.enableTestRemote = true;
+ virtualisation.memorySize = 768;
+ };
+}
diff --git a/nixos/tests/installed-tests/gcab.nix b/nixos/tests/installed-tests/gcab.nix
new file mode 100644
index 000000000000..b24cc2e01267
--- /dev/null
+++ b/nixos/tests/installed-tests/gcab.nix
@@ -0,0 +1,5 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.gcab;
+}
diff --git a/nixos/tests/installed-tests/gdk-pixbuf.nix b/nixos/tests/installed-tests/gdk-pixbuf.nix
new file mode 100644
index 000000000000..3d0011a427a4
--- /dev/null
+++ b/nixos/tests/installed-tests/gdk-pixbuf.nix
@@ -0,0 +1,13 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.gdk-pixbuf;
+
+ testConfig = {
+ # Tests allocate a lot of memory trying to exploit a CVE
+ # but qemu-system-i386 has a 2047M memory limit
+ virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096;
+ };
+
+ testRunnerFlags = "--timeout 1800";
+}
diff --git a/nixos/tests/installed-tests/gjs.nix b/nixos/tests/installed-tests/gjs.nix
new file mode 100644
index 000000000000..1656e9de171b
--- /dev/null
+++ b/nixos/tests/installed-tests/gjs.nix
@@ -0,0 +1,6 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.gjs;
+ withX11 = true;
+}
diff --git a/nixos/tests/installed-tests/glib-networking.nix b/nixos/tests/installed-tests/glib-networking.nix
new file mode 100644
index 000000000000..b58d4df21fca
--- /dev/null
+++ b/nixos/tests/installed-tests/glib-networking.nix
@@ -0,0 +1,5 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.glib-networking;
+}
diff --git a/nixos/tests/installed-tests/gnome-photos.nix b/nixos/tests/installed-tests/gnome-photos.nix
new file mode 100644
index 000000000000..05e7ccb65ad5
--- /dev/null
+++ b/nixos/tests/installed-tests/gnome-photos.nix
@@ -0,0 +1,35 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.gnome-photos;
+
+ withX11 = true;
+
+ testConfig = {
+ programs.dconf.enable = true;
+ services.gnome3.at-spi2-core.enable = true; # needed for dogtail
+ environment.systemPackages = with pkgs; [
+ # gsettings tool with access to gsettings-desktop-schemas
+ (stdenv.mkDerivation {
+ name = "desktop-gsettings";
+ dontUnpack = true;
+ nativeBuildInputs = [ glib wrapGAppsHook ];
+ buildInputs = [ gsettings-desktop-schemas ];
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out/bin
+ ln -s ${glib.bin}/bin/gsettings $out/bin/desktop-gsettings
+ runHook postInstall
+ '';
+ })
+ ];
+ services.dbus.packages = with pkgs; [ gnome-photos ];
+ };
+
+ preTestScript = ''
+ # dogtail needs accessibility enabled
+ machine.succeed(
+ "desktop-gsettings set org.gnome.desktop.interface toolkit-accessibility true 2>&1"
+ )
+ '';
+}
diff --git a/nixos/tests/installed-tests/graphene.nix b/nixos/tests/installed-tests/graphene.nix
new file mode 100644
index 000000000000..e43339abd88c
--- /dev/null
+++ b/nixos/tests/installed-tests/graphene.nix
@@ -0,0 +1,5 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.graphene;
+}
diff --git a/nixos/tests/installed-tests/ibus.nix b/nixos/tests/installed-tests/ibus.nix
new file mode 100644
index 000000000000..af54b612b507
--- /dev/null
+++ b/nixos/tests/installed-tests/ibus.nix
@@ -0,0 +1,20 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.ibus;
+
+ testConfig = {
+ i18n.inputMethod.enabled = "ibus";
+ };
+
+ preTestScript = ''
+ # ibus has ibus-desktop-testing-runner but it tries to manage desktop session so we just spawn ibus-daemon ourselves
+ machine.succeed("ibus-daemon --daemonize --verbose")
+ '';
+
+ withX11 = true;
+
+ # TODO: ibus-daemon is currently crashing or something
+ # maybe make ibus systemd service that auto-restarts?
+ meta.broken = true;
+}
diff --git a/nixos/tests/installed-tests/libgdata.nix b/nixos/tests/installed-tests/libgdata.nix
new file mode 100644
index 000000000000..f11a7bc1bc51
--- /dev/null
+++ b/nixos/tests/installed-tests/libgdata.nix
@@ -0,0 +1,11 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.libgdata;
+
+ testConfig = {
+ # # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation dummy (GDummyTlsBackend) for ‘gio-tls-backend’
+ # Bail out! libgdata:ERROR:../gdata/tests/common.c:134:gdata_test_init: assertion failed (child_error == NULL): TLS support is not available (g-tls-error-quark, 0)
+ services.gnome3.glib-networking.enable = true;
+ };
+}
diff --git a/nixos/tests/installed-tests/libxmlb.nix b/nixos/tests/installed-tests/libxmlb.nix
new file mode 100644
index 000000000000..af2bbe9c35e2
--- /dev/null
+++ b/nixos/tests/installed-tests/libxmlb.nix
@@ -0,0 +1,5 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.libxmlb;
+}
diff --git a/nixos/tests/installed-tests/ostree.nix b/nixos/tests/installed-tests/ostree.nix
new file mode 100644
index 000000000000..eef7cace54cc
--- /dev/null
+++ b/nixos/tests/installed-tests/ostree.nix
@@ -0,0 +1,23 @@
+{ pkgs, lib, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.ostree;
+
+ # TODO: Wrap/patch the tests directly in the package
+ testConfig = {
+ environment.systemPackages = with pkgs; [
+ (python3.withPackages (p: with p; [ pyyaml ]))
+ gnupg
+ ostree
+ ];
+
+ # for GJS tests
+ environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [
+ gtk3
+ pango.out
+ ostree
+ gdk-pixbuf
+ atk
+ ]);
+ };
+}
diff --git a/nixos/tests/installed-tests/xdg-desktop-portal.nix b/nixos/tests/installed-tests/xdg-desktop-portal.nix
new file mode 100644
index 000000000000..b16008ff4add
--- /dev/null
+++ b/nixos/tests/installed-tests/xdg-desktop-portal.nix
@@ -0,0 +1,5 @@
+{ pkgs, makeInstalledTest, ... }:
+
+makeInstalledTest {
+ tested = pkgs.xdg-desktop-portal;
+}
diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix
index d11eba764da3..ba464b57447b 100644
--- a/nixos/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
@@ -1,7 +1,7 @@
# Test of IPv6 functionality in NixOS, including whether router
# solicication/advertisement using radvd works.
-import ./make-test.nix ({ pkgs, lib, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "ipv6";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco ];
@@ -35,51 +35,56 @@ import ./make-test.nix ({ pkgs, lib, ...} : {
testScript =
''
+ import re
+
# Start the router first so that it respond to router solicitations.
- $router->waitForUnit("radvd");
+ router.wait_for_unit("radvd")
- startAll;
+ start_all()
- $client->waitForUnit("network.target");
- $server->waitForUnit("network.target");
- $server->waitForUnit("httpd.service");
+ client.wait_for_unit("network.target")
+ server.wait_for_unit("network.target")
+ server.wait_for_unit("httpd.service")
# Wait until the given interface has a non-tentative address of
# the desired scope (i.e. has completed Duplicate Address
# Detection).
- sub waitForAddress {
- my ($machine, $iface, $scope) = @_;
- $machine->waitUntilSucceeds("[ `ip -o -6 addr show dev $iface scope $scope | grep -v tentative | wc -l` -ge 1 ]");
- my $ip = (split /[ \/]+/, $machine->succeed("ip -o -6 addr show dev $iface scope $scope"))[3];
- $machine->log("$scope address on $iface is $ip");
- return $ip;
- }
+ def wait_for_address(machine, iface, scope, temporary=False):
+ temporary_flag = "temporary" if temporary else "-temporary"
+ cmd = f"ip -o -6 addr show dev {iface} scope {scope} -tentative {temporary_flag}"
- subtest "loopback address", sub {
- $client->succeed("ping -c 1 ::1 >&2");
- $client->fail("ping -c 1 ::2 >&2");
- };
+ machine.wait_until_succeeds(f"[ `{cmd} | wc -l` -eq 1 ]")
+ output = machine.succeed(cmd)
+ ip = re.search(r"inet6 ([0-9a-f:]{2,})/", output).group(1)
- subtest "local link addressing", sub {
- my $clientIp = waitForAddress $client, "eth1", "link";
- my $serverIp = waitForAddress $server, "eth1", "link";
- $client->succeed("ping -c 1 $clientIp%eth1 >&2");
- $client->succeed("ping -c 1 $serverIp%eth1 >&2");
- };
+ if temporary:
+ scope = scope + " temporary"
+ machine.log(f"{scope} address on {iface} is {ip}")
+ return ip
- subtest "global addressing", sub {
- my $clientIp = waitForAddress $client, "eth1", "global";
- my $serverIp = waitForAddress $server, "eth1", "global";
- $client->succeed("ping -c 1 $clientIp >&2");
- $client->succeed("ping -c 1 $serverIp >&2");
- $client->succeed("curl --fail -g http://[$serverIp]");
- $client->fail("curl --fail -g http://[$clientIp]");
- };
- subtest "privacy extensions", sub {
- my $ip = waitForAddress $client, "eth1", "global temporary";
+
+ with subtest("Loopback address can be pinged"):
+ client.succeed("ping -c 1 ::1 >&2")
+ client.fail("ping -c 1 ::2 >&2")
+
+ with subtest("Local link addresses can be obtained and pinged"):
+ client_ip = wait_for_address(client, "eth1", "link")
+ server_ip = wait_for_address(server, "eth1", "link")
+ client.succeed(f"ping -c 1 {client_ip}%eth1 >&2")
+ client.succeed(f"ping -c 1 {server_ip}%eth1 >&2")
+
+ with subtest("Global addresses can be obtained, pinged, and reached via http"):
+ client_ip = wait_for_address(client, "eth1", "global")
+ server_ip = wait_for_address(server, "eth1", "global")
+ client.succeed(f"ping -c 1 {client_ip} >&2")
+ client.succeed(f"ping -c 1 {server_ip} >&2")
+ client.succeed(f"curl --fail -g http://[{server_ip}]")
+ client.fail(f"curl --fail -g http://[{client_ip}]")
+
+ with subtest("Privacy extensions: Global temporary address can be obtained and pinged"):
+ ip = wait_for_address(client, "eth1", "global", temporary=True)
# Default route should have "src " in it
- $client->succeed("ip r g ::2 | grep $ip");
- };
+ client.succeed(f"ip r g ::2 | grep {ip}")
# TODO: test reachability of a machine on another network.
'';
diff --git a/nixos/tests/jackett.nix b/nixos/tests/jackett.nix
index c749c32ad04e..0a706c99b999 100644
--- a/nixos/tests/jackett.nix
+++ b/nixos/tests/jackett.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ... }:
+import ./make-test-python.nix ({ lib, ... }:
with lib;
@@ -11,8 +11,9 @@ with lib;
{ services.jackett.enable = true; };
testScript = ''
- $machine->waitForUnit('jackett.service');
- $machine->waitForOpenPort('9117');
- $machine->succeed("curl --fail http://localhost:9117/");
+ machine.start()
+ machine.wait_for_unit("jackett.service")
+ machine.wait_for_open_port(9117)
+ machine.succeed("curl --fail http://localhost:9117/")
'';
})
diff --git a/nixos/tests/jellyfin.nix b/nixos/tests/jellyfin.nix
index b60c6eb94f46..65360624d487 100644
--- a/nixos/tests/jellyfin.nix
+++ b/nixos/tests/jellyfin.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ...}:
+import ./make-test-python.nix ({ lib, ...}:
{
name = "jellyfin";
@@ -9,8 +9,8 @@ import ./make-test.nix ({ lib, ...}:
{ services.jellyfin.enable = true; };
testScript = ''
- $machine->waitForUnit('jellyfin.service');
- $machine->waitForOpenPort('8096');
- $machine->succeed("curl --fail http://localhost:8096/");
+ machine.wait_for_unit("jellyfin.service")
+ machine.wait_for_open_port(8096)
+ machine.succeed("curl --fail http://localhost:8096/")
'';
})
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix
index a6eec411ff28..cd64ff512878 100644
--- a/nixos/tests/jenkins.nix
+++ b/nixos/tests/jenkins.nix
@@ -3,7 +3,7 @@
# 2. jenkins user can be extended on both master and slave
# 3. jenkins service not started on slave node
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "jenkins";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ bjornfor coconnor domenkozar eelco ];
@@ -33,18 +33,17 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ start_all()
- $master->waitForUnit("jenkins");
+ master.wait_for_unit("jenkins")
- $master->mustSucceed("curl http://localhost:8080 | grep 'Authentication required'");
+ assert "Authentication required" in master.succeed("curl http://localhost:8080")
- print $master->execute("sudo -u jenkins groups");
- $master->mustSucceed("sudo -u jenkins groups | grep jenkins | grep users");
+ for host in master, slave:
+ groups = host.succeed("sudo -u jenkins groups")
+ assert "jenkins" in groups
+ assert "users" in groups
- print $slave->execute("sudo -u jenkins groups");
- $slave->mustSucceed("sudo -u jenkins groups | grep jenkins | grep users");
-
- $slave->mustFail("systemctl is-enabled jenkins.service");
+ slave.fail("systemctl is-enabled jenkins.service")
'';
})
diff --git a/nixos/tests/jormungandr.nix b/nixos/tests/jormungandr.nix
deleted file mode 100644
index 2abafc53ce51..000000000000
--- a/nixos/tests/jormungandr.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-import ./make-test.nix ({ pkgs, ... }: {
- name = "jormungandr";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ mmahut ];
- };
-
- nodes = {
- # Testing the Byzantine Fault Tolerant protocol
- bft = { ... }: {
- environment.systemPackages = [ pkgs.jormungandr ];
- services.jormungandr.enable = true;
- services.jormungandr.genesisBlockFile = "/var/lib/jormungandr/block-0.bin";
- services.jormungandr.secretFile = "/etc/secrets/jormungandr.yaml";
- };
-
- # Testing the Ouroboros Genesis Praos protocol
- genesis = { ... }: {
- environment.systemPackages = [ pkgs.jormungandr ];
- services.jormungandr.enable = true;
- services.jormungandr.genesisBlockFile = "/var/lib/jormungandr/block-0.bin";
- services.jormungandr.secretFile = "/etc/secrets/jormungandr.yaml";
- };
- };
-
- testScript = ''
- startAll;
-
- ## Testing BFT
- # Let's wait for the StateDirectory
- $bft->waitForFile("/var/lib/jormungandr/");
-
- # First, we generate the genesis file for our new blockchain
- $bft->succeed("jcli genesis init > /root/genesis.yaml");
-
- # We need to generate our secret key
- $bft->succeed("jcli key generate --type=Ed25519 > /root/key.prv");
-
- # We include the secret key into our services.jormungandr.secretFile
- $bft->succeed("mkdir -p /etc/secrets");
- $bft->succeed("echo -e \"bft:\\n signing_key:\" \$(cat /root/key.prv) > /etc/secrets/jormungandr.yaml");
-
- # After that, we generate our public key from it
- $bft->succeed("cat /root/key.prv | jcli key to-public > /root/key.pub");
-
- # We add our public key as a consensus leader in the genesis configration file
- $bft->succeed("sed -ie \"s/ed25519_pk1vvwp2s0n5jl5f4xcjurp2e92sj2awehkrydrlas4vgqr7xzt33jsadha32/\$(cat /root/key.pub)/\" /root/genesis.yaml");
-
- # Now we can generate the genesis block from it
- $bft->succeed("jcli genesis encode --input /root/genesis.yaml --output /var/lib/jormungandr/block-0.bin");
-
- # We should have everything to start the service now
- $bft->succeed("systemctl restart jormungandr");
- $bft->waitForUnit("jormungandr.service");
-
- # Now we can test if we are able to reach the REST API
- $bft->waitUntilSucceeds("curl -L http://localhost:8607/api/v0/node/stats | grep uptime");
-
- ## Testing Genesis
- # Let's wait for the StateDirectory
- $genesis->waitForFile("/var/lib/jormungandr/");
-
- # Bootstraping the configuration
- $genesis->succeed("jormungandr-bootstrap -g -p 8607 -s 1");
-
- # Moving generated files in place
- $genesis->succeed("mkdir -p /etc/secrets");
- $genesis->succeed("mv pool-secret1.yaml /etc/secrets/jormungandr.yaml");
- $genesis->succeed("mv block-0.bin /var/lib/jormungandr/");
-
- # We should have everything to start the service now
- $genesis->succeed("systemctl restart jormungandr");
- $genesis->waitForUnit("jormungandr.service");
-
- # Now we can create and delegate an account
- $genesis->succeed("./create-account-and-delegate.sh | tee -a /tmp/delegate.log");
- '';
-})
diff --git a/nixos/tests/keepalived.nix b/nixos/tests/keepalived.nix
new file mode 100644
index 000000000000..d0bf9d465200
--- /dev/null
+++ b/nixos/tests/keepalived.nix
@@ -0,0 +1,42 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+ name = "keepalived";
+
+ nodes = {
+ node1 = { pkgs, ... }: {
+ networking.firewall.extraCommands = "iptables -A INPUT -p vrrp -j ACCEPT";
+ services.keepalived.enable = true;
+ services.keepalived.vrrpInstances.test = {
+ interface = "eth1";
+ state = "MASTER";
+ priority = 50;
+ virtualIps = [{ addr = "192.168.1.200"; }];
+ virtualRouterId = 1;
+ };
+ environment.systemPackages = [ pkgs.tcpdump ];
+ };
+ node2 = { pkgs, ... }: {
+ networking.firewall.extraCommands = "iptables -A INPUT -p vrrp -j ACCEPT";
+ services.keepalived.enable = true;
+ services.keepalived.vrrpInstances.test = {
+ interface = "eth1";
+ state = "MASTER";
+ priority = 100;
+ virtualIps = [{ addr = "192.168.1.200"; }];
+ virtualRouterId = 1;
+ };
+ environment.systemPackages = [ pkgs.tcpdump ];
+ };
+ };
+
+ testScript = ''
+ # wait for boot time delay to pass
+ for node in [node1, node2]:
+ node.wait_until_succeeds(
+ "systemctl show -p LastTriggerUSecMonotonic keepalived-boot-delay.timer | grep -vq 'LastTriggerUSecMonotonic=0'"
+ )
+ node.wait_for_unit("keepalived")
+ node2.wait_until_succeeds("ip addr show dev eth1 | grep -q 192.168.1.200")
+ node1.fail("ip addr show dev eth1 | grep -q 192.168.1.200")
+ node1.succeed("ping -c1 192.168.1.200")
+ '';
+})
diff --git a/nixos/tests/kerberos/heimdal.nix b/nixos/tests/kerberos/heimdal.nix
index a0551b131e91..8abae667d043 100644
--- a/nixos/tests/kerberos/heimdal.nix
+++ b/nixos/tests/kerberos/heimdal.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({pkgs, ...}: {
+import ../make-test-python.nix ({pkgs, ...}: {
name = "kerberos_server-heimdal";
machine = { config, libs, pkgs, ...}:
{ services.kerberos_server =
@@ -23,31 +23,20 @@ import ../make-test.nix ({pkgs, ...}: {
};
testScript = ''
- $machine->start;
+ machine.succeed(
+ "kadmin -l init --realm-max-ticket-life='8 day' --realm-max-renewable-life='10 day' FOO.BAR",
+ "systemctl restart kadmind.service kdc.service",
+ )
- $machine->succeed(
- "kadmin -l init --realm-max-ticket-life='8 day' \\
- --realm-max-renewable-life='10 day' FOO.BAR"
- );
+ for unit in ["kadmind", "kdc", "kpasswdd"]:
+ machine.wait_for_unit(f"{unit}.service")
- $machine->succeed("systemctl restart kadmind.service kdc.service");
- $machine->waitForUnit("kadmind.service");
- $machine->waitForUnit("kdc.service");
- $machine->waitForUnit("kpasswdd.service");
-
- $machine->succeed(
- "kadmin -l add --password=admin_pw --use-defaults admin"
- );
- $machine->succeed(
- "kadmin -l ext_keytab --keytab=admin.keytab admin"
- );
- $machine->succeed(
- "kadmin -p admin -K admin.keytab add --password=alice_pw --use-defaults \\
- alice"
- );
- $machine->succeed(
- "kadmin -l ext_keytab --keytab=alice.keytab alice"
- );
- $machine->succeed("kinit -kt alice.keytab alice");
+ machine.succeed(
+ "kadmin -l add --password=admin_pw --use-defaults admin",
+ "kadmin -l ext_keytab --keytab=admin.keytab admin",
+ "kadmin -p admin -K admin.keytab add --password=alice_pw --use-defaults alice",
+ "kadmin -l ext_keytab --keytab=alice.keytab alice",
+ "kinit -kt alice.keytab alice",
+ )
'';
})
diff --git a/nixos/tests/kerberos/mit.nix b/nixos/tests/kerberos/mit.nix
index 6da3a384aa99..93b4020d4994 100644
--- a/nixos/tests/kerberos/mit.nix
+++ b/nixos/tests/kerberos/mit.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({pkgs, ...}: {
+import ../make-test-python.nix ({pkgs, ...}: {
name = "kerberos_server-mit";
machine = { config, libs, pkgs, ...}:
{ services.kerberos_server =
@@ -24,22 +24,18 @@ import ../make-test.nix ({pkgs, ...}: {
};
testScript = ''
- $machine->start;
+ machine.succeed(
+ "kdb5_util create -s -r FOO.BAR -P master_key",
+ "systemctl restart kadmind.service kdc.service",
+ )
- $machine->succeed(
- "kdb5_util create -s -r FOO.BAR -P master_key"
- );
+ for unit in ["kadmind", "kdc"]:
+ machine.wait_for_unit(f"{unit}.service")
- $machine->succeed("systemctl restart kadmind.service kdc.service");
- $machine->waitForUnit("kadmind.service");
- $machine->waitForUnit("kdc.service");
-
- $machine->succeed(
- "kadmin.local add_principal -pw admin_pw admin"
- );
- $machine->succeed(
- "kadmin -p admin -w admin_pw addprinc -pw alice_pw alice"
- );
- $machine->succeed("echo alice_pw | sudo -u alice kinit");
+ machine.succeed(
+ "kadmin.local add_principal -pw admin_pw admin",
+ "kadmin -p admin -w admin_pw addprinc -pw alice_pw alice",
+ "echo alice_pw | sudo -u alice kinit",
+ )
'';
})
diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix
index f30bd2e2e760..f09d0926d223 100644
--- a/nixos/tests/kernel-latest.nix
+++ b/nixos/tests/kernel-latest.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "kernel-latest";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
@@ -11,7 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- $machine->succeed("uname -s | grep 'Linux'");
- $machine->succeed("uname -a | grep '${pkgs.linuxPackages_latest.kernel.version}'");
+ assert "Linux" in machine.succeed("uname -s")
+ assert "${pkgs.linuxPackages_latest.kernel.version}" in machine.succeed("uname -a")
'';
})
diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix
index 28717fa6a844..bad706d63c03 100644
--- a/nixos/tests/kernel-lts.nix
+++ b/nixos/tests/kernel-lts.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "kernel-lts";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
@@ -11,7 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- $machine->succeed("uname -s | grep 'Linux'");
- $machine->succeed("uname -a | grep '${pkgs.linuxPackages.kernel.version}'");
+ assert "Linux" in machine.succeed("uname -s")
+ assert "${pkgs.linuxPackages.kernel.version}" in machine.succeed("uname -a")
'';
})
diff --git a/nixos/tests/kernel-testing.nix b/nixos/tests/kernel-testing.nix
index 276d2de12bb5..b7e10ebd5bd1 100644
--- a/nixos/tests/kernel-testing.nix
+++ b/nixos/tests/kernel-testing.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "kernel-testing";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
@@ -11,7 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- $machine->succeed("uname -s | grep 'Linux'");
- $machine->succeed("uname -a | grep '${pkgs.linuxPackages_testing.kernel.modDirVersion}'");
+ assert "Linux" in machine.succeed("uname -s")
+ assert "${pkgs.linuxPackages_testing.kernel.modDirVersion}" in machine.succeed("uname -a")
'';
})
diff --git a/nixos/tests/knot.nix b/nixos/tests/knot.nix
index e46159836ccc..0588cf86ac09 100644
--- a/nixos/tests/knot.nix
+++ b/nixos/tests/knot.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ...} :
+import ./make-test-python.nix ({ pkgs, lib, ...} :
let
common = {
networking.firewall.enable = false;
@@ -30,6 +30,10 @@ let
};
in {
name = "knot";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ hexa ];
+ };
+
nodes = {
master = { lib, ... }: {
@@ -161,37 +165,35 @@ in {
slave4 = (lib.head nodes.slave.config.networking.interfaces.eth1.ipv4.addresses).address;
slave6 = (lib.head nodes.slave.config.networking.interfaces.eth1.ipv6.addresses).address;
in ''
- startAll;
+ import re
- $client->waitForUnit("network.target");
- $master->waitForUnit("knot.service");
- $slave->waitForUnit("knot.service");
+ start_all()
- sub assertResponse {
- my ($knot, $query_type, $query, $expected) = @_;
- my $out = $client->succeed("khost -t $query_type $query $knot");
- $client->log("$knot replies with: $out");
- chomp $out;
- die "DNS query for $query ($query_type) against $knot gave '$out' instead of '$expected'"
- if ($out !~ $expected);
- }
+ client.wait_for_unit("network.target")
+ master.wait_for_unit("knot.service")
+ slave.wait_for_unit("knot.service")
- foreach ("${master4}", "${master6}", "${slave4}", "${slave6}") {
- subtest $_, sub {
- assertResponse($_, "SOA", "example.com", qr/start of authority.*?noc\.example\.com/);
- assertResponse($_, "A", "example.com", qr/has no [^ ]+ record/);
- assertResponse($_, "AAAA", "example.com", qr/has no [^ ]+ record/);
- assertResponse($_, "A", "www.example.com", qr/address 192.0.2.1$/);
- assertResponse($_, "AAAA", "www.example.com", qr/address 2001:db8::1$/);
+ def test(host, query_type, query, pattern):
+ out = client.succeed(f"khost -t {query_type} {query} {host}").strip()
+ client.log(f"{host} replied with: {out}")
+ assert re.search(pattern, out), f'Did not match "{pattern}"'
- assertResponse($_, "NS", "sub.example.com", qr/nameserver is ns\d\.example\.com.$/);
- assertResponse($_, "A", "sub.example.com", qr/address 192.0.2.2$/);
- assertResponse($_, "AAAA", "sub.example.com", qr/address 2001:db8::2$/);
- assertResponse($_, "RRSIG", "www.example.com", qr/RR set signature is/);
- assertResponse($_, "DNSKEY", "example.com", qr/DNSSEC key is/);
- };
- }
+ for host in ("${master4}", "${master6}", "${slave4}", "${slave6}"):
+ with subtest(f"Interrogate {host}"):
+ test(host, "SOA", "example.com", r"start of authority.*noc\.example\.com\.")
+ test(host, "A", "example.com", r"has no [^ ]+ record")
+ test(host, "AAAA", "example.com", r"has no [^ ]+ record")
+
+ test(host, "A", "www.example.com", r"address 192.0.2.1$")
+ test(host, "AAAA", "www.example.com", r"address 2001:db8::1$")
+
+ test(host, "NS", "sub.example.com", r"nameserver is ns\d\.example\.com.$")
+ test(host, "A", "sub.example.com", r"address 192.0.2.2$")
+ test(host, "AAAA", "sub.example.com", r"address 2001:db8::2$")
+
+ test(host, "RRSIG", "www.example.com", r"RR set signature is")
+ test(host, "DNSKEY", "example.com", r"DNSSEC key is")
'';
})
diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix
index f21634c4ffbf..adb736506895 100644
--- a/nixos/tests/kubernetes/base.nix
+++ b/nixos/tests/kubernetes/base.nix
@@ -53,6 +53,7 @@ let
services.flannel.iface = "eth1";
services.kubernetes = {
addons.dashboard.enable = true;
+ proxy.hostname = "${masterName}.${domain}";
easyCerts = true;
inherit (machine) roles;
diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix
index 665b9ee09b55..74b002fc00ee 100644
--- a/nixos/tests/ldap.nix
+++ b/nixos/tests/ldap.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ...} :
+import ./make-test-python.nix ({ pkgs, lib, ...} :
let
unlines = lib.concatStringsSep "\n";
@@ -288,108 +288,118 @@ in
client1 = mkClient true; # use nss_pam_ldapd
client2 = mkClient false; # use nss_ldap and pam_ldap
-
};
testScript = ''
- $server->start;
- $server->waitForUnit("default.target");
+ def expect_script(*commands):
+ script = ";".join(commands)
+ return f"${pkgs.expect}/bin/expect -c '{script}'"
- subtest "slapd", sub {
- subtest "auth as database admin with SASL and check a POSIX account", sub {
- $server->succeed(join ' ', 'test',
- '"$(ldapsearch -LLL -H ldapi:// -Y EXTERNAL',
- '-b \'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}\' ',
- '-s base uidNumber |',
- 'sed -ne \'s/^uidNumber: \\(.*\\)/\\1/p\' ',
- ')" -eq ${toString ldapUserId}');
- };
- subtest "auth as database admin with password and check a POSIX account", sub {
- $server->succeed(join ' ', 'test',
- '"$(ldapsearch -LLL -H ldap://server',
- '-D \'cn=admin,${dbSuffix}\' -w \'${dbAdminPwd}\' ',
- '-b \'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}\' ',
- '-s base uidNumber |',
- 'sed -ne \'s/^uidNumber: \\(.*\\)/\\1/p\' ',
- ')" -eq ${toString ldapUserId}');
- };
- };
- $client1->start;
- $client1->waitForUnit("default.target");
+ server.start()
+ server.wait_for_unit("default.target")
- subtest "password", sub {
- subtest "su with password to a POSIX account", sub {
- $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
- 'spawn su "${ldapUser}"',
- 'expect "Password:"',
- 'send "${ldapUserPwd}\n"',
- 'expect "*"',
- 'send "whoami\n"',
- 'expect -ex "${ldapUser}" {exit}',
- 'exit 1' . "'");
- };
- subtest "change password of a POSIX account as root", sub {
- $client1->succeed("chpasswd <<<'${ldapUser}:new-password'");
- $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
- 'spawn su "${ldapUser}"',
- 'expect "Password:"',
- 'send "new-password\n"',
- 'expect "*"',
- 'send "whoami\n"',
- 'expect -ex "${ldapUser}" {exit}',
- 'exit 1' . "'");
- $client1->succeed('chpasswd <<<\'${ldapUser}:${ldapUserPwd}\' ');
- };
- subtest "change password of a POSIX account from itself", sub {
- $client1->succeed('chpasswd <<<\'${ldapUser}:${ldapUserPwd}\' ');
- $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
- 'spawn su --login ${ldapUser} -c passwd',
- 'expect "Password: "',
- 'send "${ldapUserPwd}\n"',
- 'expect "(current) UNIX password: "',
- 'send "${ldapUserPwd}\n"',
- 'expect "New password: "',
- 'send "new-password\n"',
- 'expect "Retype new password: "',
- 'send "new-password\n"',
- 'expect "passwd: password updated successfully" {exit}',
- 'exit 1' . "'");
- $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
- 'spawn su "${ldapUser}"',
- 'expect "Password:"',
- 'send "${ldapUserPwd}\n"',
- 'expect "su: Authentication failure" {exit}',
- 'exit 1' . "'");
- $client1->succeed("${pkgs.expect}/bin/expect -c '" . join ';',
- 'spawn su "${ldapUser}"',
- 'expect "Password:"',
- 'send "new-password\n"',
- 'expect "*"',
- 'send "whoami\n"',
- 'expect -ex "${ldapUser}" {exit}',
- 'exit 1' . "'");
- $client1->succeed('chpasswd <<<\'${ldapUser}:${ldapUserPwd}\' ');
- };
- };
+ with subtest("slapd: auth as database admin with SASL and check a POSIX account"):
+ server.succeed(
+ 'test "$(ldapsearch -LLL -H ldapi:// -Y EXTERNAL '
+ + "-b 'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}' "
+ + "-s base uidNumber | "
+ + "sed -ne 's/^uidNumber: \\(.*\\)/\\1/p')\" -eq ${toString ldapUserId}"
+ )
- $client2->start;
- $client2->waitForUnit("default.target");
+ with subtest("slapd: auth as database admin with password and check a POSIX account"):
+ server.succeed(
+ "test \"$(ldapsearch -LLL -H ldap://server -D 'cn=admin,${dbSuffix}' "
+ + "-w '${dbAdminPwd}' -b 'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}' "
+ + "-s base uidNumber | "
+ + "sed -ne 's/^uidNumber: \\(.*\\)/\\1/p')\" -eq ${toString ldapUserId}"
+ )
- subtest "NSS", sub {
- $client1->succeed("test \"\$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}");
- $client1->succeed("test \"\$(id -u -n '${ldapUser}')\" = '${ldapUser}'");
- $client1->succeed("test \"\$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}");
- $client1->succeed("test \"\$(id -g -n '${ldapUser}')\" = '${ldapGroup}'");
- $client2->succeed("test \"\$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}");
- $client2->succeed("test \"\$(id -u -n '${ldapUser}')\" = '${ldapUser}'");
- $client2->succeed("test \"\$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}");
- $client2->succeed("test \"\$(id -g -n '${ldapUser}')\" = '${ldapGroup}'");
- };
+ client1.start()
+ client1.wait_for_unit("default.target")
- subtest "PAM", sub {
- $client1->succeed("echo ${ldapUserPwd} | su -l '${ldapUser}' -c true");
- $client2->succeed("echo ${ldapUserPwd} | su -l '${ldapUser}' -c true");
- };
+ with subtest("password: su with password to a POSIX account"):
+ client1.succeed(
+ expect_script(
+ 'spawn su "${ldapUser}"',
+ 'expect "Password:"',
+ 'send "${ldapUserPwd}\n"',
+ 'expect "*"',
+ 'send "whoami\n"',
+ 'expect -ex "${ldapUser}" {exit}',
+ "exit 1",
+ )
+ )
+
+ with subtest("password: change password of a POSIX account as root"):
+ client1.succeed(
+ "chpasswd <<<'${ldapUser}:new-password'",
+ expect_script(
+ 'spawn su "${ldapUser}"',
+ 'expect "Password:"',
+ 'send "new-password\n"',
+ 'expect "*"',
+ 'send "whoami\n"',
+ 'expect -ex "${ldapUser}" {exit}',
+ "exit 1",
+ ),
+ "chpasswd <<<'${ldapUser}:${ldapUserPwd}'",
+ )
+
+ with subtest("password: change password of a POSIX account from itself"):
+ client1.succeed(
+ "chpasswd <<<'${ldapUser}:${ldapUserPwd}' ",
+ expect_script(
+ "spawn su --login ${ldapUser} -c passwd",
+ 'expect "Password: "',
+ 'send "${ldapUserPwd}\n"',
+ 'expect "(current) UNIX password: "',
+ 'send "${ldapUserPwd}\n"',
+ 'expect "New password: "',
+ 'send "new-password\n"',
+ 'expect "Retype new password: "',
+ 'send "new-password\n"',
+ 'expect "passwd: password updated successfully" {exit}',
+ "exit 1",
+ ),
+ expect_script(
+ 'spawn su "${ldapUser}"',
+ 'expect "Password:"',
+ 'send "${ldapUserPwd}\n"',
+ 'expect "su: Authentication failure" {exit}',
+ "exit 1",
+ ),
+ expect_script(
+ 'spawn su "${ldapUser}"',
+ 'expect "Password:"',
+ 'send "new-password\n"',
+ 'expect "*"',
+ 'send "whoami\n"',
+ 'expect -ex "${ldapUser}" {exit}',
+ "exit 1",
+ ),
+ "chpasswd <<<'${ldapUser}:${ldapUserPwd}'",
+ )
+
+ client2.start()
+ client2.wait_for_unit("default.target")
+
+ with subtest("NSS"):
+ client1.succeed(
+ "test \"$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}",
+ "test \"$(id -u -n '${ldapUser}')\" = '${ldapUser}'",
+ "test \"$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}",
+ "test \"$(id -g -n '${ldapUser}')\" = '${ldapGroup}'",
+ "test \"$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}",
+ "test \"$(id -u -n '${ldapUser}')\" = '${ldapUser}'",
+ "test \"$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}",
+ "test \"$(id -g -n '${ldapUser}')\" = '${ldapGroup}'",
+ )
+
+ with subtest("PAM"):
+ client1.succeed(
+ "echo ${ldapUserPwd} | su -l '${ldapUser}' -c true",
+ "echo ${ldapUserPwd} | su -l '${ldapUser}' -c true",
+ )
'';
})
diff --git a/nixos/tests/leaps.nix b/nixos/tests/leaps.nix
index 6163fed56b6f..65b475d734ec 100644
--- a/nixos/tests/leaps.nix
+++ b/nixos/tests/leaps.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
{
name = "leaps";
@@ -22,9 +22,11 @@ import ./make-test.nix ({ pkgs, ... }:
testScript =
''
- startAll;
- $server->waitForOpenPort(6666);
- $client->waitForUnit("network.target");
- $client->succeed("${pkgs.curl}/bin/curl http://server:6666/leaps/ | grep -i 'leaps'");
+ start_all()
+ server.wait_for_open_port(6666)
+ client.wait_for_unit("network.target")
+ assert "leaps" in client.succeed(
+ "${pkgs.curl}/bin/curl http://server:6666/leaps/"
+ )
'';
})
diff --git a/nixos/tests/libgdata.nix b/nixos/tests/libgdata.nix
deleted file mode 100644
index 10a3ca97dd22..000000000000
--- a/nixos/tests/libgdata.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, ... }:
-
-{
- name = "libgdata";
-
- meta = {
- maintainers = pkgs.libgdata.meta.maintainers;
- };
-
- machine = { pkgs, ... }: {
- environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
- # # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation dummy (GDummyTlsBackend) for ‘gio-tls-backend’
- # Bail out! libgdata:ERROR:../gdata/tests/common.c:134:gdata_test_init: assertion failed (child_error == NULL): TLS support is not available (g-tls-error-quark, 0)
- services.gnome3.glib-networking.enable = true;
- };
-
- testScript = ''
- $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.libgdata.installedTests}/share'");
- '';
-})
diff --git a/nixos/tests/libxmlb.nix b/nixos/tests/libxmlb.nix
deleted file mode 100644
index 3bee568ac5a2..000000000000
--- a/nixos/tests/libxmlb.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, ... }:
-
-{
- name = "libxmlb";
- meta = {
- maintainers = pkgs.libxmlb.meta.maintainers;
- };
-
- machine = { pkgs, ... }: {
- environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
- };
-
- testScript = ''
- $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.libxmlb.installedTests}/share'");
- '';
-})
diff --git a/nixos/tests/lidarr.nix b/nixos/tests/lidarr.nix
index 85fcbd21d8c0..d3f83e5d9145 100644
--- a/nixos/tests/lidarr.nix
+++ b/nixos/tests/lidarr.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ... }:
+import ./make-test-python.nix ({ lib, ... }:
with lib;
@@ -11,8 +11,10 @@ with lib;
{ services.lidarr.enable = true; };
testScript = ''
- $machine->waitForUnit('lidarr.service');
- $machine->waitForOpenPort('8686');
- $machine->succeed("curl --fail http://localhost:8686/");
+ start_all()
+
+ machine.wait_for_unit("lidarr.service")
+ machine.wait_for_open_port("8686")
+ machine.succeed("curl --fail http://localhost:8686/")
'';
})
diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
index c805f1ed9f3c..46c2ed7ccc59 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixos/tests/lightdm.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "lightdm";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig worldofpeace ];
@@ -8,9 +8,8 @@ import ./make-test.nix ({ pkgs, ...} : {
imports = [ ./common/user-account.nix ];
services.xserver.enable = true;
services.xserver.displayManager.lightdm.enable = true;
- services.xserver.windowManager.default = "icewm";
+ services.xserver.displayManager.defaultSession = "none+icewm";
services.xserver.windowManager.icewm.enable = true;
- services.xserver.desktopManager.default = "none";
};
enableOCR = true;
@@ -18,12 +17,12 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
in ''
- startAll;
- $machine->waitForText(qr/${user.description}/);
- $machine->screenshot("lightdm");
- $machine->sendChars("${user.password}\n");
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow("^IceWM ");
+ start_all()
+ machine.wait_for_text("${user.description}")
+ machine.screenshot("lightdm")
+ machine.send_chars("${user.password}\n")
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
+ machine.wait_for_window("^IceWM ")
'';
})
diff --git a/nixos/tests/loki.nix b/nixos/tests/loki.nix
index 9c3058d02f84..dbf1e8a650f5 100644
--- a/nixos/tests/loki.nix
+++ b/nixos/tests/loki.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, pkgs, ... }:
+import ./make-test-python.nix ({ lib, pkgs, ... }:
{
name = "loki";
@@ -26,12 +26,14 @@ import ./make-test.nix ({ lib, pkgs, ... }:
};
testScript = ''
- $machine->start;
- $machine->waitForUnit("loki.service");
- $machine->waitForUnit("promtail.service");
- $machine->waitForOpenPort(3100);
- $machine->waitForOpenPort(9080);
- $machine->succeed("echo 'Loki Ingestion Test' > /var/log/testlog");
- $machine->waitUntilSucceeds("${pkgs.grafana-loki}/bin/logcli --addr='http://localhost:3100' query --no-labels '{job=\"varlogs\",filename=\"/var/log/testlog\"}' | grep -q 'Loki Ingestion Test'");
+ machine.start
+ machine.wait_for_unit("loki.service")
+ machine.wait_for_unit("promtail.service")
+ machine.wait_for_open_port(3100)
+ machine.wait_for_open_port(9080)
+ machine.succeed("echo 'Loki Ingestion Test' > /var/log/testlog")
+ machine.wait_until_succeeds(
+ "${pkgs.grafana-loki}/bin/logcli --addr='http://localhost:3100' query --no-labels '{job=\"varlogs\",filename=\"/var/log/testlog\"}' | grep -q 'Loki Ingestion Test'"
+ )
'';
})
diff --git a/nixos/tests/lorri/builder.sh b/nixos/tests/lorri/builder.sh
new file mode 100644
index 000000000000..b586b2bf7985
--- /dev/null
+++ b/nixos/tests/lorri/builder.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+printf "%s" "${name:?}" > "${out:?}"
diff --git a/nixos/tests/lorri/default.nix b/nixos/tests/lorri/default.nix
new file mode 100644
index 000000000000..53074385a652
--- /dev/null
+++ b/nixos/tests/lorri/default.nix
@@ -0,0 +1,26 @@
+import ../make-test-python.nix {
+ machine = { pkgs, ... }: {
+ imports = [ ../../modules/profiles/minimal.nix ];
+ environment.systemPackages = [ pkgs.lorri ];
+ };
+
+ testScript = ''
+ # Copy files over
+ machine.succeed(
+ "cp '${./fake-shell.nix}' shell.nix"
+ )
+ machine.succeed(
+ "cp '${./builder.sh}' builder.sh"
+ )
+
+ # Start the daemon and wait until it is ready
+ machine.execute("lorri daemon > lorri.stdout 2> lorri.stderr &")
+ machine.wait_until_succeeds("grep --fixed-strings 'lorri: ready' lorri.stdout")
+
+ # Ping the daemon
+ machine.execute("lorri ping_ $(readlink -f shell.nix)")
+
+ # Wait for the daemon to finish the build
+ machine.wait_until_succeeds("grep --fixed-strings 'OutputPaths' lorri.stdout")
+ '';
+}
diff --git a/nixos/tests/lorri/fake-shell.nix b/nixos/tests/lorri/fake-shell.nix
new file mode 100644
index 000000000000..9de9d247e542
--- /dev/null
+++ b/nixos/tests/lorri/fake-shell.nix
@@ -0,0 +1,5 @@
+derivation {
+ system = builtins.currentSystem;
+ name = "fake-shell";
+ builder = ./builder.sh;
+}
diff --git a/nixos/tests/magnetico.nix b/nixos/tests/magnetico.nix
index bc7aef653ee5..6770d32358e8 100644
--- a/nixos/tests/magnetico.nix
+++ b/nixos/tests/magnetico.nix
@@ -1,4 +1,9 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} :
+
+let
+ port = 8081;
+in
+{
name = "magnetico";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ rnhmjoj ];
@@ -12,17 +17,24 @@ import ./make-test.nix ({ pkgs, ...} : {
services.magnetico = {
enable = true;
crawler.port = 9000;
+ web.port = port;
web.credentials.user = "$2y$12$P88ZF6soFthiiAeXnz64aOWDsY3Dw7Yw8fZ6GtiqFNjknD70zDmNe";
};
};
testScript =
''
- startAll;
- $machine->waitForUnit("magneticod");
- $machine->waitForUnit("magneticow");
- $machine->succeed("${pkgs.curl}/bin/curl -u user:password http://localhost:8080");
- $machine->succeed("${pkgs.curl}/bin/curl -u user:wrongpwd http://localhost:8080") =~ "Unauthorised." or die;
- $machine->shutdown();
+ start_all()
+ machine.wait_for_unit("magneticod")
+ machine.wait_for_unit("magneticow")
+ machine.succeed(
+ "${pkgs.curl}/bin/curl "
+ + "-u user:password http://localhost:${toString port}"
+ )
+ assert "Unauthorised." in machine.succeed(
+ "${pkgs.curl}/bin/curl "
+ + "-u user:wrongpwd http://localhost:${toString port}"
+ )
+ machine.shutdown()
'';
})
diff --git a/nixos/tests/mailcatcher.nix b/nixos/tests/mailcatcher.nix
index d45b5d4edfc5..2ef38544fe0a 100644
--- a/nixos/tests/mailcatcher.nix
+++ b/nixos/tests/mailcatcher.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ... }:
+import ./make-test-python.nix ({ lib, ... }:
{
name = "mailcatcher";
@@ -9,18 +9,22 @@ import ./make-test.nix ({ lib, ... }:
{
services.mailcatcher.enable = true;
- networking.defaultMailServer.directDelivery = true;
- networking.defaultMailServer.hostName = "localhost:1025";
+ services.ssmtp.enable = true;
+ services.ssmtp.hostName = "localhost:1025";
environment.systemPackages = [ pkgs.mailutils ];
};
testScript = ''
- startAll;
+ start_all()
- $machine->waitForUnit('mailcatcher.service');
- $machine->waitForOpenPort('1025');
- $machine->succeed('echo "this is the body of the email" | mail -s "subject" root@example.org');
- $machine->succeed('curl http://localhost:1080/messages/1.source') =~ /this is the body of the email/ or die;
+ machine.wait_for_unit("mailcatcher.service")
+ machine.wait_for_open_port("1025")
+ machine.succeed(
+ 'echo "this is the body of the email" | mail -s "subject" root@example.org'
+ )
+ assert "this is the body of the email" in machine.succeed(
+ "curl http://localhost:1080/messages/1.source"
+ )
'';
})
diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix
index 4efa65a7b6de..2bea237c8bdd 100644
--- a/nixos/tests/matomo.nix
+++ b/nixos/tests/matomo.nix
@@ -1,7 +1,7 @@
{ system ? builtins.currentSystem, config ? { }
, pkgs ? import ../.. { inherit system config; } }:
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
let
@@ -24,11 +24,16 @@ let
};
testScript = ''
- startAll;
- $machine->waitForUnit("mysql.service");
- $machine->waitForUnit("phpfpm-matomo.service");
- $machine->waitForUnit("nginx.service");
- $machine->succeed("curl -sSfL http://localhost/ | grep 'Matomo[^<]*Installation'");
+ start_all()
+ machine.wait_for_unit("mysql.service")
+ machine.wait_for_unit("phpfpm-matomo.service")
+ machine.wait_for_unit("nginx.service")
+
+ # without the grep the command does not produce valid utf-8 for some reason
+ with subtest("welcome screen loads"):
+ machine.succeed(
+ "curl -sSfL http://localhost/ | grep 'Matomo[^<]*Installation'"
+ )
'';
};
in {
diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix
index 882e4b75814b..fca53009083a 100644
--- a/nixos/tests/matrix-synapse.nix
+++ b/nixos/tests/matrix-synapse.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... } : let
+import ./make-test-python.nix ({ pkgs, ... } : let
runWithOpenSSL = file: cmd: pkgs.runCommand file {
@@ -55,13 +55,17 @@ in {
};
testScript = ''
- startAll;
- $serverpostgres->waitForUnit("matrix-synapse.service");
- $serverpostgres->waitUntilSucceeds("curl -L --cacert ${ca_pem} https://localhost:8448/");
- $serverpostgres->requireActiveUnit("postgresql.service");
- $serversqlite->waitForUnit("matrix-synapse.service");
- $serversqlite->waitUntilSucceeds("curl -L --cacert ${ca_pem} https://localhost:8448/");
- $serversqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]");
+ start_all()
+ serverpostgres.wait_for_unit("matrix-synapse.service")
+ serverpostgres.wait_until_succeeds(
+ "curl -L --cacert ${ca_pem} https://localhost:8448/"
+ )
+ serverpostgres.require_unit_state("postgresql.service")
+ serversqlite.wait_for_unit("matrix-synapse.service")
+ serversqlite.wait_until_succeeds(
+ "curl -L --cacert ${ca_pem} https://localhost:8448/"
+ )
+ serversqlite.succeed("[ -e /var/lib/matrix-synapse/homeserver.db ]")
'';
})
diff --git a/nixos/tests/mediawiki.nix b/nixos/tests/mediawiki.nix
index 6293e8a2f465..9468c1de8ccb 100644
--- a/nixos/tests/mediawiki.nix
+++ b/nixos/tests/mediawiki.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }: {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "mediawiki";
meta.maintainers = [ lib.maintainers.aanderse ];
@@ -11,9 +11,11 @@ import ./make-test.nix ({ pkgs, lib, ... }: {
};
testScript = ''
- startAll;
+ start_all()
- $machine->waitForUnit('phpfpm-mediawiki.service');
- $machine->succeed('curl -L http://localhost/') =~ /MediaWiki has been installed/ or die;
+ machine.wait_for_unit("phpfpm-mediawiki.service")
+
+ page = machine.succeed("curl -L http://localhost/")
+ assert "MediaWiki has been installed" in page
'';
})
diff --git a/nixos/tests/memcached.nix b/nixos/tests/memcached.nix
index b120599c51dd..31f5627d25ce 100644
--- a/nixos/tests/memcached.nix
+++ b/nixos/tests/memcached.nix
@@ -1,28 +1,24 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "memcached";
- nodes = {
- machine =
- { ... }:
- {
- imports = [ ../modules/profiles/minimal.nix ];
- services.memcached.enable = true;
- };
+ machine = {
+ imports = [ ../modules/profiles/minimal.nix ];
+ services.memcached.enable = true;
};
testScript = let
- testScript = pkgs.writeScript "testScript.py" ''
- #!${pkgs.python3.withPackages (p: [p.memcached])}/bin/python
-
+ testScript = pkgs.writers.writePython3 "test_memcache" {
+ libraries = with pkgs.python3Packages; [ memcached ];
+ } ''
import memcache
c = memcache.Client(['localhost:11211'])
c.set('key', 'value')
assert 'value' == c.get('key')
'';
in ''
- startAll;
- $machine->waitForUnit("memcached.service");
- $machine->waitForOpenPort("11211");
- $machine->succeed("${testScript}");
+ machine.start()
+ machine.wait_for_unit("memcached.service")
+ machine.wait_for_open_port(11211)
+ machine.succeed("${testScript}")
'';
})
diff --git a/nixos/tests/metabase.nix b/nixos/tests/metabase.nix
index be9e5ed5b1e8..1450a4e9086f 100644
--- a/nixos/tests/metabase.nix
+++ b/nixos/tests/metabase.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "metabase";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ mmahut ];
@@ -12,9 +12,9 @@ import ./make-test.nix ({ pkgs, ... }: {
};
testScript = ''
- startAll;
- $machine->waitForUnit("metabase.service");
- $machine->waitForOpenPort(3000);
- $machine->waitUntilSucceeds("curl -L http://localhost:3000/setup | grep Metabase");
+ start_all()
+ machine.wait_for_unit("metabase.service")
+ machine.wait_for_open_port(3000)
+ machine.wait_until_succeeds("curl -L http://localhost:3000/setup | grep Metabase")
'';
})
diff --git a/nixos/tests/minidlna.nix b/nixos/tests/minidlna.nix
index 7bf1bed69d06..d852c7f60bc4 100644
--- a/nixos/tests/minidlna.nix
+++ b/nixos/tests/minidlna.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "minidlna";
nodes = {
@@ -29,11 +29,11 @@ import ./make-test.nix ({ pkgs, ... }: {
testScript =
''
- startAll;
- $server->succeed("mkdir -p /tmp/stuff && chown minidlna: /tmp/stuff");
- $server->waitForUnit("minidlna");
- $server->waitForOpenPort("8200");
- $server->succeed("curl --fail http://localhost:8200/");
- $client->succeed("curl --fail http://server:8200/");
+ start_all()
+ server.succeed("mkdir -p /tmp/stuff && chown minidlna: /tmp/stuff")
+ server.wait_for_unit("minidlna")
+ server.wait_for_open_port("8200")
+ server.succeed("curl --fail http://localhost:8200/")
+ client.succeed("curl --fail http://server:8200/")
'';
})
diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix
index 19ab4803a1d3..7d83d061a9df 100644
--- a/nixos/tests/miniflux.nix
+++ b/nixos/tests/miniflux.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
let
port = 3142;
@@ -37,16 +37,20 @@ with lib;
};
};
testScript = ''
- startAll;
+ start_all()
- $default->waitForUnit('miniflux.service');
- $default->waitForOpenPort(${toString defaultPort});
- $default->succeed("curl --fail 'http://localhost:${toString defaultPort}/healthcheck' | grep -q OK");
- $default->succeed("curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep -q '\"is_admin\":true'");
+ default.wait_for_unit("miniflux.service")
+ default.wait_for_open_port(${toString defaultPort})
+ default.succeed("curl --fail 'http://localhost:${toString defaultPort}/healthcheck' | grep -q OK")
+ default.succeed(
+ "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep -q '\"is_admin\":true'"
+ )
- $customized->waitForUnit('miniflux.service');
- $customized->waitForOpenPort(${toString port});
- $customized->succeed("curl --fail 'http://localhost:${toString port}/healthcheck' | grep -q OK");
- $customized->succeed("curl 'http://localhost:${toString port}/v1/me' -u '${username}:${password}' -H Content-Type:application/json | grep -q '\"is_admin\":true'");
+ customized.wait_for_unit("miniflux.service")
+ customized.wait_for_open_port(${toString port})
+ customized.succeed("curl --fail 'http://localhost:${toString port}/healthcheck' | grep -q OK")
+ customized.succeed(
+ "curl 'http://localhost:${toString port}/v1/me' -u '${username}:${password}' -H Content-Type:application/json | grep -q '\"is_admin\":true'"
+ )
'';
})
diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index f1218b537711..3b0619742671 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test-python.nix ({ pkgs, ...} :
let
accessKey = "BKIKJAA5BMMU2RHO6IBB";
secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
@@ -18,7 +18,7 @@ let
sio.seek(0)
minioClient.put_object('test-bucket', 'test.txt', sio, sio_len, content_type='text/plain')
'';
- in {
+in {
name = "minio";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ bachp ];
@@ -37,19 +37,19 @@ let
};
};
- testScript =
- ''
- startAll;
- $machine->waitForUnit("minio.service");
- $machine->waitForOpenPort(9000);
+ testScript = ''
+ start_all()
+ machine.wait_for_unit("minio.service")
+ machine.wait_for_open_port(9000)
- # Create a test bucket on the server
- $machine->succeed("mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} S3v4");
- $machine->succeed("mc mb minio/test-bucket");
- $machine->succeed("${minioPythonScript}");
- $machine->succeed("mc ls minio") =~ /test-bucket/ or die;
- $machine->succeed("mc cat minio/test-bucket/test.txt") =~ /Test from Python/ or die;
- $machine->shutdown;
-
- '';
+ # Create a test bucket on the server
+ machine.succeed(
+ "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} S3v4"
+ )
+ machine.succeed("mc mb minio/test-bucket")
+ machine.succeed("${minioPythonScript}")
+ assert "test-bucket" in machine.succeed("mc ls minio")
+ assert "Test from Python" in machine.succeed("mc cat minio/test-bucket/test.txt")
+ machine.shutdown()
+ '';
})
diff --git a/nixos/tests/moinmoin.nix b/nixos/tests/moinmoin.nix
index 2662b79aa099..ac327498eba0 100644
--- a/nixos/tests/moinmoin.nix
+++ b/nixos/tests/moinmoin.nix
@@ -1,6 +1,6 @@
-import ./make-test.nix ({ pkgs, lib, ... }: {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "moinmoin";
- meta.maintainers = [ ]; # waiting for https://github.com/NixOS/nixpkgs/pull/65397
+ meta.maintainers = with lib.maintainers; [ mmilata ];
machine =
{ ... }:
@@ -13,12 +13,16 @@ import ./make-test.nix ({ pkgs, lib, ... }: {
};
testScript = ''
- startAll;
+ start_all()
- $machine->waitForUnit('moin-ExampleWiki.service');
- $machine->waitForUnit('nginx.service');
- $machine->waitForFile('/run/moin/ExampleWiki/gunicorn.sock');
- $machine->succeed('curl -L http://localhost/') =~ /If you have just installed/ or die;
- $machine->succeed('moin-ExampleWiki account create --name=admin --email=admin@example.com --password=foo 2>&1') =~ /status success/ or die;
+ machine.wait_for_unit("moin-ExampleWiki.service")
+ machine.wait_for_unit("nginx.service")
+ machine.wait_for_file("/run/moin/ExampleWiki/gunicorn.sock")
+
+ assert "If you have just installed" in machine.succeed("curl -L http://localhost/")
+
+ assert "status success" in machine.succeed(
+ "moin-ExampleWiki account create --name=admin --email=admin@example.com --password=foo 2>&1"
+ )
'';
})
diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index 0ccbeb062f92..9ebf84eed232 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -1,6 +1,6 @@
# This test start mongodb, runs a query using mongo shell
-import ./make-test.nix ({ pkgs, ...} : let
+import ./make-test-python.nix ({ pkgs, ...} : let
testQuery = pkgs.writeScript "nixtest.js" ''
db.greetings.insert({ "greeting": "hello" });
print(db.greetings.findOne().greeting);
@@ -33,8 +33,10 @@ in {
};
testScript = ''
- startAll;
- $one->waitForUnit("mongodb.service");
- $one->succeed("mongo -u nixtest -p nixtest nixtest ${testQuery}") =~ /hello/ or die;
+ start_all()
+ one.wait_for_unit("mongodb.service")
+ one.succeed(
+ "mongo -u nixtest -p nixtest nixtest ${testQuery} | grep -q hello"
+ )
'';
})
diff --git a/nixos/tests/moodle.nix b/nixos/tests/moodle.nix
index 565a6b636949..56aa62596c07 100644
--- a/nixos/tests/moodle.nix
+++ b/nixos/tests/moodle.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }: {
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "moodle";
meta.maintainers = [ lib.maintainers.aanderse ];
@@ -15,8 +15,8 @@ import ./make-test.nix ({ pkgs, lib, ... }: {
};
testScript = ''
- startAll;
- $machine->waitForUnit('phpfpm-moodle.service');
- $machine->succeed('curl http://localhost/') =~ /You are not logged in/ or die;
+ start_all()
+ machine.wait_for_unit("phpfpm-moodle.service")
+ machine.wait_until_succeeds("curl http://localhost/ | grep 'You are not logged in'")
'';
})
diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix
index eab123bd50f8..64c5a27665d6 100644
--- a/nixos/tests/morty.nix
+++ b/nixos/tests/morty.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
{
name = "morty";
@@ -22,11 +22,9 @@ import ./make-test.nix ({ pkgs, ... }:
testScript =
{ ... }:
''
- $mortyProxyWithKey->waitForUnit("default.target");
-
- $mortyProxyWithKey->waitForOpenPort(3001);
- $mortyProxyWithKey->succeed("curl -L 127.0.0.1:3001 | grep MortyProxy");
-
+ mortyProxyWithKey.wait_for_unit("default.target")
+ mortyProxyWithKey.wait_for_open_port(3001)
+ mortyProxyWithKey.succeed("curl -L 127.0.0.1:3001 | grep MortyProxy")
'';
})
diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix
index b4c897c3ab5d..1f2fdf4237fa 100644
--- a/nixos/tests/mosquitto.nix
+++ b/nixos/tests/mosquitto.nix
@@ -1,21 +1,10 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
let
port = 1888;
username = "mqtt";
password = "VERY_secret";
topic = "test/foo";
-
- cmd = bin: pkgs.lib.concatStringsSep " " [
- "${pkgs.mosquitto}/bin/mosquitto_${bin}"
- "-V mqttv311"
- "-h server"
- "-p ${toString port}"
- "-u ${username}"
- "-P '${password}'"
- "-t ${topic}"
- ];
-
in {
name = "mosquitto";
meta = with pkgs.stdenv.lib; {
@@ -49,40 +38,53 @@ in {
testScript = let
file = "/tmp/msg";
- sub = args:
- "(${cmd "sub"} -C 1 ${args} | tee ${file} &)";
in ''
- startAll;
- $server->waitForUnit("mosquitto.service");
+ def mosquitto_cmd(binary):
+ return (
+ "${pkgs.mosquitto}/bin/mosquitto_{} "
+ "-V mqttv311 "
+ "-h server "
+ "-p ${toString port} "
+ "-u ${username} "
+ "-P '${password}' "
+ "-t ${topic}"
+ ).format(binary)
- $server->fail("test -f ${file}");
- $client1->fail("test -f ${file}");
- $client2->fail("test -f ${file}");
+ def publish(args):
+ return "{} {}".format(mosquitto_cmd("pub"), args)
+
+
+ def subscribe(args):
+ return "({} -C 1 {} | tee ${file} &)".format(mosquitto_cmd("sub"), args)
+
+
+ start_all()
+ server.wait_for_unit("mosquitto.service")
+
+ for machine in server, client1, client2:
+ machine.fail("test -f ${file}")
# QoS = 0, so only one subscribers should get it
- $server->execute("${sub "-q 0"}");
+ server.execute(subscribe("-q 0"))
# we need to give the subscribers some time to connect
- $client2->execute("sleep 5");
- $client2->succeed("${cmd "pub"} -m FOO -q 0");
-
- $server->waitUntilSucceeds("grep -q FOO ${file}");
- $server->execute("rm ${file}");
+ client2.execute("sleep 5")
+ client2.succeed(publish("-m FOO -q 0"))
+ server.wait_until_succeeds("grep -q FOO ${file}")
+ server.execute("rm ${file}")
# QoS = 1, so both subscribers should get it
- $server->execute("${sub "-q 1"}");
- $client1->execute("${sub "-q 1"}");
+ server.execute(subscribe("-q 1"))
+ client1.execute(subscribe("-q 1"))
# we need to give the subscribers some time to connect
- $client2->execute("sleep 5");
- $client2->succeed("${cmd "pub"} -m BAR -q 1");
+ client2.execute("sleep 5")
+ client2.succeed(publish("-m BAR -q 1"))
- $server->waitUntilSucceeds("grep -q BAR ${file}");
- $server->execute("rm ${file}");
-
- $client1->waitUntilSucceeds("grep -q BAR ${file}");
- $client1->execute("rm ${file}");
+ for machine in server, client1:
+ machine.wait_until_succeeds("grep -q BAR ${file}")
+ machine.execute("rm ${file}")
'';
})
diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix
index ac2b810defe3..895b7e2014c8 100644
--- a/nixos/tests/mpd.nix
+++ b/nixos/tests/mpd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
let
track = pkgs.fetchurl {
# Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in
@@ -46,74 +46,87 @@ import ./make-test.nix ({ pkgs, ... }:
};
nodes =
- { client =
+ { client =
{ ... }: { };
serverALSA =
- { ... }: (mkServer {
- mpd = defaultMpdCfg // {
- network.listenAddress = "any";
- extraConfig = ''
- audio_output {
- type "alsa"
- name "ALSA"
- mixer_type "null"
- }
- '';
- };
-
- musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; };
- }) // { networking.firewall.allowedTCPPorts = [ 6600 ]; };
+ { ... }: lib.mkMerge [
+ (mkServer {
+ mpd = defaultMpdCfg // {
+ network.listenAddress = "any";
+ extraConfig = ''
+ audio_output {
+ type "alsa"
+ name "ALSA"
+ mixer_type "null"
+ }
+ '';
+ };
+ musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; };
+ })
+ { networking.firewall.allowedTCPPorts = [ 6600 ]; }
+ ];
serverPulseAudio =
- { ... }: (mkServer {
- mpd = defaultMpdCfg // {
- extraConfig = ''
- audio_output {
- type "pulse"
- name "The Pulse"
- }
- '';
- };
+ { ... }: lib.mkMerge [
+ (mkServer {
+ mpd = defaultMpdCfg // {
+ extraConfig = ''
+ audio_output {
+ type "pulse"
+ name "The Pulse"
+ }
+ '';
+ };
- musicService = with defaultCfg; musicService { inherit user group musicDirectory; };
- }) // { hardware.pulseaudio.enable = true; };
+ musicService = with defaultCfg; musicService { inherit user group musicDirectory; };
+ })
+ {
+ hardware.pulseaudio = {
+ enable = true;
+ systemWide = true;
+ tcp.enable = true;
+ tcp.anonymousClients.allowAll = true;
+ };
+ systemd.services.mpd.environment.PULSE_SERVER = "localhost";
+ }
+ ];
};
testScript = ''
- my $mpc = "${pkgs.mpc_cli}/bin/mpc --wait";
+ mpc = "${pkgs.mpc_cli}/bin/mpc --wait"
# Connects to the given server and attempts to play a tune.
- sub play_some_music {
- my $server = $_[0];
+ def play_some_music(server):
+ server.wait_for_unit("mpd.service")
+ server.succeed(f"{mpc} update")
+ _, tracks = server.execute(f"{mpc} ls")
- $server->waitForUnit("mpd.service");
- $server->succeed("$mpc update");
- my @tracks = $server->execute("$mpc ls");
+ for track in tracks.splitlines():
+ server.succeed(f"{mpc} add {track}")
- for my $track (split(/\n/, $tracks[1])) {
- $server->succeed("$mpc add $track");
- };
+ _, added_tracks = server.execute(f"{mpc} listall")
- my @added_tracks = $server->execute("$mpc listall");
- (length $added_tracks[1]) > 0 or die "Failed to add audio tracks to the playlist.";
+ # Check we succeeded adding audio tracks to the playlist
+ assert len(added_tracks.splitlines()) > 0
- $server->succeed("$mpc play");
+ server.succeed(f"{mpc} play")
- my @status = $server->execute("$mpc status");
- my @output = split(/\n/, $status[1]);
- $output[1] =~ /.*playing.*/ or die "Audio track is not playing, as expected.";
+ _, output = server.execute(f"{mpc} status")
+ # Assure audio track is playing
+ assert "playing" in output
- $server->succeed("$mpc stop");
- };
+ server.succeed(f"{mpc} stop")
- play_some_music($serverALSA);
- play_some_music($serverPulseAudio);
- $client->succeed("$mpc -h serverALSA status");
+ play_some_music(serverALSA)
+ play_some_music(serverPulseAudio)
+
+ client.wait_for_unit("multi-user.target")
+ client.succeed(f"{mpc} -h serverALSA status")
# The PulseAudio-based server is configured not to accept external client connections
# to perform the following test:
- $client->fail("$mpc -h serverPulseAudio status");
+ client.fail(f"{mpc} -h serverPulseAudio status")
'';
})
diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix
index 652d49a24b1c..e9b6d14c6a1f 100644
--- a/nixos/tests/mumble.nix
+++ b/nixos/tests/mumble.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test-python.nix ({ pkgs, ...} :
let
client = { pkgs, ... }: {
@@ -24,50 +24,50 @@ in
};
testScript = ''
- startAll;
+ start_all()
- $server->waitForUnit("murmur.service");
- $client1->waitForX;
- $client2->waitForX;
+ server.wait_for_unit("murmur.service")
+ client1.wait_for_x()
+ client2.wait_for_x()
- $client1->execute("mumble mumble://client1\@server/test &");
- $client2->execute("mumble mumble://client2\@server/test &");
+ client1.execute("mumble mumble://client1\@server/test &")
+ client2.execute("mumble mumble://client2\@server/test &")
# cancel client audio configuration
- $client1->waitForWindow(qr/Audio Tuning Wizard/);
- $client2->waitForWindow(qr/Audio Tuning Wizard/);
- $server->sleep(5); # wait because mumble is slow to register event handlers
- $client1->sendKeys("esc");
- $client2->sendKeys("esc");
+ client1.wait_for_window(r"Audio Tuning Wizard")
+ client2.wait_for_window(r"Audio Tuning Wizard")
+ server.sleep(5) # wait because mumble is slow to register event handlers
+ client1.send_key("esc")
+ client2.send_key("esc")
# cancel client cert configuration
- $client1->waitForWindow(qr/Certificate Management/);
- $client2->waitForWindow(qr/Certificate Management/);
- $server->sleep(5); # wait because mumble is slow to register event handlers
- $client1->sendKeys("esc");
- $client2->sendKeys("esc");
+ client1.wait_for_window(r"Certificate Management")
+ client2.wait_for_window(r"Certificate Management")
+ server.sleep(5) # wait because mumble is slow to register event handlers
+ client1.send_key("esc")
+ client2.send_key("esc")
# accept server certificate
- $client1->waitForWindow(qr/^Mumble$/);
- $client2->waitForWindow(qr/^Mumble$/);
- $server->sleep(5); # wait because mumble is slow to register event handlers
- $client1->sendChars("y");
- $client2->sendChars("y");
- $server->sleep(5); # wait because mumble is slow to register event handlers
+ client1.wait_for_window(r"^Mumble$")
+ client2.wait_for_window(r"^Mumble$")
+ server.sleep(5) # wait because mumble is slow to register event handlers
+ client1.send_chars("y")
+ client2.send_chars("y")
+ server.sleep(5) # wait because mumble is slow to register event handlers
# sometimes the wrong of the 2 windows is focused, we switch focus and try pressing "y" again
- $client1->sendKeys("alt-tab");
- $client2->sendKeys("alt-tab");
- $server->sleep(5); # wait because mumble is slow to register event handlers
- $client1->sendChars("y");
- $client2->sendChars("y");
+ client1.send_key("alt-tab")
+ client2.send_key("alt-tab")
+ server.sleep(5) # wait because mumble is slow to register event handlers
+ client1.send_chars("y")
+ client2.send_chars("y")
# Find clients in logs
- $server->waitUntilSucceeds("journalctl -eu murmur -o cat | grep -q client1");
- $server->waitUntilSucceeds("journalctl -eu murmur -o cat | grep -q client2");
+ server.wait_until_succeeds("journalctl -eu murmur -o cat | grep -q client1")
+ server.wait_until_succeeds("journalctl -eu murmur -o cat | grep -q client2")
- $server->sleep(5); # wait to get screenshot
- $client1->screenshot("screen1");
- $client2->screenshot("screen2");
+ server.sleep(5) # wait to get screenshot
+ client1.screenshot("screen1")
+ client2.screenshot("screen2")
'';
})
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index 31374aaf77e7..7b674db7768d 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -1,7 +1,7 @@
# This test runs basic munin setup with node and cron job running on the same
# machine.
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "munin";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ domenkozar eelco ];
@@ -12,33 +12,33 @@ import ./make-test.nix ({ pkgs, ...} : {
{ config, ... }:
{
services = {
- munin-node = {
+ munin-node = {
+ enable = true;
+ # disable a failing plugin to prevent irrelevant error message, see #23049
+ disabledPlugins = [ "apc_nis" ];
+ };
+ munin-cron = {
enable = true;
- # disable a failing plugin to prevent irrelevant error message, see #23049
- disabledPlugins = [ "apc_nis" ];
- };
- munin-cron = {
- enable = true;
- hosts = ''
- [${config.networking.hostName}]
- address localhost
- '';
- };
+ hosts = ''
+ [${config.networking.hostName}]
+ address localhost
+ '';
+ };
};
- # long timeout to prevent hydra failure on high load
- systemd.services.munin-node.serviceConfig.TimeoutStartSec = "10min";
+
+ # increase the systemd timer interval so it fires more often
+ systemd.timers.munin-cron.timerConfig.OnCalendar = pkgs.stdenv.lib.mkForce "*:*:0/10";
};
};
testScript = ''
- startAll;
+ start_all()
- $one->waitForUnit("munin-node.service");
- # make sure the node is actually listening
- $one->waitForOpenPort(4949);
- $one->succeed('systemctl start munin-cron');
- # wait for munin-cron output
- $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd");
- $one->waitForFile("/var/www/munin/one/index.html");
+ with subtest("ensure munin-node starts and listens on 4949"):
+ one.wait_for_unit("munin-node.service")
+ one.wait_for_open_port(4949)
+ with subtest("ensure munin-cron output is correct"):
+ one.wait_for_file("/var/lib/munin/one/one-uptime-uptime-g.rrd")
+ one.wait_for_file("/var/www/munin/one/index.html")
'';
})
diff --git a/nixos/tests/mutable-users.nix b/nixos/tests/mutable-users.nix
index e590703ab2f4..49c7f78b82ed 100644
--- a/nixos/tests/mutable-users.nix
+++ b/nixos/tests/mutable-users.nix
@@ -1,6 +1,6 @@
# Mutable users tests.
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "mutable-users";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ gleber ];
@@ -19,21 +19,27 @@ import ./make-test.nix ({ pkgs, ...} : {
immutableSystem = nodes.machine.config.system.build.toplevel;
mutableSystem = nodes.mutable.config.system.build.toplevel;
in ''
- $machine->start();
- $machine->waitForUnit("default.target");
+ machine.start()
+ machine.wait_for_unit("default.target")
# Machine starts in immutable mode. Add a user and test if reactivating
# configuration removes the user.
- $machine->fail("cat /etc/passwd | grep ^foobar:");
- $machine->succeed("sudo useradd foobar");
- $machine->succeed("cat /etc/passwd | grep ^foobar:");
- $machine->succeed("${immutableSystem}/bin/switch-to-configuration test");
- $machine->fail("cat /etc/passwd | grep ^foobar:");
+ with subtest("Machine in immutable mode"):
+ assert "foobar" not in machine.succeed("cat /etc/passwd")
+ machine.succeed("sudo useradd foobar")
+ assert "foobar" in machine.succeed("cat /etc/passwd")
+ machine.succeed(
+ "${immutableSystem}/bin/switch-to-configuration test"
+ )
+ assert "foobar" not in machine.succeed("cat /etc/passwd")
# In immutable mode passwd is not wrapped, while in mutable mode it is
# wrapped.
- $machine->succeed('which passwd | grep /run/current-system/');
- $machine->succeed("${mutableSystem}/bin/switch-to-configuration test");
- $machine->succeed('which passwd | grep /run/wrappers/');
+ with subtest("Password is wrapped in mutable mode"):
+ assert "/run/current-system/" in machine.succeed("which passwd")
+ machine.succeed(
+ "${mutableSystem}/bin/switch-to-configuration test"
+ )
+ assert "/run/wrappers/" in machine.succeed("which passwd")
'';
})
diff --git a/nixos/tests/mxisd.nix b/nixos/tests/mxisd.nix
index 0039256f5861..b2b60db4d822 100644
--- a/nixos/tests/mxisd.nix
+++ b/nixos/tests/mxisd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... } : {
+import ./make-test-python.nix ({ pkgs, ... } : {
name = "mxisd";
meta = with pkgs.stdenv.lib.maintainers; {
@@ -19,13 +19,12 @@ import ./make-test.nix ({ pkgs, ... } : {
};
testScript = ''
- startAll;
- $server_mxisd->waitForUnit("mxisd.service");
- $server_mxisd->waitForOpenPort(8090);
- $server_mxisd->succeed("curl -Ssf \"http://127.0.0.1:8090/_matrix/identity/api/v1\"");
- $server_ma1sd->waitForUnit("mxisd.service");
- $server_ma1sd->waitForOpenPort(8090);
- $server_ma1sd->succeed("curl -Ssf \"http://127.0.0.1:8090/_matrix/identity/api/v1\"")
-
+ start_all()
+ server_mxisd.wait_for_unit("mxisd.service")
+ server_mxisd.wait_for_open_port(8090)
+ server_mxisd.succeed("curl -Ssf 'http://127.0.0.1:8090/_matrix/identity/api/v1'")
+ server_ma1sd.wait_for_unit("mxisd.service")
+ server_ma1sd.wait_for_open_port(8090)
+ server_ma1sd.succeed("curl -Ssf 'http://127.0.0.1:8090/_matrix/identity/api/v1'")
'';
})
diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix
index 81482dfef7e5..a0595e4d5539 100644
--- a/nixos/tests/mysql-backup.nix
+++ b/nixos/tests/mysql-backup.nix
@@ -1,5 +1,5 @@
# Test whether mysqlBackup option works
-import ./make-test.nix ({ pkgs, ... } : {
+import ./make-test-python.nix ({ pkgs, ... } : {
name = "mysql-backup";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ rvl ];
@@ -20,31 +20,37 @@ import ./make-test.nix ({ pkgs, ... } : {
};
};
- testScript =
- '' startAll;
+ testScript = ''
+ start_all()
- # Delete backup file that may be left over from a previous test run.
- # This is not needed on Hydra but useful for repeated local test runs.
- $master->execute("rm -f /var/backup/mysql/testdb.gz");
+ # Delete backup file that may be left over from a previous test run.
+ # This is not needed on Hydra but useful for repeated local test runs.
+ master.execute("rm -f /var/backup/mysql/testdb.gz")
- # Need to have mysql started so that it can be populated with data.
- $master->waitForUnit("mysql.service");
+ # Need to have mysql started so that it can be populated with data.
+ master.wait_for_unit("mysql.service")
- # Wait for testdb to be fully populated (5 rows).
- $master->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
+ # Wait for testdb to be fully populated (5 rows).
+ master.wait_until_succeeds(
+ "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"
+ )
- # Do a backup and wait for it to start
- $master->startJob("mysql-backup.service");
- $master->waitForJob("mysql-backup.service");
+ # Do a backup and wait for it to start
+ master.start_job("mysql-backup.service")
+ master.wait_for_unit("mysql-backup.service")
- # wait for backup to fail, because of database 'doesnotexist'
- $master->waitUntilFails("systemctl is-active -q mysql-backup.service");
+ # wait for backup to fail, because of database 'doesnotexist'
+ master.wait_until_fails("systemctl is-active -q mysql-backup.service")
- # wait for backup file and check that data appears in backup
- $master->waitForFile("/var/backup/mysql/testdb.gz");
- $master->succeed("${pkgs.gzip}/bin/zcat /var/backup/mysql/testdb.gz | grep hello");
+ # wait for backup file and check that data appears in backup
+ master.wait_for_file("/var/backup/mysql/testdb.gz")
+ master.succeed(
+ "${pkgs.gzip}/bin/zcat /var/backup/mysql/testdb.gz | grep hello"
+ )
- # Check that a failed backup is logged
- $master->succeed("journalctl -u mysql-backup.service | grep 'fail.*doesnotexist' > /dev/null");
- '';
+ # Check that a failed backup is logged
+ master.succeed(
+ "journalctl -u mysql-backup.service | grep 'fail.*doesnotexist' > /dev/null"
+ )
+ '';
})
diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index c75a862106f6..a2654f041add 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test-python.nix ({ pkgs, ...} :
let
replicateUser = "replicate";
@@ -54,28 +54,36 @@ in
};
testScript = ''
- $master->start;
- $master->waitForUnit("mysql");
- $master->waitForOpenPort(3306);
+ master.start()
+ master.wait_for_unit("mysql")
+ master.wait_for_open_port(3306)
# Wait for testdb to be fully populated (5 rows).
- $master->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
+ master.wait_until_succeeds(
+ "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"
+ )
- $slave1->start;
- $slave2->start;
- $slave1->waitForUnit("mysql");
- $slave1->waitForOpenPort(3306);
- $slave2->waitForUnit("mysql");
- $slave2->waitForOpenPort(3306);
+ slave1.start()
+ slave2.start()
+ slave1.wait_for_unit("mysql")
+ slave1.wait_for_open_port(3306)
+ slave2.wait_for_unit("mysql")
+ slave2.wait_for_open_port(3306)
# wait for replications to finish
- $slave1->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
- $slave2->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
+ slave1.wait_until_succeeds(
+ "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"
+ )
+ slave2.wait_until_succeeds(
+ "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5"
+ )
- $slave2->succeed("systemctl stop mysql");
- $master->succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N");
- $slave2->succeed("systemctl start mysql");
- $slave2->waitForUnit("mysql");
- $slave2->waitForOpenPort(3306);
- $slave2->waitUntilSucceeds("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456");
+ slave2.succeed("systemctl stop mysql")
+ master.succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N")
+ slave2.succeed("systemctl start mysql")
+ slave2.wait_for_unit("mysql")
+ slave2.wait_for_open_port(3306)
+ slave2.wait_until_succeeds(
+ "echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456"
+ )
'';
})
diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index 05bd968de02d..2c0d212c2f1d 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "mysql";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco shlevy ];
@@ -47,17 +47,23 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ start_all
- $mysql->waitForUnit("mysql");
- $mysql->succeed("echo 'use empty_testdb;' | mysql -u root");
- $mysql->succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4");
+ mysql.wait_for_unit("mysql")
+ mysql.succeed("echo 'use empty_testdb;' | mysql -u root")
+ mysql.succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4")
# ';' acts as no-op, just check whether login succeeds with the user created from the initialScript
- $mysql->succeed("echo ';' | mysql -u passworduser --password=password123");
+ mysql.succeed("echo ';' | mysql -u passworduser --password=password123")
- $mariadb->waitForUnit("mysql");
- $mariadb->succeed("echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser");
- $mariadb->succeed("echo 'use testdb; insert into tests values (42);' | sudo -u testuser mysql -u testuser");
- $mariadb->succeed("echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42");
+ mariadb.wait_for_unit("mysql")
+ mariadb.succeed(
+ "echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser"
+ )
+ mariadb.succeed(
+ "echo 'use testdb; insert into tests values (42);' | sudo -u testuser mysql -u testuser"
+ )
+ mariadb.succeed(
+ "echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42"
+ )
'';
})
diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix
index 51d9cf166bb6..0d1f7aaedfa2 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -3,7 +3,7 @@
# client on the inside network, a server on the outside network, and a
# router connected to both that performs Network Address Translation
# for the client.
-import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ... }:
+import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ... }:
let
unit = if withFirewall then "firewall" else "nat";
@@ -69,49 +69,52 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
routerDummyNoNatClosure = nodes.routerDummyNoNat.config.system.build.toplevel;
routerClosure = nodes.router.config.system.build.toplevel;
in ''
- $client->start;
- $router->start;
- $server->start;
+ client.start()
+ router.start()
+ server.start()
# The router should have access to the server.
- $server->waitForUnit("network.target");
- $server->waitForUnit("httpd");
- $router->waitForUnit("network.target");
- $router->succeed("curl --fail http://server/ >&2");
+ server.wait_for_unit("network.target")
+ server.wait_for_unit("httpd")
+ router.wait_for_unit("network.target")
+ router.succeed("curl --fail http://server/ >&2")
# The client should be also able to connect via the NAT router.
- $router->waitForUnit("${unit}");
- $client->waitForUnit("network.target");
- $client->succeed("curl --fail http://server/ >&2");
- $client->succeed("ping -c 1 server >&2");
+ router.wait_for_unit("${unit}")
+ client.wait_for_unit("network.target")
+ client.succeed("curl --fail http://server/ >&2")
+ client.succeed("ping -c 1 server >&2")
# Test whether passive FTP works.
- $server->waitForUnit("vsftpd");
- $server->succeed("echo Hello World > /home/ftp/foo.txt");
- $client->succeed("curl -v ftp://server/foo.txt >&2");
+ server.wait_for_unit("vsftpd")
+ server.succeed("echo Hello World > /home/ftp/foo.txt")
+ client.succeed("curl -v ftp://server/foo.txt >&2")
# Test whether active FTP works.
- $client->${if withConntrackHelpers then "succeed" else "fail"}(
- "curl -v -P - ftp://server/foo.txt >&2");
+ client.${if withConntrackHelpers then "succeed" else "fail"}("curl -v -P - ftp://server/foo.txt >&2")
# Test ICMP.
- $client->succeed("ping -c 1 router >&2");
- $router->succeed("ping -c 1 client >&2");
+ client.succeed("ping -c 1 router >&2")
+ router.succeed("ping -c 1 client >&2")
# If we turn off NAT, the client shouldn't be able to reach the server.
- $router->succeed("${routerDummyNoNatClosure}/bin/switch-to-configuration test 2>&1");
- $client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
- $client->fail("ping -c 1 server >&2");
+ router.succeed(
+ "${routerDummyNoNatClosure}/bin/switch-to-configuration test 2>&1"
+ )
+ client.fail("curl --fail --connect-timeout 5 http://server/ >&2")
+ client.fail("ping -c 1 server >&2")
# And make sure that reloading the NAT job works.
- $router->succeed("${routerClosure}/bin/switch-to-configuration test 2>&1");
+ router.succeed(
+ "${routerClosure}/bin/switch-to-configuration test 2>&1"
+ )
# FIXME: this should not be necessary, but nat.service is not started because
# network.target is not triggered
# (https://github.com/NixOS/nixpkgs/issues/16230#issuecomment-226408359)
${lib.optionalString (!withFirewall) ''
- $router->succeed("systemctl start nat.service");
+ router.succeed("systemctl start nat.service")
''}
- $client->succeed("curl --fail http://server/ >&2");
- $client->succeed("ping -c 1 server >&2");
+ client.succeed("curl --fail http://server/ >&2")
+ client.succeed("ping -c 1 server >&2")
'';
})
diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix
index 6a6f602726de..b67b26a79341 100644
--- a/nixos/tests/ndppd.nix
+++ b/nixos/tests/ndppd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "ndppd";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ fpletz ];
@@ -52,9 +52,9 @@ import ./make-test.nix ({ pkgs, lib, ...} : {
};
testScript = ''
- startAll;
- $server->waitForUnit("multi-user.target");
- $upstream->waitForUnit("multi-user.target");
- $upstream->waitUntilSucceeds("ping -c5 fd42::2");
+ start_all()
+ server.wait_for_unit("multi-user.target")
+ upstream.wait_for_unit("multi-user.target")
+ upstream.wait_until_succeeds("ping -c5 fd42::2")
'';
})
diff --git a/nixos/tests/neo4j.nix b/nixos/tests/neo4j.nix
index 86ed8970517c..32ee7f501b8b 100644
--- a/nixos/tests/neo4j.nix
+++ b/nixos/tests/neo4j.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix {
+import ./make-test-python.nix {
name = "neo4j";
nodes = {
@@ -11,10 +11,10 @@ import ./make-test.nix {
};
testScript = ''
- startAll;
+ start_all()
- $master->waitForUnit("neo4j");
- $master->sleep(20); # Hopefully this is long enough!!
- $master->succeed("curl http://localhost:7474/");
+ master.wait_for_unit("neo4j")
+ master.wait_for_open_port(7474)
+ master.succeed("curl http://localhost:7474/")
'';
}
diff --git a/nixos/tests/nesting.nix b/nixos/tests/nesting.nix
index 1306d6f8e0c5..6388b67a6e40 100644
--- a/nixos/tests/nesting.nix
+++ b/nixos/tests/nesting.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix {
+import ./make-test-python.nix {
name = "nesting";
nodes = {
clone = { pkgs, ... }: {
@@ -19,24 +19,26 @@ import ./make-test.nix {
};
};
testScript = ''
- $clone->waitForUnit("default.target");
- $clone->succeed("cowsay hey");
- $clone->fail("hello");
+ clone.wait_for_unit("default.target")
+ clone.succeed("cowsay hey")
+ clone.fail("hello")
- # Nested clones do inherit from parent
- $clone->succeed("/run/current-system/fine-tune/child-1/bin/switch-to-configuration test");
- $clone->succeed("cowsay hey");
- $clone->succeed("hello");
+ with subtest("Nested clones do inherit from parent"):
+ clone.succeed(
+ "/run/current-system/fine-tune/child-1/bin/switch-to-configuration test"
+ )
+ clone.succeed("cowsay hey")
+ clone.succeed("hello")
+ children.wait_for_unit("default.target")
+ children.succeed("cowsay hey")
+ children.fail("hello")
- $children->waitForUnit("default.target");
- $children->succeed("cowsay hey");
- $children->fail("hello");
-
- # Nested children do not inherit from parent
- $children->succeed("/run/current-system/fine-tune/child-1/bin/switch-to-configuration test");
- $children->fail("cowsay hey");
- $children->succeed("hello");
-
+ with subtest("Nested children do not inherit from parent"):
+ children.succeed(
+ "/run/current-system/fine-tune/child-1/bin/switch-to-configuration test"
+ )
+ children.fail("cowsay hey")
+ children.succeed("hello")
'';
}
diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix
index 9bd147968e4b..8dd5eafb0977 100644
--- a/nixos/tests/netdata.nix
+++ b/nixos/tests/netdata.nix
@@ -1,6 +1,6 @@
# This test runs netdata and checks for data via apps.plugin
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "netdata";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ cransom ];
@@ -16,23 +16,22 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ start_all()
- $netdata->waitForUnit("netdata.service");
+ netdata.wait_for_unit("netdata.service")
# wait for the service to listen before sending a request
- $netdata->waitForOpenPort(19999);
+ netdata.wait_for_open_port(19999)
# check if the netdata main page loads.
- $netdata->succeed("curl --fail http://localhost:19999/");
+ netdata.succeed("curl --fail http://localhost:19999/")
# check if netdata can read disk ops for root owned processes.
# if > 0, successful. verifies both netdata working and
# apps.plugin has elevated capabilities.
- my $cmd = <<'CMD';
- curl -s http://localhost:19999/api/v1/data\?chart=users.pwrites | \
- jq -e '[.data[range(10)][.labels | indices("root")[0]]] | add | . > 0'
- CMD
- $netdata->waitUntilSucceeds($cmd);
+ url = "http://localhost:19999/api/v1/data\?chart=users.pwrites"
+ filter = '[.data[range(10)][.labels | indices("root")[0]]] | add | . > 0'
+ cmd = f"curl -s {url} | jq -e '{filter}'"
+ netdata.wait_until_succeeds(cmd)
'';
})
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index e0585d8f1bb4..9448a104073f 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -4,7 +4,7 @@
# bool: whether to use networkd in the tests
, networkd }:
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
let
@@ -75,10 +75,11 @@ let
machine.networking.useDHCP = false;
machine.networking.useNetworkd = networkd;
testScript = ''
- startAll;
- $machine->waitForUnit("network.target");
- $machine->succeed("ip addr show lo | grep -q 'inet 127.0.0.1/8 '");
- $machine->succeed("ip addr show lo | grep -q 'inet6 ::1/128 '");
+ start_all()
+ machine.wait_for_unit("network.target")
+ loopback_addresses = machine.succeed("ip addr show lo")
+ assert "inet 127.0.0.1/8" in loopback_addresses
+ assert "inet6 ::1/128" in loopback_addresses
'';
};
static = {
@@ -102,35 +103,35 @@ let
};
testScript = { ... }:
''
- startAll;
+ start_all()
- $client->waitForUnit("network.target");
- $router->waitForUnit("network-online.target");
+ client.wait_for_unit("network.target")
+ router.wait_for_unit("network-online.target")
- # Make sure dhcpcd is not started
- $client->fail("systemctl status dhcpcd.service");
+ with subtest("Make sure dhcpcd is not started"):
+ client.fail("systemctl status dhcpcd.service")
- # Test vlan 1
- $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
- $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
- $client->waitUntilSucceeds("ping -c 1 192.168.1.3");
- $client->waitUntilSucceeds("ping -c 1 192.168.1.10");
+ with subtest("Test vlan 1"):
+ client.wait_until_succeeds("ping -c 1 192.168.1.1")
+ client.wait_until_succeeds("ping -c 1 192.168.1.2")
+ client.wait_until_succeeds("ping -c 1 192.168.1.3")
+ client.wait_until_succeeds("ping -c 1 192.168.1.10")
- $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
- $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
- $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
- $router->waitUntilSucceeds("ping -c 1 192.168.1.10");
+ router.wait_until_succeeds("ping -c 1 192.168.1.1")
+ router.wait_until_succeeds("ping -c 1 192.168.1.2")
+ router.wait_until_succeeds("ping -c 1 192.168.1.3")
+ router.wait_until_succeeds("ping -c 1 192.168.1.10")
- # Test vlan 2
- $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
- $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
+ with subtest("Test vlan 2"):
+ client.wait_until_succeeds("ping -c 1 192.168.2.1")
+ client.wait_until_succeeds("ping -c 1 192.168.2.2")
- $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
- $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
+ router.wait_until_succeeds("ping -c 1 192.168.2.1")
+ router.wait_until_succeeds("ping -c 1 192.168.2.2")
- # Test default gateway
- $router->waitUntilSucceeds("ping -c 1 192.168.3.1");
- $client->waitUntilSucceeds("ping -c 1 192.168.3.1");
+ with subtest("Test default gateway"):
+ router.wait_until_succeeds("ping -c 1 192.168.3.1")
+ client.wait_until_succeeds("ping -c 1 192.168.3.1")
'';
};
dhcpSimple = {
@@ -155,38 +156,38 @@ let
};
testScript = { ... }:
''
- startAll;
+ start_all()
- $client->waitForUnit("network.target");
- $router->waitForUnit("network-online.target");
+ client.wait_for_unit("network.target")
+ router.wait_for_unit("network-online.target")
- # Wait until we have an ip address on each interface
- $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
- $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'");
- $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q '192.168.2'");
- $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q 'fd00:1234:5678:2:'");
+ with subtest("Wait until we have an ip address on each interface"):
+ client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'")
+ client.wait_until_succeeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'")
+ client.wait_until_succeeds("ip addr show dev eth2 | grep -q '192.168.2'")
+ client.wait_until_succeeds("ip addr show dev eth2 | grep -q 'fd00:1234:5678:2:'")
- # Test vlan 1
- $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
- $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
- $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1");
- $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::2");
+ with subtest("Test vlan 1"):
+ client.wait_until_succeeds("ping -c 1 192.168.1.1")
+ client.wait_until_succeeds("ping -c 1 192.168.1.2")
+ client.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1")
+ client.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::2")
- $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
- $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
- $router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1");
- $router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::2");
+ router.wait_until_succeeds("ping -c 1 192.168.1.1")
+ router.wait_until_succeeds("ping -c 1 192.168.1.2")
+ router.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1")
+ router.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::2")
- # Test vlan 2
- $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
- $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
- $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::1");
- $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::2");
+ with subtest("Test vlan 2"):
+ client.wait_until_succeeds("ping -c 1 192.168.2.1")
+ client.wait_until_succeeds("ping -c 1 192.168.2.2")
+ client.wait_until_succeeds("ping -c 1 fd00:1234:5678:2::1")
+ client.wait_until_succeeds("ping -c 1 fd00:1234:5678:2::2")
- $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
- $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
- $router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::1");
- $router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::2");
+ router.wait_until_succeeds("ping -c 1 192.168.2.1")
+ router.wait_until_succeeds("ping -c 1 192.168.2.2")
+ router.wait_until_succeeds("ping -c 1 fd00:1234:5678:2::1")
+ router.wait_until_succeeds("ping -c 1 fd00:1234:5678:2::2")
'';
};
dhcpOneIf = {
@@ -206,28 +207,28 @@ let
};
testScript = { ... }:
''
- startAll;
+ start_all()
- # Wait for networking to come up
- $client->waitForUnit("network.target");
- $router->waitForUnit("network.target");
+ with subtest("Wait for networking to come up"):
+ client.wait_for_unit("network.target")
+ router.wait_for_unit("network.target")
- # Wait until we have an ip address on each interface
- $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
+ with subtest("Wait until we have an ip address on each interface"):
+ client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'")
- # Test vlan 1
- $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
- $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
+ with subtest("Test vlan 1"):
+ client.wait_until_succeeds("ping -c 1 192.168.1.1")
+ client.wait_until_succeeds("ping -c 1 192.168.1.2")
- $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
- $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+ router.wait_until_succeeds("ping -c 1 192.168.1.1")
+ router.wait_until_succeeds("ping -c 1 192.168.1.2")
- # Test vlan 2
- $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
- $client->fail("ping -c 1 192.168.2.2");
+ with subtest("Test vlan 2"):
+ client.wait_until_succeeds("ping -c 1 192.168.2.1")
+ client.fail("ping -c 1 192.168.2.2")
- $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
- $router->fail("ping -c 1 192.168.2.2");
+ router.wait_until_succeeds("ping -c 1 192.168.2.1")
+ router.fail("ping -c 1 192.168.2.2")
'';
};
bond = let
@@ -252,18 +253,18 @@ let
nodes.client2 = node "192.168.1.2";
testScript = { ... }:
''
- startAll;
+ start_all()
- # Wait for networking to come up
- $client1->waitForUnit("network.target");
- $client2->waitForUnit("network.target");
+ with subtest("Wait for networking to come up"):
+ client1.wait_for_unit("network.target")
+ client2.wait_for_unit("network.target")
- # Test bonding
- $client1->waitUntilSucceeds("ping -c 2 192.168.1.1");
- $client1->waitUntilSucceeds("ping -c 2 192.168.1.2");
+ with subtest("Test bonding"):
+ client1.wait_until_succeeds("ping -c 2 192.168.1.1")
+ client1.wait_until_succeeds("ping -c 2 192.168.1.2")
- $client2->waitUntilSucceeds("ping -c 2 192.168.1.1");
- $client2->waitUntilSucceeds("ping -c 2 192.168.1.2");
+ client2.wait_until_succeeds("ping -c 2 192.168.1.1")
+ client2.wait_until_succeeds("ping -c 2 192.168.1.2")
'';
};
bridge = let
@@ -294,25 +295,24 @@ let
};
testScript = { ... }:
''
- startAll;
+ start_all()
- # Wait for networking to come up
- $client1->waitForUnit("network.target");
- $client2->waitForUnit("network.target");
- $router->waitForUnit("network.target");
+ with subtest("Wait for networking to come up"):
+ for machine in client1, client2, router:
+ machine.wait_for_unit("network.target")
- # Test bridging
- $client1->waitUntilSucceeds("ping -c 1 192.168.1.1");
- $client1->waitUntilSucceeds("ping -c 1 192.168.1.2");
- $client1->waitUntilSucceeds("ping -c 1 192.168.1.3");
+ with subtest("Test bridging"):
+ client1.wait_until_succeeds("ping -c 1 192.168.1.1")
+ client1.wait_until_succeeds("ping -c 1 192.168.1.2")
+ client1.wait_until_succeeds("ping -c 1 192.168.1.3")
- $client2->waitUntilSucceeds("ping -c 1 192.168.1.1");
- $client2->waitUntilSucceeds("ping -c 1 192.168.1.2");
- $client2->waitUntilSucceeds("ping -c 1 192.168.1.3");
+ client2.wait_until_succeeds("ping -c 1 192.168.1.1")
+ client2.wait_until_succeeds("ping -c 1 192.168.1.2")
+ client2.wait_until_succeeds("ping -c 1 192.168.1.3")
- $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
- $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
- $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
+ router.wait_until_succeeds("ping -c 1 192.168.1.1")
+ router.wait_until_succeeds("ping -c 1 192.168.1.2")
+ router.wait_until_succeeds("ping -c 1 192.168.1.3")
'';
};
macvlan = {
@@ -340,35 +340,35 @@ let
};
testScript = { ... }:
''
- startAll;
+ start_all()
- # Wait for networking to come up
- $client->waitForUnit("network.target");
- $router->waitForUnit("network.target");
+ with subtest("Wait for networking to come up"):
+ client.wait_for_unit("network.target")
+ router.wait_for_unit("network.target")
- # Wait until we have an ip address on each interface
- $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
- $client->waitUntilSucceeds("ip addr show dev macvlan | grep -q '192.168.1'");
+ with subtest("Wait until we have an ip address on each interface"):
+ client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'")
+ client.wait_until_succeeds("ip addr show dev macvlan | grep -q '192.168.1'")
- # Print lots of diagnostic information
- $router->log('**********************************************');
- $router->succeed("ip addr >&2");
- $router->succeed("ip route >&2");
- $router->execute("iptables-save >&2");
- $client->log('==============================================');
- $client->succeed("ip addr >&2");
- $client->succeed("ip route >&2");
- $client->execute("iptables-save >&2");
- $client->log('##############################################');
+ with subtest("Print lots of diagnostic information"):
+ router.log("**********************************************")
+ router.succeed("ip addr >&2")
+ router.succeed("ip route >&2")
+ router.execute("iptables-save >&2")
+ client.log("==============================================")
+ client.succeed("ip addr >&2")
+ client.succeed("ip route >&2")
+ client.execute("iptables-save >&2")
+ client.log("##############################################")
- # Test macvlan creates routable ips
- $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
- $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
- $client->waitUntilSucceeds("ping -c 1 192.168.1.3");
+ with subtest("Test macvlan creates routable ips"):
+ client.wait_until_succeeds("ping -c 1 192.168.1.1")
+ client.wait_until_succeeds("ping -c 1 192.168.1.2")
+ client.wait_until_succeeds("ping -c 1 192.168.1.3")
- $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
- $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
- $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
+ router.wait_until_succeeds("ping -c 1 192.168.1.1")
+ router.wait_until_succeeds("ping -c 1 192.168.1.2")
+ router.wait_until_succeeds("ping -c 1 192.168.1.3")
'';
};
sit = let
@@ -395,22 +395,22 @@ let
nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; };
testScript = { ... }:
''
- startAll;
+ start_all()
- # Wait for networking to be configured
- $client1->waitForUnit("network.target");
- $client2->waitForUnit("network.target");
+ with subtest("Wait for networking to be configured"):
+ client1.wait_for_unit("network.target")
+ client2.wait_for_unit("network.target")
- # Print diagnostic information
- $client1->succeed("ip addr >&2");
- $client2->succeed("ip addr >&2");
+ # Print diagnostic information
+ client1.succeed("ip addr >&2")
+ client2.succeed("ip addr >&2")
- # Test ipv6
- $client1->waitUntilSucceeds("ping -c 1 fc00::1");
- $client1->waitUntilSucceeds("ping -c 1 fc00::2");
+ with subtest("Test ipv6"):
+ client1.wait_until_succeeds("ping -c 1 fc00::1")
+ client1.wait_until_succeeds("ping -c 1 fc00::2")
- $client2->waitUntilSucceeds("ping -c 1 fc00::1");
- $client2->waitUntilSucceeds("ping -c 1 fc00::2");
+ client2.wait_until_succeeds("ping -c 1 fc00::1")
+ client2.wait_until_succeeds("ping -c 1 fc00::2")
'';
};
vlan = let
@@ -435,15 +435,15 @@ let
nodes.client2 = node "192.168.1.2";
testScript = { ... }:
''
- startAll;
+ start_all()
- # Wait for networking to be configured
- $client1->waitForUnit("network.target");
- $client2->waitForUnit("network.target");
+ with subtest("Wait for networking to be configured"):
+ client1.wait_for_unit("network.target")
+ client2.wait_for_unit("network.target")
- # Test vlan is setup
- $client1->succeed("ip addr show dev vlan >&2");
- $client2->succeed("ip addr show dev vlan >&2");
+ with subtest("Test vlan is setup"):
+ client1.succeed("ip addr show dev vlan >&2")
+ client2.succeed("ip addr show dev vlan >&2")
'';
};
virtual = {
@@ -464,33 +464,38 @@ let
};
testScript = ''
- my $targetList = <<'END';
+ targetList = """
tap0: tap persist user 0
tun0: tun persist user 0
- END
+ """.strip()
- # Wait for networking to come up
- $machine->start;
- $machine->waitForUnit("network-online.target");
+ with subtest("Wait for networking to come up"):
+ machine.start()
+ machine.wait_for_unit("network-online.target")
- # Test interfaces set up
- my $list = $machine->succeed("ip tuntap list | sort");
- "$list" eq "$targetList" or die(
- "The list of virtual interfaces does not match the expected one:\n",
- "Result:\n", "$list\n",
- "Expected:\n", "$targetList\n"
- );
+ with subtest("Test interfaces set up"):
+ list = machine.succeed("ip tuntap list | sort").strip()
+ assert (
+ list == targetList
+ ), """
+ The list of virtual interfaces does not match the expected one:
+ Result:
+ {}
+ Expected:
+ {}
+ """.format(
+ list, targetList
+ )
- # Test interfaces clean up
- $machine->succeed("systemctl stop network-addresses-tap0");
- $machine->sleep(10);
- $machine->succeed("systemctl stop network-addresses-tun0");
- $machine->sleep(10);
- my $residue = $machine->succeed("ip tuntap list");
- $residue eq "" or die(
- "Some virtual interface has not been properly cleaned:\n",
- "$residue\n"
- );
+ with subtest("Test interfaces clean up"):
+ machine.succeed("systemctl stop network-addresses-tap0")
+ machine.sleep(10)
+ machine.succeed("systemctl stop network-addresses-tun0")
+ machine.sleep(10)
+ residue = machine.succeed("ip tuntap list")
+ assert (
+ residue is ""
+ ), "Some virtual interface has not been properly cleaned:\n{}".format(residue)
'';
};
privacy = {
@@ -522,7 +527,7 @@ let
'';
};
};
- nodes.clientWithPrivacy = { pkgs, ... }: with pkgs.lib; {
+ nodes.client_with_privacy = { pkgs, ... }: with pkgs.lib; {
virtualisation.vlans = [ 1 ];
networking = {
useNetworkd = networkd;
@@ -550,25 +555,31 @@ let
};
testScript = { ... }:
''
- startAll;
+ start_all()
- $client->waitForUnit("network.target");
- $clientWithPrivacy->waitForUnit("network.target");
- $router->waitForUnit("network-online.target");
+ client.wait_for_unit("network.target")
+ client_with_privacy.wait_for_unit("network.target")
+ router.wait_for_unit("network-online.target")
- # Wait until we have an ip address
- $clientWithPrivacy->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'");
- $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'");
+ with subtest("Wait until we have an ip address"):
+ client_with_privacy.wait_until_succeeds(
+ "ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'"
+ )
+ client.wait_until_succeeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'")
- # Test vlan 1
- $clientWithPrivacy->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1");
- $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1");
+ with subtest("Test vlan 1"):
+ client_with_privacy.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1")
+ client.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1")
- # Test address used is temporary
- $clientWithPrivacy->waitUntilSucceeds("! ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'");
+ with subtest("Test address used is temporary"):
+ client_with_privacy.wait_until_succeeds(
+ "! ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'"
+ )
- # Test address used is EUI-64
- $client->waitUntilSucceeds("ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'");
+ with subtest("Test address used is EUI-64"):
+ client.wait_until_succeeds(
+ "ip route get fd00:1234:5678:1::1 | grep -q ':[a-f0-9]*ff:fe[a-f0-9]*:'"
+ )
'';
};
routes = {
@@ -591,47 +602,57 @@ let
};
testScript = ''
- my $targetIPv4Table = <<'END';
+ targetIPv4Table = """
10.0.0.0/16 proto static scope link mtu 1500
192.168.1.0/24 proto kernel scope link src 192.168.1.2
192.168.2.0/24 via 192.168.1.1 proto static
- END
+ """.strip()
- my $targetIPv6Table = <<'END';
+ targetIPv6Table = """
2001:1470:fffd:2097::/64 proto kernel metric 256 pref medium
2001:1470:fffd:2098::/64 via fdfd:b3f0::1 proto static metric 1024 pref medium
fdfd:b3f0::/48 proto static metric 1024 pref medium
- END
+ """.strip()
- $machine->start;
- $machine->waitForUnit("network.target");
+ machine.start()
+ machine.wait_for_unit("network.target")
- # test routing tables
- my $ipv4Table = $machine->succeed("ip -4 route list dev eth0 | head -n3");
- my $ipv6Table = $machine->succeed("ip -6 route list dev eth0 | head -n3");
- "$ipv4Table" eq "$targetIPv4Table" or die(
- "The IPv4 routing table does not match the expected one:\n",
- "Result:\n", "$ipv4Table\n",
- "Expected:\n", "$targetIPv4Table\n"
- );
- "$ipv6Table" eq "$targetIPv6Table" or die(
- "The IPv6 routing table does not match the expected one:\n",
- "Result:\n", "$ipv6Table\n",
- "Expected:\n", "$targetIPv6Table\n"
- );
+ with subtest("test routing tables"):
+ ipv4Table = machine.succeed("ip -4 route list dev eth0 | head -n3").strip()
+ ipv6Table = machine.succeed("ip -6 route list dev eth0 | head -n3").strip()
+ assert (
+ ipv4Table == targetIPv4Table
+ ), """
+ The IPv4 routing table does not match the expected one:
+ Result:
+ {}
+ Expected:
+ {}
+ """.format(
+ ipv4Table, targetIPv4Table
+ )
+ assert (
+ ipv6Table == targetIPv6Table
+ ), """
+ The IPv6 routing table does not match the expected one:
+ Result:
+ {}
+ Expected:
+ {}
+ """.format(
+ ipv6Table, targetIPv6Table
+ )
- # test clean-up of the tables
- $machine->succeed("systemctl stop network-addresses-eth0");
- my $ipv4Residue = $machine->succeed("ip -4 route list dev eth0 | head -n-3");
- my $ipv6Residue = $machine->succeed("ip -6 route list dev eth0 | head -n-3");
- $ipv4Residue eq "" or die(
- "The IPv4 routing table has not been properly cleaned:\n",
- "$ipv4Residue\n"
- );
- $ipv6Residue eq "" or die(
- "The IPv6 routing table has not been properly cleaned:\n",
- "$ipv6Residue\n"
- );
+ with subtest("test clean-up of the tables"):
+ machine.succeed("systemctl stop network-addresses-eth0")
+ ipv4Residue = machine.succeed("ip -4 route list dev eth0 | head -n-3").strip()
+ ipv6Residue = machine.succeed("ip -6 route list dev eth0 | head -n-3").strip()
+ assert (
+ ipv4Residue is ""
+ ), "The IPv4 routing table has not been properly cleaned:\n{}".format(ipv4Residue)
+ assert (
+ ipv6Residue is ""
+ ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue)
'';
};
};
diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix
index bfb97ec3f230..75862feb202d 100644
--- a/nixos/tests/nextcloud/basic.nix
+++ b/nixos/tests/nextcloud/basic.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({ pkgs, ...}: let
+import ../make-test-python.nix ({ pkgs, ...}: let
adminpass = "notproduction";
adminuser = "root";
in {
@@ -50,11 +50,15 @@ in {
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}");
+ start_all()
+ nextcloud.wait_for_unit("multi-user.target")
+ nextcloud.succeed("curl -sSf http://nextcloud/login")
+ nextcloud.succeed(
+ "${withRcloneEnv} ${copySharedFile}"
+ )
+ client.wait_for_unit("multi-user.target")
+ client.succeed(
+ "${withRcloneEnv} ${diffSharedFile}"
+ )
'';
})
diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
index aaf37ee4c810..b9ba5888187d 100644
--- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix
+++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({ pkgs, ...}: let
+import ../make-test-python.nix ({ pkgs, ...}: let
adminpass = "hunter2";
adminuser = "root";
in {
@@ -85,13 +85,16 @@ in {
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}");
-
+ start_all()
+ nextcloud.wait_for_unit("multi-user.target")
+ nextcloud.succeed("${configureMemcached}")
+ nextcloud.succeed("curl -sSf http://nextcloud/login")
+ nextcloud.succeed(
+ "${withRcloneEnv} ${copySharedFile}"
+ )
+ client.wait_for_unit("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
index f655aba9d45e..324853350af6 100644
--- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix
+++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({ pkgs, ...}: let
+import ../make-test-python.nix ({ pkgs, ...}: let
adminpass = "hunter2";
adminuser = "custom-admin-username";
in {
@@ -85,12 +85,16 @@ in {
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}");
+ start_all()
+ nextcloud.wait_for_unit("multi-user.target")
+ nextcloud.succeed("${configureRedis}")
+ nextcloud.succeed("curl -sSf http://nextcloud/login")
+ nextcloud.succeed(
+ "${withRcloneEnv} ${copySharedFile}"
+ )
+ client.wait_for_unit("multi-user.target")
+ client.succeed(
+ "${withRcloneEnv} ${diffSharedFile}"
+ )
'';
})
diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix
index 783c9f5c019f..1ec5c40476a6 100644
--- a/nixos/tests/nexus.nix
+++ b/nixos/tests/nexus.nix
@@ -3,7 +3,7 @@
# 2. nexus service can startup on server (creating database and all other initial stuff)
# 3. the web application is reachable via HTTP
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "nexus";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ironpinguin ma27 ];
@@ -22,11 +22,11 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ start_all()
- $server->waitForUnit("nexus");
- $server->waitForOpenPort(8081);
+ server.wait_for_unit("nexus")
+ server.wait_for_open_port(8081)
- $server->succeed("curl -f 127.0.0.1:8081");
+ server.succeed("curl -f 127.0.0.1:8081")
'';
})
diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix
deleted file mode 100644
index 2f655336e757..000000000000
--- a/nixos/tests/nfs.nix
+++ /dev/null
@@ -1,90 +0,0 @@
-import ./make-test.nix ({ pkgs, version ? 4, ... }:
-
-let
-
- client =
- { pkgs, ... }:
- { fileSystems = pkgs.lib.mkVMOverride
- [ { mountPoint = "/data";
- # nfs4 exports the export with fsid=0 as a virtual root directory
- device = if (version == 4) then "server:/" else "server:/data";
- fsType = "nfs";
- options = [ "vers=${toString version}" ];
- }
- ];
- networking.firewall.enable = false; # FIXME: only open statd
- };
-
-in
-
-{
- name = "nfs";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco ];
- };
-
- nodes =
- { client1 = client;
- client2 = client;
-
- server =
- { ... }:
- { services.nfs.server.enable = true;
- services.nfs.server.exports =
- ''
- /data 192.168.1.0/255.255.255.0(rw,no_root_squash,no_subtree_check,fsid=0)
- '';
- services.nfs.server.createMountPoints = true;
- networking.firewall.enable = false; # FIXME: figure out what ports need to be allowed
- };
- };
-
- testScript =
- ''
- $server->waitForUnit("nfs-server");
- $server->succeed("systemctl start network-online.target");
- $server->waitForUnit("network-online.target");
-
- startAll;
-
- $client1->waitForUnit("data.mount");
- $client1->succeed("echo bla > /data/foo");
- $server->succeed("test -e /data/foo");
-
- $client2->waitForUnit("data.mount");
- $client2->succeed("echo bla > /data/bar");
- $server->succeed("test -e /data/bar");
-
- # Test whether restarting ‘nfs-server’ works correctly.
- $server->succeed("systemctl restart nfs-server");
- $client2->succeed("echo bla >> /data/bar"); # will take 90 seconds due to the NFS grace period
-
- # Test whether we can get a lock.
- $client2->succeed("time flock -n -s /data/lock true");
-
- # Test locking: client 1 acquires an exclusive lock, so client 2
- # should then fail to acquire a shared lock.
- $client1->succeed("flock -x /data/lock -c 'touch locked; sleep 100000' &");
- $client1->waitForFile("locked");
- $client2->fail("flock -n -s /data/lock true");
-
- # Test whether client 2 obtains the lock if we reset client 1.
- $client2->succeed("flock -x /data/lock -c 'echo acquired; touch locked; sleep 100000' >&2 &");
- $client1->crash;
- $client1->start;
- $client2->waitForFile("locked");
-
- # Test whether locks survive a reboot of the server.
- $client1->waitForUnit("data.mount");
- $server->shutdown;
- $server->start;
- $client1->succeed("touch /data/xyzzy");
- $client1->fail("time flock -n -s /data/lock true");
-
- # Test whether unmounting during shutdown happens quickly.
- my $t1 = time;
- $client1->shutdown;
- my $duration = time - $t1;
- die "shutdown took too long ($duration seconds)" if $duration > 30;
- '';
-})
diff --git a/nixos/tests/nfs/default.nix b/nixos/tests/nfs/default.nix
new file mode 100644
index 000000000000..6bc803c91b46
--- /dev/null
+++ b/nixos/tests/nfs/default.nix
@@ -0,0 +1,9 @@
+{ version ? 4
+, system ? builtins.currentSystem
+, pkgs ? import ../../.. { inherit system; }
+}: {
+ simple = import ./simple.nix { inherit version system pkgs; };
+} // pkgs.lib.optionalAttrs (version == 4) {
+ # TODO: Test kerberos + nfsv3
+ kerberos = import ./kerberos.nix { inherit version system pkgs; };
+}
diff --git a/nixos/tests/nfs/kerberos.nix b/nixos/tests/nfs/kerberos.nix
new file mode 100644
index 000000000000..1f2d0d453ea0
--- /dev/null
+++ b/nixos/tests/nfs/kerberos.nix
@@ -0,0 +1,133 @@
+import ../make-test-python.nix ({ pkgs, lib, ... }:
+
+with lib;
+
+let
+ krb5 =
+ { enable = true;
+ domain_realm."nfs.test" = "NFS.TEST";
+ libdefaults.default_realm = "NFS.TEST";
+ realms."NFS.TEST" =
+ { admin_server = "server.nfs.test";
+ kdc = "server.nfs.test";
+ };
+ };
+
+ hosts =
+ ''
+ 192.168.1.1 client.nfs.test
+ 192.168.1.2 server.nfs.test
+ '';
+
+ users = {
+ users.alice = {
+ isNormalUser = true;
+ name = "alice";
+ uid = 1000;
+ };
+ };
+
+in
+
+{
+ name = "nfsv4-with-kerberos";
+
+ nodes = {
+ client = { lib, ... }:
+ { inherit krb5 users;
+
+ networking.extraHosts = hosts;
+ networking.domain = "nfs.test";
+ networking.hostName = "client";
+
+ fileSystems = lib.mkVMOverride
+ { "/data" = {
+ device = "server.nfs.test:/";
+ fsType = "nfs";
+ options = [ "nfsvers=4" "sec=krb5p" "noauto" ];
+ };
+ };
+ };
+
+ server = { lib, ...}:
+ { inherit krb5 users;
+
+ networking.extraHosts = hosts;
+ networking.domain = "nfs.test";
+ networking.hostName = "server";
+
+ networking.firewall.allowedTCPPorts = [
+ 111 # rpc
+ 2049 # nfs
+ 88 # kerberos
+ 749 # kerberos admin
+ ];
+
+ services.kerberos_server.enable = true;
+ services.kerberos_server.realms =
+ { "NFS.TEST".acl =
+ [ { access = "all"; principal = "admin/admin"; } ];
+ };
+
+ services.nfs.server.enable = true;
+ services.nfs.server.createMountPoints = true;
+ services.nfs.server.exports =
+ ''
+ /data *(rw,no_root_squash,fsid=0,sec=krb5p)
+ '';
+ };
+ };
+
+ testScript =
+ ''
+ server.succeed("mkdir -p /data/alice")
+ server.succeed("chown alice:users /data/alice")
+
+ # set up kerberos database
+ server.succeed(
+ "kdb5_util create -s -r NFS.TEST -P master_key",
+ "systemctl restart kadmind.service kdc.service",
+ )
+ server.wait_for_unit(f"kadmind.service")
+ server.wait_for_unit(f"kdc.service")
+
+ # create principals
+ server.succeed(
+ "kadmin.local add_principal -randkey nfs/server.nfs.test",
+ "kadmin.local add_principal -randkey nfs/client.nfs.test",
+ "kadmin.local add_principal -pw admin_pw admin/admin",
+ "kadmin.local add_principal -pw alice_pw alice",
+ )
+
+ # add principals to server keytab
+ server.succeed("kadmin.local ktadd nfs/server.nfs.test")
+ server.succeed("systemctl start rpc-gssd.service rpc-svcgssd.service")
+ server.wait_for_unit(f"rpc-gssd.service")
+ server.wait_for_unit(f"rpc-svcgssd.service")
+
+ client.wait_for_unit("network-online.target")
+
+ # add principals to client keytab
+ client.succeed("echo admin_pw | kadmin -p admin/admin ktadd nfs/client.nfs.test")
+ client.succeed("systemctl start rpc-gssd.service")
+ client.wait_for_unit("rpc-gssd.service")
+
+ with subtest("nfs share mounts"):
+ client.succeed("systemctl restart data.mount")
+ client.wait_for_unit("data.mount")
+
+ with subtest("permissions on nfs share are enforced"):
+ client.fail("su alice -c 'ls /data'")
+ client.succeed("su alice -c 'echo alice_pw | kinit'")
+ client.succeed("su alice -c 'ls /data'")
+
+ client.fail("su alice -c 'echo bla >> /data/foo'")
+ client.succeed("su alice -c 'echo bla >> /data/alice/foo'")
+ server.succeed("test -e /data/alice/foo")
+
+ with subtest("uids/gids are mapped correctly on nfs share"):
+ ids = client.succeed("stat -c '%U %G' /data/alice").split()
+ expected = ["alice", "users"]
+ assert ids == expected, f"ids incorrect: got {ids} expected {expected}"
+ '';
+})
diff --git a/nixos/tests/nfs/simple.nix b/nixos/tests/nfs/simple.nix
new file mode 100644
index 000000000000..a1a09ee0f45c
--- /dev/null
+++ b/nixos/tests/nfs/simple.nix
@@ -0,0 +1,94 @@
+import ../make-test-python.nix ({ pkgs, version ? 4, ... }:
+
+let
+
+ client =
+ { pkgs, ... }:
+ { fileSystems = pkgs.lib.mkVMOverride
+ [ { mountPoint = "/data";
+ # nfs4 exports the export with fsid=0 as a virtual root directory
+ device = if (version == 4) then "server:/" else "server:/data";
+ fsType = "nfs";
+ options = [ "vers=${toString version}" ];
+ }
+ ];
+ networking.firewall.enable = false; # FIXME: only open statd
+ };
+
+in
+
+{
+ name = "nfs";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ eelco ];
+ };
+
+ nodes =
+ { client1 = client;
+ client2 = client;
+
+ server =
+ { ... }:
+ { services.nfs.server.enable = true;
+ services.nfs.server.exports =
+ ''
+ /data 192.168.1.0/255.255.255.0(rw,no_root_squash,no_subtree_check,fsid=0)
+ '';
+ services.nfs.server.createMountPoints = true;
+ networking.firewall.enable = false; # FIXME: figure out what ports need to be allowed
+ };
+ };
+
+ testScript =
+ ''
+ import time
+
+ server.wait_for_unit("nfs-server")
+ server.succeed("systemctl start network-online.target")
+ server.wait_for_unit("network-online.target")
+
+ start_all()
+
+ client1.wait_for_unit("data.mount")
+ client1.succeed("echo bla > /data/foo")
+ server.succeed("test -e /data/foo")
+
+ client2.wait_for_unit("data.mount")
+ client2.succeed("echo bla > /data/bar")
+ server.succeed("test -e /data/bar")
+
+ with subtest("restarting 'nfs-server' works correctly"):
+ server.succeed("systemctl restart nfs-server")
+ # will take 90 seconds due to the NFS grace period
+ client2.succeed("echo bla >> /data/bar")
+
+ with subtest("can get a lock"):
+ client2.succeed("time flock -n -s /data/lock true")
+
+ with subtest("client 2 fails to acquire lock held by client 1"):
+ client1.succeed("flock -x /data/lock -c 'touch locked; sleep 100000' &")
+ client1.wait_for_file("locked")
+ client2.fail("flock -n -s /data/lock true")
+
+ with subtest("client 2 obtains lock after resetting client 1"):
+ client2.succeed(
+ "flock -x /data/lock -c 'echo acquired; touch locked; sleep 100000' >&2 &"
+ )
+ client1.crash()
+ client1.start()
+ client2.wait_for_file("locked")
+
+ with subtest("locks survive server reboot"):
+ client1.wait_for_unit("data.mount")
+ server.shutdown()
+ server.start()
+ client1.succeed("touch /data/xyzzy")
+ client1.fail("time flock -n -s /data/lock true")
+
+ with subtest("unmounting during shutdown happens quickly"):
+ t1 = time.monotonic()
+ client1.shutdown()
+ duration = time.monotonic() - t1
+ assert duration < 30, f"shutdown took too long ({duration} seconds)"
+ '';
+})
diff --git a/nixos/tests/nghttpx.nix b/nixos/tests/nghttpx.nix
index 11611bfe1063..d83c1c4cae63 100644
--- a/nixos/tests/nghttpx.nix
+++ b/nixos/tests/nghttpx.nix
@@ -1,7 +1,7 @@
let
nginxRoot = "/run/nginx";
in
- import ./make-test.nix ({...}: {
+ import ./make-test-python.nix ({...}: {
name = "nghttpx";
nodes = {
webserver = {
@@ -52,10 +52,10 @@ in
};
testScript = ''
- startAll;
+ start_all()
- $webserver->waitForOpenPort("80");
- $proxy->waitForOpenPort("80");
- $client->waitUntilSucceeds("curl -s --fail http://proxy/hello-world.txt");
+ webserver.wait_for_open_port("80")
+ proxy.wait_for_open_port("80")
+ client.wait_until_succeeds("curl -s --fail http://proxy/hello-world.txt")
'';
})
diff --git a/nixos/tests/nix-ssh-serve.nix b/nixos/tests/nix-ssh-serve.nix
index 494d55121eb1..03f83542c7c1 100644
--- a/nixos/tests/nix-ssh-serve.nix
+++ b/nixos/tests/nix-ssh-serve.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
let inherit (import ./ssh-keys.nix pkgs)
snakeOilPrivateKey snakeOilPublicKey;
ssh-config = builtins.toFile "ssh.conf" ''
@@ -18,22 +18,28 @@ in
client.nix.package = pkgs.nix;
};
testScript = ''
- startAll;
+ start_all()
- $client->succeed("mkdir -m 700 /root/.ssh");
- $client->copyFileFromHost("${ssh-config}", "/root/.ssh/config");
- $client->succeed("cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa");
- $client->succeed("chmod 600 /root/.ssh/id_ecdsa");
+ client.succeed("mkdir -m 700 /root/.ssh")
+ client.succeed(
+ "cat ${ssh-config} > /root/.ssh/config"
+ )
+ client.succeed(
+ "cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa"
+ )
+ client.succeed("chmod 600 /root/.ssh/id_ecdsa")
- $client->succeed("nix-store --add /etc/machine-id > mach-id-path");
+ client.succeed("nix-store --add /etc/machine-id > mach-id-path")
- $server->waitForUnit("sshd");
+ server.wait_for_unit("sshd")
- $client->fail("diff /root/other-store\$(cat mach-id-path) /etc/machine-id");
+ client.fail("diff /root/other-store$(cat mach-id-path) /etc/machine-id")
# Currently due to shared store this is a noop :(
- $client->succeed("nix copy --to ssh-ng://nix-ssh\@server \$(cat mach-id-path)");
- $client->succeed("nix-store --realise \$(cat mach-id-path) --store /root/other-store --substituters ssh-ng://nix-ssh\@server");
- $client->succeed("diff /root/other-store\$(cat mach-id-path) /etc/machine-id");
+ client.succeed("nix copy --to ssh-ng://nix-ssh@server $(cat mach-id-path)")
+ client.succeed(
+ "nix-store --realise $(cat mach-id-path) --store /root/other-store --substituters ssh-ng://nix-ssh@server"
+ )
+ client.succeed("diff /root/other-store$(cat mach-id-path) /etc/machine-id")
'';
}
)
diff --git a/nixos/tests/nixos-generate-config.nix b/nixos/tests/nixos-generate-config.nix
index 15a173e024b4..6c83ccecc70a 100644
--- a/nixos/tests/nixos-generate-config.nix
+++ b/nixos/tests/nixos-generate-config.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ... } : {
+import ./make-test-python.nix ({ lib, ... } : {
name = "nixos-generate-config";
meta.maintainers = with lib.maintainers; [ basvandijk ];
machine = {
@@ -11,14 +11,16 @@ import ./make-test.nix ({ lib, ... } : {
'';
};
testScript = ''
- startAll;
- $machine->waitForUnit("multi-user.target");
- $machine->succeed("nixos-generate-config");
+ start_all()
+ machine.wait_for_unit("multi-user.target")
+ machine.succeed("nixos-generate-config")
# Test if the configuration really is overridden
- $machine->succeed("grep 'OVERRIDDEN' /etc/nixos/configuration.nix");
+ machine.succeed("grep 'OVERRIDDEN' /etc/nixos/configuration.nix")
# Test of if the Perl variable $bootLoaderConfig is spliced correctly:
- $machine->succeed("grep 'boot\\.loader\\.grub\\.enable = true;' /etc/nixos/configuration.nix");
+ machine.succeed(
+ "grep 'boot\\.loader\\.grub\\.enable = true;' /etc/nixos/configuration.nix"
+ )
'';
})
diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix
index 4eb60c0feb5c..940210dee235 100644
--- a/nixos/tests/novacomd.nix
+++ b/nixos/tests/novacomd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "novacomd";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ dtzWill ];
@@ -9,26 +9,20 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- $machine->waitForUnit("multi-user.target");
+ machine.wait_for_unit("novacomd.service")
- # multi-user.target wants novacomd.service, but let's make sure
- $machine->waitForUnit("novacomd.service");
+ with subtest("Make sure the daemon is really listening"):
+ machine.wait_for_open_port(6968)
+ machine.succeed("novacom -l")
- # Check status and try connecting with novacom
- $machine->succeed("systemctl status novacomd.service >&2");
- # to prevent non-deterministic failure,
- # make sure the daemon is really listening
- $machine->waitForOpenPort(6968);
- $machine->succeed("novacom -l");
+ with subtest("Stop the daemon, double-check novacom fails if daemon isn't working"):
+ machine.stop_job("novacomd")
+ machine.fail("novacom -l")
- # Stop the daemon, double-check novacom fails if daemon isn't working
- $machine->stopJob("novacomd");
- $machine->fail("novacom -l");
-
- # And back again for good measure
- $machine->startJob("novacomd");
- # make sure the daemon is really listening
- $machine->waitForOpenPort(6968);
- $machine->succeed("novacom -l");
+ with subtest("Make sure the daemon starts back up again"):
+ machine.start_job("novacomd")
+ # make sure the daemon is really listening
+ machine.wait_for_open_port(6968)
+ machine.succeed("novacom -l")
'';
})
diff --git a/nixos/tests/nzbget.nix b/nixos/tests/nzbget.nix
index 042ccec98cf6..12d8ed6ea8da 100644
--- a/nixos/tests/nzbget.nix
+++ b/nixos/tests/nzbget.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "nzbget";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aanderse flokli ];
@@ -15,12 +15,16 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ start_all()
- $server->waitForUnit("nzbget.service");
- $server->waitForUnit("network.target");
- $server->waitForOpenPort(6789);
- $server->succeed("curl -s -u nzbget:tegbzn6789 http://127.0.0.1:6789 | grep -q 'This file is part of nzbget'");
- $server->succeed("${pkgs.nzbget}/bin/nzbget -n -o ControlIP=127.0.0.1 -o ControlPort=6789 -o ControlPassword=tegbzn6789 -V");
+ server.wait_for_unit("nzbget.service")
+ server.wait_for_unit("network.target")
+ server.wait_for_open_port(6789)
+ assert "This file is part of nzbget" in server.succeed(
+ "curl -s -u nzbget:tegbzn6789 http://127.0.0.1:6789"
+ )
+ server.succeed(
+ "${pkgs.nzbget}/bin/nzbget -n -o Control_iP=127.0.0.1 -o Control_port=6789 -o Control_password=tegbzn6789 -V"
+ )
'';
})
diff --git a/nixos/tests/openarena.nix b/nixos/tests/openarena.nix
index 4cc4db229637..b315426532ba 100644
--- a/nixos/tests/openarena.nix
+++ b/nixos/tests/openarena.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "openarena";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ tomfitzhenry ];
@@ -23,14 +23,19 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- $machine->waitForUnit("openarena.service");
- $machine->waitUntilSucceeds("ss --numeric --udp --listening | grep -q 27960");
+ machine.wait_for_unit("openarena.service")
+ machine.wait_until_succeeds("ss --numeric --udp --listening | grep -q 27960")
# The log line containing 'resolve address' is last and only message that occurs after
# the server starts accepting clients.
- $machine->waitUntilSucceeds("journalctl -u openarena.service | grep 'resolve address: dpmaster.deathmask.net'");
+ machine.wait_until_succeeds(
+ "journalctl -u openarena.service | grep 'resolve address: dpmaster.deathmask.net'"
+ )
# Check it's possible to join the server.
- $machine->succeed("echo -n -e '\\xff\\xff\\xff\\xffgetchallenge' | socat - UDP4-DATAGRAM:127.0.0.1:27960 | grep -q challengeResponse");
+ # Can't use substring match instead of grep because the output is not utf-8
+ machine.succeed(
+ "echo -n -e '\\xff\\xff\\xff\\xffgetchallenge' | socat - UDP4-DATAGRAM:127.0.0.1:27960 | grep -q challengeResponse"
+ )
'';
})
diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix
index 3ef90e183479..f8321a2c522d 100644
--- a/nixos/tests/openldap.nix
+++ b/nixos/tests/openldap.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix {
+import ./make-test-python.nix {
name = "openldap";
machine = { pkgs, ... }: {
@@ -24,8 +24,10 @@ import ./make-test.nix {
};
testScript = ''
- $machine->waitForUnit('openldap.service');
- $machine->succeed('systemctl status openldap.service');
- $machine->succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"');
+ machine.wait_for_unit("openldap.service")
+ machine.succeed(
+ "systemctl status openldap.service",
+ 'ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"',
+ )
'';
}
diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
index 883ad7604941..e6f52db1d984 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixos/tests/opensmtpd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix {
+import ./make-test-python.nix {
name = "opensmtpd";
nodes = {
@@ -102,23 +102,23 @@ import ./make-test.nix {
};
testScript = ''
- startAll;
+ start_all()
- $client->waitForUnit("network-online.target");
- $smtp1->waitForUnit('opensmtpd');
- $smtp2->waitForUnit('opensmtpd');
- $smtp2->waitForUnit('dovecot2');
+ client.wait_for_unit("network-online.target")
+ smtp1.wait_for_unit("opensmtpd")
+ smtp2.wait_for_unit("opensmtpd")
+ smtp2.wait_for_unit("dovecot2")
# To prevent sporadic failures during daemon startup, make sure
# services are listening on their ports before sending requests
- $smtp1->waitForOpenPort(25);
- $smtp2->waitForOpenPort(25);
- $smtp2->waitForOpenPort(143);
+ smtp1.wait_for_open_port(25)
+ smtp2.wait_for_open_port(25)
+ smtp2.wait_for_open_port(143)
- $client->succeed('send-a-test-mail');
- $smtp1->waitUntilFails('smtpctl show queue | egrep .');
- $smtp2->waitUntilFails('smtpctl show queue | egrep .');
- $client->succeed('check-mail-landed >&2');
+ client.succeed("send-a-test-mail")
+ smtp1.wait_until_fails("smtpctl show queue | egrep .")
+ smtp2.wait_until_fails("smtpctl show queue | egrep .")
+ client.succeed("check-mail-landed >&2")
'';
meta.timeout = 30;
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 8b9e2170f150..e9692b503272 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
let inherit (import ./ssh-keys.nix pkgs)
snakeOilPrivateKey snakeOilPublicKey;
@@ -58,47 +58,55 @@ in {
};
testScript = ''
- startAll;
+ start_all()
- my $key=`${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f key -N ""`;
+ server.wait_for_unit("sshd")
- $server->waitForUnit("sshd");
+ with subtest("manual-authkey"):
+ client.succeed("mkdir -m 700 /root/.ssh")
+ client.succeed(
+ '${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f /root/.ssh/id_ed25519 -N ""'
+ )
+ public_key = client.succeed(
+ "${pkgs.openssh}/bin/ssh-keygen -y -f /root/.ssh/id_ed25519"
+ )
+ public_key = public_key.strip()
+ client.succeed("chmod 600 /root/.ssh/id_ed25519")
- subtest "manual-authkey", sub {
- $server->succeed("mkdir -m 700 /root/.ssh");
- $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
- $server_lazy->succeed("mkdir -m 700 /root/.ssh");
- $server_lazy->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
+ server.succeed("mkdir -m 700 /root/.ssh")
+ server.succeed("echo '{}' > /root/.ssh/authorized_keys".format(public_key))
+ server_lazy.succeed("mkdir -m 700 /root/.ssh")
+ server_lazy.succeed("echo '{}' > /root/.ssh/authorized_keys".format(public_key))
- $client->succeed("mkdir -m 700 /root/.ssh");
- $client->copyFileFromHost("key", "/root/.ssh/id_ed25519");
- $client->succeed("chmod 600 /root/.ssh/id_ed25519");
+ client.wait_for_unit("network.target")
+ client.succeed(
+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2"
+ )
+ client.succeed(
+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024"
+ )
- $client->waitForUnit("network.target");
- $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2");
- $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024");
+ client.succeed(
+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2"
+ )
+ client.succeed(
+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024"
+ )
- $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2");
- $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024");
+ with subtest("configured-authkey"):
+ client.succeed(
+ "cat ${snakeOilPrivateKey} > privkey.snakeoil"
+ )
+ client.succeed("chmod 600 privkey.snakeoil")
+ client.succeed(
+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true"
+ )
+ client.succeed(
+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true"
+ )
- };
-
- subtest "configured-authkey", sub {
- $client->succeed("cat ${snakeOilPrivateKey} > privkey.snakeoil");
- $client->succeed("chmod 600 privkey.snakeoil");
- $client->succeed("ssh -o UserKnownHostsFile=/dev/null" .
- " -o StrictHostKeyChecking=no -i privkey.snakeoil" .
- " server true");
-
- $client->succeed("ssh -o UserKnownHostsFile=/dev/null" .
- " -o StrictHostKeyChecking=no -i privkey.snakeoil" .
- " server_lazy true");
-
- };
-
- subtest "localhost-only", sub {
- $server_localhost_only->succeed("ss -nlt | grep '127.0.0.1:22'");
- $server_localhost_only_lazy->succeed("ss -nlt | grep '127.0.0.1:22'");
- }
+ with subtest("localhost-only"):
+ server_localhost_only.succeed("ss -nlt | grep '127.0.0.1:22'")
+ server_localhost_only_lazy.succeed("ss -nlt | grep '127.0.0.1:22'")
'';
})
diff --git a/nixos/tests/orangefs.nix b/nixos/tests/orangefs.nix
index bdf4fc10c447..46d7a6a72f89 100644
--- a/nixos/tests/orangefs.nix
+++ b/nixos/tests/orangefs.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ ... } :
+import ./make-test-python.nix ({ ... } :
let
server = { pkgs, ... } : {
@@ -52,37 +52,31 @@ in {
testScript = ''
# format storage
- foreach my $server (($server1,$server2))
- {
- $server->start();
- $server->waitForUnit("multi-user.target");
- $server->succeed("mkdir -p /data/storage /data/meta");
- $server->succeed("chown orangefs:orangefs /data/storage /data/meta");
- $server->succeed("chmod 0770 /data/storage /data/meta");
- $server->succeed("sudo -g orangefs -u orangefs pvfs2-server -f /etc/orangefs/server.conf");
- }
+ for server in server1, server2:
+ server.start()
+ server.wait_for_unit("multi-user.target")
+ server.succeed("mkdir -p /data/storage /data/meta")
+ server.succeed("chown orangefs:orangefs /data/storage /data/meta")
+ server.succeed("chmod 0770 /data/storage /data/meta")
+ server.succeed(
+ "sudo -g orangefs -u orangefs pvfs2-server -f /etc/orangefs/server.conf"
+ )
# start services after storage is formated on all machines
- foreach my $server (($server1,$server2))
- {
- $server->succeed("systemctl start orangefs-server.service");
- }
+ for server in server1, server2:
+ server.succeed("systemctl start orangefs-server.service")
- # Check if clients can reach and mount the FS
- foreach my $client (($client1,$client2))
- {
- $client->start();
- $client->waitForUnit("orangefs-client.service");
- # Both servers need to be reachable
- $client->succeed("pvfs2-check-server -h server1 -f orangefs -n tcp -p 3334");
- $client->succeed("pvfs2-check-server -h server2 -f orangefs -n tcp -p 3334");
- $client->waitForUnit("orangefs.mount");
-
- }
-
- # R/W test between clients
- $client1->succeed("echo test > /orangefs/file1");
- $client2->succeed("grep test /orangefs/file1");
+ with subtest("clients can reach and mount the FS"):
+ for client in client1, client2:
+ client.start()
+ client.wait_for_unit("orangefs-client.service")
+ # Both servers need to be reachable
+ client.succeed("pvfs2-check-server -h server1 -f orangefs -n tcp -p 3334")
+ client.succeed("pvfs2-check-server -h server2 -f orangefs -n tcp -p 3334")
+ client.wait_for_unit("orangefs.mount")
+ with subtest("R/W test between clients"):
+ client1.succeed("echo test > /orangefs/file1")
+ client2.succeed("grep test /orangefs/file1")
'';
})
diff --git a/nixos/tests/osquery.nix b/nixos/tests/osquery.nix
deleted file mode 100644
index d95871ffafc6..000000000000
--- a/nixos/tests/osquery.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
-
-with lib;
-
-{
- name = "osquery";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ ma27 ];
- };
-
- machine = {
- services.osquery.enable = true;
- services.osquery.loggerPath = "/var/log/osquery/logs";
- services.osquery.pidfile = "/run/osqueryd.pid";
- };
-
- testScript = ''
- $machine->start;
- $machine->waitForUnit("osqueryd.service");
-
- $machine->succeed("echo 'SELECT address FROM etc_hosts LIMIT 1;' | osqueryi | grep '127.0.0.1'");
- $machine->succeed(
- "echo 'SELECT value FROM osquery_flags WHERE name = \"logger_path\";' | osqueryi | grep /var/log/osquery/logs"
- );
-
- $machine->succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"pidfile\";' | osqueryi | grep /run/osqueryd.pid");
- '';
-})
diff --git a/nixos/tests/osrm-backend.nix b/nixos/tests/osrm-backend.nix
index 6e2d098d4adb..db67a5a589f9 100644
--- a/nixos/tests/osrm-backend.nix
+++ b/nixos/tests/osrm-backend.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
let
port = 5000;
in {
@@ -45,9 +45,13 @@ in {
testScript = let
query = "http://localhost:${toString port}/route/v1/driving/7.41720,43.73304;7.42463,43.73886?steps=true";
in ''
- $machine->waitForUnit("osrm.service");
- $machine->waitForOpenPort(${toString port});
- $machine->succeed("curl --silent '${query}' | jq .waypoints[0].name | grep -F 'Boulevard Rainier III'");
- $machine->succeed("curl --silent '${query}' | jq .waypoints[1].name | grep -F 'Avenue de la Costa'");
+ machine.wait_for_unit("osrm.service")
+ machine.wait_for_open_port(${toString port})
+ assert "Boulevard Rainier III" in machine.succeed(
+ "curl --silent '${query}' | jq .waypoints[0].name"
+ )
+ assert "Avenue de la Costa" in machine.succeed(
+ "curl --silent '${query}' | jq .waypoints[1].name"
+ )
'';
})
diff --git a/nixos/tests/ostree.nix b/nixos/tests/ostree.nix
deleted file mode 100644
index d7ad84a1a5f0..000000000000
--- a/nixos/tests/ostree.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, lib, ... }: {
- name = "ostree";
-
- meta = {
- maintainers = pkgs.ostree.meta.maintainers;
- };
-
- # TODO: Wrap/patch the tests directly in the package
- machine = { pkgs, ... }: {
- environment.systemPackages = with pkgs; [
- gnome-desktop-testing ostree gnupg (python3.withPackages (p: with p; [ pyyaml ]))
- ];
-
- environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk-pixbuf atk ]); # for GJS tests
- };
-
- testScript = ''
- $machine->succeed("gnome-desktop-testing-runner -d ${pkgs.ostree.installedTests}/share");
- '';
-})
diff --git a/nixos/tests/overlayfs.nix b/nixos/tests/overlayfs.nix
index 99bb6b0f5531..33794deb9ed8 100644
--- a/nixos/tests/overlayfs.nix
+++ b/nixos/tests/overlayfs.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "overlayfs";
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ bachp ];
@@ -9,49 +9,42 @@ import ./make-test.nix ({ pkgs, ... }: {
};
testScript = ''
- $machine->succeed("ls /dev");
+ machine.succeed("ls /dev")
- $machine->succeed("mkdir -p /tmp/mnt");
+ machine.succeed("mkdir -p /tmp/mnt")
# Test ext4 + overlayfs
- $machine->succeed(
-
- "mkfs.ext4 -F -L overlay-ext4 /dev/vdb",
- "mount -t ext4 /dev/vdb /tmp/mnt",
-
- "mkdir -p /tmp/mnt/upper /tmp/mnt/lower /tmp/mnt/work /tmp/mnt/merged",
-
- # Setup some existing files
- "echo 'Replace' > /tmp/mnt/lower/replace.txt",
- "echo 'Append' > /tmp/mnt/lower/append.txt",
- "echo 'Overwrite' > /tmp/mnt/lower/overwrite.txt",
-
- "mount -t overlay overlay -o lowerdir=/tmp/mnt/lower,upperdir=/tmp/mnt/upper,workdir=/tmp/mnt/work /tmp/mnt/merged",
-
- # Test new
- "echo 'New' > /tmp/mnt/merged/new.txt",
- "[[ \"\$(cat /tmp/mnt/merged/new.txt)\" == \"New\" ]]",
-
- # Test replace
- "[[ \"\$(cat /tmp/mnt/merged/replace.txt)\" == \"Replace\" ]]",
- "echo 'Replaced' > /tmp/mnt/merged/replace-tmp.txt",
- "mv /tmp/mnt/merged/replace-tmp.txt /tmp/mnt/merged/replace.txt",
- "[[ \"\$(cat /tmp/mnt/merged/replace.txt)\" == \"Replaced\" ]]",
-
- # Overwrite
- "[[ \"\$(cat /tmp/mnt/merged/overwrite.txt)\" == \"Overwrite\" ]]",
- "echo 'Overwritten' > /tmp/mnt/merged/overwrite.txt",
- "[[ \"\$(cat /tmp/mnt/merged/overwrite.txt)\" == \"Overwritten\" ]]",
-
- # Test append
- "[[ \"\$(cat /tmp/mnt/merged/append.txt)\" == \"Append\" ]]",
- "echo 'ed' >> /tmp/mnt/merged/append.txt",
- #"cat /tmp/mnt/merged/append.txt && exit 1",
- "[[ \"\$(cat /tmp/mnt/merged/append.txt)\" == \"Append\ned\" ]]",
-
- "umount /tmp/mnt/merged",
- "umount /tmp/mnt",
- "udevadm settle"
- );
+ machine.succeed(
+ """
+ mkfs.ext4 -F -L overlay-ext4 /dev/vdb
+ mount -t ext4 /dev/vdb /tmp/mnt
+ mkdir -p /tmp/mnt/upper /tmp/mnt/lower /tmp/mnt/work /tmp/mnt/merged
+ # Setup some existing files
+ echo 'Replace' > /tmp/mnt/lower/replace.txt
+ echo 'Append' > /tmp/mnt/lower/append.txt
+ echo 'Overwrite' > /tmp/mnt/lower/overwrite.txt
+ mount -t overlay overlay -o lowerdir=/tmp/mnt/lower,upperdir=/tmp/mnt/upper,workdir=/tmp/mnt/work /tmp/mnt/merged
+ # Test new
+ echo 'New' > /tmp/mnt/merged/new.txt
+ [[ "\$(cat /tmp/mnt/merged/new.txt)" == "New" ]]
+ # Test replace
+ [[ "\$(cat /tmp/mnt/merged/replace.txt)" == "Replace" ]]
+ echo 'Replaced' > /tmp/mnt/merged/replace-tmp.txt
+ mv /tmp/mnt/merged/replace-tmp.txt /tmp/mnt/merged/replace.txt
+ [[ "\$(cat /tmp/mnt/merged/replace.txt)" == "Replaced" ]]
+ # Overwrite
+ [[ "\$(cat /tmp/mnt/merged/overwrite.txt)" == "Overwrite" ]]
+ echo 'Overwritten' > /tmp/mnt/merged/overwrite.txt
+ [[ "\$(cat /tmp/mnt/merged/overwrite.txt)" == "Overwritten" ]]
+ # Test append
+ [[ "\$(cat /tmp/mnt/merged/append.txt)" == "Append" ]]
+ echo 'ed' >> /tmp/mnt/merged/append.txt
+ #"cat /tmp/mnt/merged/append.txt && exit 1
+ [[ "\$(cat /tmp/mnt/merged/append.txt)" == "Append\ned" ]]
+ umount /tmp/mnt/merged
+ umount /tmp/mnt
+ udevadm settle
+ """
+ )
'';
})
diff --git a/nixos/tests/packagekit.nix b/nixos/tests/packagekit.nix
index e2d68af661f8..7e93ad35e80a 100644
--- a/nixos/tests/packagekit.nix
+++ b/nixos/tests/packagekit.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "packagekit";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ peterhoeg ];
@@ -13,12 +13,14 @@ import ./make-test.nix ({ pkgs, ... }: {
};
testScript = ''
- startAll;
+ start_all()
# send a dbus message to activate the service
- $machine->succeed("dbus-send --system --type=method_call --print-reply --dest=org.freedesktop.PackageKit /org/freedesktop/PackageKit org.freedesktop.DBus.Introspectable.Introspect");
+ machine.succeed(
+ "dbus-send --system --type=method_call --print-reply --dest=org.freedesktop.PackageKit /org/freedesktop/PackageKit org.freedesktop.DBus.Introspectable.Introspect"
+ )
# so now it should be running
- $machine->succeed("systemctl is-active packagekit.service");
+ machine.wait_for_unit("packagekit.service")
'';
})
diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix
index b9d489950e72..6d48199eda97 100644
--- a/nixos/tests/pam-oath-login.nix
+++ b/nixos/tests/pam-oath-login.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ ... }:
+import ./make-test-python.nix ({ ... }:
let
oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3";
@@ -55,70 +55,54 @@ in
};
};
- testScript =
- ''
- $machine->waitForUnit('multi-user.target');
- $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty1'");
- $machine->screenshot("postboot");
+ testScript = ''
+ def switch_to_tty(tty_number):
+ machine.fail(f"pgrep -f 'agetty.*tty{tty_number}'")
+ machine.send_key(f"alt-f{tty_number}")
+ machine.wait_until_succeeds(f"[ $(fgconsole) = {tty_number} ]")
+ machine.wait_for_unit(f"getty@tty{tty_number}.service")
+ machine.wait_until_succeeds(f"pgrep -f 'agetty.*tty{tty_number}'")
- subtest "Invalid password", sub {
- $machine->fail("pgrep -f 'agetty.*tty2'");
- $machine->sendKeys("alt-f2");
- $machine->waitUntilSucceeds("[ \$(fgconsole) = 2 ]");
- $machine->waitForUnit('getty@tty2.service');
- $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty2'");
+ def enter_user_alice(tty_number):
+ machine.wait_until_tty_matches(tty_number, "login: ")
+ machine.send_chars("alice\n")
+ machine.wait_until_tty_matches(tty_number, "login: alice")
+ machine.wait_until_succeeds("pgrep login")
+ machine.wait_until_tty_matches(tty_number, "One-time password")
- $machine->waitUntilTTYMatches(2, "login: ");
- $machine->sendChars("alice\n");
- $machine->waitUntilTTYMatches(2, "login: alice");
- $machine->waitUntilSucceeds("pgrep login");
- $machine->waitUntilTTYMatches(2, "One-time password");
- $machine->sendChars("${oathSnakeOilPassword1}\n");
- $machine->waitUntilTTYMatches(2, "Password: ");
- $machine->sendChars("blorg\n");
- $machine->waitUntilTTYMatches(2, "Login incorrect");
- };
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
+ machine.screenshot("postboot")
- subtest "Invalid oath token", sub {
- $machine->fail("pgrep -f 'agetty.*tty3'");
- $machine->sendKeys("alt-f3");
- $machine->waitUntilSucceeds("[ \$(fgconsole) = 3 ]");
- $machine->waitForUnit('getty@tty3.service');
- $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty3'");
+ with subtest("Invalid password"):
+ switch_to_tty(2)
+ enter_user_alice(2)
- $machine->waitUntilTTYMatches(3, "login: ");
- $machine->sendChars("alice\n");
- $machine->waitUntilTTYMatches(3, "login: alice");
- $machine->waitUntilSucceeds("pgrep login");
- $machine->waitUntilTTYMatches(3, "One-time password");
- $machine->sendChars("000000\n");
- $machine->waitUntilTTYMatches(3, "Login incorrect");
- $machine->waitUntilTTYMatches(3, "login:");
- };
+ machine.send_chars("${oathSnakeOilPassword1}\n")
+ machine.wait_until_tty_matches(2, "Password: ")
+ machine.send_chars("blorg\n")
+ machine.wait_until_tty_matches(2, "Login incorrect")
- subtest "Happy path (both passwords are mandatory to get us in)", sub {
- $machine->fail("pgrep -f 'agetty.*tty4'");
- $machine->sendKeys("alt-f4");
- $machine->waitUntilSucceeds("[ \$(fgconsole) = 4 ]");
- $machine->waitForUnit('getty@tty4.service');
- $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty4'");
+ with subtest("Invalid oath token"):
+ switch_to_tty(3)
+ enter_user_alice(3)
- $machine->waitUntilTTYMatches(4, "login: ");
- $machine->sendChars("alice\n");
- $machine->waitUntilTTYMatches(4, "login: alice");
- $machine->waitUntilSucceeds("pgrep login");
- $machine->waitUntilTTYMatches(4, "One-time password");
- $machine->sendChars("${oathSnakeOilPassword2}\n");
- $machine->waitUntilTTYMatches(4, "Password: ");
- $machine->sendChars("${alicePassword}\n");
+ machine.send_chars("000000\n")
+ machine.wait_until_tty_matches(3, "Login incorrect")
+ machine.wait_until_tty_matches(3, "login:")
- $machine->waitUntilSucceeds("pgrep -u alice bash");
- $machine->sendChars("touch done4\n");
- $machine->waitForFile("/home/alice/done4");
- };
+ with subtest("Happy path: Both passwords are mandatory to get us in"):
+ switch_to_tty(4)
+ enter_user_alice(4)
+ machine.send_chars("${oathSnakeOilPassword2}\n")
+ machine.wait_until_tty_matches(4, "Password: ")
+ machine.send_chars("${alicePassword}\n")
+
+ machine.wait_until_succeeds("pgrep -u alice bash")
+ machine.send_chars("touch done4\n")
+ machine.wait_for_file("/home/alice/done4")
'';
-
})
diff --git a/nixos/tests/pam-u2f.nix b/nixos/tests/pam-u2f.nix
index 1052a2f3b916..f492baa9e139 100644
--- a/nixos/tests/pam-u2f.nix
+++ b/nixos/tests/pam-u2f.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ ... }:
+import ./make-test-python.nix ({ ... }:
{
name = "pam-u2f";
@@ -17,7 +17,9 @@ import ./make-test.nix ({ ... }:
testScript =
''
- $machine->waitForUnit('multi-user.target');
- $machine->succeed('egrep "auth required .*/lib/security/pam_u2f.so.*debug.*interactive.*cue" /etc/pam.d/ -R');
+ machine.wait_for_unit("multi-user.target")
+ machine.succeed(
+ 'egrep "auth required .*/lib/security/pam_u2f.so.*debug.*interactive.*cue" /etc/pam.d/ -R'
+ )
'';
})
diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix
index 9888887ee8b5..c0434f20754c 100644
--- a/nixos/tests/pantheon.nix
+++ b/nixos/tests/pantheon.nix
@@ -1,9 +1,10 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test-python.nix ({ pkgs, ...} :
{
name = "pantheon";
+
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ worldofpeace ];
+ maintainers = pkgs.pantheon.maintainers;
};
machine = { ... }:
@@ -21,35 +22,38 @@ import ./make-test.nix ({ pkgs, ...} :
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
+ bob = nodes.machine.config.users.users.bob;
in ''
- startAll;
+ machine.wait_for_unit("display-manager.service")
- # Wait for display manager to start
- $machine->waitForText(qr/${user.description}/);
- $machine->screenshot("lightdm");
+ with subtest("Test we can see usernames in elementary-greeter"):
+ machine.wait_for_text("${user.description}")
+ # OCR was struggling with this one.
+ # machine.wait_for_text("${bob.description}")
+ machine.screenshot("elementary_greeter_lightdm")
- # Log in
- $machine->sendChars("${user.password}\n");
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
+ with subtest("Login with elementary-greeter"):
+ machine.send_chars("${user.password}\n")
+ machine.wait_for_x()
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
- # Check if "pantheon-shell" components actually start
- $machine->waitUntilSucceeds("pgrep gala");
- $machine->waitForWindow(qr/gala/);
- $machine->waitUntilSucceeds("pgrep wingpanel");
- $machine->waitForWindow("wingpanel");
- $machine->waitUntilSucceeds("pgrep plank");
- $machine->waitForWindow(qr/plank/);
+ with subtest("Check that logging in has given the user ownership of devices"):
+ machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
- # Check that logging in has given the user ownership of devices.
- $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice");
+ # TODO: DBus API could eliminate this? Pantheon uses Bamf.
+ with subtest("Check if pantheon session components actually start"):
+ machine.wait_until_succeeds("pgrep gala")
+ machine.wait_for_window("gala")
+ machine.wait_until_succeeds("pgrep wingpanel")
+ machine.wait_for_window("wingpanel")
+ machine.wait_until_succeeds("pgrep plank")
+ machine.wait_for_window("plank")
- # Open elementary terminal
- $machine->execute("su - alice -c 'DISPLAY=:0.0 io.elementary.terminal &'");
- $machine->waitForWindow(qr/io.elementary.terminal/);
-
- # Take a screenshot of the desktop
- $machine->sleep(20);
- $machine->screenshot("screen");
+ with subtest("Open elementary terminal"):
+ machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal &'")
+ machine.wait_for_window("io.elementary.terminal")
+ machine.sleep(20)
+ machine.screenshot("screen")
'';
})
diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix
index 860ad0a6218f..355e7041d3fe 100644
--- a/nixos/tests/paperless.nix
+++ b/nixos/tests/paperless.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ... } : {
+import ./make-test-python.nix ({ lib, ... } : {
name = "paperless";
meta = with lib.maintainers; {
maintainers = [ earvstedt ];
@@ -13,17 +13,24 @@ import ./make-test.nix ({ lib, ... } : {
};
testScript = ''
- $machine->waitForUnit("paperless-consumer.service");
- # Create test doc
- $machine->succeed('convert -size 400x40 xc:white -font "DejaVu-Sans" -pointsize 20 -fill black \
- -annotate +5+20 "hello world 16-10-2005" /var/lib/paperless/consume/doc.png');
+ machine.wait_for_unit("paperless-consumer.service")
- $machine->waitForUnit("paperless-server.service");
- # Wait until server accepts connections
- $machine->waitUntilSucceeds("curl -s localhost:28981");
- # Wait until document is consumed
- $machine->waitUntilSucceeds('(($(curl -s localhost:28981/api/documents/ | jq .count) == 1))');
- $machine->succeed("curl -s localhost:28981/api/documents/ | jq '.results | .[0] | .created'")
- =~ /2005-10-16/ or die;
+ # Create test doc
+ machine.succeed(
+ "convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black -annotate +5+20 'hello world 16-10-2005' /var/lib/paperless/consume/doc.png"
+ )
+
+ with subtest("Service gets ready"):
+ machine.wait_for_unit("paperless-server.service")
+ # Wait until server accepts connections
+ machine.wait_until_succeeds("curl -s localhost:28981")
+
+ with subtest("Test document is consumed"):
+ machine.wait_until_succeeds(
+ "(($(curl -s localhost:28981/api/documents/ | jq .count) == 1))"
+ )
+ assert "2005-10-16" in machine.succeed(
+ "curl -s localhost:28981/api/documents/ | jq '.results | .[0] | .created'"
+ )
'';
})
diff --git a/nixos/tests/pdns-recursor.nix b/nixos/tests/pdns-recursor.nix
index bf6e6093d69c..de1b60e0b1c7 100644
--- a/nixos/tests/pdns-recursor.nix
+++ b/nixos/tests/pdns-recursor.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "powerdns";
nodes.server = { ... }: {
@@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: {
};
testScript = ''
- $server->waitForUnit("pdns-recursor");
- $server->waitForOpenPort("53");
+ server.wait_for_unit("pdns-recursor")
+ server.wait_for_open_port("53")
'';
})
diff --git a/nixos/tests/peerflix.nix b/nixos/tests/peerflix.nix
index fae37fedaac7..37628604d49b 100644
--- a/nixos/tests/peerflix.nix
+++ b/nixos/tests/peerflix.nix
@@ -1,6 +1,6 @@
# This test runs peerflix and checks if peerflix starts
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "peerflix";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ offline ];
@@ -15,9 +15,9 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ start_all()
- $peerflix->waitForUnit("peerflix.service");
- $peerflix->waitUntilSucceeds("curl localhost:9000");
+ peerflix.wait_for_unit("peerflix.service")
+ peerflix.wait_until_succeeds("curl localhost:9000")
'';
})
diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix
index a2d81288c812..4793a3e31503 100644
--- a/nixos/tests/pgjwt.nix
+++ b/nixos/tests/pgjwt.nix
@@ -1,12 +1,5 @@
-import ./make-test.nix ({ pkgs, lib, ...}:
-let
- test = with pkgs; runCommand "patch-test" {
- nativeBuildInputs = [ pgjwt ];
- }
- ''
- sed -e '12 i CREATE EXTENSION pgcrypto;\nCREATE EXTENSION pgtap;\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > $out;
- '';
-in
+import ./make-test-python.nix ({ pkgs, lib, ...}:
+
with pkgs; {
name = "pgjwt";
meta = with lib.maintainers; {
@@ -29,9 +22,13 @@ with pkgs; {
pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}";
in
''
- startAll;
- $master->waitForUnit("postgresql");
- $master->copyFileFromHost("${test}","/tmp/test.sql");
- $master->succeed("${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql");
+ start_all()
+ master.wait_for_unit("postgresql")
+ master.succeed(
+ "${pkgs.gnused}/bin/sed -e '12 i CREATE EXTENSION pgcrypto;\\nCREATE EXTENSION pgtap;\\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > /tmp/test.sql"
+ )
+ master.succeed(
+ "${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql"
+ )
'';
})
diff --git a/nixos/tests/pgmanage.nix b/nixos/tests/pgmanage.nix
index bacaf3f41588..4f5dbed24a97 100644
--- a/nixos/tests/pgmanage.nix
+++ b/nixos/tests/pgmanage.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... } :
+import ./make-test-python.nix ({ pkgs, ... } :
let
role = "test";
password = "secret";
@@ -29,11 +29,13 @@ in
};
testScript = ''
- startAll;
- $one->waitForUnit("default.target");
- $one->requireActiveUnit("pgmanage.service");
+ start_all()
+ one.wait_for_unit("default.target")
+ one.require_unit_state("pgmanage.service", "active")
# Test if we can log in.
- $one->waitUntilSucceeds("curl 'http://localhost:8080/pgmanage/auth' --data 'action=login&connname=${conn}&username=${role}&password=${password}' --fail");
+ one.wait_until_succeeds(
+ "curl 'http://localhost:8080/pgmanage/auth' --data 'action=login&connname=${conn}&username=${role}&password=${password}' --fail"
+ )
'';
})
diff --git a/nixos/tests/php-pcre.nix b/nixos/tests/php-pcre.nix
index ae44aec7944f..d5c22e0582a0 100644
--- a/nixos/tests/php-pcre.nix
+++ b/nixos/tests/php-pcre.nix
@@ -1,7 +1,7 @@
let testString = "can-use-subgroups"; in
-import ./make-test.nix ({ ...}: {
+import ./make-test-python.nix ({ ...}: {
name = "php-httpd-pcre-jit-test";
machine = { lib, pkgs, ... }: {
time.timeZone = "UTC";
@@ -31,9 +31,10 @@ import ./make-test.nix ({ ...}: {
};
testScript = { ... }:
''
- $machine->waitForUnit('httpd.service');
+ machine.wait_for_unit("httpd.service")
# Ensure php evaluation by matching on the var_dump syntax
- $machine->succeed('curl -vvv -s http://127.0.0.1:80/index.php \
- | grep "string(${toString (builtins.stringLength testString)}) \"${testString}\""');
+ assert 'string(${toString (builtins.stringLength testString)}) "${testString}"' in machine.succeed(
+ "curl -vvv -s http://127.0.0.1:80/index.php"
+ )
'';
})
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index 614fc9bf316e..2eccfdf47f59 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test-python.nix ({ pkgs, ...} :
{
name = "plasma5";
@@ -7,59 +7,53 @@ import ./make-test.nix ({ pkgs, ...} :
};
machine = { ... }:
- let
- sddm_theme = pkgs.stdenv.mkDerivation {
- name = "breeze-ocr-theme";
- phases = "buildPhase";
- buildCommand = ''
- mkdir -p $out/share/sddm/themes/
- cp -r ${pkgs.plasma-workspace}/share/sddm/themes/breeze $out/share/sddm/themes/breeze-ocr-theme
- chmod -R +w $out/share/sddm/themes/breeze-ocr-theme
- printf "[General]\ntype=color\ncolor=#1d99f3\nbackground=\n" > $out/share/sddm/themes/breeze-ocr-theme/theme.conf
- '';
- };
- in
+
{
imports = [ ./common/user-account.nix ];
services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true;
- services.xserver.displayManager.sddm.theme = "breeze-ocr-theme";
+ services.xserver.displayManager.defaultSession = "plasma5";
services.xserver.desktopManager.plasma5.enable = true;
- services.xserver.desktopManager.default = "plasma5";
services.xserver.displayManager.sddm.autoLogin = {
enable = true;
user = "alice";
};
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
virtualisation.memorySize = 1024;
- environment.systemPackages = [ sddm_theme ];
};
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
xdo = "${pkgs.xdotool}/bin/xdotool";
in ''
- startAll;
- # wait for log in
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
+ with subtest("Wait for login"):
+ start_all()
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
- $machine->waitUntilSucceeds("pgrep plasmashell");
- $machine->waitForWindow("^Desktop ");
+ with subtest("Check plasmashell started"):
+ machine.wait_until_succeeds("pgrep plasmashell")
+ machine.wait_for_window("^Desktop ")
- # Check that logging in has given the user ownership of devices.
- $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice");
+ with subtest("Check that logging in has given the user ownership of devices"):
+ machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
- $machine->execute("su - alice -c 'DISPLAY=:0.0 dolphin &'");
- $machine->waitForWindow(" Dolphin");
+ with subtest("Run Dolphin"):
+ machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin &'")
+ machine.wait_for_window(" Dolphin")
- $machine->execute("su - alice -c 'DISPLAY=:0.0 konsole &'");
- $machine->waitForWindow("Konsole");
+ with subtest("Run Konsole"):
+ machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 konsole &'")
+ machine.wait_for_window("Konsole")
- $machine->execute("su - alice -c 'DISPLAY=:0.0 systemsettings5 &'");
- $machine->waitForWindow("Settings");
+ with subtest("Run systemsettings"):
+ machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 systemsettings5 &'")
+ machine.wait_for_window("Settings")
- $machine->execute("${xdo} key Alt+F1 sleep 10");
- $machine->screenshot("screen");
+ with subtest("Wait to get a screenshot"):
+ machine.execute(
+ "${xdo} key Alt+F1 sleep 10"
+ )
+ machine.screenshot("screen")
'';
})
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix
index 294eb50b5fe5..84bbb0bc8ec6 100644
--- a/nixos/tests/postgis.nix
+++ b/nixos/tests/postgis.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "postgis";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ lsix ];
@@ -20,10 +20,10 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
- $master->waitForUnit("postgresql");
- $master->sleep(10); # Hopefully this is long enough!!
- $master->succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'");
- $master->succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'");
+ start_all()
+ master.wait_for_unit("postgresql")
+ master.sleep(10) # Hopefully this is long enough!!
+ master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'")
+ master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis_topology;'")
'';
})
diff --git a/nixos/tests/powerdns.nix b/nixos/tests/powerdns.nix
index 8addcc784012..75d71315e644 100644
--- a/nixos/tests/powerdns.nix
+++ b/nixos/tests/powerdns.nix
@@ -1,12 +1,13 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "powerdns";
nodes.server = { ... }: {
services.powerdns.enable = true;
+ environment.systemPackages = [ pkgs.dnsutils ];
};
testScript = ''
- $server->waitForUnit("pdns");
- $server->succeed("${pkgs.dnsutils}/bin/dig version.bind txt chaos \@127.0.0.1");
+ server.wait_for_unit("pdns")
+ server.succeed("dig version.bind txt chaos \@127.0.0.1")
'';
})
diff --git a/nixos/tests/pppd.nix b/nixos/tests/pppd.nix
index 91f811859093..bda0aa75bb50 100644
--- a/nixos/tests/pppd.nix
+++ b/nixos/tests/pppd.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix (
+import ./make-test-python.nix (
let
chap-secrets = {
text = ''"flynn" * "reindeerflotilla" *'';
@@ -53,10 +53,10 @@ import ./make-test.nix (
environment.etc."ppp/chap-secrets" = chap-secrets;
};
};
-
+
testScript = ''
- startAll;
- $client->waitUntilSucceeds("ping -c1 -W1 192.0.2.1");
- $server->waitUntilSucceeds("ping -c1 -W1 192.0.2.2");
+ start_all()
+ client.wait_until_succeeds("ping -c1 -W1 192.0.2.1")
+ server.wait_until_succeeds("ping -c1 -W1 192.0.2.2")
'';
- })
+ })
diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix
index 194b4dafa772..83883477a5cc 100644
--- a/nixos/tests/predictable-interface-names.nix
+++ b/nixos/tests/predictable-interface-names.nix
@@ -4,7 +4,7 @@
}:
let
- inherit (import ../lib/testing.nix { inherit system pkgs; }) makeTest;
+ inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
name = pkgs.lib.optionalString (!predictable) "un" + "predictable"
+ pkgs.lib.optionalString withNetworkd "Networkd";
@@ -20,8 +20,8 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
};
testScript = ''
- print $machine->succeed("ip link");
- $machine->${if predictable then "fail" else "succeed"}("ip link show eth0 ");
+ print(machine.succeed("ip link"))
+ machine.${if predictable then "fail" else "succeed"}("ip link show eth0")
'';
};
}) [[true false] [true false]])
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 676183f6356f..563f24726477 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -4,12 +4,10 @@
}:
let
- inherit (import ../lib/testing.nix { inherit system pkgs; }) makeTest;
+ inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
inherit (pkgs.lib) concatStringsSep maintainers mapAttrs mkMerge
removeSuffix replaceChars singleton splitString;
- escape' = str: replaceChars [''"'' "$" "\n"] [''\\\"'' "\\$" ""] str;
-
/*
* The attrset `exporterTests` contains one attribute
* for each exporter test. Each of these attributes
@@ -33,9 +31,9 @@ let
* services..enable = true;
* };
* exporterTest = ''
- * waitForUnit("prometheus--exporter.service");
- * waitForOpenPort("1234");
- * succeed("curl -sSf 'localhost:1234/metrics'");
+ * wait_for_unit("prometheus--exporter.service")
+ * wait_for_open_port("1234")
+ * succeed("curl -sSf 'localhost:1234/metrics'")
* '';
* };
*
@@ -49,11 +47,11 @@ let
* };
*
* testScript = ''
- * $->start();
- * $->waitForUnit("prometheus--exporter.service");
- * $->waitForOpenPort("1234");
- * $->succeed("curl -sSf 'localhost:1234/metrics'");
- * $->shutdown();
+ * .start()
+ * .wait_for_unit("prometheus--exporter.service")
+ * .wait_for_open_port("1234")
+ * .succeed("curl -sSf 'localhost:1234/metrics'")
+ * .shutdown()
* '';
*/
@@ -72,9 +70,11 @@ let
'';
};
exporterTest = ''
- waitForUnit("prometheus-bind-exporter.service");
- waitForOpenPort(9119);
- succeed("curl -sSf http://localhost:9119/metrics | grep -q 'bind_query_recursions_total 0'");
+ wait_for_unit("prometheus-bind-exporter.service")
+ wait_for_open_port(9119)
+ succeed(
+ "curl -sSf http://localhost:9119/metrics | grep -q 'bind_query_recursions_total 0'"
+ )
'';
};
@@ -89,9 +89,11 @@ let
});
};
exporterTest = ''
- waitForUnit("prometheus-blackbox-exporter.service");
- waitForOpenPort(9115);
- succeed("curl -sSf 'http://localhost:9115/probe?target=localhost&module=icmp_v6' | grep -q 'probe_success 1'");
+ wait_for_unit("prometheus-blackbox-exporter.service")
+ wait_for_open_port(9115)
+ succeed(
+ "curl -sSf 'http://localhost:9115/probe?target=localhost&module=icmp_v6' | grep -q 'probe_success 1'"
+ )
'';
};
@@ -100,7 +102,7 @@ let
enable = true;
extraFlags = [ "--web.collectd-push-path /collectd" ];
};
- exporterTest =let postData = escape' ''
+ exporterTest = let postData = replaceChars [ "\n" ] [ "" ] ''
[{
"values":[23],
"dstypes":["gauge"],
@@ -108,13 +110,21 @@ let
"interval":1000,
"host":"testhost",
"plugin":"testplugin",
- "time":$(date +%s)
+ "time":DATE
}]
''; in ''
- waitForUnit("prometheus-collectd-exporter.service");
- waitForOpenPort(9103);
- succeed("curl -sSfH 'Content-Type: application/json' -X POST --data \"${postData}\" localhost:9103/collectd");
- succeed("curl -sSf localhost:9103/metrics | grep -q 'collectd_testplugin_gauge{instance=\"testhost\"} 23'");
+ wait_for_unit("prometheus-collectd-exporter.service")
+ wait_for_open_port(9103)
+ succeed(
+ 'echo \'${postData}\'> /tmp/data.json'
+ )
+ succeed('sed -ie "s DATE $(date +%s) " /tmp/data.json')
+ succeed(
+ "curl -sSfH 'Content-Type: application/json' -X POST --data @/tmp/data.json localhost:9103/collectd"
+ )
+ succeed(
+ "curl -sSf localhost:9103/metrics | grep -q 'collectd_testplugin_gauge{instance=\"testhost\"} 23'"
+ )
'';
};
@@ -127,9 +137,9 @@ let
services.dnsmasq.enable = true;
};
exporterTest = ''
- waitForUnit("prometheus-dnsmasq-exporter.service");
- waitForOpenPort(9153);
- succeed("curl -sSf http://localhost:9153/metrics | grep -q 'dnsmasq_leases 0'");
+ wait_for_unit("prometheus-dnsmasq-exporter.service")
+ wait_for_open_port(9153)
+ succeed("curl -sSf http://localhost:9153/metrics | grep -q 'dnsmasq_leases 0'")
'';
};
@@ -144,9 +154,11 @@ let
services.dovecot2.enable = true;
};
exporterTest = ''
- waitForUnit("prometheus-dovecot-exporter.service");
- waitForOpenPort(9166);
- succeed("curl -sSf http://localhost:9166/metrics | grep -q 'dovecot_up{scope=\"global\"} 1'");
+ wait_for_unit("prometheus-dovecot-exporter.service")
+ wait_for_open_port(9166)
+ succeed(
+ "curl -sSf http://localhost:9166/metrics | grep -q 'dovecot_up{scope=\"global\"} 1'"
+ )
'';
};
@@ -155,9 +167,11 @@ let
enable = true;
};
exporterTest = ''
- waitForUnit("prometheus-fritzbox-exporter.service");
- waitForOpenPort(9133);
- succeed("curl -sSf http://localhost:9133/metrics | grep -q 'fritzbox_exporter_collect_errors 0'");
+ wait_for_unit("prometheus-fritzbox-exporter.service")
+ wait_for_open_port(9133)
+ succeed(
+ "curl -sSf http://localhost:9133/metrics | grep -q 'fritzbox_exporter_collect_errors 0'"
+ )
'';
};
@@ -180,11 +194,11 @@ let
};
};
exporterTest = ''
- waitForUnit("nginx.service");
- waitForOpenPort(80);
- waitForUnit("prometheus-json-exporter.service");
- waitForOpenPort(7979);
- succeed("curl -sSf localhost:7979/metrics | grep -q 'json_test_metric 1'");
+ wait_for_unit("nginx.service")
+ wait_for_open_port(80)
+ wait_for_unit("prometheus-json-exporter.service")
+ wait_for_open_port(7979)
+ succeed("curl -sSf localhost:7979/metrics | grep -q 'json_test_metric 1'")
'';
};
@@ -222,10 +236,12 @@ let
users.users.mailexporter.isSystemUser = true;
};
exporterTest = ''
- waitForUnit("postfix.service")
- waitForUnit("prometheus-mail-exporter.service")
- waitForOpenPort(9225)
- waitUntilSucceeds("curl -sSf http://localhost:9225/metrics | grep -q 'mail_deliver_success{configname=\"testserver\"} 1'")
+ wait_for_unit("postfix.service")
+ wait_for_unit("prometheus-mail-exporter.service")
+ wait_for_open_port(9225)
+ wait_until_succeeds(
+ "curl -sSf http://localhost:9225/metrics | grep -q 'mail_deliver_success{configname=\"testserver\"} 1'"
+ )
'';
};
@@ -256,9 +272,9 @@ let
};
};
exporterTest = ''
- waitForUnit("nginx.service")
- waitForUnit("prometheus-nextcloud-exporter.service")
- waitForOpenPort(9205)
+ wait_for_unit("nginx.service")
+ wait_for_unit("prometheus-nextcloud-exporter.service")
+ wait_for_open_port(9205)
succeed("curl -sSf http://localhost:9205/metrics | grep -q 'nextcloud_up 1'")
'';
};
@@ -275,9 +291,9 @@ let
};
};
exporterTest = ''
- waitForUnit("nginx.service")
- waitForUnit("prometheus-nginx-exporter.service")
- waitForOpenPort(9113)
+ wait_for_unit("nginx.service")
+ wait_for_unit("prometheus-nginx-exporter.service")
+ wait_for_open_port(9113)
succeed("curl -sSf http://localhost:9113/metrics | grep -q 'nginx_up 1'")
'';
};
@@ -287,9 +303,11 @@ let
enable = true;
};
exporterTest = ''
- waitForUnit("prometheus-node-exporter.service");
- waitForOpenPort(9100);
- succeed("curl -sSf http://localhost:9100/metrics | grep -q 'node_exporter_build_info{.\\+} 1'");
+ wait_for_unit("prometheus-node-exporter.service")
+ wait_for_open_port(9100)
+ succeed(
+ "curl -sSf http://localhost:9100/metrics | grep -q 'node_exporter_build_info{.\\+} 1'"
+ )
'';
};
@@ -301,9 +319,11 @@ let
services.postfix.enable = true;
};
exporterTest = ''
- waitForUnit("prometheus-postfix-exporter.service");
- waitForOpenPort(9154);
- succeed("curl -sSf http://localhost:9154/metrics | grep -q 'postfix_smtpd_connects_total 0'");
+ wait_for_unit("prometheus-postfix-exporter.service")
+ wait_for_open_port(9154)
+ succeed(
+ "curl -sSf http://localhost:9154/metrics | grep -q 'postfix_smtpd_connects_total 0'"
+ )
'';
};
@@ -316,18 +336,24 @@ let
services.postgresql.enable = true;
};
exporterTest = ''
- waitForUnit("prometheus-postgres-exporter.service");
- waitForOpenPort(9187);
- waitForUnit("postgresql.service");
- succeed("curl -sSf http://localhost:9187/metrics | grep -q 'pg_exporter_last_scrape_error 0'");
- succeed("curl -sSf http://localhost:9187/metrics | grep -q 'pg_up 1'");
- systemctl("stop postgresql.service");
- succeed("curl -sSf http://localhost:9187/metrics | grep -qv 'pg_exporter_last_scrape_error 0'");
- succeed("curl -sSf http://localhost:9187/metrics | grep -q 'pg_up 0'");
- systemctl("start postgresql.service");
- waitForUnit("postgresql.service");
- succeed("curl -sSf http://localhost:9187/metrics | grep -q 'pg_exporter_last_scrape_error 0'");
- succeed("curl -sSf http://localhost:9187/metrics | grep -q 'pg_up 1'");
+ wait_for_unit("prometheus-postgres-exporter.service")
+ wait_for_open_port(9187)
+ wait_for_unit("postgresql.service")
+ succeed(
+ "curl -sSf http://localhost:9187/metrics | grep -q 'pg_exporter_last_scrape_error 0'"
+ )
+ succeed("curl -sSf http://localhost:9187/metrics | grep -q 'pg_up 1'")
+ systemctl("stop postgresql.service")
+ succeed(
+ "curl -sSf http://localhost:9187/metrics | grep -qv 'pg_exporter_last_scrape_error 0'"
+ )
+ succeed("curl -sSf http://localhost:9187/metrics | grep -q 'pg_up 0'")
+ systemctl("start postgresql.service")
+ wait_for_unit("postgresql.service")
+ succeed(
+ "curl -sSf http://localhost:9187/metrics | grep -q 'pg_exporter_last_scrape_error 0'"
+ )
+ succeed("curl -sSf http://localhost:9187/metrics | grep -q 'pg_up 1'")
'';
};
@@ -339,11 +365,13 @@ let
services.rspamd.enable = true;
};
exporterTest = ''
- waitForUnit("rspamd.service");
- waitForUnit("prometheus-rspamd-exporter.service");
- waitForOpenPort(11334);
- waitForOpenPort(7980);
- waitUntilSucceeds("curl -sSf localhost:7980/metrics | grep -q 'rspamd_scanned{host=\"rspamd\"} 0'");
+ wait_for_unit("rspamd.service")
+ wait_for_unit("prometheus-rspamd-exporter.service")
+ wait_for_open_port(11334)
+ wait_for_open_port(7980)
+ wait_until_succeeds(
+ "curl -sSf localhost:7980/metrics | grep -q 'rspamd_scanned{host=\"rspamd\"} 0'"
+ )
'';
};
@@ -356,9 +384,9 @@ let
};
};
exporterTest = ''
- waitForUnit("prometheus-snmp-exporter.service");
- waitForOpenPort(9116);
- succeed("curl -sSf localhost:9116/metrics | grep -q 'snmp_request_errors_total 0'");
+ wait_for_unit("prometheus-snmp-exporter.service")
+ wait_for_open_port(9116)
+ succeed("curl -sSf localhost:9116/metrics | grep -q 'snmp_request_errors_total 0'")
'';
};
@@ -377,11 +405,11 @@ let
};
};
exporterTest = ''
- waitForUnit("nginx.service");
- waitForOpenPort(80);
- waitForUnit("prometheus-surfboard-exporter.service");
- waitForOpenPort(9239);
- succeed("curl -sSf localhost:9239/metrics | grep -q 'surfboard_up 1'");
+ wait_for_unit("nginx.service")
+ wait_for_open_port(80)
+ wait_for_unit("prometheus-surfboard-exporter.service")
+ wait_for_open_port(9239)
+ succeed("curl -sSf localhost:9239/metrics | grep -q 'surfboard_up 1'")
'';
};
@@ -396,11 +424,11 @@ let
services.tor.controlPort = 9051;
};
exporterTest = ''
- waitForUnit("tor.service");
- waitForOpenPort(9051);
- waitForUnit("prometheus-tor-exporter.service");
- waitForOpenPort(9130);
- succeed("curl -sSf localhost:9130/metrics | grep -q 'tor_version{.\\+} 1'");
+ wait_for_unit("tor.service")
+ wait_for_open_port(9051)
+ wait_for_unit("prometheus-tor-exporter.service")
+ wait_for_open_port(9130)
+ succeed("curl -sSf localhost:9130/metrics | grep -q 'tor_version{.\\+} 1'")
'';
};
@@ -426,10 +454,10 @@ let
};
};
exporterTest = ''
- waitForUnit("prometheus-varnish-exporter.service");
- waitForOpenPort(6081);
- waitForOpenPort(9131);
- succeed("curl -sSf http://localhost:9131/metrics | grep -q 'varnish_up 1'");
+ wait_for_unit("prometheus-varnish-exporter.service")
+ wait_for_open_port(6081)
+ wait_for_open_port(9131)
+ succeed("curl -sSf http://localhost:9131/metrics | grep -q 'varnish_up 1'")
'';
};
@@ -451,9 +479,11 @@ let
systemd.services.prometheus-wireguard-exporter.after = [ "wireguard-wg0.service" ];
};
exporterTest = ''
- waitForUnit("prometheus-wireguard-exporter.service");
- waitForOpenPort(9586);
- waitUntilSucceeds("curl -sSf http://localhost:9586/metrics | grep '${snakeoil.peer1.publicKey}'");
+ wait_for_unit("prometheus-wireguard-exporter.service")
+ wait_for_open_port(9586)
+ wait_until_succeeds(
+ "curl -sSf http://localhost:9586/metrics | grep '${snakeoil.peer1.publicKey}'"
+ )
'';
};
};
@@ -466,11 +496,13 @@ mapAttrs (exporter: testConfig: (makeTest {
} testConfig.metricProvider or {}];
testScript = ''
- ${"$"+exporter}->start();
- ${concatStringsSep " " (map (line: ''
- ${"$"+exporter}->${line};
- '') (splitString "\n" (removeSuffix "\n" testConfig.exporterTest)))}
- ${"$"+exporter}->shutdown();
+ ${exporter}.start()
+ ${concatStringsSep "\n" (map (line:
+ if (builtins.substring 0 1 line == " " || builtins.substring 0 1 line == ")")
+ then line
+ else "${exporter}.${line}"
+ ) (splitString "\n" (removeSuffix "\n" testConfig.exporterTest)))}
+ ${exporter}.shutdown()
'';
meta = with maintainers; {
diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix
index 52f61046be39..8bfd0c131e61 100644
--- a/nixos/tests/prometheus.nix
+++ b/nixos/tests/prometheus.nix
@@ -31,7 +31,7 @@ let
};
};
-in import ./make-test.nix {
+in import ./make-test-python.nix {
name = "prometheus";
nodes = {
@@ -173,67 +173,73 @@ in import ./make-test.nix {
testScript = { nodes, ... } : ''
# Before starting the other machines we first make sure that our S3 service is online
# and has a bucket added for thanos:
- $s3->start;
- $s3->waitForUnit("minio.service");
- $s3->waitForOpenPort(${toString minioPort});
- $s3->succeed(
- "mc config host add minio " .
- "http://localhost:${toString minioPort} ${s3.accessKey} ${s3.secretKey} S3v4");
- $s3->succeed("mc mb minio/thanos-bucket");
+ s3.start()
+ s3.wait_for_unit("minio.service")
+ s3.wait_for_open_port(${toString minioPort})
+ s3.succeed(
+ "mc config host add minio "
+ + "http://localhost:${toString minioPort} "
+ + "${s3.accessKey} ${s3.secretKey} S3v4",
+ "mc mb minio/thanos-bucket",
+ )
# Now that s3 has started we can start the other machines:
- $prometheus->start;
- $query->start;
- $store->start;
+ for machine in prometheus, query, store:
+ machine.start()
# Check if prometheus responds to requests:
- $prometheus->waitForUnit("prometheus.service");
- $prometheus->waitForOpenPort(${toString queryPort});
- $prometheus->succeed("curl -s http://127.0.0.1:${toString queryPort}/metrics");
+ prometheus.wait_for_unit("prometheus.service")
+ prometheus.wait_for_open_port(${toString queryPort})
+ prometheus.succeed("curl -s http://127.0.0.1:${toString queryPort}/metrics")
# Let's test if pushing a metric to the pushgateway succeeds:
- $prometheus->waitForUnit("pushgateway.service");
- $prometheus->succeed(
- "echo 'some_metric 3.14' | " .
- "curl --data-binary \@- http://127.0.0.1:${toString pushgwPort}/metrics/job/some_job");
+ prometheus.wait_for_unit("pushgateway.service")
+ prometheus.succeed(
+ "echo 'some_metric 3.14' | "
+ + "curl --data-binary \@- "
+ + "http://127.0.0.1:${toString pushgwPort}/metrics/job/some_job"
+ )
# Now check whether that metric gets ingested by prometheus.
# Since we'll check for the metric several times on different machines
# we abstract the test using the following function:
# Function to check if the metric "some_metric" has been received and returns the correct value.
- local *Machine::waitForMetric = sub {
- my ($self) = @_;
- $self->waitUntilSucceeds(
- "curl -sf 'http://127.0.0.1:${toString queryPort}/api/v1/query?query=some_metric' " .
- "| jq '.data.result[0].value[1]' | grep '\"3.14\"'");
- };
+ def wait_for_metric(machine):
+ return machine.wait_until_succeeds(
+ "curl -sf 'http://127.0.0.1:${toString queryPort}/api/v1/query?query=some_metric' | "
+ + "jq '.data.result[0].value[1]' | grep '\"3.14\"'"
+ )
- $prometheus->waitForMetric;
+
+ wait_for_metric(prometheus)
# Let's test if the pushgateway persists metrics to the configured location.
- $prometheus->waitUntilSucceeds("test -e /var/lib/prometheus-pushgateway/metrics");
+ prometheus.wait_until_succeeds("test -e /var/lib/prometheus-pushgateway/metrics")
# Test thanos
- $prometheus->waitForUnit("thanos-sidecar.service");
+ prometheus.wait_for_unit("thanos-sidecar.service")
# Test if the Thanos query service can correctly retrieve the metric that was send above.
- $query->waitForUnit("thanos-query.service");
- $query->waitForMetric;
+ query.wait_for_unit("thanos-query.service")
+ wait_for_metric(query)
# Test if the Thanos sidecar has correctly uploaded its TSDB to S3, if the
# Thanos storage service has correctly downloaded it from S3 and if the Thanos
# query service running on $store can correctly retrieve the metric:
- $store->waitForUnit("thanos-store.service");
- $store->waitForMetric;
+ store.wait_for_unit("thanos-store.service")
+ wait_for_metric(store)
- $store->waitForUnit("thanos-compact.service");
+ store.wait_for_unit("thanos-compact.service")
# Test if the Thanos bucket command is able to retrieve blocks from the S3 bucket
# and check if the blocks have the correct labels:
- $store->succeed(
- "thanos bucket ls" .
- " --objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file}" .
- " --output=json | jq .thanos.labels.some_label | grep 'required by thanos'");
+ store.succeed(
+ "thanos bucket ls "
+ + "--objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file} "
+ + "--output=json | "
+ + "jq .thanos.labels.some_label | "
+ + "grep 'required by thanos'"
+ )
'';
}
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index 1f39e903cddb..3859d429c21b 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test.nix ({ pkgs, ...} :
let
@@ -7,7 +7,7 @@ let
{ services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org";
- services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
+ services.httpd.virtualHosts.localhost.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
networking.firewall.allowedTCPPorts = [ 80 ];
};
@@ -26,11 +26,11 @@ in
{ services.httpd.enable = true;
services.httpd.adminAddr = "bar@example.org";
services.httpd.extraModules = [ "proxy_balancer" "lbmethod_byrequests" ];
-
- services.httpd.extraConfig =
- ''
- ExtendedStatus on
-
+ services.httpd.extraConfig = ''
+ ExtendedStatus on
+ '';
+ services.httpd.virtualHosts.localhost = {
+ extraConfig = ''
Require all granted
SetHandler server-status
@@ -50,6 +50,7 @@ in
# For testing; don't want to wait forever for dead backend servers.
ProxyTimeout 5
'';
+ };
networking.firewall.allowedTCPPorts = [ 80 ];
};
diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix
index 6aee7ea57f03..04590aa0eb38 100644
--- a/nixos/tests/quagga.nix
+++ b/nixos/tests/quagga.nix
@@ -5,7 +5,7 @@
#
# All interfaces are in OSPF Area 0.
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
let
ifAddr = node: iface: (pkgs.lib.head node.config.networking.interfaces.${iface}.ipv4.addresses).address;
@@ -74,23 +74,23 @@ import ./make-test.nix ({ pkgs, ... }:
testScript =
{ ... }:
''
- startAll;
+ start_all()
# Wait for the networking to start on all machines
- $_->waitForUnit("network.target") foreach values %vms;
+ for machine in client, router1, router2, server:
+ machine.wait_for_unit("network.target")
- # Wait for OSPF to form adjacencies
- for my $gw ($router1, $router2) {
- $gw->waitForUnit("ospfd");
- $gw->waitUntilSucceeds("vtysh -c 'show ip ospf neighbor' | grep Full");
- $gw->waitUntilSucceeds("vtysh -c 'show ip route' | grep '^O>'");
- }
+ with subtest("Wait for OSPF to form adjacencies"):
+ for gw in router1, router2:
+ gw.wait_for_unit("ospfd")
+ gw.wait_until_succeeds("vtysh -c 'show ip ospf neighbor' | grep Full")
+ gw.wait_until_succeeds("vtysh -c 'show ip route' | grep '^O>'")
- # Test ICMP.
- $client->succeed("ping -c 3 server >&2");
+ with subtest("Test ICMP"):
+ client.wait_until_succeeds("ping -c 3 server >&2")
- # Test whether HTTP works.
- $server->waitForUnit("httpd");
- $client->succeed("curl --fail http://server/ >&2");
+ with subtest("Test whether HTTP works"):
+ server.wait_for_unit("httpd")
+ client.succeed("curl --fail http://server/ >&2")
'';
})
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
deleted file mode 100644
index 4d57e2197904..000000000000
--- a/nixos/tests/quake3.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-import ./make-test-python.nix ({ pkgs, ...} :
-
-let
-
- # Build Quake with coverage instrumentation.
- overrides = pkgs:
- {
- quake3game = pkgs.quake3game.override (args: {
- stdenv = pkgs.stdenvAdapters.addCoverageInstrumentation args.stdenv;
- });
- };
-
- # Only allow the demo data to be used (only if it's unfreeRedistributable).
- unfreePredicate = pkg: with pkgs.lib; let
- allowPackageNames = [ "quake3-demodata" "quake3-pointrelease" ];
- allowLicenses = [ pkgs.lib.licenses.unfreeRedistributable ];
- in elem pkg.pname allowPackageNames &&
- elem (pkg.meta.license or null) allowLicenses;
-
-in
-
-rec {
- name = "quake3";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ domenkozar eelco ];
- };
-
- # TODO: lcov doesn't work atm
- #makeCoverageReport = true;
-
- client =
- { pkgs, ... }:
-
- { imports = [ ./common/x11.nix ];
- hardware.opengl.driSupport = true;
- environment.systemPackages = [ pkgs.quake3demo ];
- nixpkgs.config.packageOverrides = overrides;
- nixpkgs.config.allowUnfreePredicate = unfreePredicate;
- };
-
- nodes =
- { server =
- { pkgs, ... }:
-
- { systemd.services.quake3-server =
- { wantedBy = [ "multi-user.target" ];
- script =
- "${pkgs.quake3demo}/bin/quake3-server +set g_gametype 0 " +
- "+map q3dm7 +addbot grunt +addbot daemia 2> /tmp/log";
- };
- nixpkgs.config.packageOverrides = overrides;
- nixpkgs.config.allowUnfreePredicate = unfreePredicate;
- networking.firewall.allowedUDPPorts = [ 27960 ];
- };
-
- client1 = client;
- client2 = client;
- };
-
- testScript =
- ''
- start_all()
-
- server.wait_for_unit("quake3-server")
- client1.wait_for_x()
- client2.wait_for_x()
-
- client1.execute("quake3 +set r_fullscreen 0 +set name Foo +connect server &")
- client2.execute("quake3 +set r_fullscreen 0 +set name Bar +connect server &")
-
- server.wait_until_succeeds("grep -q 'Foo.*entered the game' /tmp/log")
- server.wait_until_succeeds("grep -q 'Bar.*entered the game' /tmp/log")
-
- server.sleep(10) # wait for a while to get a nice screenshot
-
- client1.block()
-
- server.sleep(20)
-
- client1.screenshot("screen1")
- client2.screenshot("screen2")
-
- client1.unblock()
-
- server.sleep(10)
-
- client1.screenshot("screen3")
- client2.screenshot("screen4")
-
- client1.shutdown()
- client2.shutdown()
- server.stop_job("quake3-server")
- '';
-
-})
diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix
index bb5932c36417..8e7f34d06e32 100644
--- a/nixos/tests/rabbitmq.nix
+++ b/nixos/tests/rabbitmq.nix
@@ -1,21 +1,21 @@
# This test runs rabbitmq and checks if rabbitmq is up and running.
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "rabbitmq";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco offline ];
};
- nodes = {
- one = { ... }: {
- services.rabbitmq.enable = true;
- };
+ machine = {
+ services.rabbitmq.enable = true;
};
testScript = ''
- startAll;
+ machine.start()
- $one->waitForUnit("rabbitmq.service");
- $one->waitUntilSucceeds("su -s ${pkgs.stdenv.shell} rabbitmq -c \"rabbitmqctl status\"");
+ machine.wait_for_unit("rabbitmq.service")
+ machine.wait_until_succeeds(
+ 'su -s ${pkgs.stdenv.shell} rabbitmq -c "rabbitmqctl status"'
+ )
'';
})
diff --git a/nixos/tests/radarr.nix b/nixos/tests/radarr.nix
index 9bc5607ccd5a..ed90025ac420 100644
--- a/nixos/tests/radarr.nix
+++ b/nixos/tests/radarr.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ... }:
+import ./make-test-python.nix ({ lib, ... }:
with lib;
@@ -11,8 +11,8 @@ with lib;
{ services.radarr.enable = true; };
testScript = ''
- $machine->waitForUnit('radarr.service');
- $machine->waitForOpenPort('7878');
- $machine->succeed("curl --fail http://localhost:7878/");
+ machine.wait_for_unit("radarr.service")
+ machine.wait_for_open_port("7878")
+ machine.succeed("curl --fail http://localhost:7878/")
'';
})
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index 607964255640..c81e78a8f994 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -28,7 +28,7 @@ let
in
- import ./make-test.nix ({ lib, ... }@args: {
+ import ./make-test-python.nix ({ lib, ... }@args: {
name = "radicale";
meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ];
@@ -64,43 +64,59 @@ in
newSystem = nodes.${nodeName}.config.system.build.toplevel;
in "${newSystem}/bin/switch-to-configuration test";
in ''
- # Check Radicale 1 functionality
- $radicale->succeed('${switchToConfig "radicale1"} >&2');
- $radicale->waitForUnit('radicale.service');
- $radicale->waitForOpenPort(${port});
- $radicale->succeed('curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/');
+ with subtest("Check Radicale 1 functionality"):
+ radicale.succeed(
+ "${switchToConfig "radicale1"} >&2"
+ )
+ radicale.wait_for_unit("radicale.service")
+ radicale.wait_for_open_port(${port})
+ radicale.succeed(
+ "curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/"
+ )
- # Export data in Radicale 2 format
- $radicale->succeed('systemctl stop radicale');
- $radicale->succeed('ls -al /tmp/collections');
- $radicale->fail('ls -al /tmp/collections-new');
- # Radicale exits immediately after exporting storage
- $radicale->succeed('${switchToConfig "radicale1_export"} >&2');
- $radicale->waitUntilFails('systemctl status radicale');
- $radicale->succeed('ls -al /tmp/collections');
- $radicale->succeed('ls -al /tmp/collections-new');
+ with subtest("Export data in Radicale 2 format"):
+ radicale.succeed("systemctl stop radicale")
+ radicale.succeed("ls -al /tmp/collections")
+ radicale.fail("ls -al /tmp/collections-new")
- # Verify data in Radicale 2 format
- $radicale->succeed('rm -r /tmp/collections/${user}');
- $radicale->succeed('mv /tmp/collections-new/collection-root /tmp/collections');
- $radicale->succeed('${switchToConfig "radicale2_verify"} >&2');
- $radicale->waitUntilFails('systemctl status radicale');
- my ($retcode, $logs) = $radicale->execute('journalctl -u radicale -n 10');
- if ($retcode != 0 || index($logs, 'Verifying storage') == -1) {
- die "Radicale 2 didn't verify storage"
- }
- if (index($logs, 'failed') != -1 || index($logs, 'exception') != -1) {
- die "storage verification failed"
- }
+ with subtest("Radicale exits immediately after exporting storage"):
+ radicale.succeed(
+ "${switchToConfig "radicale1_export"} >&2"
+ )
+ radicale.wait_until_fails("systemctl status radicale")
+ radicale.succeed("ls -al /tmp/collections")
+ radicale.succeed("ls -al /tmp/collections-new")
- # Check Radicale 2 functionality
- $radicale->succeed('${switchToConfig "radicale2"} >&2');
- $radicale->waitForUnit('radicale.service');
- $radicale->waitForOpenPort(${port});
- my ($retcode, $output) = $radicale->execute('curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/');
- if ($retcode != 0 || index($output, 'VCALENDAR') == -1) {
- die "Could not read calendar from Radicale 2"
- }
- $radicale->succeed('curl --fail http://${user}:${password}@localhost:${port}/.web/');
+ with subtest("Verify data in Radicale 2 format"):
+ radicale.succeed("rm -r /tmp/collections/${user}")
+ radicale.succeed("mv /tmp/collections-new/collection-root /tmp/collections")
+ radicale.succeed(
+ "${switchToConfig "radicale2_verify"} >&2"
+ )
+ radicale.wait_until_fails("systemctl status radicale")
+
+ (retcode, logs) = radicale.execute("journalctl -u radicale -n 10")
+ assert (
+ retcode == 0 and "Verifying storage" in logs
+ ), "Radicale 2 didn't verify storage"
+ assert (
+ "failed" not in logs and "exception" not in logs
+ ), "storage verification failed"
+
+ with subtest("Check Radicale 2 functionality"):
+ radicale.succeed(
+ "${switchToConfig "radicale2"} >&2"
+ )
+ radicale.wait_for_unit("radicale.service")
+ radicale.wait_for_open_port(${port})
+
+ (retcode, output) = radicale.execute(
+ "curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/"
+ )
+ assert (
+ retcode == 0 and "VCALENDAR" in output
+ ), "Could not read calendar from Radicale 2"
+
+ radicale.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/")
'';
})
diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix
index 325d93424dd7..529965d7acde 100644
--- a/nixos/tests/redis.nix
+++ b/nixos/tests/redis.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "redis";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ flokli ];
@@ -15,12 +15,10 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
-
- $machine->waitForUnit("redis");
- $machine->waitForOpenPort("6379");
-
- $machine->succeed("redis-cli ping | grep PONG");
- $machine->succeed("redis-cli -s /run/redis/redis.sock ping | grep PONG");
+ start_all()
+ machine.wait_for_unit("redis")
+ machine.wait_for_open_port("6379")
+ machine.succeed("redis-cli ping | grep PONG")
+ machine.succeed("redis-cli -s /run/redis/redis.sock ping | grep PONG")
'';
})
diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix
index 2d4df288b055..f0f4cbf6a21c 100644
--- a/nixos/tests/redmine.nix
+++ b/nixos/tests/redmine.nix
@@ -64,18 +64,13 @@ let
};
in
{
- v3-mysql = mysqlTest pkgs.redmine // {
- name = "v3-mysql";
+ mysql = mysqlTest pkgs.redmine // {
+ name = "mysql";
meta.maintainers = [ maintainers.aanderse ];
};
- v4-mysql = mysqlTest pkgs.redmine_4 // {
- name = "v4-mysql";
- meta.maintainers = [ maintainers.aanderse ];
- };
-
- v4-pgsql = pgsqlTest pkgs.redmine_4 // {
- name = "v4-pgsql";
+ pgsql = pgsqlTest pkgs.redmine // {
+ name = "pgsql";
meta.maintainers = [ maintainers.aanderse ];
};
}
diff --git a/nixos/tests/resolv.nix b/nixos/tests/resolv.nix
new file mode 100644
index 000000000000..b506f87451ee
--- /dev/null
+++ b/nixos/tests/resolv.nix
@@ -0,0 +1,46 @@
+# Test whether DNS resolving returns multiple records and all address families.
+import ./make-test-python.nix ({ pkgs, ... } : {
+ name = "resolv";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ ckauhaus ];
+ };
+
+ nodes.resolv = { ... }: {
+ networking.extraHosts = ''
+ # IPv4 only
+ 192.0.2.1 host-ipv4.example.net
+ 192.0.2.2 host-ipv4.example.net
+ # IP6 only
+ 2001:db8::2:1 host-ipv6.example.net
+ 2001:db8::2:2 host-ipv6.example.net
+ # dual stack
+ 192.0.2.1 host-dual.example.net
+ 192.0.2.2 host-dual.example.net
+ 2001:db8::2:1 host-dual.example.net
+ 2001:db8::2:2 host-dual.example.net
+ '';
+ };
+
+ testScript = ''
+ def addrs_in(hostname, addrs):
+ res = resolv.succeed("getent ahosts {}".format(hostname))
+ for addr in addrs:
+ assert addr in res, "Expected output '{}' not found in\n{}".format(addr, res)
+
+
+ start_all()
+ resolv.wait_for_unit("nscd")
+
+ ipv4 = ["192.0.2.1", "192.0.2.2"]
+ ipv6 = ["2001:db8::2:1", "2001:db8::2:2"]
+
+ with subtest("IPv4 resolves"):
+ addrs_in("host-ipv4.example.net", ipv4)
+
+ with subtest("IPv6 resolves"):
+ addrs_in("host-ipv6.example.net", ipv6)
+
+ with subtest("Dual stack resolves"):
+ addrs_in("host-dual.example.net", ipv4 + ipv6)
+ '';
+})
diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix
index ed0ebd7dd19d..1897b53e283a 100644
--- a/nixos/tests/roundcube.nix
+++ b/nixos/tests/roundcube.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "roundcube";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ globin ];
@@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : {
services.roundcube = {
enable = true;
hostName = "roundcube";
- database.password = "notproduction";
+ database.password = "not production";
package = pkgs.roundcube.withPlugins (plugins: [ plugins.persistent_login ]);
plugins = [ "persistent_login" ];
};
@@ -21,10 +21,10 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- $roundcube->start;
- $roundcube->waitForUnit("postgresql.service");
- $roundcube->waitForUnit("phpfpm-roundcube.service");
- $roundcube->waitForUnit("nginx.service");
- $roundcube->succeed("curl -sSfL http://roundcube/ | grep 'Keep me logged in'");
+ roundcube.start
+ roundcube.wait_for_unit("postgresql.service")
+ roundcube.wait_for_unit("phpfpm-roundcube.service")
+ roundcube.wait_for_unit("nginx.service")
+ roundcube.succeed("curl -sSfL http://roundcube/ | grep 'Keep me logged in'")
'';
})
diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix
index 0cc94728f80a..bf3f0de62044 100644
--- a/nixos/tests/rspamd.nix
+++ b/nixos/tests/rspamd.nix
@@ -3,20 +3,20 @@
pkgs ? import ../.. { inherit system config; }
}:
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
let
initMachine = ''
- startAll
- $machine->waitForUnit("rspamd.service");
- $machine->succeed("id \"rspamd\" >/dev/null");
+ start_all()
+ machine.wait_for_unit("rspamd.service")
+ machine.succeed("id rspamd >/dev/null")
'';
checkSocket = socket: user: group: mode: ''
- $machine->succeed("ls ${socket} >/dev/null");
- $machine->succeed("[[ \"\$(stat -c %U ${socket})\" == \"${user}\" ]]");
- $machine->succeed("[[ \"\$(stat -c %G ${socket})\" == \"${group}\" ]]");
- $machine->succeed("[[ \"\$(stat -c %a ${socket})\" == \"${mode}\" ]]");
+ machine.succeed("ls ${socket} >/dev/null")
+ machine.succeed('[[ "$(stat -c %U ${socket})" == "${user}" ]]')
+ machine.succeed('[[ "$(stat -c %G ${socket})" == "${group}" ]]')
+ machine.succeed('[[ "$(stat -c %a ${socket})" == "${mode}" ]]')
'';
simple = name: enableIPv6: makeTest {
name = "rspamd-${name}";
@@ -25,22 +25,23 @@ let
networking.enableIPv6 = enableIPv6;
};
testScript = ''
- startAll
- $machine->waitForUnit("multi-user.target");
- $machine->waitForOpenPort(11334);
- $machine->waitForUnit("rspamd.service");
- $machine->succeed("id \"rspamd\" >/dev/null");
+ start_all()
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_for_open_port(11334)
+ machine.wait_for_unit("rspamd.service")
+ machine.succeed("id rspamd >/dev/null")
${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" }
- sleep 10;
- $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf"));
- $machine->log($machine->succeed("grep 'CONFDIR/worker-controller.inc' /etc/rspamd/rspamd.conf"));
- $machine->log($machine->succeed("grep 'CONFDIR/worker-normal.inc' /etc/rspamd/rspamd.conf"));
- $machine->log($machine->succeed("systemctl cat rspamd.service"));
- $machine->log($machine->succeed("curl http://localhost:11334/auth"));
- $machine->log($machine->succeed("curl http://127.0.0.1:11334/auth"));
- ${optionalString enableIPv6 ''
- $machine->log($machine->succeed("curl http://[::1]:11334/auth"));
- ''}
+ machine.sleep(10)
+ machine.log(machine.succeed("cat /etc/rspamd/rspamd.conf"))
+ machine.log(
+ machine.succeed("grep 'CONFDIR/worker-controller.inc' /etc/rspamd/rspamd.conf")
+ )
+ machine.log(machine.succeed("grep 'CONFDIR/worker-normal.inc' /etc/rspamd/rspamd.conf"))
+ machine.log(machine.succeed("systemctl cat rspamd.service"))
+ machine.log(machine.succeed("curl http://localhost:11334/auth"))
+ machine.log(machine.succeed("curl http://127.0.0.1:11334/auth"))
+ ${optionalString enableIPv6 ''machine.log(machine.succeed("curl http://[::1]:11334/auth"))''}
+ # would not reformat
'';
};
in
@@ -69,14 +70,18 @@ in
testScript = ''
${initMachine}
- $machine->waitForFile("/run/rspamd.sock");
+ machine.wait_for_file("/run/rspamd.sock")
${checkSocket "/run/rspamd.sock" "root" "root" "600" }
${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" }
- $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf"));
- $machine->log($machine->succeed("grep 'CONFDIR/worker-controller.inc' /etc/rspamd/rspamd.conf"));
- $machine->log($machine->succeed("grep 'CONFDIR/worker-normal.inc' /etc/rspamd/rspamd.conf"));
- $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat"));
- $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping"));
+ machine.log(machine.succeed("cat /etc/rspamd/rspamd.conf"))
+ machine.log(
+ machine.succeed("grep 'CONFDIR/worker-controller.inc' /etc/rspamd/rspamd.conf")
+ )
+ machine.log(machine.succeed("grep 'CONFDIR/worker-normal.inc' /etc/rspamd/rspamd.conf"))
+ machine.log(machine.succeed("rspamc -h /run/rspamd-worker.sock stat"))
+ machine.log(
+ machine.succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")
+ )
'';
};
@@ -111,18 +116,32 @@ in
testScript = ''
${initMachine}
- $machine->waitForFile("/run/rspamd.sock");
+ machine.wait_for_file("/run/rspamd.sock")
${checkSocket "/run/rspamd.sock" "root" "root" "600" }
${checkSocket "/run/rspamd-worker.sock" "root" "root" "666" }
- $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf"));
- $machine->log($machine->succeed("grep 'CONFDIR/worker-controller.inc' /etc/rspamd/rspamd.conf"));
- $machine->log($machine->succeed("grep 'CONFDIR/worker-normal.inc' /etc/rspamd/rspamd.conf"));
- $machine->log($machine->succeed("grep 'LOCAL_CONFDIR/override.d/worker-controller2.inc' /etc/rspamd/rspamd.conf"));
- $machine->log($machine->succeed("grep 'verysecretpassword' /etc/rspamd/override.d/worker-controller2.inc"));
- $machine->waitUntilSucceeds("journalctl -u rspamd | grep -i 'starting controller process' >&2");
- $machine->log($machine->succeed("rspamc -h /run/rspamd-worker.sock stat"));
- $machine->log($machine->succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping"));
- $machine->log($machine->succeed("curl http://localhost:11335/ping"));
+ machine.log(machine.succeed("cat /etc/rspamd/rspamd.conf"))
+ machine.log(
+ machine.succeed("grep 'CONFDIR/worker-controller.inc' /etc/rspamd/rspamd.conf")
+ )
+ machine.log(machine.succeed("grep 'CONFDIR/worker-normal.inc' /etc/rspamd/rspamd.conf"))
+ machine.log(
+ machine.succeed(
+ "grep 'LOCAL_CONFDIR/override.d/worker-controller2.inc' /etc/rspamd/rspamd.conf"
+ )
+ )
+ machine.log(
+ machine.succeed(
+ "grep 'verysecretpassword' /etc/rspamd/override.d/worker-controller2.inc"
+ )
+ )
+ machine.wait_until_succeeds(
+ "journalctl -u rspamd | grep -i 'starting controller process' >&2"
+ )
+ machine.log(machine.succeed("rspamc -h /run/rspamd-worker.sock stat"))
+ machine.log(
+ machine.succeed("curl --unix-socket /run/rspamd-worker.sock http://localhost/ping")
+ )
+ machine.log(machine.succeed("curl http://localhost:11335/ping"))
'';
};
customLuaRules = makeTest {
@@ -199,22 +218,34 @@ in
};
testScript = ''
${initMachine}
- $machine->waitForOpenPort(11334);
- $machine->log($machine->succeed("cat /etc/rspamd/rspamd.conf"));
- $machine->log($machine->succeed("cat /etc/rspamd/rspamd.local.lua"));
- $machine->log($machine->succeed("cat /etc/rspamd/local.d/groups.conf"));
+ machine.wait_for_open_port(11334)
+ machine.log(machine.succeed("cat /etc/rspamd/rspamd.conf"))
+ machine.log(machine.succeed("cat /etc/rspamd/rspamd.local.lua"))
+ machine.log(machine.succeed("cat /etc/rspamd/local.d/groups.conf"))
# Verify that redis.conf was not written
- $machine->fail("cat /etc/rspamd/local.d/redis.conf >&2");
+ machine.fail("cat /etc/rspamd/local.d/redis.conf >&2")
# Verify that antivirus.conf was not written
- $machine->fail("cat /etc/rspamd/local.d/antivirus.conf >&2");
+ machine.fail("cat /etc/rspamd/local.d/antivirus.conf >&2")
${checkSocket "/run/rspamd/rspamd.sock" "rspamd" "rspamd" "660" }
- $machine->log($machine->succeed("curl --unix-socket /run/rspamd/rspamd.sock http://localhost/ping"));
- $machine->log($machine->succeed("rspamc -h 127.0.0.1:11334 stat"));
- $machine->log($machine->succeed("cat /etc/tests/no-muh.eml | rspamc -h 127.0.0.1:11334"));
- $machine->log($machine->succeed("cat /etc/tests/muh.eml | rspamc -h 127.0.0.1:11334 symbols"));
- $machine->waitUntilSucceeds("journalctl -u rspamd | grep -i muh >&2");
- $machine->log($machine->fail("cat /etc/tests/no-muh.eml | rspamc -h 127.0.0.1:11334 symbols | grep NO_MUH"));
- $machine->log($machine->succeed("cat /etc/tests/muh.eml | rspamc -h 127.0.0.1:11334 symbols | grep NO_MUH"));
+ machine.log(
+ machine.succeed("curl --unix-socket /run/rspamd/rspamd.sock http://localhost/ping")
+ )
+ machine.log(machine.succeed("rspamc -h 127.0.0.1:11334 stat"))
+ machine.log(machine.succeed("cat /etc/tests/no-muh.eml | rspamc -h 127.0.0.1:11334"))
+ machine.log(
+ machine.succeed("cat /etc/tests/muh.eml | rspamc -h 127.0.0.1:11334 symbols")
+ )
+ machine.wait_until_succeeds("journalctl -u rspamd | grep -i muh >&2")
+ machine.log(
+ machine.fail(
+ "cat /etc/tests/no-muh.eml | rspamc -h 127.0.0.1:11334 symbols | grep NO_MUH"
+ )
+ )
+ machine.log(
+ machine.succeed(
+ "cat /etc/tests/muh.eml | rspamc -h 127.0.0.1:11334 symbols | grep NO_MUH"
+ )
+ )
'';
};
postfixIntegration = makeTest {
@@ -250,16 +281,24 @@ in
};
testScript = ''
${initMachine}
- $machine->waitForOpenPort(11334);
- $machine->waitForOpenPort(25);
+ machine.wait_for_open_port(11334)
+ machine.wait_for_open_port(25)
${checkSocket "/run/rspamd/rspamd-milter.sock" "rspamd" "postfix" "660" }
- $machine->log($machine->succeed("rspamc -h 127.0.0.1:11334 stat"));
- $machine->log($machine->succeed("msmtp --host=localhost -t --read-envelope-from < /etc/tests/example.eml"));
- $machine->log($machine->fail("msmtp --host=localhost -t --read-envelope-from < /etc/tests/gtube.eml"));
+ machine.log(machine.succeed("rspamc -h 127.0.0.1:11334 stat"))
+ machine.log(
+ machine.succeed(
+ "msmtp --host=localhost -t --read-envelope-from < /etc/tests/example.eml"
+ )
+ )
+ machine.log(
+ machine.fail(
+ "msmtp --host=localhost -t --read-envelope-from < /etc/tests/gtube.eml"
+ )
+ )
- $machine->waitUntilFails('[ "$(postqueue -p)" != "Mail queue is empty" ]');
- $machine->fail("journalctl -u postfix | grep -i error >&2");
- $machine->fail("journalctl -u postfix | grep -i warning >&2");
+ machine.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]')
+ machine.fail("journalctl -u postfix | grep -i error >&2")
+ machine.fail("journalctl -u postfix | grep -i warning >&2")
'';
};
}
diff --git a/nixos/tests/rss2email.nix b/nixos/tests/rss2email.nix
index 492d47da9f56..d62207a417b8 100644
--- a/nixos/tests/rss2email.nix
+++ b/nixos/tests/rss2email.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix {
+import ./make-test-python.nix {
name = "opensmtpd";
nodes = {
@@ -53,14 +53,14 @@ import ./make-test.nix {
};
testScript = ''
- startAll;
+ start_all()
- $server->waitForUnit("network-online.target");
- $server->waitForUnit("opensmtpd");
- $server->waitForUnit("dovecot2");
- $server->waitForUnit("nginx");
- $server->waitForUnit("rss2email");
+ server.wait_for_unit("network-online.target")
+ server.wait_for_unit("opensmtpd")
+ server.wait_for_unit("dovecot2")
+ server.wait_for_unit("nginx")
+ server.wait_for_unit("rss2email")
- $server->waitUntilSucceeds('check-mail-landed >&2');
+ server.wait_until_succeeds("check-mail-landed >&2")
'';
}
diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix
index d0b53db8eeb6..194a2e3d2b94 100644
--- a/nixos/tests/rxe.nix
+++ b/nixos/tests/rxe.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ ... } :
+import ./make-test-python.nix ({ ... } :
let
node = { pkgs, ... } : {
@@ -26,27 +26,21 @@ in {
testScript = ''
# Test if rxe interface comes up
- $server->waitForUnit("default.target");
- $server->succeed("systemctl status rxe.service");
- $server->succeed("ibv_devices | grep rxe0");
+ server.wait_for_unit("default.target")
+ server.succeed("systemctl status rxe.service")
+ server.succeed("ibv_devices | grep rxe0")
- $client->waitForUnit("default.target");
+ client.wait_for_unit("default.target")
- # ping pong test
- $server->succeed("screen -dmS rc_pingpong ibv_rc_pingpong -p 4800 -g0");
- $client->succeed("sleep 2; ibv_rc_pingpong -p 4800 -g0 server");
+ # ping pong tests
+ for proto in "rc", "uc", "ud", "srq":
+ server.succeed(
+ "screen -dmS {0}_pingpong ibv_{0}_pingpong -p 4800 -s 1024 -g0".format(proto)
+ )
+ client.succeed("sleep 2; ibv_{}_pingpong -p 4800 -s 1024 -g0 server".format(proto))
- $server->succeed("screen -dmS uc_pingpong ibv_uc_pingpong -p 4800 -g0");
- $client->succeed("sleep 2; ibv_uc_pingpong -p 4800 -g0 server");
-
- $server->succeed("screen -dmS ud_pingpong ibv_ud_pingpong -p 4800 -s 1024 -g0");
- $client->succeed("sleep 2; ibv_ud_pingpong -p 4800 -s 1024 -g0 server");
-
- $server->succeed("screen -dmS srq_pingpong ibv_srq_pingpong -p 4800 -g0");
- $client->succeed("sleep 2; ibv_srq_pingpong -p 4800 -g0 server");
-
- $server->succeed("screen -dmS rping rping -s -a server -C 10");
- $client->succeed("sleep 2; rping -c -a server -C 10");
+ server.succeed("screen -dmS rping rping -s -a server -C 10")
+ client.succeed("sleep 2; rping -c -a server -C 10")
'';
})
diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix
index 2802e00a5b1a..142269752b34 100644
--- a/nixos/tests/samba.nix
+++ b/nixos/tests/samba.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
{
name = "samba";
@@ -36,12 +36,12 @@ import ./make-test.nix ({ pkgs, ... }:
testScript =
''
- $server->start;
- $server->waitForUnit("samba.target");
- $server->succeed("mkdir -p /public; echo bar > /public/foo");
+ server.start()
+ server.wait_for_unit("samba.target")
+ server.succeed("mkdir -p /public; echo bar > /public/foo")
- $client->start;
- $client->waitForUnit("remote-fs.target");
- $client->succeed("[[ \$(cat /public/foo) = bar ]]");
+ client.start()
+ client.wait_for_unit("remote-fs.target")
+ client.succeed("[[ $(cat /public/foo) = bar ]]")
'';
})
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index 678bcbeab20a..a145705250f7 100644
--- a/nixos/tests/sddm.nix
+++ b/nixos/tests/sddm.nix
@@ -3,7 +3,7 @@
pkgs ? import ../.. { inherit system config; }
}:
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
let
inherit (pkgs) lib;
@@ -16,9 +16,8 @@ let
imports = [ ./common/user-account.nix ];
services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true;
- services.xserver.windowManager.default = "icewm";
+ services.xserver.displayManager.defaultSession = "none+icewm";
services.xserver.windowManager.icewm.enable = true;
- services.xserver.desktopManager.default = "none";
};
enableOCR = true;
@@ -26,13 +25,13 @@ let
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
in ''
- startAll;
- $machine->waitForText(qr/select your user/i);
- $machine->screenshot("sddm");
- $machine->sendChars("${user.password}\n");
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow("^IceWM ");
+ start_all()
+ machine.wait_for_text("(?i)select your user")
+ machine.screenshot("sddm")
+ machine.send_chars("${user.password}\n")
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
+ machine.wait_for_window("^IceWM ")
'';
};
@@ -52,16 +51,17 @@ let
user = "alice";
};
};
- services.xserver.windowManager.default = "icewm";
+ services.xserver.displayManager.defaultSession = "none+icewm";
services.xserver.windowManager.icewm.enable = true;
- services.xserver.desktopManager.default = "none";
};
- testScript = { ... }: ''
- startAll;
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow("^IceWM ");
+ testScript = { nodes, ... }: let
+ user = nodes.machine.config.users.users.alice;
+ in ''
+ start_all()
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
+ machine.wait_for_window("^IceWM ")
'';
};
};
diff --git a/nixos/tests/shiori.nix b/nixos/tests/shiori.nix
index 0022a7220fe2..a5771262c6f2 100644
--- a/nixos/tests/shiori.nix
+++ b/nixos/tests/shiori.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ...}:
+import ./make-test-python.nix ({ pkgs, lib, ...}:
{
name = "shiori";
@@ -8,10 +8,74 @@ import ./make-test.nix ({ lib, ...}:
{ ... }:
{ services.shiori.enable = true; };
- testScript = ''
- $machine->waitForUnit('shiori.service');
- $machine->waitForOpenPort('8080');
- $machine->succeed("curl --fail http://localhost:8080/");
- $machine->succeed("curl --fail --location http://localhost:8080/ | grep -qi shiori");
+ testScript = let
+ authJSON = pkgs.writeText "auth.json" (builtins.toJSON {
+ username = "shiori";
+ password = "gopher";
+ remember = 1; # hour
+ owner = true;
+ });
+
+ insertBookmark = {
+ url = "http://example.org";
+ title = "Example Bookmark";
+ };
+
+ insertBookmarkJSON = pkgs.writeText "insertBookmark.json" (builtins.toJSON insertBookmark);
+ in ''
+ import json
+
+ machine.wait_for_unit("shiori.service")
+ machine.wait_for_open_port(8080)
+ machine.succeed("curl --fail http://localhost:8080/")
+ machine.succeed("curl --fail --location http://localhost:8080/ | grep -qi shiori")
+
+ with subtest("login"):
+ auth_json = machine.succeed(
+ "curl --fail --location http://localhost:8080/api/login "
+ "-X POST -H 'Content-Type:application/json' -d @${authJSON}"
+ )
+ auth_ret = json.loads(auth_json)
+ session_id = auth_ret["session"]
+
+ with subtest("bookmarks"):
+ with subtest("first use no bookmarks"):
+ bookmarks_json = machine.succeed(
+ (
+ "curl --fail --location http://localhost:8080/api/bookmarks "
+ "-H 'X-Session-Id:{}'"
+ ).format(session_id)
+ )
+
+ if json.loads(bookmarks_json)["bookmarks"] != []:
+ raise Exception("Shiori have a bookmark on first use")
+
+ with subtest("insert bookmark"):
+ machine.succeed(
+ (
+ "curl --fail --location http://localhost:8080/api/bookmarks "
+ "-X POST -H 'X-Session-Id:{}' "
+ "-H 'Content-Type:application/json' -d @${insertBookmarkJSON}"
+ ).format(session_id)
+ )
+
+ with subtest("get inserted bookmark"):
+ bookmarks_json = machine.succeed(
+ (
+ "curl --fail --location http://localhost:8080/api/bookmarks "
+ "-H 'X-Session-Id:{}'"
+ ).format(session_id)
+ )
+
+ bookmarks = json.loads(bookmarks_json)["bookmarks"]
+ if len(bookmarks) != 1:
+ raise Exception("Shiori didn't save the bookmark")
+
+ bookmark = bookmarks[0]
+ if (
+ bookmark["url"] != "${insertBookmark.url}"
+ or bookmark["title"] != "${insertBookmark.title}"
+ ):
+ raise Exception("Inserted bookmark doesn't have same URL or title")
'';
})
diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix
index 605b9c3e1301..c746d46dc550 100644
--- a/nixos/tests/signal-desktop.nix
+++ b/nixos/tests/signal-desktop.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test-python.nix ({ pkgs, ...} :
{
name = "signal-desktop";
@@ -24,14 +24,14 @@ import ./make-test.nix ({ pkgs, ...} :
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
in ''
- startAll;
- $machine->waitForX;
+ start_all()
+ machine.wait_for_x()
# start signal desktop
- $machine->execute("su - alice -c signal-desktop &");
+ machine.execute("su - alice -c signal-desktop &")
# wait for the "Link your phone to Signal Desktop" message
- $machine->waitForText(qr/Link your phone to Signal Desktop/);
- $machine->screenshot("signal_desktop");
+ machine.wait_for_text("Link your phone to Signal Desktop")
+ machine.screenshot("signal_desktop")
'';
})
diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix
index 84c5621d962f..3810a2cd3a58 100644
--- a/nixos/tests/simple.nix
+++ b/nixos/tests/simple.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "simple";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco ];
@@ -10,8 +10,8 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- startAll;
- $machine->waitForUnit("multi-user.target");
- $machine->shutdown;
+ start_all()
+ machine.wait_for_unit("multi-user.target")
+ machine.shutdown()
'';
})
diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix
deleted file mode 100644
index 42c87dfa039d..000000000000
--- a/nixos/tests/slim.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
- name = "slim";
-
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ aszlig ];
- };
-
- machine = { pkgs, ... }: {
- imports = [ ./common/user-account.nix ];
- services.xserver.enable = true;
- services.xserver.windowManager.default = "icewm";
- services.xserver.windowManager.icewm.enable = true;
- services.xserver.desktopManager.default = "none";
- services.xserver.displayManager.slim = {
- enable = true;
-
- # Use a custom theme in order to get best OCR results
- theme = pkgs.runCommand "slim-theme-ocr" {
- nativeBuildInputs = [ pkgs.imagemagick ];
- } ''
- mkdir "$out"
- convert -size 1x1 xc:white "$out/background.jpg"
- convert -size 200x100 xc:white "$out/panel.jpg"
- cat > "$out/slim.theme" <waitForText(qr/Username:/);
- $machine->sendChars("${user.name}\n");
- $machine->waitForText(qr/Password:/);
- $machine->sendChars("${user.password}\n");
-
- $machine->waitForFile('${user.home}/.Xauthority');
- $machine->succeed('xauth merge ${user.home}/.Xauthority');
- $machine->waitForWindow('^IceWM ');
-
- # Make sure SLiM doesn't create a log file
- $machine->fail('test -e /var/log/slim.log');
- '';
-})
diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index 4c2cd3c3d264..d0e62d15437c 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ... }:
+import ./make-test-python.nix ({ lib, ... }:
let
mungekey = "mungeverryweakkeybuteasytointegratoinatest";
@@ -54,10 +54,15 @@ in {
networking.firewall.enable = false;
services.slurm.dbdserver = {
enable = true;
+ storagePass = "password123";
};
services.mysql = {
enable = true;
- package = pkgs.mysql;
+ package = pkgs.mariadb;
+ initialScript = pkgs.writeText "mysql-init.sql" ''
+ CREATE USER 'slurm'@'localhost' IDENTIFIED BY 'password123';
+ GRANT ALL PRIVILEGES ON slurm_acct_db.* TO 'slurm'@'localhost';
+ '';
ensureDatabases = [ "slurm_acct_db" ];
ensureUsers = [{
ensurePermissions = { "slurm_acct_db.*" = "ALL PRIVILEGES"; };
@@ -80,63 +85,57 @@ in {
testScript =
''
- startAll;
+ start_all()
# Set up authentification across the cluster
- foreach my $node (($submit,$control,$dbd,$node1,$node2,$node3))
- {
- $node->waitForUnit("default.target");
+ for node in [submit, control, dbd, node1, node2, node3]:
- $node->succeed("mkdir /etc/munge");
- $node->succeed("echo '${mungekey}' > /etc/munge/munge.key");
- $node->succeed("chmod 0400 /etc/munge/munge.key");
- $node->succeed("chown munge:munge /etc/munge/munge.key");
- $node->succeed("systemctl restart munged");
+ node.wait_for_unit("default.target")
+
+ node.succeed("mkdir /etc/munge")
+ node.succeed(
+ "echo '${mungekey}' > /etc/munge/munge.key"
+ )
+ node.succeed("chmod 0400 /etc/munge/munge.key")
+ node.succeed("chown munge:munge /etc/munge/munge.key")
+ node.succeed("systemctl restart munged")
+
+ node.wait_for_unit("munged")
- $node->waitForUnit("munged");
- };
# Restart the services since they have probably failed due to the munge init
# failure
- subtest "can_start_slurmdbd", sub {
- $dbd->succeed("systemctl restart slurmdbd");
- $dbd->waitForUnit("slurmdbd.service");
- $dbd->waitForOpenPort(6819);
- };
+ with subtest("can_start_slurmdbd"):
+ dbd.succeed("systemctl restart slurmdbd")
+ dbd.wait_for_unit("slurmdbd.service")
+ dbd.wait_for_open_port(6819)
# there needs to be an entry for the current
# cluster in the database before slurmctld is restarted
- subtest "add_account", sub {
- $control->succeed("sacctmgr -i add cluster default");
- # check for cluster entry
- $control->succeed("sacctmgr list cluster | awk '{ print \$1 }' | grep default");
- };
+ with subtest("add_account"):
+ control.succeed("sacctmgr -i add cluster default")
+ # check for cluster entry
+ control.succeed("sacctmgr list cluster | awk '{ print $1 }' | grep default")
- subtest "can_start_slurmctld", sub {
- $control->succeed("systemctl restart slurmctld");
- $control->waitForUnit("slurmctld.service");
- };
+ with subtest("can_start_slurmctld"):
+ control.succeed("systemctl restart slurmctld")
+ control.wait_for_unit("slurmctld.service")
- subtest "can_start_slurmd", sub {
- foreach my $node (($node1,$node2,$node3))
- {
- $node->succeed("systemctl restart slurmd.service");
- $node->waitForUnit("slurmd");
- }
- };
+ with subtest("can_start_slurmd"):
+ for node in [node1, node2, node3]:
+ node.succeed("systemctl restart slurmd.service")
+ node.wait_for_unit("slurmd")
# Test that the cluster works and can distribute jobs;
- subtest "run_distributed_command", sub {
- # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes).
- # The output must contain the 3 different names
- $submit->succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq");
- };
+ with subtest("run_distributed_command"):
+ # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes).
+ # The output must contain the 3 different names
+ submit.succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq")
- subtest "check_slurm_dbd", sub {
- # find the srun job from above in the database
- sleep 5;
- $control->succeed("sacct | grep hostname");
- };
+ with subtest("check_slurm_dbd"):
+ # find the srun job from above in the database
+ control.succeed("sleep 5")
+ control.succeed("sacct | grep hostname")
'';
})
diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix
index 07d228051127..4f8f0fcc9fe2 100644
--- a/nixos/tests/smokeping.nix
+++ b/nixos/tests/smokeping.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "smokeping";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ cransom ];
@@ -22,12 +22,12 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
- $sm->waitForUnit("smokeping");
- $sm->waitForUnit("thttpd");
- $sm->waitForFile("/var/lib/smokeping/data/Local/LocalMachine.rrd");
- $sm->succeed("curl -s -f localhost:8081/smokeping.fcgi?target=Local");
- $sm->succeed("ls /var/lib/smokeping/cache/Local/LocalMachine_mini.png");
- $sm->succeed("ls /var/lib/smokeping/cache/index.html");
+ start_all()
+ sm.wait_for_unit("smokeping")
+ sm.wait_for_unit("thttpd")
+ sm.wait_for_file("/var/lib/smokeping/data/Local/LocalMachine.rrd")
+ sm.succeed("curl -s -f localhost:8081/smokeping.fcgi?target=Local")
+ sm.succeed("ls /var/lib/smokeping/cache/Local/LocalMachine_mini.png")
+ sm.succeed("ls /var/lib/smokeping/cache/index.html")
'';
})
diff --git a/nixos/tests/snapper.nix b/nixos/tests/snapper.nix
index 74ec22fd3499..018102d7f640 100644
--- a/nixos/tests/snapper.nix
+++ b/nixos/tests/snapper.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ ... }:
+import ./make-test-python.nix ({ ... }:
{
name = "snapper";
@@ -20,24 +20,16 @@ import ./make-test.nix ({ ... }:
};
testScript = ''
- $machine->succeed("btrfs subvolume create /home/.snapshots");
-
- $machine->succeed("snapper -c home list");
-
- $machine->succeed("snapper -c home create --description empty");
-
- $machine->succeed("echo test > /home/file");
- $machine->succeed("snapper -c home create --description file");
-
- $machine->succeed("snapper -c home status 1..2");
-
- $machine->succeed("snapper -c home undochange 1..2");
- $machine->fail("ls /home/file");
-
- $machine->succeed("snapper -c home delete 2");
-
- $machine->succeed("systemctl --wait start snapper-timeline.service");
-
- $machine->succeed("systemctl --wait start snapper-cleanup.service");
+ machine.succeed("btrfs subvolume create /home/.snapshots")
+ machine.succeed("snapper -c home list")
+ machine.succeed("snapper -c home create --description empty")
+ machine.succeed("echo test > /home/file")
+ machine.succeed("snapper -c home create --description file")
+ machine.succeed("snapper -c home status 1..2")
+ machine.succeed("snapper -c home undochange 1..2")
+ machine.fail("ls /home/file")
+ machine.succeed("snapper -c home delete 2")
+ machine.succeed("systemctl --wait start snapper-timeline.service")
+ machine.succeed("systemctl --wait start snapper-cleanup.service")
'';
})
diff --git a/nixos/tests/sonarr.nix b/nixos/tests/sonarr.nix
index 3e84445099ab..764a4d05b381 100644
--- a/nixos/tests/sonarr.nix
+++ b/nixos/tests/sonarr.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ... }:
+import ./make-test-python.nix ({ lib, ... }:
with lib;
@@ -11,8 +11,8 @@ with lib;
{ services.sonarr.enable = true; };
testScript = ''
- $machine->waitForUnit('sonarr.service');
- $machine->waitForOpenPort('8989');
- $machine->succeed("curl --fail http://localhost:8989/");
+ machine.wait_for_unit("sonarr.service")
+ machine.wait_for_open_port("8989")
+ machine.succeed("curl --fail http://localhost:8989/")
'';
})
diff --git a/nixos/tests/spacecookie.nix b/nixos/tests/spacecookie.nix
new file mode 100644
index 000000000000..6eff32a2e75d
--- /dev/null
+++ b/nixos/tests/spacecookie.nix
@@ -0,0 +1,51 @@
+let
+ gopherRoot = "/tmp/gopher";
+ gopherHost = "gopherd";
+ fileContent = "Hello Gopher!";
+ fileName = "file.txt";
+in
+ import ./make-test-python.nix ({...}: {
+ name = "spacecookie";
+ nodes = {
+ ${gopherHost} = {
+ networking.firewall.allowedTCPPorts = [ 70 ];
+ systemd.services.spacecookie = {
+ preStart = ''
+ mkdir -p ${gopherRoot}/directory
+ echo "${fileContent}" > ${gopherRoot}/${fileName}
+ '';
+ };
+
+ services.spacecookie = {
+ enable = true;
+ root = gopherRoot;
+ hostname = gopherHost;
+ };
+ };
+
+ client = {};
+ };
+
+ testScript = ''
+ start_all()
+ ${gopherHost}.wait_for_open_port(70)
+ ${gopherHost}.wait_for_unit("spacecookie.service")
+ client.wait_for_unit("network.target")
+
+ fileResponse = client.succeed("curl -s gopher://${gopherHost}//${fileName}")
+
+ # the file response should return our created file exactly
+ if not (fileResponse == "${fileContent}\n"):
+ raise Exception("Unexpected file response")
+
+ # sanity check on the directory listing: we serve a directory and a file
+ # via gopher, so the directory listing should have exactly two entries,
+ # one with gopher file type 0 (file) and one with file type 1 (directory).
+ dirResponse = client.succeed("curl -s gopher://${gopherHost}")
+ dirEntries = [l[0] for l in dirResponse.split("\n") if len(l) > 0]
+ dirEntries.sort()
+
+ if not (["0", "1"] == dirEntries):
+ raise Exception("Unexpected directory response")
+ '';
+ })
diff --git a/nixos/tests/spike.nix b/nixos/tests/spike.nix
new file mode 100644
index 000000000000..47763e75ffa2
--- /dev/null
+++ b/nixos/tests/spike.nix
@@ -0,0 +1,22 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+let
+ riscvPkgs = import ../.. { crossSystem = pkgs.stdenv.lib.systems.examples.riscv64-embedded; };
+in
+{
+ name = "spike";
+ meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ blitz ]; };
+
+ machine = { pkgs, lib, ... }: {
+ environment.systemPackages = [ pkgs.spike riscvPkgs.riscv-pk riscvPkgs.hello ];
+ };
+
+ # Run the RISC-V hello applications using the proxy kernel on the
+ # Spike emulator and see whether we get the expected output.
+ testScript =
+ ''
+ machine.wait_for_unit("multi-user.target")
+ output = machine.succeed("spike -m64 $(which pk) $(which hello)")
+ assert output == "Hello, world!\n"
+ '';
+})
diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix
index 9bab9349ea73..152c0d61c543 100644
--- a/nixos/tests/strongswan-swanctl.nix
+++ b/nixos/tests/strongswan-swanctl.nix
@@ -16,7 +16,7 @@
# See the NixOS manual for how to run this test:
# https://nixos.org/nixos/manual/index.html#sec-running-nixos-tests-interactively
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test-python.nix ({ pkgs, ...} :
let
allowESP = "iptables --insert INPUT --protocol ESP --jump ACCEPT";
@@ -142,7 +142,7 @@ in {
};
testScript = ''
- startAll();
- $carol->waitUntilSucceeds("ping -c 1 alice");
+ start_all()
+ carol.wait_until_succeeds("ping -c 1 alice")
'';
})
diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix
index fc16b99cc19c..5bbec3d57269 100644
--- a/nixos/tests/sudo.nix
+++ b/nixos/tests/sudo.nix
@@ -4,7 +4,7 @@ let
password = "helloworld";
in
- import ./make-test.nix ({ pkgs, ...} : {
+ import ./make-test-python.nix ({ pkgs, ...} : {
name = "sudo";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ lschuermann ];
@@ -50,44 +50,34 @@ in
testScript =
''
- subtest "users in wheel group should have passwordless sudo", sub {
- $machine->succeed("su - test0 -c \"sudo -u root true\"");
- };
+ with subtest("users in wheel group should have passwordless sudo"):
+ machine.succeed('su - test0 -c "sudo -u root true"')
- subtest "test1 user should have sudo with password", sub {
- $machine->succeed("su - test1 -c \"echo ${password} | sudo -S -u root true\"");
- };
+ with subtest("test1 user should have sudo with password"):
+ machine.succeed('su - test1 -c "echo ${password} | sudo -S -u root true"')
- subtest "test1 user should not be able to use sudo without password", sub {
- $machine->fail("su - test1 -c \"sudo -n -u root true\"");
- };
+ with subtest("test1 user should not be able to use sudo without password"):
+ machine.fail('su - test1 -c "sudo -n -u root true"')
- subtest "users in group 'foobar' should be able to use sudo with password", sub {
- $machine->succeed("sudo -u test2 echo ${password} | sudo -S -u root true");
- };
+ with subtest("users in group 'foobar' should be able to use sudo with password"):
+ machine.succeed("sudo -u test2 echo ${password} | sudo -S -u root true")
- subtest "users in group 'barfoo' should be able to use sudo without password", sub {
- $machine->succeed("sudo -u test3 sudo -n -u root true");
- };
+ with subtest("users in group 'barfoo' should be able to use sudo without password"):
+ machine.succeed("sudo -u test3 sudo -n -u root true")
- subtest "users in group 'baz' (GID 1337) should be able to use sudo without password", sub {
- $machine->succeed("sudo -u test4 sudo -n -u root echo true");
- };
+ with subtest("users in group 'baz' (GID 1337)"):
+ machine.succeed("sudo -u test4 sudo -n -u root echo true")
- subtest "test5 user should be able to run commands under test1", sub {
- $machine->succeed("sudo -u test5 sudo -n -u test1 true");
- };
+ with subtest("test5 user should be able to run commands under test1"):
+ machine.succeed("sudo -u test5 sudo -n -u test1 true")
- subtest "test5 user should not be able to run commands under root", sub {
- $machine->fail("sudo -u test5 sudo -n -u root true");
- };
+ with subtest("test5 user should not be able to run commands under root"):
+ machine.fail("sudo -u test5 sudo -n -u root true")
- subtest "test5 user should be able to keep his environment", sub {
- $machine->succeed("sudo -u test5 sudo -n -E -u test1 true");
- };
+ with subtest("test5 user should be able to keep his environment"):
+ machine.succeed("sudo -u test5 sudo -n -E -u test1 true")
- subtest "users in group 'barfoo' should not be able to keep their environment", sub {
- $machine->fail("sudo -u test3 sudo -n -E -u root true");
- };
+ with subtest("users in group 'barfoo' should not be able to keep their environment"):
+ machine.fail("sudo -u test3 sudo -n -E -u root true")
'';
})
diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix
index 0dba3697980f..7076bd77b770 100644
--- a/nixos/tests/switch-test.nix
+++ b/nixos/tests/switch-test.nix
@@ -1,6 +1,6 @@
# Test configuration switching.
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "switch-test";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ gleber ];
@@ -28,7 +28,11 @@ import ./make-test.nix ({ pkgs, ...} : {
exec env -i "$@" | tee /dev/stderr
'';
in ''
- $machine->succeed("${stderrRunner} ${originalSystem}/bin/switch-to-configuration test");
- $machine->succeed("${stderrRunner} ${otherSystem}/bin/switch-to-configuration test");
+ machine.succeed(
+ "${stderrRunner} ${originalSystem}/bin/switch-to-configuration test"
+ )
+ machine.succeed(
+ "${stderrRunner} ${otherSystem}/bin/switch-to-configuration test"
+ )
'';
})
diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix
index 0de76b688bdc..9c8e0a3d087e 100644
--- a/nixos/tests/syncthing-init.nix
+++ b/nixos/tests/syncthing-init.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, pkgs, ... }: let
+import ./make-test-python.nix ({ lib, pkgs, ... }: let
testId = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
@@ -22,13 +22,11 @@ in {
};
testScript = ''
- my $config;
-
- $machine->waitForUnit("syncthing-init.service");
- $config = $machine->succeed("cat /var/lib/syncthing/.config/syncthing/config.xml");
+ machine.wait_for_unit("syncthing-init.service")
+ config = machine.succeed("cat /var/lib/syncthing/.config/syncthing/config.xml")
- $config =~ /${testId}/ or die;
- $config =~ /testFolder/ or die;
+ assert "testFolder" in config
+ assert "${testId}" in config
'';
})
diff --git a/nixos/tests/syncthing-relay.nix b/nixos/tests/syncthing-relay.nix
index f1ceb4993337..cd72ef1cbe1d 100644
--- a/nixos/tests/syncthing-relay.nix
+++ b/nixos/tests/syncthing-relay.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, pkgs, ... }: {
+import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "syncthing-relay";
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ delroth ];
@@ -14,9 +14,13 @@ import ./make-test.nix ({ lib, pkgs, ... }: {
};
testScript = ''
- $machine->waitForUnit("syncthing-relay.service");
- $machine->waitForOpenPort(12345);
- $machine->waitForOpenPort(12346);
- $machine->succeed("curl http://localhost:12346/status | jq -r '.options.\"provided-by\"'") =~ /nixos-test/ or die;
+ machine.wait_for_unit("syncthing-relay.service")
+ machine.wait_for_open_port(12345)
+ machine.wait_for_open_port(12346)
+
+ out = machine.succeed(
+ "curl -sS http://localhost:12346/status | jq -r '.options.\"provided-by\"'"
+ )
+ assert "nixos-test" in out
'';
})
diff --git a/nixos/tests/systemd-analyze.nix b/nixos/tests/systemd-analyze.nix
new file mode 100644
index 000000000000..a78ba08cd55c
--- /dev/null
+++ b/nixos/tests/systemd-analyze.nix
@@ -0,0 +1,46 @@
+import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
+
+{
+ name = "systemd-analyze";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ raskin ];
+ };
+
+ machine =
+ { pkgs, lib, ... }:
+ { boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest;
+ sound.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
+ };
+
+ testScript = ''
+ machine.wait_for_unit("multi-user.target")
+
+ # We create a special output directory to copy it as a whole
+ with subtest("Prepare output dir"):
+ machine.succeed("mkdir systemd-analyze")
+
+
+ # Save the output into a file with given name inside the common
+ # output directory
+ def run_systemd_analyze(args, name):
+ tgt_dir = "systemd-analyze"
+ machine.succeed(
+ "systemd-analyze {} > {}/{} 2> {}/{}.err".format(
+ " ".join(args), tgt_dir, name, tgt_dir, name
+ )
+ )
+
+
+ with subtest("Print statistics"):
+ run_systemd_analyze(["blame"], "blame.txt")
+ run_systemd_analyze(["critical-chain"], "critical-chain.txt")
+ run_systemd_analyze(["dot"], "dependencies.dot")
+ run_systemd_analyze(["plot"], "systemd-analyze.svg")
+
+ # We copy the main graph into the $out (toplevel), and we also copy
+ # the entire output directory with additional data
+ with subtest("Copying the resulting data into $out"):
+ machine.copy_from_vm("systemd-analyze/", "")
+ machine.copy_from_vm("systemd-analyze/systemd-analyze.svg", "")
+ '';
+})
diff --git a/nixos/tests/systemd-networkd-wireguard.nix b/nixos/tests/systemd-networkd-wireguard.nix
index aa0ac54e7969..be5c0da981d2 100644
--- a/nixos/tests/systemd-networkd-wireguard.nix
+++ b/nixos/tests/systemd-networkd-wireguard.nix
@@ -1,4 +1,4 @@
-let generateNodeConf = { lib, pkgs, config, privkpath, pubk, peerId, nodeId, ...}: {
+let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: {
imports = [ common/user-account.nix ];
systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
networking.useNetworkd = true;
@@ -7,13 +7,16 @@ let generateNodeConf = { lib, pkgs, config, privkpath, pubk, peerId, nodeId, ...
virtualisation.vlans = [ 1 ];
environment.systemPackages = with pkgs; [ wireguard-tools ];
boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
+ systemd.tmpfiles.rules = [
+ "f /run/wg_priv 0640 root systemd-network - ${privk}"
+ ];
systemd.network = {
enable = true;
netdevs = {
"90-wg0" = {
netdevConfig = { Kind = "wireguard"; Name = "wg0"; };
wireguardConfig = {
- PrivateKeyFile = privkpath ;
+ PrivateKeyFile = "/run/wg_priv";
ListenPort = 51820;
FwMark = 42;
};
@@ -45,7 +48,7 @@ let generateNodeConf = { lib, pkgs, config, privkpath, pubk, peerId, nodeId, ...
};
};
};
-in import ./make-test.nix ({pkgs, ... }: {
+in import ./make-test-python.nix ({pkgs, ... }: {
name = "networkd-wireguard";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ninjatrappeur ];
@@ -53,7 +56,7 @@ in import ./make-test.nix ({pkgs, ... }: {
nodes = {
node1 = { pkgs, ... }@attrs:
let localConf = {
- privkpath = pkgs.writeText "priv.key" "GDiXWlMQKb379XthwX0haAbK6hTdjblllpjGX0heP00=";
+ privk = "GDiXWlMQKb379XthwX0haAbK6hTdjblllpjGX0heP00=";
pubk = "iRxpqj42nnY0Qz8MAQbSm7bXxXP5hkPqWYIULmvW+EE=";
nodeId = "1";
peerId = "2";
@@ -62,7 +65,7 @@ in import ./make-test.nix ({pkgs, ... }: {
node2 = { pkgs, ... }@attrs:
let localConf = {
- privkpath = pkgs.writeText "priv.key" "eHxSI2jwX/P4AOI0r8YppPw0+4NZnjOxfbS5mt06K2k=";
+ privk = "eHxSI2jwX/P4AOI0r8YppPw0+4NZnjOxfbS5mt06K2k=";
pubk = "27s0OvaBBdHoJYkH9osZpjpgSOVNw+RaKfboT/Sfq0g=";
nodeId = "2";
peerId = "1";
@@ -70,12 +73,12 @@ in import ./make-test.nix ({pkgs, ... }: {
in generateNodeConf (attrs // localConf);
};
testScript = ''
- startAll;
- $node1->waitForUnit('systemd-networkd-wait-online.service');
- $node2->waitForUnit('systemd-networkd-wait-online.service');
- $node1->succeed('ping -c 5 10.0.0.2');
- $node2->succeed('ping -c 5 10.0.0.1');
+ start_all()
+ node1.wait_for_unit("systemd-networkd-wait-online.service")
+ node2.wait_for_unit("systemd-networkd-wait-online.service")
+ node1.succeed("ping -c 5 10.0.0.2")
+ node2.succeed("ping -c 5 10.0.0.1")
# Is the fwmark set?
- $node2->succeed('wg | grep -q 42');
+ node2.succeed("wg | grep -q 42")
'';
})
diff --git a/nixos/tests/systemd-nspawn.nix b/nixos/tests/systemd-nspawn.nix
new file mode 100644
index 000000000000..5bf55060d2e0
--- /dev/null
+++ b/nixos/tests/systemd-nspawn.nix
@@ -0,0 +1,60 @@
+import ./make-test-python.nix ({pkgs, lib, ...}:
+let
+ gpgKeyring = (pkgs.runCommand "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } ''
+ mkdir -p $out
+ export GNUPGHOME=$out
+ cat > foo < $out/pubkey.gpg
+ '');
+
+ nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } ''
+ mkdir -p $out
+ cd $out
+ dd if=/dev/urandom of=$out/testimage.raw bs=$((1024*1024+7)) count=5
+ sha256sum testimage.raw > SHA256SUMS
+ export GNUPGHOME="$(mktemp -d)"
+ cp -R ${gpgKeyring}/* $GNUPGHOME
+ gpg --batch --sign --detach-sign --output SHA256SUMS.gpg SHA256SUMS
+ '');
+in {
+ name = "systemd-nspawn";
+
+ nodes = {
+ server = { pkgs, ... }: {
+ networking.firewall.allowedTCPPorts = [ 80 ];
+ services.nginx = {
+ enable = true;
+ virtualHosts."server".root = nspawnImages;
+ };
+ };
+ client = { pkgs, ... }: {
+ environment.etc."systemd/import-pubring.gpg".source = "${gpgKeyring}/pubkey.gpg";
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ server.wait_for_unit("nginx.service")
+ client.wait_for_unit("network-online.target")
+ client.succeed("machinectl pull-raw --verify=signature http://server/testimage.raw")
+ client.succeed(
+ "cmp /var/lib/machines/testimage.raw ${nspawnImages}/testimage.raw"
+ )
+ '';
+})
diff --git a/nixos/tests/systemd-timesyncd.nix b/nixos/tests/systemd-timesyncd.nix
index d12b8eb2bf7e..ad5b9a47383b 100644
--- a/nixos/tests/systemd-timesyncd.nix
+++ b/nixos/tests/systemd-timesyncd.nix
@@ -1,7 +1,7 @@
# Regression test for systemd-timesync having moved the state directory without
# upstream providing a migration path. https://github.com/systemd/systemd/issues/12131
-import ./make-test.nix (let
+import ./make-test-python.nix (let
common = { lib, ... }: {
# override the `false` value from the qemu-vm base profile
services.timesyncd.enable = lib.mkForce true;
@@ -25,28 +25,28 @@ in {
};
testScript = ''
- startAll;
- $current->succeed('systemctl status systemd-timesyncd.service');
+ start_all()
+ current.succeed("systemctl status systemd-timesyncd.service")
# on a new install with a recent systemd there should not be any
# leftovers from the dynamic user mess
- $current->succeed('test -e /var/lib/systemd/timesync');
- $current->succeed('test ! -L /var/lib/systemd/timesync');
+ current.succeed("test -e /var/lib/systemd/timesync")
+ current.succeed("test ! -L /var/lib/systemd/timesync")
# timesyncd should be running on the upgrading system since we fixed the
# file bits in the activation script
- $pre1909->succeed('systemctl status systemd-timesyncd.service');
+ pre1909.succeed("systemctl status systemd-timesyncd.service")
# the path should be gone after the migration
- $pre1909->succeed('test ! -e /var/lib/private/systemd/timesync');
+ pre1909.succeed("test ! -e /var/lib/private/systemd/timesync")
# and the new path should no longer be a symlink
- $pre1909->succeed('test -e /var/lib/systemd/timesync');
- $pre1909->succeed('test ! -L /var/lib/systemd/timesync');
+ pre1909.succeed("test -e /var/lib/systemd/timesync")
+ pre1909.succeed("test ! -L /var/lib/systemd/timesync")
# after a restart things should still work and not fail in the activation
# scripts and cause the boot to fail..
- $pre1909->shutdown;
- $pre1909->start;
- $pre1909->succeed('systemctl status systemd-timesyncd.service');
+ pre1909.shutdown()
+ pre1909.start()
+ pre1909.succeed("systemctl status systemd-timesyncd.service")
'';
})
diff --git a/nixos/tests/telegraf.nix b/nixos/tests/telegraf.nix
index 6776f8d8c37f..73f741b11357 100644
--- a/nixos/tests/telegraf.nix
+++ b/nixos/tests/telegraf.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "telegraf";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ mic92 ];
@@ -22,9 +22,9 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ start_all()
- $machine->waitForUnit("telegraf.service");
- $machine->waitUntilSucceeds("grep -q example /tmp/metrics.out");
+ machine.wait_for_unit("telegraf.service")
+ machine.wait_until_succeeds("grep -q example /tmp/metrics.out")
'';
})
diff --git a/nixos/tests/tiddlywiki.nix b/nixos/tests/tiddlywiki.nix
index 4a2014a4ec91..cf45578b0f98 100644
--- a/nixos/tests/tiddlywiki.nix
+++ b/nixos/tests/tiddlywiki.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ ... }: {
+import ./make-test-python.nix ({ ... }: {
name = "tiddlywiki";
nodes = {
default = {
@@ -20,48 +20,50 @@ import ./make-test.nix ({ ... }: {
};
};
- testScript = ''
- startAll;
+ testScript =
+ ''
+ start_all()
- subtest "by default works without configuration", sub {
- $default->waitForUnit("tiddlywiki.service");
- };
+ with subtest("by default works without configuration"):
+ default.wait_for_unit("tiddlywiki.service")
- subtest "by default available on port 8080 without auth", sub {
- $default->waitForUnit("tiddlywiki.service");
- $default->waitForOpenPort(8080);
- $default->succeed("curl --fail 127.0.0.1:8080");
- };
+ with subtest("by default available on port 8080 without auth"):
+ default.wait_for_unit("tiddlywiki.service")
+ default.wait_for_open_port(8080)
+ # we output to /dev/null here to avoid a python UTF-8 decode error
+ # but the check will still fail if the service doesn't respond
+ default.succeed("curl --fail -o /dev/null 127.0.0.1:8080")
- subtest "by default creates empty wiki", sub {
- $default->succeed("test -f /var/lib/tiddlywiki/tiddlywiki.info");
- };
+ with subtest("by default creates empty wiki"):
+ default.succeed("test -f /var/lib/tiddlywiki/tiddlywiki.info")
- subtest "configured on port 3000 with basic auth", sub {
- $configured->waitForUnit("tiddlywiki.service");
- $configured->waitForOpenPort(3000);
- $configured->fail("curl --fail 127.0.0.1:3000");
- $configured->succeed("curl --fail 127.0.0.1:3000 --user somelogin:somesecret");
- };
+ with subtest("configured on port 3000 with basic auth"):
+ configured.wait_for_unit("tiddlywiki.service")
+ configured.wait_for_open_port(3000)
+ configured.fail("curl --fail -o /dev/null 127.0.0.1:3000")
+ configured.succeed(
+ "curl --fail -o /dev/null 127.0.0.1:3000 --user somelogin:somesecret"
+ )
+
+ with subtest("restart preserves changes"):
+ # given running wiki
+ default.wait_for_unit("tiddlywiki.service")
+ # with some changes
+ default.succeed(
+ 'curl --fail --request PUT --header \'X-Requested-With:TiddlyWiki\' \
+ --data \'{ "title": "title", "text": "content" }\' \
+ --url 127.0.0.1:8080/recipes/default/tiddlers/somepage '
+ )
+ default.succeed("sleep 2")
- subtest "configured with different wikifolder", sub {
- $configured->succeed("test -f /var/lib/tiddlywiki/tiddlywiki.info");
- };
+ # when wiki is cycled
+ default.systemctl("restart tiddlywiki.service")
+ default.wait_for_unit("tiddlywiki.service")
+ default.wait_for_open_port(8080)
- subtest "restart preserves changes", sub {
- # given running wiki
- $default->waitForUnit("tiddlywiki.service");
- # with some changes
- $default->succeed("curl --fail --request PUT --header 'X-Requested-With:TiddlyWiki' --data '{ \"title\": \"title\", \"text\": \"content\" }' --url 127.0.0.1:8080/recipes/default/tiddlers/somepage ");
- $default->succeed("sleep 2"); # server syncs to filesystem on timer
-
- # when wiki is cycled
- $default->systemctl("restart tiddlywiki.service");
- $default->waitForUnit("tiddlywiki.service");
- $default->waitForOpenPort(8080);
-
- # the change is preserved
- $default->succeed("curl --fail 127.0.0.1:8080/recipes/default/tiddlers/somepage");
- };
- '';
+ # the change is preserved
+ default.succeed(
+ "curl --fail -o /dev/null 127.0.0.1:8080/recipes/default/tiddlers/somepage"
+ )
+ '';
})
diff --git a/nixos/tests/timezone.nix b/nixos/tests/timezone.nix
index 2204649a3fc4..7fc9a5058eee 100644
--- a/nixos/tests/timezone.nix
+++ b/nixos/tests/timezone.nix
@@ -1,45 +1,50 @@
-{
- timezone-static = import ./make-test.nix ({ pkgs, ... }: {
- name = "timezone-static";
- meta.maintainers = with pkgs.lib.maintainers; [ lheckemann ];
+import ./make-test-python.nix ({ pkgs, ...} : {
+ name = "timezone";
+ meta.maintainers = with pkgs.lib.maintainers; [ lheckemann ];
- machine.time.timeZone = "Europe/Amsterdam";
+ nodes = {
+ node_eutz = { pkgs, ... }: {
+ time.timeZone = "Europe/Amsterdam";
+ };
- testScript = ''
- $machine->waitForUnit("dbus.socket");
- $machine->fail("timedatectl set-timezone Asia/Tokyo");
- my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"');
- $dateResult[1] eq "1970-01-01 01:00:00\n" or die "Timezone seems to be wrong";
- '';
- });
+ node_nulltz = { pkgs, ... }: {
+ time.timeZone = null;
+ };
+ };
- timezone-imperative = import ./make-test.nix ({ pkgs, ... }: {
- name = "timezone-imperative";
- meta.maintainers = with pkgs.lib.maintainers; [ lheckemann ];
+ testScript = { nodes, ... }: ''
+ node_eutz.wait_for_unit("dbus.socket")
- machine.time.timeZone = null;
+ with subtest("static - Ensure timezone change gives the correct result"):
+ node_eutz.fail("timedatectl set-timezone Asia/Tokyo")
+ date_result = node_eutz.succeed('date -d @0 "+%Y-%m-%d %H:%M:%S"')
+ assert date_result == "1970-01-01 01:00:00\n", "Timezone seems to be wrong"
- testScript = ''
- $machine->waitForUnit("dbus.socket");
+ node_nulltz.wait_for_unit("dbus.socket")
- # Should default to UTC
- my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"');
- print $dateResult[1];
- $dateResult[1] eq "1970-01-01 00:00:00\n" or die "Timezone seems to be wrong";
+ with subtest("imperative - Ensure timezone defaults to UTC"):
+ date_result = node_nulltz.succeed('date -d @0 "+%Y-%m-%d %H:%M:%S"')
+ print(date_result)
+ assert (
+ date_result == "1970-01-01 00:00:00\n"
+ ), "Timezone seems to be wrong (not UTC)"
- $machine->succeed("timedatectl set-timezone Asia/Tokyo");
+ with subtest("imperative - Ensure timezone adjustment produces expected result"):
+ node_nulltz.succeed("timedatectl set-timezone Asia/Tokyo")
- # Adjustment should be taken into account
- my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"');
- print $dateResult[1];
- $dateResult[1] eq "1970-01-01 09:00:00\n" or die "Timezone was not adjusted";
+ # Adjustment should be taken into account
+ date_result = node_nulltz.succeed('date -d @0 "+%Y-%m-%d %H:%M:%S"')
+ print(date_result)
+ assert date_result == "1970-01-01 09:00:00\n", "Timezone was not adjusted"
- # Adjustment should persist across a reboot
- $machine->shutdown;
- $machine->waitForUnit("dbus.socket");
- my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"');
- print $dateResult[1];
- $dateResult[1] eq "1970-01-01 09:00:00\n" or die "Timezone adjustment was not persisted";
- '';
- });
-}
+ with subtest("imperative - Ensure timezone adjustment persists across reboot"):
+ # Adjustment should persist across a reboot
+ node_nulltz.shutdown()
+ node_nulltz.wait_for_unit("dbus.socket")
+ date_result = node_nulltz.succeed('date -d @0 "+%Y-%m-%d %H:%M:%S"')
+ print(date_result)
+ assert (
+ date_result == "1970-01-01 09:00:00\n"
+ ), "Timezone adjustment was not persisted"
+ '';
+})
diff --git a/nixos/tests/tinydns.nix b/nixos/tests/tinydns.nix
index cb7ee0c5fb5e..c7740d5ade35 100644
--- a/nixos/tests/tinydns.nix
+++ b/nixos/tests/tinydns.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ...} : {
+import ./make-test-python.nix ({ lib, ...} : {
name = "tinydns";
meta = {
maintainers = with lib.maintainers; [ basvandijk ];
@@ -19,8 +19,8 @@ import ./make-test.nix ({ lib, ...} : {
};
};
testScript = ''
- $nameserver->start;
- $nameserver->waitForUnit("tinydns.service");
- $nameserver->succeed("host bla.foo.bar | grep '1\.2\.3\.4'");
+ nameserver.start()
+ nameserver.wait_for_unit("tinydns.service")
+ nameserver.succeed("host bla.foo.bar | grep '1\.2\.3\.4'")
'';
})
diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix
index 0cb44ddff248..ad07231557c3 100644
--- a/nixos/tests/tor.nix
+++ b/nixos/tests/tor.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ lib, ... }: with lib;
+import ./make-test-python.nix ({ lib, ... }: with lib;
rec {
name = "tor";
@@ -21,8 +21,10 @@ rec {
};
testScript = ''
- $client->waitForUnit("tor.service");
- $client->waitForOpenPort(9051);
- $client->succeed("echo GETINFO version | nc 127.0.0.1 9051") =~ /514 Authentication required./ or die;
+ client.wait_for_unit("tor.service")
+ client.wait_for_open_port(9051)
+ assert "514 Authentication required." in client.succeed(
+ "echo GETINFO version | nc 127.0.0.1 9051"
+ )
'';
})
diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
index 643095d947ea..7953f8d41f77 100644
--- a/nixos/tests/trac.nix
+++ b/nixos/tests/trac.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "trac";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ mmahut ];
@@ -11,9 +11,9 @@ import ./make-test.nix ({ pkgs, ... }: {
};
testScript = ''
- startAll;
- $machine->waitForUnit("trac.service");
- $machine->waitForOpenPort(8000);
- $machine->waitUntilSucceeds("curl -L http://localhost:8000/ | grep 'Trac Powered'");
+ start_all()
+ machine.wait_for_unit("trac.service")
+ machine.wait_for_open_port(8000)
+ machine.wait_until_succeeds("curl -L http://localhost:8000/ | grep 'Trac Powered'")
'';
})
diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix
index f1c238730ebb..f4f2186be1ff 100644
--- a/nixos/tests/transmission.nix
+++ b/nixos/tests/transmission.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "transmission";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ coconnor ];
@@ -14,8 +14,8 @@ import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
- startAll;
- $machine->waitForUnit("transmission");
- $machine->shutdown;
+ start_all()
+ machine.wait_for_unit("transmission")
+ machine.shutdown()
'';
})
diff --git a/nixos/tests/trezord.nix b/nixos/tests/trezord.nix
index 1c85bf539345..8d908a522492 100644
--- a/nixos/tests/trezord.nix
+++ b/nixos/tests/trezord.nix
@@ -1,7 +1,7 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "trezord";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ mmahut ];
+ maintainers = [ mmahut "1000101" ];
};
nodes = {
@@ -12,9 +12,9 @@ import ./make-test.nix ({ pkgs, ... }: {
};
testScript = ''
- startAll;
- $machine->waitForUnit("trezord.service");
- $machine->waitForOpenPort(21325);
- $machine->waitUntilSucceeds("curl -L http://localhost:21325/status/ | grep Version");
+ start_all()
+ machine.wait_for_unit("trezord.service")
+ machine.wait_for_open_port(21325)
+ machine.wait_until_succeeds("curl -L http://localhost:21325/status/ | grep Version")
'';
})
diff --git a/nixos/tests/trickster.nix b/nixos/tests/trickster.nix
index 1461a32bb07e..e2ca00980d53 100644
--- a/nixos/tests/trickster.nix
+++ b/nixos/tests/trickster.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
name = "trickster";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ "1000101" ];
@@ -15,15 +15,23 @@ import ./make-test.nix ({ pkgs, ... }: {
};
testScript = ''
- startAll;
- $prometheus->waitForUnit("prometheus.service");
- $prometheus->waitForOpenPort(9090);
- $prometheus->waitUntilSucceeds("curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'");
- $trickster->waitForUnit("trickster.service");
- $trickster->waitForOpenPort(8082);
- $trickster->waitForOpenPort(9090);
- $trickster->waitUntilSucceeds("curl -L http://localhost:8082/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'");
- $trickster->waitUntilSucceeds("curl -L http://prometheus:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'");
- $trickster->waitUntilSucceeds("curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'");
+ start_all()
+ prometheus.wait_for_unit("prometheus.service")
+ prometheus.wait_for_open_port(9090)
+ prometheus.wait_until_succeeds(
+ "curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'"
+ )
+ trickster.wait_for_unit("trickster.service")
+ trickster.wait_for_open_port(8082)
+ trickster.wait_for_open_port(9090)
+ trickster.wait_until_succeeds(
+ "curl -L http://localhost:8082/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'"
+ )
+ trickster.wait_until_succeeds(
+ "curl -L http://prometheus:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'"
+ )
+ trickster.wait_until_succeeds(
+ "curl -L http://localhost:9090/metrics | grep 'promhttp_metric_handler_requests_total{code=\"500\"} 0'"
+ )
'';
})
\ No newline at end of file
diff --git a/nixos/tests/trilium-server.nix b/nixos/tests/trilium-server.nix
new file mode 100644
index 000000000000..6346575b33da
--- /dev/null
+++ b/nixos/tests/trilium-server.nix
@@ -0,0 +1,53 @@
+import ./make-test-python.nix ({ ... }: {
+ name = "trilium-server";
+ nodes = {
+ default = {
+ services.trilium-server.enable = true;
+ };
+ configured = {
+ services.trilium-server = {
+ enable = true;
+ dataDir = "/data/trilium";
+ };
+ };
+
+ nginx = {
+ services.trilium-server = {
+ enable = true;
+ nginx.enable = true;
+ nginx.hostName = "trilium.example.com";
+ };
+ };
+ };
+
+ testScript =
+ ''
+ start_all()
+
+ with subtest("by default works without configuration"):
+ default.wait_for_unit("trilium-server.service")
+
+ with subtest("by default available on port 8080"):
+ default.wait_for_unit("trilium-server.service")
+ default.wait_for_open_port(8080)
+ # we output to /dev/null here to avoid a python UTF-8 decode error
+ # but the check will still fail if the service doesn't respond
+ default.succeed("curl --fail -o /dev/null 127.0.0.1:8080")
+
+ with subtest("by default creates empty document"):
+ default.wait_for_unit("trilium-server.service")
+ default.succeed("test -f /var/lib/trilium/document.db")
+
+ with subtest("configured with custom data store"):
+ configured.wait_for_unit("trilium-server.service")
+ configured.succeed("test -f /data/trilium/document.db")
+
+ with subtest("nginx with custom host name"):
+ nginx.wait_for_unit("trilium-server.service")
+ nginx.wait_for_unit("nginx.service")
+
+ nginx.succeed(
+ "curl --resolve 'trilium.example.com:80:127.0.0.1' http://trilium.example.com/"
+ )
+ '';
+})
diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix
index dcf869908d82..0cbfa0c4c7be 100644
--- a/nixos/tests/udisks2.nix
+++ b/nixos/tests/udisks2.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
let
@@ -30,32 +30,40 @@ in
testScript =
''
- my $stick = $machine->stateDir . "/usbstick.img";
- system("xz -d < ${stick} > $stick") == 0 or die;
+ import lzma
- $machine->succeed("udisksctl info -b /dev/vda >&2");
- $machine->fail("udisksctl info -b /dev/sda1");
+ with lzma.open(
+ "${stick}"
+ ) as data, open(machine.state_dir + "/usbstick.img", "wb") as stick:
+ stick.write(data.read())
+
+ machine.succeed("udisksctl info -b /dev/vda >&2")
+ machine.fail("udisksctl info -b /dev/sda1")
# Attach a USB stick and wait for it to show up.
- $machine->sendMonitorCommand("drive_add 0 id=stick,if=none,file=$stick,format=raw");
- $machine->sendMonitorCommand("device_add usb-storage,id=stick,drive=stick");
- $machine->waitUntilSucceeds("udisksctl info -b /dev/sda1");
- $machine->succeed("udisksctl info -b /dev/sda1 | grep 'IdLabel:.*USBSTICK'");
+ machine.send_monitor_command(
+ f"drive_add 0 id=stick,if=none,file={stick.name},format=raw"
+ )
+ machine.send_monitor_command("device_add usb-storage,id=stick,drive=stick")
+ machine.wait_until_succeeds("udisksctl info -b /dev/sda1")
+ machine.succeed("udisksctl info -b /dev/sda1 | grep 'IdLabel:.*USBSTICK'")
# Mount the stick as a non-root user and do some stuff with it.
- $machine->succeed("su - alice -c 'udisksctl info -b /dev/sda1'");
- $machine->succeed("su - alice -c 'udisksctl mount -b /dev/sda1'");
- $machine->succeed("su - alice -c 'cat /run/media/alice/USBSTICK/test.txt'") =~ /Hello World/ or die;
- $machine->succeed("su - alice -c 'echo foo > /run/media/alice/USBSTICK/bar.txt'");
+ machine.succeed("su - alice -c 'udisksctl info -b /dev/sda1'")
+ machine.succeed("su - alice -c 'udisksctl mount -b /dev/sda1'")
+ machine.succeed(
+ "su - alice -c 'cat /run/media/alice/USBSTICK/test.txt' | grep -q 'Hello World'"
+ )
+ machine.succeed("su - alice -c 'echo foo > /run/media/alice/USBSTICK/bar.txt'")
# Unmounting the stick should make the mountpoint disappear.
- $machine->succeed("su - alice -c 'udisksctl unmount -b /dev/sda1'");
- $machine->fail("[ -d /run/media/alice/USBSTICK ]");
+ machine.succeed("su - alice -c 'udisksctl unmount -b /dev/sda1'")
+ machine.fail("[ -d /run/media/alice/USBSTICK ]")
# Remove the USB stick.
- $machine->sendMonitorCommand("device_del stick");
- $machine->waitUntilFails("udisksctl info -b /dev/sda1");
- $machine->fail("[ -e /dev/sda ]");
+ machine.send_monitor_command("device_del stick")
+ machine.wait_until_fails("udisksctl info -b /dev/sda1")
+ machine.fail("[ -e /dev/sda ]")
'';
})
diff --git a/nixos/tests/upnp.nix b/nixos/tests/upnp.nix
index 98344aee3efa..a7d837ea0708 100644
--- a/nixos/tests/upnp.nix
+++ b/nixos/tests/upnp.nix
@@ -5,7 +5,7 @@
# this succeeds an external client will try to connect to the port
# mapping.
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
let
internalRouterAddress = "192.168.3.1";
@@ -56,9 +56,11 @@ in
networking.firewall.enable = false;
services.httpd.enable = true;
- services.httpd.listen = [{ ip = "*"; port = 9000; }];
- services.httpd.adminAddr = "foo@example.org";
- services.httpd.documentRoot = "/tmp";
+ services.httpd.virtualHosts.localhost = {
+ listen = [{ ip = "*"; port = 9000; }];
+ adminAddr = "foo@example.org";
+ documentRoot = "/tmp";
+ };
};
client2 =
@@ -75,20 +77,20 @@ in
testScript =
{ nodes, ... }:
''
- startAll;
+ start_all()
# Wait for network and miniupnpd.
- $router->waitForUnit("network-online.target");
- # $router->waitForUnit("nat");
- $router->waitForUnit("firewall.service");
- $router->waitForUnit("miniupnpd");
+ router.wait_for_unit("network-online.target")
+ # $router.wait_for_unit("nat")
+ router.wait_for_unit("firewall.service")
+ router.wait_for_unit("miniupnpd")
- $client1->waitForUnit("network-online.target");
+ client1.wait_for_unit("network-online.target")
- $client1->succeed("upnpc -a ${internalClient1Address} 9000 9000 TCP");
+ client1.succeed("upnpc -a ${internalClient1Address} 9000 9000 TCP")
- $client1->waitForUnit("httpd");
- $client2->waitUntilSucceeds("curl http://${externalRouterAddress}:9000/");
+ client1.wait_for_unit("httpd")
+ client2.wait_until_succeeds("curl http://${externalRouterAddress}:9000/")
'';
})
diff --git a/nixos/tests/uwsgi.nix b/nixos/tests/uwsgi.nix
index afc03e74ed7e..78a87147f55c 100644
--- a/nixos/tests/uwsgi.nix
+++ b/nixos/tests/uwsgi.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
{
name = "uwsgi";
meta = with pkgs.stdenv.lib.maintainers; {
@@ -30,9 +30,9 @@ import ./make-test.nix ({ pkgs, ... }:
testScript =
''
- $machine->waitForUnit('multi-user.target');
- $machine->waitForUnit('uwsgi.service');
- $machine->waitForOpenPort(8000);
- $machine->succeed('curl -v 127.0.0.1:8000 | grep "Hello World!"');
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_for_unit("uwsgi.service")
+ machine.wait_for_open_port(8000)
+ assert "Hello World" in machine.succeed("curl -v 127.0.0.1:8000")
'';
})
diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix
index caf0cbb2abfe..ac8cf0703da5 100644
--- a/nixos/tests/vault.nix
+++ b/nixos/tests/vault.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
{
name = "vault";
meta = with pkgs.stdenv.lib.maintainers; {
@@ -12,12 +12,12 @@ import ./make-test.nix ({ pkgs, ... }:
testScript =
''
- startAll;
+ start_all()
- $machine->waitForUnit('multi-user.target');
- $machine->waitForUnit('vault.service');
- $machine->waitForOpenPort(8200);
- $machine->succeed('vault operator init');
- $machine->succeed('vault status | grep Sealed | grep true');
+ machine.wait_for_unit("multi-user.target")
+ machine.wait_for_unit("vault.service")
+ machine.wait_for_open_port(8200)
+ machine.succeed("vault operator init")
+ machine.succeed("vault status | grep Sealed | grep true")
'';
})
diff --git a/nixos/tests/wireguard/namespaces.nix b/nixos/tests/wireguard/namespaces.nix
new file mode 100644
index 000000000000..c8a4e3bb52a1
--- /dev/null
+++ b/nixos/tests/wireguard/namespaces.nix
@@ -0,0 +1,78 @@
+let
+ listenPort = 12345;
+ socketNamespace = "foo";
+ interfaceNamespace = "bar";
+ node = {
+ networking.wireguard.interfaces.wg0 = {
+ listenPort = listenPort;
+ ips = [ "10.10.10.1/24" ];
+ privateKeyFile = "/etc/wireguard/private";
+ generatePrivateKeyFile = true;
+ };
+ };
+
+in
+
+import ../make-test-python.nix ({ pkgs, ...} : {
+ name = "wireguard-with-namespaces";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ asymmetric ];
+ };
+
+ nodes = {
+ # interface should be created in the socketNamespace
+ # and not moved from there
+ peer0 = pkgs.lib.attrsets.recursiveUpdate node {
+ networking.wireguard.interfaces.wg0 = {
+ preSetup = ''
+ ip netns add ${socketNamespace}
+ '';
+ inherit socketNamespace;
+ };
+ };
+ # interface should be created in the init namespace
+ # and moved to the interfaceNamespace
+ peer1 = pkgs.lib.attrsets.recursiveUpdate node {
+ networking.wireguard.interfaces.wg0 = {
+ preSetup = ''
+ ip netns add ${interfaceNamespace}
+ '';
+ inherit interfaceNamespace;
+ };
+ };
+ # interface should be created in the socketNamespace
+ # and moved to the interfaceNamespace
+ peer2 = pkgs.lib.attrsets.recursiveUpdate node {
+ networking.wireguard.interfaces.wg0 = {
+ preSetup = ''
+ ip netns add ${socketNamespace}
+ ip netns add ${interfaceNamespace}
+ '';
+ inherit socketNamespace interfaceNamespace;
+ };
+ };
+ # interface should be created in the socketNamespace
+ # and moved to the init namespace
+ peer3 = pkgs.lib.attrsets.recursiveUpdate node {
+ networking.wireguard.interfaces.wg0 = {
+ preSetup = ''
+ ip netns add ${socketNamespace}
+ '';
+ inherit socketNamespace;
+ interfaceNamespace = "init";
+ };
+ };
+ };
+
+ testScript = ''
+ start_all()
+
+ for machine in peer0, peer1, peer2, peer3:
+ machine.wait_for_unit("wireguard-wg0.service")
+
+ peer0.succeed("ip -n ${socketNamespace} link show wg0")
+ peer1.succeed("ip -n ${interfaceNamespace} link show wg0")
+ peer2.succeed("ip -n ${interfaceNamespace} link show wg0")
+ peer3.succeed("ip link show wg0")
+ '';
+})
diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix
index c6acfa6c1f3d..b7449859f7e6 100644
--- a/nixos/tests/wordpress.nix
+++ b/nixos/tests/wordpress.nix
@@ -1,9 +1,13 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
{
name = "wordpress";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ grahamc ]; # under duress!
+ maintainers = [
+ flokli
+ grahamc # under duress!
+ mmilata
+ ];
};
machine =
@@ -23,19 +27,31 @@ import ./make-test.nix ({ pkgs, ... }:
};
testScript = ''
- startAll;
+ import re
- $machine->waitForUnit("httpd");
- $machine->waitForUnit("phpfpm-wordpress-site1.local");
- $machine->waitForUnit("phpfpm-wordpress-site2.local");
+ start_all()
- $machine->succeed("curl -L site1.local | grep 'Welcome to the famous'");
- $machine->succeed("curl -L site2.local | grep 'Welcome to the famous'");
+ machine.wait_for_unit("httpd")
- $machine->succeed("systemctl --no-pager show wordpress-init-site1.local.service | grep 'ExecStart=.*status=0'");
- $machine->succeed("systemctl --no-pager show wordpress-init-site2.local.service | grep 'ExecStart=.*status=0'");
- $machine->succeed("grep -E '^define.*NONCE_SALT.{64,};\$' /var/lib/wordpress/site1.local/secret-keys.php");
- $machine->succeed("grep -E '^define.*NONCE_SALT.{64,};\$' /var/lib/wordpress/site2.local/secret-keys.php");
+ machine.wait_for_unit("phpfpm-wordpress-site1.local")
+ machine.wait_for_unit("phpfpm-wordpress-site2.local")
+
+ site_names = ["site1.local", "site2.local"]
+
+ with subtest("website returns welcome screen"):
+ for site_name in site_names:
+ assert "Welcome to the famous" in machine.succeed(f"curl -L {site_name}")
+
+ with subtest("wordpress-init went through"):
+ for site_name in site_names:
+ info = machine.get_unit_info(f"wordpress-init-{site_name}")
+ assert info["Result"] == "success"
+
+ with subtest("secret keys are set"):
+ pattern = re.compile(r"^define.*NONCE_SALT.{64,};$", re.MULTILINE)
+ for site_name in site_names:
+ assert pattern.search(
+ machine.succeed(f"cat /var/lib/wordpress/{site_name}/secret-keys.php")
+ )
'';
-
})
diff --git a/nixos/tests/xautolock.nix b/nixos/tests/xautolock.nix
index ee46d9e05b06..10e92b40e956 100644
--- a/nixos/tests/xautolock.nix
+++ b/nixos/tests/xautolock.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
with lib;
@@ -15,10 +15,10 @@ with lib;
};
testScript = ''
- $machine->start;
- $machine->waitForX;
- $machine->mustFail("pgrep xlock");
- $machine->sleep(120);
- $machine->mustSucceed("pgrep xlock");
+ machine.start()
+ machine.wait_for_x()
+ machine.fail("pgrep xlock")
+ machine.sleep(120)
+ machine.succeed("pgrep xlock")
'';
})
diff --git a/nixos/tests/xdg-desktop-portal.nix b/nixos/tests/xdg-desktop-portal.nix
deleted file mode 100644
index 79ebb83c49a5..000000000000
--- a/nixos/tests/xdg-desktop-portal.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# run installed tests
-import ./make-test.nix ({ pkgs, ... }:
-
-{
- name = "xdg-desktop-portal";
- meta = {
- maintainers = pkgs.xdg-desktop-portal.meta.maintainers;
- };
-
- machine = { pkgs, ... }: {
- environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
- };
-
- testScript = ''
- $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.xdg-desktop-portal.installedTests}/share'");
- '';
-})
diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index 7ff623062d93..3ea96b383631 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -1,8 +1,5 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "xfce";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ eelco shlevy ];
- };
machine =
{ pkgs, ... }:
@@ -16,31 +13,26 @@ import ./make-test.nix ({ pkgs, ...} : {
services.xserver.desktopManager.xfce.enable = true;
- environment.systemPackages = [ pkgs.xorg.xmessage ];
-
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
virtualisation.memorySize = 1024;
};
- testScript =
- ''
- $machine->waitForX;
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow(qr/xfce4-panel/);
- $machine->sleep(10);
+ testScript = { nodes, ... }: let
+ user = nodes.machine.config.users.users.alice;
+ in ''
+ machine.wait_for_x()
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
+ machine.wait_for_window("xfce4-panel")
+ machine.sleep(10)
# Check that logging in has given the user ownership of devices.
- $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice");
+ machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
- $machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'");
- $machine->waitForWindow(qr/Terminal/);
- $machine->sleep(10);
- $machine->screenshot("screen");
-
- # Ensure that the X server does proper access control.
- $machine->mustFail("su - bob -c 'DISPLAY=:0.0 xmessage Foo'");
- $machine->mustFail("su - bob -c 'DISPLAY=:0 xmessage Foo'");
+ machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 xfce4-terminal &'")
+ machine.wait_for_window("Terminal")
+ machine.sleep(10)
+ machine.screenshot("screen")
'';
})
diff --git a/nixos/tests/xfce4-14.nix b/nixos/tests/xfce4-14.nix
deleted file mode 100644
index d9b87b084376..000000000000
--- a/nixos/tests/xfce4-14.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
- name = "xfce4-14";
-
- machine =
- { pkgs, ... }:
-
- { imports = [ ./common/user-account.nix ];
-
- services.xserver.enable = true;
-
- services.xserver.displayManager.auto.enable = true;
- services.xserver.displayManager.auto.user = "alice";
-
- services.xserver.desktopManager.xfce4-14.enable = true;
-
- hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
-
- virtualisation.memorySize = 1024;
- };
-
- testScript =
- ''
- $machine->waitForX;
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->waitForWindow(qr/xfce4-panel/);
- $machine->sleep(10);
-
- # Check that logging in has given the user ownership of devices.
- $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice");
-
- $machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'");
- $machine->waitForWindow(qr/Terminal/);
- $machine->sleep(10);
- $machine->screenshot("screen");
- '';
-})
diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix
index 79c15ccffecd..ef711f8dcf6a 100644
--- a/nixos/tests/xmonad.nix
+++ b/nixos/tests/xmonad.nix
@@ -1,13 +1,13 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "xmonad";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
};
- machine = { lib, pkgs, ... }: {
+ machine = { pkgs, ... }: {
imports = [ ./common/x11.nix ./common/user-account.nix ];
services.xserver.displayManager.auto.user = "alice";
- services.xserver.windowManager.default = lib.mkForce "xmonad";
+ services.xserver.displayManager.defaultSession = "none+xmonad";
services.xserver.windowManager.xmonad = {
enable = true;
enableContribAndExtras = true;
@@ -21,19 +21,21 @@ import ./make-test.nix ({ pkgs, ...} : {
};
};
- testScript = { ... }: ''
- $machine->waitForX;
- $machine->waitForFile("/home/alice/.Xauthority");
- $machine->succeed("xauth merge ~alice/.Xauthority");
- $machine->sendKeys("alt-ctrl-x");
- $machine->waitForWindow(qr/alice.*machine/);
- $machine->sleep(1);
- $machine->screenshot("terminal");
- $machine->waitUntilSucceeds("xmonad --restart");
- $machine->sleep(3);
- $machine->sendKeys("alt-shift-ret");
- $machine->waitForWindow(qr/alice.*machine/);
- $machine->sleep(1);
- $machine->screenshot("terminal");
+ testScript = { nodes, ... }: let
+ user = nodes.machine.config.users.users.alice;
+ in ''
+ machine.wait_for_x()
+ machine.wait_for_file("${user.home}/.Xauthority")
+ machine.succeed("xauth merge ${user.home}/.Xauthority")
+ machine.send_key("alt-ctrl-x")
+ machine.wait_for_window("${user.name}.*machine")
+ machine.sleep(1)
+ machine.screenshot("terminal")
+ machine.wait_until_succeeds("xmonad --restart")
+ machine.sleep(3)
+ machine.send_key("alt-shift-ret")
+ machine.wait_for_window("${user.name}.*machine")
+ machine.sleep(1)
+ machine.screenshot("terminal")
'';
})
diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix
index 196a04aca300..1518aaacc8ab 100644
--- a/nixos/tests/xmpp/ejabberd.nix
+++ b/nixos/tests/xmpp/ejabberd.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix ({ pkgs, ... }: {
+import ../make-test-python.nix ({ pkgs, ... }: {
name = "ejabberd";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ajs124 ];
@@ -248,13 +248,21 @@ import ../make-test.nix ({ pkgs, ... }: {
};
testScript = { nodes, ... }: ''
- $server->waitForUnit('ejabberd.service');
- $server->succeed('su ejabberd -s $(which ejabberdctl) status|grep started') =~ /ejabberd is running/;
- $server->succeed('su ejabberd -s $(which ejabberdctl) register azurediamond example.com hunter2');
- $server->succeed('su ejabberd -s $(which ejabberdctl) register cthon98 example.com nothunter2');
- $server->fail('su ejabberd -s $(which ejabberdctl) register asdf wrong.domain');
- $client->succeed('send-message');
- $server->succeed('su ejabberd -s $(which ejabberdctl) unregister cthon98 example.com');
- $server->succeed('su ejabberd -s $(which ejabberdctl) unregister azurediamond example.com');
+ ejabberd_prefix = "su ejabberd -s $(which ejabberdctl) "
+
+ server.wait_for_unit("ejabberd.service")
+
+ assert "status: started" in server.succeed(ejabberd_prefix + "status")
+
+ server.succeed(
+ ejabberd_prefix + "register azurediamond example.com hunter2",
+ ejabberd_prefix + "register cthon98 example.com nothunter2",
+ )
+ server.fail(ejabberd_prefix + "register asdf wrong.domain")
+ client.succeed("send-message")
+ server.succeed(
+ ejabberd_prefix + "unregister cthon98 example.com",
+ ejabberd_prefix + "unregister azurediamond example.com",
+ )
'';
})
diff --git a/nixos/tests/xmpp/prosody-mysql.nix b/nixos/tests/xmpp/prosody-mysql.nix
index 62b4a17421e5..0507227021b2 100644
--- a/nixos/tests/xmpp/prosody-mysql.nix
+++ b/nixos/tests/xmpp/prosody-mysql.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix {
+import ../make-test-python.nix {
name = "prosody-mysql";
nodes = {
@@ -57,21 +57,21 @@ import ../make-test.nix {
};
testScript = { nodes, ... }: ''
- $mysql->waitForUnit('mysql.service');
- $server->waitForUnit('prosody.service');
- $server->succeed('prosodyctl status') =~ /Prosody is running/;
+ mysql.wait_for_unit("mysql.service")
+ server.wait_for_unit("prosody.service")
+ server.succeed('prosodyctl status | grep "Prosody is running"')
# set password to 'nothunter2' (it's asked twice)
- $server->succeed('yes nothunter2 | prosodyctl adduser cthon98@example.com');
+ server.succeed("yes nothunter2 | prosodyctl adduser cthon98@example.com")
# set password to 'y'
- $server->succeed('yes | prosodyctl adduser azurediamond@example.com');
+ server.succeed("yes | prosodyctl adduser azurediamond@example.com")
# correct password to 'hunter2'
- $server->succeed('yes hunter2 | prosodyctl passwd azurediamond@example.com');
+ server.succeed("yes hunter2 | prosodyctl passwd azurediamond@example.com")
- $client->succeed("send-message");
+ client.succeed("send-message")
- $server->succeed('prosodyctl deluser cthon98@example.com');
- $server->succeed('prosodyctl deluser azurediamond@example.com');
+ server.succeed("prosodyctl deluser cthon98@example.com")
+ server.succeed("prosodyctl deluser azurediamond@example.com")
'';
}
diff --git a/nixos/tests/xmpp/prosody.nix b/nixos/tests/xmpp/prosody.nix
index 8331c7b6d331..9d1374bff6bd 100644
--- a/nixos/tests/xmpp/prosody.nix
+++ b/nixos/tests/xmpp/prosody.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix {
+import ../make-test-python.nix {
name = "prosody";
nodes = {
@@ -28,19 +28,19 @@ import ../make-test.nix {
};
testScript = { nodes, ... }: ''
- $server->waitForUnit('prosody.service');
- $server->succeed('prosodyctl status') =~ /Prosody is running/;
+ server.wait_for_unit("prosody.service")
+ server.succeed('prosodyctl status | grep "Prosody is running"')
# set password to 'nothunter2' (it's asked twice)
- $server->succeed('yes nothunter2 | prosodyctl adduser cthon98@example.com');
+ server.succeed("yes nothunter2 | prosodyctl adduser cthon98@example.com")
# set password to 'y'
- $server->succeed('yes | prosodyctl adduser azurediamond@example.com');
- # correct password to 'hunter2'
- $server->succeed('yes hunter2 | prosodyctl passwd azurediamond@example.com');
+ server.succeed("yes | prosodyctl adduser azurediamond@example.com")
+ # correct password to "hunter2"
+ server.succeed("yes hunter2 | prosodyctl passwd azurediamond@example.com")
- $client->succeed("send-message");
+ client.succeed("send-message")
- $server->succeed('prosodyctl deluser cthon98@example.com');
- $server->succeed('prosodyctl deluser azurediamond@example.com');
+ server.succeed("prosodyctl deluser cthon98@example.com")
+ server.succeed("prosodyctl deluser azurediamond@example.com")
'';
}
diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix
index 0106aefe8318..1aceeffb955d 100644
--- a/nixos/tests/xrdp.nix
+++ b/nixos/tests/xrdp.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "xrdp";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ volth ];
@@ -21,25 +21,27 @@ import ./make-test.nix ({ pkgs, ...} : {
};
};
- testScript = { ... }: ''
- startAll;
+ testScript = { nodes, ... }: let
+ user = nodes.client.config.users.users.alice;
+ in ''
+ start_all()
- $client->waitForX;
- $client->waitForFile("/home/alice/.Xauthority");
- $client->succeed("xauth merge ~alice/.Xauthority");
+ client.wait_for_x()
+ client.wait_for_file("${user.home}/.Xauthority")
+ client.succeed("xauth merge ${user.home}/.Xauthority")
- $client->sleep(5);
+ client.sleep(5)
- $client->execute("xterm &");
- $client->sleep(1);
- $client->sendChars("xfreerdp /cert-tofu /w:640 /h:480 /v:127.0.0.1 /u:alice /p:foobar\n");
- $client->sleep(5);
- $client->screenshot("localrdp");
+ client.execute("xterm &")
+ client.sleep(1)
+ client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:127.0.0.1 /u:${user.name} /p:${user.password}\n")
+ client.sleep(5)
+ client.screenshot("localrdp")
- $client->execute("xterm &");
- $client->sleep(1);
- $client->sendChars("xfreerdp /cert-tofu /w:640 /h:480 /v:server /u:alice /p:foobar\n");
- $client->sleep(5);
- $client->screenshot("remoterdp");
+ client.execute("xterm &")
+ client.sleep(1)
+ client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:server /u:${user.name} /p:${user.password}\n")
+ client.sleep(5)
+ client.screenshot("remoterdp")
'';
})
diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix
index 0d757e8cef3f..3a7dea07d53a 100644
--- a/nixos/tests/xss-lock.nix
+++ b/nixos/tests/xss-lock.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
with lib;
@@ -26,15 +26,19 @@ with lib;
};
testScript = ''
- startAll;
+ def perform_xsslock_test(machine, lockCmd):
+ machine.start()
+ machine.wait_for_x()
+ machine.wait_for_unit("xss-lock.service", "alice")
+ machine.fail(f"pgrep {lockCmd}")
+ machine.succeed("su -l alice -c 'xset dpms force standby'")
+ machine.wait_until_succeeds(f"pgrep {lockCmd}")
- ${concatStringsSep "\n" (mapAttrsToList (name: lockCmd: ''
- ${"$"+name}->start;
- ${"$"+name}->waitForX;
- ${"$"+name}->waitForUnit("xss-lock.service", "alice");
- ${"$"+name}->fail("pgrep ${lockCmd}");
- ${"$"+name}->succeed("su -l alice -c 'xset dpms force standby'");
- ${"$"+name}->waitUntilSucceeds("pgrep ${lockCmd}");
- '') { simple = "i3lock"; custom_lockcmd = "xlock"; })}
+
+ with subtest("simple"):
+ perform_xsslock_test(simple, "i3lock")
+
+ with subtest("custom_cmd"):
+ perform_xsslock_test(custom_lockcmd, "xlock")
'';
})
diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix
index bbc0cf4c7dd7..9108004d4df9 100644
--- a/nixos/tests/yabar.nix
+++ b/nixos/tests/yabar.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
with lib;
@@ -20,14 +20,14 @@ with lib;
};
testScript = ''
- $machine->start;
- $machine->waitForX;
+ machine.start()
+ machine.wait_for_x()
# confirm proper startup
- $machine->waitForUnit("yabar.service", "bob");
- $machine->sleep(10);
- $machine->waitForUnit("yabar.service", "bob");
+ machine.wait_for_unit("yabar.service", "bob")
+ machine.sleep(10)
+ machine.wait_for_unit("yabar.service", "bob")
- $machine->screenshot("top_bar");
+ machine.screenshot("top_bar")
'';
})
diff --git a/nixos/tests/yggdrasil.nix b/nixos/tests/yggdrasil.nix
index ddff35cce3a1..468fcf671274 100644
--- a/nixos/tests/yggdrasil.nix
+++ b/nixos/tests/yggdrasil.nix
@@ -19,7 +19,7 @@ let
SigningPrivateKey = "2a6c21550f3fca0331df50668ffab66b6dce8237bcd5728e571e8033b363e247de111da0ec781e45bf6c63ecb45a78c24d7d4655abfaeea83b26c36eb5c0fd5b";
};
-in import ./make-test.nix ({ pkgs, ...} : {
+in import ./make-test-python.nix ({ pkgs, ...} : {
name = "yggdrasil";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ gazally ];
@@ -81,7 +81,7 @@ in import ./make-test.nix ({ pkgs, ...} : {
denyDhcpcdInterfaces = [ "ygg0" ];
config = {
IfTAPMode = true;
- IFName = "ygg0";
+ IfName = "ygg0";
MulticastInterfaces = [ "eth1" ];
LinkLocalTCPPort = 43210;
};
@@ -91,33 +91,35 @@ in import ./make-test.nix ({ pkgs, ...} : {
testScript =
''
+ import re
+
# Give Alice a head start so she is ready when Bob calls.
- $alice->start;
- $alice->waitForUnit("yggdrasil.service");
+ alice.start()
+ alice.wait_for_unit("yggdrasil.service")
- $bob->start;
- $carol->start;
- $bob->waitForUnit("yggdrasil.service");
- $carol->waitForUnit("yggdrasil.service");
+ bob.start()
+ carol.start()
+ bob.wait_for_unit("yggdrasil.service")
+ carol.wait_for_unit("yggdrasil.service")
- $carol->waitUntilSucceeds("[ `ip -o -6 addr show dev ygg0 scope global | grep -v tentative | wc -l` -ge 1 ]");
- my $carolIp6 = (split /[ \/]+/, $carol->succeed("ip -o -6 addr show dev ygg0 scope global"))[3];
+ ip_addr_show = "ip -o -6 addr show dev ygg0 scope global"
+ carol.wait_until_succeeds(f"[ `{ip_addr_show} | grep -v tentative | wc -l` -ge 1 ]")
+ carol_ip6 = re.split(" +|/", carol.succeed(ip_addr_show))[3]
# If Alice can talk to Carol, then Bob's outbound peering and Carol's
# local peering have succeeded and everybody is connected.
- $alice->waitUntilSucceeds("ping -c 1 $carolIp6");
- $alice->succeed("ping -c 1 ${bobIp6}");
+ alice.wait_until_succeeds(f"ping -c 1 {carol_ip6}")
+ alice.succeed(f"ping -c 1 ${bobIp6}")
- $bob->succeed("ping -c 1 ${aliceIp6}");
- $bob->succeed("ping -c 1 $carolIp6");
+ bob.succeed("ping -c 1 ${aliceIp6}")
+ bob.succeed(f"ping -c 1 {carol_ip6}")
- $carol->succeed("ping -c 1 ${aliceIp6}");
- $carol->succeed("ping -c 1 ${bobIp6}");
+ carol.succeed("ping -c 1 ${aliceIp6}")
+ carol.succeed("ping -c 1 ${bobIp6}")
- $carol->fail("journalctl -u dhcpcd | grep ygg0");
-
- $alice->waitForUnit("httpd.service");
- $carol->succeed("curl --fail -g http://[${aliceIp6}]");
+ carol.fail("journalctl -u dhcpcd | grep ygg0")
+ alice.wait_for_unit("httpd.service")
+ carol.succeed("curl --fail -g http://[${aliceIp6}]")
'';
})
diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix
index f343ebd39e44..42cf20b39c52 100644
--- a/nixos/tests/zookeeper.nix
+++ b/nixos/tests/zookeeper.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
name = "zookeeper";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
@@ -15,14 +15,20 @@ import ./make-test.nix ({ pkgs, ...} : {
};
testScript = ''
- startAll;
+ start_all()
- $server->waitForUnit("zookeeper");
- $server->waitForUnit("network.target");
- $server->waitForOpenPort(2181);
+ server.wait_for_unit("zookeeper")
+ server.wait_for_unit("network.target")
+ server.wait_for_open_port(2181)
- $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 create /foo bar");
- $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 set /foo hello");
- $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 get /foo | grep hello");
+ server.wait_until_succeeds(
+ "${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 create /foo bar"
+ )
+ server.wait_until_succeeds(
+ "${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 set /foo hello"
+ )
+ server.wait_until_succeeds(
+ "${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 get /foo | grep hello"
+ )
'';
})
diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix
new file mode 100644
index 000000000000..4380ec9adfd2
--- /dev/null
+++ b/nixos/tests/zsh-history.nix
@@ -0,0 +1,35 @@
+import ./make-test-python.nix ({ pkgs, ...} : {
+ name = "zsh-history";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ kampka ];
+ };
+
+ nodes.default = { ... }: {
+ programs = {
+ zsh.enable = true;
+ };
+ environment.systemPackages = [ pkgs.zsh-history ];
+ programs.zsh.interactiveShellInit = ''
+ source ${pkgs.zsh-history.out}/share/zsh/init.zsh
+ '';
+ users.users.root.shell = "${pkgs.zsh}/bin/zsh";
+ };
+
+ testScript = ''
+ start_all()
+ default.wait_for_unit("multi-user.target")
+ default.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
+
+ # Login
+ default.wait_until_tty_matches(1, "login: ")
+ default.send_chars("root\n")
+ default.wait_until_tty_matches(1, "root@default>")
+
+ # Generate some history
+ default.send_chars("echo foobar\n")
+ default.wait_until_tty_matches(1, "foobar")
+
+ # Ensure that command was recorded in history
+ default.succeed("/run/current-system/sw/bin/history list | grep -q foobar")
+ '';
+})
diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix
index 92f46abddd5a..42f8af99e6f4 100644
--- a/pkgs/applications/audio/MMA/default.nix
+++ b/pkgs/applications/audio/MMA/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }:
stdenv.mkDerivation rec {
- version = "16.06";
+ version = "19.08";
pname = "mma";
src = fetchurl {
url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
- sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww";
+ sha256 = "02g2q9f1hbrj1v4mbf7zx2571vqpfla5803hcjpkdkvn8g0dwci0";
};
buildInputs = [ makeWrapper python3 alsaUtils timidity ];
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index c72815d5ca25..cd951701e771 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -33,6 +33,8 @@ mkDerivation rec {
enableParallelBuilding = true;
meta = with lib; {
+ homepage = "https://amarok.kde.org";
+ description = "A powerful music player with an intuitive interface";
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix
index 0750c38550b1..34f5667bfcaa 100644
--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An LV2 port of the internal modules found in Alsa Modular Synth";
- homepage = http://objectivewave.wordpress.com/ams-lv2;
+ homepage = "https://github.com/blablack/ams-lv2";
license = licenses.gpl3;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 6be40a7b93aa..2fd3e5c27fe7 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2,
+{ stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext,
libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame,
expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
autoconf, automake, libtool
@@ -7,12 +7,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.3.2";
+ version = "2.3.3";
pname = "audacity";
- src = fetchurl {
+ src = fetchzip {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
- sha256 = "0cf7fr1qhyyylj8g9ax1rq5sb887bcv5b8d7hwlcfwamzxqpliyc";
+ sha256 = "0ddc03dbm4ixy877czmwd03fpjgr3y68bxfgb6n2q6cv4prp30ig";
};
preConfigure = /* we prefer system-wide libs */ ''
@@ -43,12 +43,11 @@ stdenv.mkDerivation rec {
"-lswscale"
];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig autoconf automake libtool ];
buildInputs = [
file gettext wxGTK30 expat alsaLib
- libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2
+ libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk
ffmpeg libmad lame libvorbis flac soundtouch
- autoconf automake libtool # for the preConfigure phase
]; #ToDo: detach sbsms
enableParallelBuilding = true;
@@ -60,7 +59,7 @@ stdenv.mkDerivation rec {
description = "Sound editor with graphical UI";
homepage = http://audacityteam.org/;
license = licenses.gpl2Plus;
- platforms = with platforms; linux;
+ platforms = intersectLists platforms.linux platforms.x86; # fails on ARM
maintainers = with maintainers; [ the-kenny ];
};
}
diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix
index 7ca5d83b48b2..eeb0f67d1937 100644
--- a/pkgs/applications/audio/avldrums-lv2/default.nix
+++ b/pkgs/applications/audio/avldrums-lv2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "avldrums.lv2";
- version = "0.3.5";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "x42";
repo = pname;
rev = "v${version}";
- sha256 = "00n2varc7iwp0xbfi45hpq4vlpxxb2kbrdzvrc20qp2265994bqf";
+ sha256 = "1z70rcq6z3gkb4fm8dm9hs31bslwr97zdh2n012fzki9b9rdj5qv";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
index 3e9a2d380e27..dd59ac5080ff 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
@@ -3,11 +3,11 @@
bitwig-studio1.overrideAttrs (oldAttrs: rec {
name = "bitwig-studio-${version}";
- version = "3.0.1";
+ version = "3.0.3";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
- sha256 = "0k25p1j4kgnhm7p90qp1cz79xddgi6nh1nx1y5wz42x8qrpxya0s";
+ sha256 = "162l95imq2fb4blfkianlkymm690by9ri73xf9zigknqf0gacgsa";
};
runtimeDependencies = [
diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix
index e4ac2fbbcdc2..b91554f5716e 100644
--- a/pkgs/applications/audio/bsequencer/default.nix
+++ b/pkgs/applications/audio/bsequencer/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BSEQuencer";
- version = "0.4";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
- rev = "v${version}";
- sha256 = "0c3bm2z6z2bjjv1cy50383zr81h99rcb2frmxad0r7lhi27mjyqn";
+ rev = "${version}";
+ sha256 = "08xwz5v8wrar0rx7qdr9pkpjz2k9sw6bn5glhpn6sp6453fabf8q";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/applications/audio/bshapr/default.nix
index 1d49ca1fa4fe..732a8cf1ce2f 100644
--- a/pkgs/applications/audio/bshapr/default.nix
+++ b/pkgs/applications/audio/bshapr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BShapr";
- version = "0.4";
+ version = "0.6";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = "v${version}";
- sha256 = "02b4wdfhr9y7z2k6ls086gv3vz4sjf7b1k8ryh573bzd8nr4896v";
+ sha256 = "0mi8f0svq1h9cmmxyskcazr5x2q4dls3j9jc6ahi5rlk7i0bpa74";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix
index 8fbac6daf466..3273d7de68c2 100644
--- a/pkgs/applications/audio/bslizr/default.nix
+++ b/pkgs/applications/audio/bslizr/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "BSlizr";
- version = "1.2.0";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "sjaehn";
repo = pname;
rev = "${version}";
- sha256 = "1xqhpppfj47nzmyksbqgfvvi5j807g96hqla544w2f752zz4yi0s";
+ sha256 = "0q92ygz17iiriwzqylmaxd5ml2bhqy3n6c3f7g71n4hn9z3bl3s1";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix
index 87efa6fb6b66..cd1d837e1dd1 100644
--- a/pkgs/applications/audio/cadence/default.nix
+++ b/pkgs/applications/audio/cadence/default.nix
@@ -1,4 +1,6 @@
{ stdenv
+, mkDerivation
+, lib
, fetchzip
, pkgconfig
, qtbase
@@ -6,74 +8,65 @@
, python3Packages
}:
- stdenv.mkDerivation rec {
- version = "0.9.0";
+ mkDerivation rec {
+ version = "0.9.1";
pname = "cadence";
src = fetchzip {
url = "https://github.com/falkTX/Cadence/archive/v${version}.tar.gz";
- sha256 = "08vcggypkdfr70v49innahs5s11hi222dhhnm5wcqzdgksphqzwx";
+ sha256 = "07z8grnnpkd0nf3y3r6qjlk1jlzrbhdrp9mnhrhhmws54p1bhl20";
};
- nativeBuildInputs = [ makeWrapper pkgconfig ];
- buildInputs = [ qtbase ];
+ nativeBuildInputs = [
+ pkgconfig
+ ];
- makeFlags = ''
- PREFIX=""
- DESTDIR=$(out)
- '';
+ buildInputs = [
+ qtbase
+ ];
- propagatedBuildInputs = with python3Packages; [ pyqt5_with_qtwebkit ];
+ makeFlags = [
+ "PREFIX=''"
+ "DESTDIR=${placeholder "out"}"
+ ];
- postInstall = ''
- # replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise
- rm $out/bin/cadence
- makeWrapper ${python3Packages.python.interpreter} $out/bin/cadence \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/cadence.py"
- rm $out/bin/claudia
- makeWrapper ${python3Packages.python.interpreter} $out/bin/claudia \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/claudia.py"
- rm $out/bin/catarina
- makeWrapper ${python3Packages.python.interpreter} $out/bin/catarina \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/catarina.py"
- rm $out/bin/catia
- makeWrapper ${python3Packages.python.interpreter} $out/bin/catia \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/catia.py"
- rm $out/bin/cadence-jacksettings
- makeWrapper ${python3Packages.python.interpreter} $out/bin/cadence-jacksettings \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/jacksettings.py"
- rm $out/bin/cadence-aloop-daemon
- makeWrapper ${python3Packages.python.interpreter} $out/bin/cadence-aloop-daemon \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/cadence_aloop_daemon.py"
- rm $out/bin/cadence-logs
- makeWrapper ${python3Packages.python.interpreter} $out/bin/cadence-logs \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/logs.py"
- rm $out/bin/cadence-render
- makeWrapper ${python3Packages.python.interpreter} $out/bin/cadence-render \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/render.py"
- rm $out/bin/claudia-launcher
- makeWrapper ${python3Packages.python.interpreter} $out/bin/claudia-launcher \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/claudia_launcher.py"
- rm $out/bin/cadence-session-start
- makeWrapper ${python3Packages.python.interpreter} $out/bin/cadence-session-start \
- --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \
- --add-flags "-O $out/share/cadence/src/cadence_session_start.py"
- '';
+ propagatedBuildInputs = with python3Packages; [
+ pyqt5_with_qtwebkit
+ ];
+
+ dontWrapQtApps = true;
+
+ # Replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise.
+ preFixup = let
+ outRef = placeholder "out";
+ prefix = "${outRef}/share/cadence/src";
+ scriptAndSource = lib.mapAttrs' (script: source:
+ lib.nameValuePair ("${outRef}/bin/" + script) ("${prefix}/" + source)
+ ) {
+ "cadence" = "cadence.py";
+ "claudia" = "claudia.py";
+ "catarina" = "catarina.py";
+ "catia" = "catia.py";
+ "cadence-jacksettings" = "jacksettings.py";
+ "cadence-aloop-daemon" = "cadence_aloop_daemon.py";
+ "cadence-logs" = "logs.py";
+ "cadence-render" = "render.py";
+ "claudia-launcher" = "claudia_launcher.py";
+ "cadence-session-start" = "cadence_session_start.py";
+ };
+ in lib.mapAttrsToList (script: source: ''
+ rm -f ${script}
+ makeWrapper ${python3Packages.python.interpreter} ${script} \
+ --set PYTHONPATH "$PYTHONPATH:${outRef}/share/cadence" \
+ ''${qtWrapperArgs[@]} \
+ --add-flags "-O ${source}"
+ '') scriptAndSource;
meta = {
homepage = https://github.com/falkTX/Cadence/;
description = "Collection of tools useful for audio production";
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ genesis ];
+ maintainers = with stdenv.lib.maintainers; [ genesis worldofpeace ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index bdbf6a45a6d4..876889416daa 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -80,7 +80,7 @@ in mkDerivation {
homepage = https://github.com/cdrummond/cantata;
description = "A graphical client for MPD";
license = licenses.gpl3;
- maintainers = with maintainers; [ fuuzetsu peterhoeg ];
+ maintainers = with maintainers; [ peterhoeg ];
# Technically Cantata can run on Windows so if someone wants to
# bother figuring that one out, be my guest.
platforms = platforms.linux;
diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix
index 331e3fb96989..f3adec4fece2 100644
--- a/pkgs/applications/audio/denemo/default.nix
+++ b/pkgs/applications/audio/denemo/default.nix
@@ -2,7 +2,7 @@
, libjack2, gettext, intltool, guile_2_0, lilypond
, glib, libxml2, librsvg, libsndfile, aubio
, gtk3, gtksourceview, evince, fluidsynth, rubberband
-, portaudio, portmidi, fftw, makeWrapper }:
+, portaudio, portmidi, fftw, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "denemo";
@@ -14,17 +14,21 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- libjack2 gettext guile_2_0 lilypond pkgconfig glib libxml2 librsvg libsndfile
+ libjack2 guile_2_0 lilypond glib libxml2 librsvg libsndfile
aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi
- makeWrapper
];
- postInstall = ''
- wrapProgram $out/bin/denemo --prefix PATH : ${lilypond}/bin
+ preFixup = ''
+ gappsWrapperArgs+=(
+ --prefix PATH : "${lilypond}/bin"
+ )
'';
nativeBuildInputs = [
+ wrapGAppsHook
intltool
+ gettext
+ pkgconfig
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 604fe4c4ab71..b926ff09d22b 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
+{ mkDerivation, lib, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "drumkv1";
- version = "0.9.10";
+ version = "0.9.11";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
- sha256 = "0h08r6vq23dlnag67fcfcpx83wampx4fag82v4bgkqg2sdh64p3n";
+ sha256 = "1wnjn175l0mz51k9pjf3pdzv54c4jlh63saavld9lm6zfgfs13d7";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
nativeBuildInputs = [ pkgconfig ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "An old-school drum-kit sampler synthesizer with stereo fx";
homepage = http://drumkv1.sourceforge.net/;
license = licenses.gpl2Plus;
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index c6fb7c67d584..4c2b97e727f4 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
description = "View and edit tags for various audio files";
homepage = https://wiki.gnome.org/Apps/EasyTAG;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix
new file mode 100644
index 000000000000..5940203d04d1
--- /dev/null
+++ b/pkgs/applications/audio/ensemble-chorus/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, fltk, alsaLib, freetype, libXrandr, libXinerama, libXcursor, lv2, libjack2, cmake, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ pname = "ensemble-chorus";
+ version = "unstable-15-02-2019";
+
+ src = fetchFromGitHub {
+ owner = "jpcima";
+ repo = pname;
+ rev = "59baeb86b8851f521bc8162e22e3f15061662cc3";
+ sha256 = "0c1y10vyhrihcjvxqpqf6b52yk5yhwh813cfp6nla5ax2w88dbhr";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ buildInputs = [
+ fltk alsaLib freetype libXrandr libXinerama libXcursor lv2 libjack2
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/jpcima/ensemble-chorus;
+ description = "Digital model of electronic string ensemble chorus";
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.linux;
+ license = licenses.boost;
+ };
+}
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index 043d5b9d2d3a..32cec811d002 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "espeak-ng";
- version = "1.49.2";
+ version = "1.50";
src = fetchFromGitHub {
owner = "espeak-ng";
repo = "espeak-ng";
rev = version;
- sha256 = "17bbl3zi8214iaaj8kjnancjvmvizwybg3sg17qjq4mf5c6xfg2c";
+ sha256 = "0jkqhf2h94vbqq7mg7mmm23bq372fa7mdk941my18c3vkldcir1b";
};
nativeBuildInputs = [ autoconf automake which libtool pkgconfig ronn ];
diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix
index 5e95d7179689..248967e06e6f 100644
--- a/pkgs/applications/audio/fmsynth/default.nix
+++ b/pkgs/applications/audio/fmsynth/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
buildPhase = ''
cd lv2
substituteInPlace GNUmakefile --replace "/usr/lib/lv2" "$out/lib/lv2"
- make
+ make SIMD=0
'';
preInstall = "mkdir -p $out/lib/lv2";
diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix
new file mode 100644
index 000000000000..8907011c16fb
--- /dev/null
+++ b/pkgs/applications/audio/giada/default.nix
@@ -0,0 +1,43 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook,
+ fltk, jansson, rtmidi, libsamplerate, libsndfile,
+ jack2, alsaLib, libpulseaudio,
+ libXpm, libXinerama, libXcursor }:
+
+stdenv.mkDerivation rec {
+ pname = "giada";
+ version = "0.16.0";
+
+ src = fetchFromGitHub {
+ owner = "monocasual";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1lbxqa4kwzjdd79whrjgh8li453z4ckkjx4s4qzmrv7aqa2xmfsf";
+ };
+
+ configureFlags = [ "--target=linux" ];
+ nativeBuildInputs = [
+ autoreconfHook
+ ];
+ buildInputs = [
+ fltk
+ libsndfile
+ libsamplerate
+ jansson
+ rtmidi
+ libXpm
+ jack2
+ alsaLib
+ libpulseaudio
+ libXinerama
+ libXcursor
+ ];
+
+ meta = with lib; {
+ description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians";
+ homepage = "https://giadamusic.com/";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ petabyteboy ];
+ platforms = platforms.all;
+ broken = stdenv.hostPlatform.isAarch64; # produces build failure on aarch64-linux
+ };
+}
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index eeafdc80344d..7a44ebe67694 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -1,45 +1,74 @@
-{ stdenv, fetchurl, fetchpatch, meson, ninja, gettext, cargo, rustc, python3, pkgconfig, gnome3
-, glib, libhandy, gtk3, dbus, openssl, sqlite, gst_all_1, wrapGAppsHook }:
+{ stdenv
+, rustPlatform
+, fetchFromGitLab
+, fetchpatch
+, meson
+, ninja
+, gettext
+, cargo
+, rustc
+, python3
+, pkgconfig
+, gnome3
+, glib
+, libhandy
+, gtk3
+, dbus
+, openssl
+, sqlite
+, gst_all_1
+, wrapGAppsHook
+}:
-# TODO: build from git for easier updates
-# rustPlatform.buildRustPackage rec {
-stdenv.mkDerivation {
- version = "0.4.6";
+rustPlatform.buildRustPackage rec {
+ version = "0.4.7";
pname = "gnome-podcasts";
- src = fetchurl {
- url = https://gitlab.gnome.org/World/podcasts/uploads/e59ac5d618d7daf4c7f33ba72957c466/gnome-podcasts-0.4.6.tar.xz;
- sha256 = "0g2rk3w251fp5jwbxs5ya1adv8nsgdqjy1vmfg8qqab6qyndhbrc";
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "World";
+ repo = "podcasts";
+ rev = version;
+ sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0";
};
- patches = [
- # podcasts-data would fail to build because it errors on warnings
- (fetchpatch {
- url = "https://gitlab.gnome.org/World/podcasts/commit/7dc1b25ee7fc59a188312d31b1fa00c3110ae63e.patch";
- sha256 = "03ibbh1snk1391vnni529agqs14lzg5g0axjgpf3gn8dwwh1yvd5";
- })
- ];
-
- # src = fetchFromGitLab {
- # domain = "gitlab.gnome.org";
- # owner = "World";
- # repo = "podcasts";
- # rev = version;
- # sha256 = "15xj98dhxvys0cnya9488qsfsm0ys1wy69wkc39z8j6hwdm7byq2";
- # };
+ cargoSha256 = "1h0n8zclb8a1b1ri83viiwwzlj3anm38m4cp38aqyf6q40qga35q";
nativeBuildInputs = [
- meson ninja pkgconfig gettext cargo rustc python3 wrapGAppsHook
- ];
- buildInputs = [
- glib gtk3 libhandy dbus openssl sqlite gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad
+ meson
+ ninja
+ pkgconfig
+ gettext
+ cargo
+ rustc
+ python3
+ wrapGAppsHook
];
- # cargoSha256 = "0721b5f700vvvzvmdl8nfjaa6j412q1fjssgrjv8n6rmn9z13d2v";
+ buildInputs = [
+ glib
+ gtk3
+ libhandy
+ dbus
+ openssl
+ sqlite
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-bad
+ ];
+
+ # use Meson/Ninja phases
+ configurePhase = null;
+ buildPhase = null;
+ checkPhase = null;
+ installPhase = null;
+
+ # tests require network
+ doCheck = false;
postPatch = ''
chmod +x scripts/compile-gschema.py # patchShebangs requires executable file
- patchShebangs scripts/compile-gschema.py
+ patchShebangs scripts/compile-gschema.py scripts/cargo.sh scripts/test.sh
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 246cba590f45..b972aae7de80 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3, python3Packages, intltool
, glibcLocales, gnome3, gtk3, wrapGAppsHook
-, ipodSupport ? false, libgpod, gobject-introspection
+, gobject-introspection
}:
python3Packages.buildPythonApplication rec {
@@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec {
podcastparser
html5lib
gtk3
- ] ++ stdenv.lib.optional ipodSupport libgpod;
+ ];
makeFlags = [
"PREFIX=$(out)"
diff --git a/pkgs/applications/audio/gxmatcheq-lv2/default.nix b/pkgs/applications/audio/gxmatcheq-lv2/default.nix
new file mode 100644
index 000000000000..1d5579d74c05
--- /dev/null
+++ b/pkgs/applications/audio/gxmatcheq-lv2/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, xorg, xorgproto, cairo, lv2, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ pname = "GxMatchEQ.lv2";
+ version = "0.1";
+
+ src = fetchFromGitHub {
+ owner = "brummer10";
+ repo = pname;
+ rev = "V${version}";
+ sha256 = "0azdmgzqwjn26nx38iw13666a1i4y2bv39wk89pf6ihdi46klf72";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [
+ xorg.libX11 xorgproto cairo lv2
+ ];
+
+ # error: format not a string literal and no format arguments [-Werror=format-security]
+ hardeningDisable = [ "format" ];
+
+ installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/brummer10/GxMatchEQ.lv2;
+ description = "Matching Equalizer to apply EQ curve from one source to another source";
+ maintainers = [ maintainers.magnetophon ];
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix
index 64de722afe9e..428490e119a6 100644
--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@@ -1,5 +1,5 @@
- { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
- , lv2, pkgconfig, libGLU_combined }:
+{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
+, lv2, pkgconfig, libGLU, libGL }:
stdenv.mkDerivation {
version = "0.9.0";
@@ -15,7 +15,7 @@
buildInputs = [
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
xorg.libXinerama xorg.libXrender xorg.libXrandr
- freetype alsaLib curl libjack2 pkgconfig libGLU_combined lv2
+ freetype alsaLib curl libjack2 pkgconfig libGLU libGL lv2
];
CXXFLAGS = "-DHAVE_LROUND";
diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index 2cc39e649434..f3928499413c 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
];
preConfigure = ''
- export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")"
+ export CMAKE_PREFIX_PATH="''${CMAKE_PREFIX_PATH-}:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")"
'';
postInstall = ''rm $out/bin/i-score.sh'';
diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix
index d31bc981e0cb..5bad5453504f 100644
--- a/pkgs/applications/audio/jack-oscrolloscope/default.nix
+++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }:
+{ stdenv, fetchurl, SDL, libjack2, libGLU, libGL, pkgconfig }:
stdenv.mkDerivation rec {
pname = "jack_oscrolloscope";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ SDL libjack2 libGLU_combined ];
+ buildInputs = [ SDL libjack2 libGLU libGL ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index d22065eb9fe0..99503fc3942b 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13
, fluidsynth_1 ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
, libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null
-, qtbase, qtx11extras, qttools, SDL ? null }:
+, qtbase, qtx11extras, qttools, SDL ? null, mkDerivation }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "lmms";
version = "1.2.0-rc7";
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
description = "DAW similar to FL Studio (music production software)";
homepage = https://lmms.io;
license = licenses.gpl2Plus;
- platforms = platforms.linux;
+ platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ goibhniu yegortimoshenko ];
};
}
diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 8bdf45a968a5..2d2062696d77 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -19,7 +19,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
- version = "1.2.5";
+ version = "1.2.16";
format = "other";
doCheck = false;
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
- sha256 = "148p3ab7nnfz13hgjkx1cf2ahq9mgl72csrl35xy6d0nkfqbfr8r";
+ sha256 = "0rl4a5npjh5sm3kih11cs2j7ik894nlygllbw4j5pn9n9v66x51w";
};
nativeBuildInputs = [
@@ -79,15 +79,15 @@ python3.pkgs.buildPythonApplication rec {
# argument
dontWrapGApps = true;
- makeWrapperArgs = [
- "\${gappsWrapperArgs[@]}"
- ];
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
meta = with lib; {
+ changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}";
description = "A modern music player for GNOME";
homepage = https://wiki.gnome.org/Apps/Lollypop;
license = licenses.gpl3Plus;
- changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}";
maintainers = with maintainers; [ worldofpeace ];
platforms = platforms.linux;
};
diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix
index 47d8f165ad05..d5d893891ffe 100644
--- a/pkgs/applications/audio/lsp-plugins/default.nix
+++ b/pkgs/applications/audio/lsp-plugins/default.nix
@@ -1,40 +1,28 @@
{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper
, libsndfile, jack2Full
, libGLU, libGL, lv2, cairo
-, ladspaH, php, expat }:
+, ladspaH, php }:
stdenv.mkDerivation rec {
pname = "lsp-plugins";
- version = "1.1.10";
+ version = "1.1.13";
src = fetchFromGitHub {
owner = "sadko4u";
repo = pname;
rev = "${pname}-${version}";
- sha256 = "09gmwzh1gq1q2lxn8fc1bpdh02h8vr7r0i040c1nx256wgfsarqb";
+ sha256 = "00mhrr873kgcnqy3q0yi1r5zacfcvz7fqpzsmfhw5d095jm970al";
};
- nativeBuildInputs = [ pkgconfig php expat ];
- buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH makeWrapper ];
+ nativeBuildInputs = [ pkgconfig php makeWrapper ];
+ buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ];
makeFlags = [
- "BIN_PATH=$(out)/bin"
- "LIB_PATH=$(out)/lib"
- "DOC_PATH=$(out)/share/doc"
+ "PREFIX=${placeholder ''out''}"
];
NIX_CFLAGS_COMPILE = [ "-DLSP_NO_EXPERIMENTAL" ];
- patchPhase = ''
- runHook prePatch
- substituteInPlace Makefile --replace "/usr/lib" "$out/lib"
- substituteInPlace ./include/container/jack/main.h --replace "/usr/lib" "$out/lib"
- substituteInPlace ./include/container/vst/main.h --replace "/usr/lib" "$out/lib"
- # for https://github.com/sadko4u/lsp-plugins/issues/7#issuecomment-426561549 :
- sed -i '/X11__NET_WM_WINDOW_TYPE_DOCK;/d' ./src/ui/ws/x11/X11Window.cpp
- runHook postPatch
- '';
-
doCheck = true;
checkPhase = ''
@@ -45,7 +33,7 @@ stdenv.mkDerivation rec {
runHook postCheck
'';
- buildFlags = "release";
+ buildFlags = [ "release" ];
meta = with stdenv.lib;
{ description = "Collection of open-source audio plugins";
@@ -154,6 +142,6 @@ stdenv.mkDerivation rec {
homepage = https://lsp-plug.in;
maintainers = with maintainers; [ magnetophon ];
license = licenses.gpl2;
- platforms = [ "x86_64-linux" ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix
index 901be5a23d08..61f2bc33f7f7 100644
--- a/pkgs/applications/audio/mda-lv2/default.nix
+++ b/pkgs/applications/audio/mda-lv2/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mda-lv2";
- version = "1.2.2";
+ version = "1.2.4";
src = fetchurl {
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
- sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4";
+ sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8";
};
nativeBuildInputs = [ pkgconfig wafHook ];
diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix
index a2368017cc1e..12383dcbbda4 100644
--- a/pkgs/applications/audio/meters_lv2/default.nix
+++ b/pkgs/applications/audio/meters_lv2/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
-, lv2, libGLU_combined, gtk2, cairo, pango, fftwFloat, libjack2 }:
+, lv2, libGLU, libGL, gtk2, cairo, pango, fftwFloat, libjack2 }:
let
version = "0.9.10";
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
inherit name;
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ lv2 libGLU_combined gtk2 cairo pango fftwFloat libjack2 ];
+ buildInputs = [ lv2 libGLU libGL gtk2 cairo pango fftwFloat libjack2 ];
srcs = [ src robtkSrc ];
sourceRoot = name;
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 5cf9b1b8ab70..82db91dcb077 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -8,13 +8,13 @@
mkDerivation rec {
pname = "mixxx";
- version = "2.2.2";
+ version = "2.2.3";
src = fetchFromGitHub {
owner = "mixxxdj";
repo = "mixxx";
rev = "release-${version}";
- sha256 = "0dmkvcsgq7abxqd4wms8c4w0mr5c53z7n5r8jgzp4swz9nmfjpfg";
+ sha256 = "1h7q25fv62c5m74d4cn1m6mpanmqpbl2wqbch4qvn488jb2jw1dv";
};
buildInputs = [
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 22cef5414f84..88cdde2ceb2a 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
- version = "3.41.1";
+ version = "3.43.0";
src = pythonPackages.fetchPypi {
inherit pname version;
- sha256 = "1bdcxsvb756rchyp9cj1y5x1w0w6p2hp7grgar5c4cyh3kshc2kj";
+ sha256 = "1qg9xyjf27dp0810h4kdliyfb8r3kvi37lq8r93d01xwfphdzs05";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index b13e1cc037a0..1e8d73ce560f 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mpd_clientlib }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, mpd_clientlib, sphinx, libiconv }:
stdenv.mkDerivation rec {
pname = "mpc";
- version = "0.28";
+ version = "0.33";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "mpc";
rev = "v${version}";
- sha256 = "1g8i4q5xsqdhidyjpvj6hzbhxacv27cb47ndv9k68whd80c5f9n9";
+ sha256 = "1qbi0i9cq54rj8z2kapk8x8g1jkw2jz781niwb9i7kw4xfhvy5zx";
};
- buildInputs = [ mpd_clientlib ];
+ buildInputs = [ mpd_clientlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
- enableParallelBuilding = true;
+ nativeBuildInputs = [ meson ninja pkgconfig sphinx ];
meta = with stdenv.lib; {
description = "A minimalist command line interface to MPD";
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 0d5445650a0a..6c4b9a431768 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "mpg123-1.25.12";
+ name = "mpg123-1.25.13";
src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
- sha256 = "1l9iwwgqzw6yg5zk9pqmlbfyq6d8dqysbmj0j3m8dyrxd34wgzhz";
+ sha256 = "02l915jq0ymndb082g6w89bpf66z04ifa1lr7ga3yycw6m46hc4h";
};
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
index 65dfe3484b66..fdefcf7e77d6 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib
+{stdenv, fetchurl, fetchpatch, libao, libmad, libid3tag, zlib, alsaLib
# Specify default libao output plugin to use (e.g. "alsa", "pulse" …).
# If null, it will use the libao system default.
, defaultAudio ? null
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "0ki8mh76bbmdh77qsiw682dvi8y468yhbdabqwg05igmwc1wqvq5";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2018-7263.patch";
+ url = "https://sources.debian.org/data/main/m/mpg321/0.3.2-3/debian/patches/handle_illegal_bitrate_value.patch";
+ sha256 = "15simp5fjvm9b024ryfh441rkh2d5bcrizqkzlrh07n9sm7fkw6x";
+ })
+ ];
+
hardeningDisable = [ "format" ];
configureFlags =
diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index 02b1d8ea5111..372c8faf773d 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
version = "3.1pre1";
meta = with stdenv.lib; {
- homepage = http://www.muse-sequencer.org;
+ homepage = "https://www.muse-sequencer.org/";
description = "MIDI/Audio sequencer with recording and editing capabilities";
longDescription = ''
MusE is a MIDI/Audio sequencer with recording and editing capabilities
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index 4fa9626332be..58eb5462ef84 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -1,25 +1,32 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses
-, mpd_clientlib, gettext, boost }:
+, mpd_clientlib, gettext, boost
+, pcreSupport ? false
+, pcre ? null
+}:
+
+with stdenv.lib;
+
+assert pcreSupport -> pcre != null;
stdenv.mkDerivation rec {
pname = "ncmpc";
- version = "0.35";
+ version = "0.36";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
- sha256 = "0hhc5snxy5fbg47ynz4b7fkmzdy974zxqr0cqc6kh15yvbr25ikh";
+ sha256 = "1ssmk1p43gjhcqi86sh6b7csqpwwpf3hs32cmnylv6pmbcwbs69h";
};
- buildInputs = [ glib ncurses mpd_clientlib boost ];
+ buildInputs = [ glib ncurses mpd_clientlib boost ]
+ ++ optional pcreSupport pcre;
nativeBuildInputs = [ meson ninja pkgconfig gettext ];
mesonFlags = [
"-Dlirc=disabled"
- "-Dregex=disabled"
"-Ddocumentation=disabled"
- ];
+ ] ++ optional (!pcreSupport) "-Dregex=disabled";
meta = with stdenv.lib; {
description = "Curses-based interface for MPD (music player daemon)";
diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index 63ae9278c5d3..136f6fc1427d 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -11,17 +11,17 @@ let
++ lib.optional withPortAudio "portaudio_backend";
in
rustPlatform.buildRustPackage rec {
- pname = "ncspot-unstable";
- version = "2019-10-12";
+ pname = "ncspot";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
- rev = "4defded54646958268a20787917e4721ae96407d";
- sha256 = "1w3cmilwjzk3pfnq97qgz6hzxgjgi27dm8jq7maw87qyl3v17gyg";
+ rev = "v${version}";
+ sha256 = "0ldisr45w6ys1j62qv99ssqfg5q9dwrrzxh2maggyrx1zqdlsk6m";
};
- cargoSha256 = "1w1fk39pragfy2i2myw99mqf63w6fw4nr2kri8ily2iqc6g9xpgw";
+ cargoSha256 = "0k765hinqxfm30li1z66m1chsv69v6hiz109q2zlkxzg937qbnjh";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
diff --git a/pkgs/applications/audio/netease-cloud-music/default.nix b/pkgs/applications/audio/netease-cloud-music/default.nix
new file mode 100644
index 000000000000..76dcba304a32
--- /dev/null
+++ b/pkgs/applications/audio/netease-cloud-music/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, lib, fontconfig, zlib, libGL, glib, pango
+, gdk-pixbuf, freetype, atk, cairo, libsForQt5, xorg
+, sqlite, taglib, nss, nspr, cups, dbus, alsaLib
+, libpulseaudio, deepin, qt5, harfbuzz, p11-kit
+, libgpgerror, libudev0-shim, makeWrapper, dpkg, fetchurl }:
+let
+ rpath = lib.makeLibraryPath [
+ fontconfig.lib
+ zlib
+ stdenv.cc.cc.lib
+ libGL
+ glib
+ pango
+ gdk-pixbuf
+ freetype
+ atk
+ cairo
+ libsForQt5.vlc
+ sqlite
+ taglib
+ nss
+ nspr
+ cups.lib
+ dbus.lib
+ alsaLib
+ libpulseaudio
+ xorg.libX11
+ xorg.libXext
+ xorg.libXtst
+ xorg.libXdamage
+ xorg.libXScrnSaver
+ xorg.libxcb
+ xorg.libXi
+ deepin.qcef
+ qt5.qtwebchannel
+ qt5.qtbase
+ qt5.qtx11extras
+ qt5.qtdeclarative
+ harfbuzz
+ p11-kit
+ libgpgerror
+ ];
+
+ runtimeLibs = lib.makeLibraryPath [ libudev0-shim ];
+
+in stdenv.mkDerivation rec {
+ pname = "netease-cloud-music";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "http://d1.music.126.net/dmusic/netease-cloud-music_1.2.0_amd64_deepin_stable_20190424.deb";
+ sha256 = "0hg8jqim77vd0fmk8gfbz2fmlj99byxcm9jn70xf7vk1sy7wp6h1";
+ curlOpts = "-A 'Mozilla/5.0'";
+ };
+ unpackCmd = "${dpkg}/bin/dpkg -x $src .";
+ sourceRoot = ".";
+
+ nativeBuildInputs = [ qt5.wrapQtAppsHook makeWrapper ];
+
+ installPhase = ''
+ mkdir -p $out
+ cp -r usr/* $out
+ '';
+
+ preFixup = ''
+ local exefile="$out/bin/netease-cloud-music"
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exefile"
+ patchelf --set-rpath "$out/libs:$(patchelf --print-rpath "$exefile"):${rpath}" "$exefile"
+
+ wrapProgram $out/bin/netease-cloud-music \
+ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
+ --set QT_AUTO_SCREEN_SCALE_FACTOR 1 \
+ --set QCEF_INSTALL_PATH "${deepin.qcef}/lib/qcef"
+ '';
+
+ meta = {
+ description = "Client for Netease Cloud Music service";
+ homepage = https://music.163.com;
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ maintainers = [ stdenv.lib.maintainers.mlatus ];
+ license = stdenv.lib.licenses.unfreeRedistributable;
+ };
+}
diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix
new file mode 100644
index 000000000000..146e13f34de1
--- /dev/null
+++ b/pkgs/applications/audio/noise-repellent/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fftwFloat, lv2 }:
+
+stdenv.mkDerivation rec {
+ pname = "noise-repellent";
+ version = "unstable-2018-12-29";
+
+ src = fetchFromGitHub {
+ owner = "lucianodato";
+ repo = pname;
+ rev = "9efdd0b41ec184a792087c87cbf5382f455e33ec";
+ sha256 = "0pn9cxapfvb5l62q86bchyfll1290vi0rhrzarb1jpc4ix7kz53c";
+ fetchSubmodules = true;
+ };
+
+ mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2");
+
+ nativeBuildInputs = [ meson ninja pkgconfig ];
+ buildInputs = [
+ fftwFloat lv2
+ ];
+
+ meta = with stdenv.lib; {
+ description = "An lv2 plugin for broadband noise reduction";
+ homepage = https://github.com/lucianodato/noise-repellent;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.magnetophon ];
+ platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ];
+ };
+}
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index 08c5c1a5c361..58e0887163d7 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/pkgs/applications/audio/openmpt123/default.nix
@@ -2,14 +2,14 @@
, usePulseAudio ? config.pulseaudio or false, libpulseaudio }:
let
- version = "0.4.9";
+ version = "0.4.10";
in stdenv.mkDerivation {
pname = "openmpt123";
inherit version;
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
- sha256 = "02kjwwh9d9i4rnfzqzr18pvcklc46yrs9mvdmjqx7kxg3c28hkqm";
+ sha256 = "12i5iwxb5g27amqgqr6iiy63w49nwil5vyypnbj91ahy97ah8a3a";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix
index 85d0e1fbaf71..69fa75d85f4d 100644
--- a/pkgs/applications/audio/opus-tools/default.nix
+++ b/pkgs/applications/audio/opus-tools/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
description = "Tools to work with opus encoded audio streams";
homepage = http://www.opus-codec.org/;
license = stdenv.lib.licenses.bsd2;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; unix;
};
}
diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
index 993e3c4fe8c5..25636863793f 100644
--- a/pkgs/applications/audio/opusfile/default.nix
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
homepage = http://www.opus-codec.org/;
license = licenses.bsd3;
platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index 448b219a1afa..fee456ae717c 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }:
+{ stdenv, fetchurl, alsaLib, cmake, libGLU, libGL, makeWrapper, qt4 }:
stdenv.mkDerivation {
pname = "pianobooster";
@@ -16,12 +16,13 @@ stdenv.mkDerivation {
preConfigure = "cd src";
- buildInputs = [ alsaLib cmake makeWrapper libGLU_combined qt4 ];
+ buildInputs = [ alsaLib cmake makeWrapper libGLU libGL qt4 ];
NIX_LDFLAGS = [ "-lGL" "-lpthread" ];
postInstall = ''
wrapProgram $out/bin/pianobooster \
- --prefix LD_LIBRARY_PATH : ${libGLU_combined}/lib
+ --prefix LD_LIBRARY_PATH : ${libGL}/lib \
+ --prefix LD_LIBRARY_PATH : ${libGLU}/lib
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index dc1118f47e04..b40ab6d4f7a5 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -4,13 +4,13 @@ let
pythonPackages = python3Packages;
in pythonPackages.buildPythonApplication rec {
pname = "picard";
- version = "2.2.2";
+ version = "2.2.3";
src = fetchFromGitHub {
owner = "metabrainz";
repo = pname;
rev = "release-${version}";
- sha256 = "1iibkvwpj862wcrl0fmyi6qhcgx4q5ay63yr0zyg0bkqgcka0gpr";
+ sha256 = "0lb4pzl03mr5hrzrzva99rxqd5yfip62b7sjmlg4j0imw8mxaj16";
};
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ];
diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix
index 5d86e37dec8a..20a6e928cefb 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/applications/audio/pithos/default.nix
@@ -4,13 +4,13 @@
pythonPackages.buildPythonApplication rec {
pname = "pithos";
- version = "1.4.1";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "0vaw0rfcdh4bsp9b8la9bs36kw0iwia54y5x060byxhff9av6nj4";
+ sha256 = "10nnm55ql86x1qfmq6dx9a1igf7myjxibmvyhd7fyv06vdhfifgy";
};
format = "other";
diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index 302dd5c8e697..2d941f74c73c 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -46,13 +46,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
- version = "4.6.8";
+ version = "4.6.9";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
- sha256 = "09crsg73mvqdknvh6lczwx16x73zb2vb3m53bsapqiaq4lmwy3qr";
+ sha256 = "0ag19hvf50ip7z1s8jziy4pm8c72w7qq9zzgb4967l6v17rar4yh";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 0b50d3098aa2..84cc11b8bf34 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
{ stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
mkDerivation rec {
- version = "0.5.9";
+ version = "0.6.0";
pname = "qjackctl";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz";
- sha256 = "1saywsda9m124rmjp7i3n0llryaliabjxhqhvqr6dm983qy7pypk";
+ sha256 = "1kddvxxhwvw1ps1c1drr08hxqci7jw4jwr8h1d9isb8agydfxmcx";
};
buildInputs = [
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index aee373329ce0..801d32189bfd 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
# handle that.
mkDerivation rec {
- name = "qmmp-1.3.4";
+ name = "qmmp-1.3.5";
src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
- sha256 = "0j9vgm6216w7arwl919p9rps0a9r6s4415spl3qkpifhwlk90zg0";
+ sha256 = "0h7kcqzhfvk610937pwrhizcdgd4n7ncl1vayv6sj3va1x7pv6xm";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index dee9b8f20c89..46dafb72c412 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "qtractor";
- version = "0.9.10";
+ version = "0.9.11";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
- sha256 = "00fj762qdna4bm8hshdhkwfa48s01bi5sk4f030rfk77mivl09jk";
+ sha256 = "02cpjlf3j4sm74hz88r1frnlycs52rs11mzplr2q8plji3ic5w50";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index c0186a146bee..a64e407b39b8 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -21,7 +21,7 @@
# User-agent info
, lsb-release
# rt2rtng
-, python2
+, python3
# Testing
, gtest
# Fixup
@@ -36,17 +36,17 @@ let
gst-libav
];
# For the rt2rtng utility for converting bookmark file to -ng format
- pythonInputs = with python2.pkgs; [ python2 lxml ];
+ pythonInputs = with python3.pkgs; [ python lxml ];
in
stdenv.mkDerivation rec {
pname = "radiotray-ng";
- version = "0.2.6";
+ version = "0.2.7";
src = fetchFromGitHub {
owner = "ebruck";
- repo = "radiotray-ng";
+ repo = pname;
rev = "v${version}";
- sha256 = "0khrfxjas2ldh0kksq7l811srqy16ahjxchvz0hhykx5hykymxlb";
+ sha256 = "1v2nsz7s0jj0wmqabzk6akcf1353rachm1lfq77hxbq9z5pw8pgb";
};
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 4a6cdc44f446..236c42b52930 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "reaper";
- version = "5.983";
+ version = "5.987";
src = fetchurl {
url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz";
- sha256 = "16xw3gsxgjfdxd1ldm8zxd48qh6lgxacnj9yjryy0brhw51dw1q4";
+ sha256 = "040k5inzj7mmi75fc6hr0ym18y5xss1675bl5rmhn4sq535m289k";
};
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index 62625aa421d1..7b2d92ad59d3 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -4,8 +4,7 @@
with stdenv.lib;
# To use the full release version:
-# 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version
-# for your machine to some stable location.
+# 1) Sign into https://backstage.renoise.com and download the release version to some stable location.
# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle.
# Note: Renoise creates an individual build for each license which screws somewhat with the
# use of functions like requireFile as the hash will be different for every user.
@@ -15,25 +14,20 @@ in
stdenv.mkDerivation rec {
pname = "renoise";
- version = "3.1.0";
+ version = "3.2.0";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
if releasePath == null then
- fetchurl {
- url = "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2";
- sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
- }
+ fetchurl {
+ urls = [
+ "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz"
+ "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz"
+ ];
+ sha256 = "0cfczzpk1ddz61nk4d72fydbm5nbgxqp95v81by2n87s1wffjjhi";
+ }
else
- releasePath
- else if stdenv.hostPlatform.system == "i686-linux" then
- if releasePath == null then
- fetchurl {
- url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2";
- sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";
- }
- else
- releasePath
+ releasePath
else throw "Platform is not supported by Renoise";
buildInputs = [ alsaLib libjack2 libX11 libXcursor libXext libXrandr ];
@@ -69,6 +63,6 @@ stdenv.mkDerivation rec {
homepage = https://www.renoise.com/;
license = licenses.unfree;
maintainers = [];
- platforms = [ "i686-linux" "x86_64-linux" ];
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
index cd8079e31dce..5a90ee659478 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchzip, alsaLib, freetype, ftgl, libjack2, libX11, lv2
-, libGLU_combined, pkgconfig, ttf_bitstream_vera
+, libGLU, libGL, pkgconfig, ttf_bitstream_vera
}:
stdenv.mkDerivation rec {
pname = "setbfree";
- version = "0.8.9";
+ version = "0.8.10";
src = fetchzip {
url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz";
- sha256 = "097bby2da47zlkaqy2jl8j6q0h5pxaq67lz473ygadqs5ic3nhc1";
+ sha256 = "1hpj8qb5mhkqm4yy8mzzrrq0ljw22y807qly90vjkg61ascyina4";
};
postPatch = ''
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- alsaLib freetype ftgl libjack2 libX11 lv2 libGLU_combined
+ alsaLib freetype ftgl libjack2 libX11 lv2 libGLU libGL
ttf_bitstream_vera
];
diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix
index 32cfd0f74940..f95655f5e9a3 100644
--- a/pkgs/applications/audio/sisco.lv2/default.nix
+++ b/pkgs/applications/audio/sisco.lv2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU_combined, cairo, pango, libjack2 }:
+{ stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU, libGL, cairo, pango, libjack2 }:
let
name = "sisco.lv2-${version}";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
sourceRoot = src.name;
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ lv2 pango cairo libjack2 libGLU_combined ];
+ buildInputs = [ lv2 pango cairo libjack2 libGLU libGL ];
postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk";
sisco_VERSION = version;
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 43637ef5dc4b..2ba9d4f50c3a 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "snd-19.7";
+ name = "snd-19.9";
src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
- sha256 = "1pr3l9iadvwinmxfl9a2lsm67yi7w3rhxglidpd41m2ni8jf2rlm";
+ sha256 = "13s8fahpsjygjdrcwmprcrz23ny3klaj2rh2xzdv3bfs69gxvhys";
};
nativeBuildInputs = [ pkgconfig ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
homepage = http://ccrma.stanford.edu/software/snd;
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.free;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index ce2a4e9d2c80..b9293fe27294 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -2,7 +2,7 @@
, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }:
let
- inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2;
+ inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools;
in buildPythonApplication rec {
pname = "sonata";
version = "1.7b1";
@@ -29,7 +29,7 @@ in buildPythonApplication rec {
'';
propagatedBuildInputs = [
- gobject-introspection gtk3 pygobject3
+ gobject-introspection gtk3 pygobject3 setuptools
];
# The optional tagpy dependency (for editing metadata) is not yet
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index 055678b0e35f..ac72a26b0eec 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -14,6 +14,7 @@
, supercollider
, qscintilla
, qwt
+, osmid
}:
let
@@ -59,6 +60,10 @@ mkDerivation rec {
buildPhase = ''
export SONIC_PI_HOME=$TMPDIR
export AUBIO_LIB=${aubio}/lib/libaubio.so
+ export OSMID_DIR=app/server/native/osmid
+
+ mkdir -p $OSMID_DIR
+ cp ${osmid}/bin/{m2o,o2m} $OSMID_DIR
pushd app/server/ruby/bin
./compile-extensions.rb
@@ -95,11 +100,10 @@ mkDerivation rec {
'';
meta = {
- homepage = http://sonic-pi.net/;
+ homepage = "https://sonic-pi.net/";
description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Phlogistique kamilchm ];
platforms = lib.platforms.linux;
- broken = true;
};
}
diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix
index 30ff41da3695..5b5f01eef5cc 100644
--- a/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -11,7 +11,7 @@
, boost
, ecasound
, glibcLocales
-, libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
+, libGLU, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
}:
stdenv.mkDerivation {
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
LC_ALL = "en_US.UTF-8";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ boost boost.dev ecasound libGLU_combined help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
+ buildInputs = [ boost boost.dev ecasound libGLU libGL help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
# 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53
# 2) Make it find ecasound headers
diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix
index a73a46a7cb07..973062ecb750 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@@ -1,23 +1,22 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, python3, libxcb, AppKit, Security }:
rustPlatform.buildRustPackage rec {
pname = "spotify-tui";
- version = "0.8.0";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "Rigellute";
repo = "spotify-tui";
rev = "v${version}";
- sha256 = "0pgmcld48sd34jpsc4lr8dbqs8iwk0xp9aa3b15m61mv3lf04qc6";
+ sha256 = "1pshwn486msn418dilk57rl9471aas0dif765nx1p9xgkrjpb7wa";
};
- cargoSha256 = "1rb4dl9zn3xx2yrapx5cfsli93ggmdq8w9fqi8cy8giyja1mnqfl";
+ cargoSha256 = "0020igycgikkbd649hv6xlpn13dij4g7yc43fic9z710p6nsxqaq";
- cargoPatches = [ ./fix-cargo-lock-version.patch ];
-
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
buildInputs = [ openssl ]
- ++ stdenv.lib.optional stdenv.isDarwin Security;
+ ++ stdenv.lib.optional stdenv.isLinux libxcb
+ ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ];
meta = with stdenv.lib; {
description = "Spotify for the terminal written in Rust";
diff --git a/pkgs/applications/audio/spotify-tui/fix-cargo-lock-version.patch b/pkgs/applications/audio/spotify-tui/fix-cargo-lock-version.patch
deleted file mode 100644
index d38c6890033b..000000000000
--- a/pkgs/applications/audio/spotify-tui/fix-cargo-lock-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/Cargo.lock w/Cargo.lock
-index e1eae72..e004898 100644
---- i/Cargo.lock
-+++ w/Cargo.lock
-@@ -1310,7 +1310,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
-
- [[package]]
- name = "spotify-tui"
--version = "0.7.5"
-+version = "0.8.0"
- dependencies = [
- "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 3f99e22a4cbd..bc95ec625bbb 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
, glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3
-, at-spi2-atk
+, at-spi2-atk, at-spi2-core, libpulseaudio
}:
let
@@ -10,20 +10,21 @@ let
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
- version = "1.0.96.181.gf6bc1b6b-12";
+ version = "1.1.10.546.ge08ef575-19";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "30";
+ rev = "36";
deps = [
alsaLib
atk
at-spi2-atk
+ at-spi2-core
cairo
cups
curl
@@ -38,6 +39,7 @@ let
libgcrypt
libnotify
libpng
+ libpulseaudio
nss
pango
stdenv.cc.cc
@@ -73,7 +75,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "859730fbc80067f0828f7e13eee9a21b13b749f897a50e17c2da4ee672785cfd79e1af6336e609529d105e040dc40f61b6189524783ac93d49f991c4ea8b3c56";
+ sha512 = "c49f1a86a9b737e64a475bbe62754a36f607669e908eb725a2395f0a0a6b95968e0c8ce27ab2c8b6c92fe8cbacb1ef58de11c79b92dc0f58c2c6d3a140706a1f";
};
buildInputs = [ squashfsTools makeWrapper ];
diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index d420d1a67095..36ab017c5cbb 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "spotifyd";
- version = "0.2.19";
+ version = "0.2.20";
src = fetchFromGitHub {
owner = "Spotifyd";
repo = "spotifyd";
rev = "v${version}";
- sha256 = "063b28ysj224m6ngns9i574i7vnp1x4g07cqjw908ch04yngcg1c";
+ sha256 = "1hf4wpk7r0s4jpjhxaz67y1hd8jx9ns5imd85r3cdg4lxf3j5gph";
};
- cargoSha256 = "0pqxqd5dyw9mjclrqkxzfnzsz74xl4bg0b86v5q6kc0a91zd49b9";
+ cargoSha256 = "1h3fis47hmxvppiv1icjhgp48nd46gayfcmzfjs34q6jask90n0w";
cargoBuildFlags = [
"--no-default-features"
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
description = "An open source Spotify client running as a UNIX daemon";
homepage = "https://github.com/Spotifyd/spotifyd";
license = with licenses; [ gpl3 ];
- maintainers = [ maintainers.anderslundstedt maintainers.marsam ];
+ maintainers = with maintainers; [ anderslundstedt filalex77 marsam ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix
new file mode 100644
index 000000000000..6e64ebc7fb3e
--- /dev/null
+++ b/pkgs/applications/audio/stone-phaser/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, xorg, cairo, lv2, libjack2, mesa, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ pname = "stone-phaser";
+ version = "0.1.2";
+
+ src = fetchFromGitHub {
+ owner = "jpcima";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "180b32z8h9zi8p0q55r1dzxfckamnngm52zjypjjvvy7qdj3mfcd";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [
+ xorg.libX11 cairo lv2 libjack2 mesa
+ ];
+
+ postPatch = ''
+ patch -d dpf -p 1 -i "$src/resources/patch/DPF-bypass.patch"
+ patchShebangs ./dpf/utils/generate-ttl.sh
+ '';
+
+ installFlags = [ "PREFIX=$(out)" ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/jpcima/stone-phaser;
+ description = "A classic analog phaser effect, made with DPF and Faust";
+ maintainers = [ maintainers.magnetophon ];
+ platforms = platforms.linux;
+ license = licenses.boost;
+ };
+}
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index c62eba998452..07e7bb84c565 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -22,7 +22,7 @@
, libpulseaudio ? null
, libselinux ? null
, libsepol ? null
-, p11_kit ? null
+, p11-kit ? null
, utillinux ? null
, qtbase
, qtx11extras
@@ -35,13 +35,13 @@
mkDerivation rec {
pname = "strawberry";
- version = "0.6.5";
+ version = "0.6.7";
src = fetchFromGitHub {
owner = "jonaski";
repo = pname;
rev = version;
- sha256 = "1kqx0q99n1p5pm6skvqjihz11byhxdid1qw6gqp67dh2na62z1lm";
+ sha256 = "14bw4hmysrbl4havz03s3wl8bv76380wddf5zzrjvfjjpwn333r6";
};
buildInputs = [
@@ -66,7 +66,7 @@ mkDerivation rec {
libpulseaudio
libselinux
libsepol
- p11_kit
+ p11-kit
utillinux
]
++ lib.optionals withGstreamer (with gst_all_1; [
@@ -93,7 +93,7 @@ mkDerivation rec {
changelog = "https://raw.githubusercontent.com/jonaski/strawberry/${version}/Changelog";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
- # upstream says darwin should work but they lack maintainers as of 0.6.5
+ # upstream says darwin should work but they lack maintainers as of 0.6.6
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 6d650abfb97b..349c7acc3db3 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, qt5, libjack2, alsaLib, liblo, lv2 }:
+{ mkDerivation, stdenv, fetchurl, pkgconfig, qtbase, qttools, libjack2, alsaLib, liblo, lv2 }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "synthv1";
- version = "0.9.10";
+ version = "0.9.11";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz";
- sha256 = "1ssdm7aiaz908ydqwdx9khxnnd0yfacjgvbxg5p9s9xhkbqqc2f2";
+ sha256 = "116k2vca9dygvsd684wvxm61p0l1xrrgdph4qrrprlsr6vj0llgm";
};
- buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
+ buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
index 1beb68a3af30..c0bbd6e71db3 100644
--- a/pkgs/applications/audio/vcv-rack/default.nix
+++ b/pkgs/applications/audio/vcv-rack/default.nix
@@ -3,17 +3,10 @@
, libzip, rtaudio, rtmidi, speex, libsamplerate }:
let
- glfw-git = glfw.overrideAttrs (oldAttrs: rec {
- name = "glfw-git-${version}";
- version = "2019-06-30";
- src = fetchFromGitHub {
- owner = "glfw";
- repo = "glfw";
- rev = "d25248343e248337284dfbe5ecd1eddbd37ae66d";
- sha256 = "0gbz353bfmqbpm0af2nqf5draz3k4f3lqwiqj68s8nwn7878aqm3";
- };
- buildInputs = oldAttrs.buildInputs ++ [ libXext libXi ];
- });
+ # The package repo vendors some of the package dependencies as submodules.
+ # Others are downloaded with `make deps`. Due to previous issues with the
+ # `glfw` submodule (see above) and because we can not access the network when
+ # building in a sandbox, we fetch the dependency source manually.
pfft-source = fetchFromBitbucket {
owner = "jpommier";
repo = "pffft";
@@ -47,24 +40,22 @@ let
in
with stdenv.lib; stdenv.mkDerivation rec {
pname = "VCV-Rack";
- version = "1.1.5";
+ version = "1.1.6";
src = fetchFromGitHub {
owner = "VCVRack";
repo = "Rack";
rev = "v${version}";
- sha256 = "1g3mkghgiycbxyvzjhanc1b10jynkfkw03bpnha06qgd6gd9wv7k";
+ sha256 = "0ji64prr74qzxf5bx1sw022kbslx9nzll16lmk5in78hbl137b3i";
};
patches = [
./rack-minimize-vendoring.patch
- # We patch out a call to a custom function, that is not needed on Linux.
- # This avoids needing a patched version of glfw. The version we previously used disappeared
- # on GitHub. See https://github.com/NixOS/nixpkgs/issues/71189
- ./remove-custom-glfw-function.patch
];
prePatch = ''
+ # As we can't use `make dep` to set up the dependencies (as explained
+ # above), we do it here manually
mkdir -p dep/include
cp -r ${pfft-source} dep/jpommier-pffft-source
@@ -86,7 +77,7 @@ with stdenv.lib; stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ makeWrapper pkgconfig ];
- buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex libsamplerate ];
+ buildInputs = [ alsaLib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ];
buildFlags = "Rack";
diff --git a/pkgs/applications/audio/vcv-rack/remove-custom-glfw-function.patch b/pkgs/applications/audio/vcv-rack/remove-custom-glfw-function.patch
deleted file mode 100644
index ceb273b81af0..000000000000
--- a/pkgs/applications/audio/vcv-rack/remove-custom-glfw-function.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/main.cpp b/src/main.cpp
-index 0954ae6..a8299f7 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -162,11 +162,6 @@ int main(int argc, char* argv[]) {
- INFO("Initializing app");
- appInit();
-
-- const char* openedFilename = glfwGetOpenedFilename();
-- if (openedFilename) {
-- patchPath = openedFilename;
-- }
--
- if (!settings::headless) {
- APP->patch->init(patchPath);
- }
diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix
index c26d8b6d3607..c928962c983c 100644
--- a/pkgs/applications/audio/vocal/default.nix
+++ b/pkgs/applications/audio/vocal/default.nix
@@ -58,6 +58,13 @@ stdenv.mkDerivation rec {
webkitgtk
];
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
+
meta = with stdenv.lib; {
description = "The podcast client for the modern free desktop";
longDescription = ''
diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix
index 79801f2e99fa..ff278d4d7f23 100644
--- a/pkgs/applications/audio/whipper/default.nix
+++ b/pkgs/applications/audio/whipper/default.nix
@@ -1,24 +1,31 @@
-{ stdenv, fetchFromGitHub, python2, cdparanoia, cdrdao, flac
-, sox, accuraterip-checksum, utillinux, substituteAll }:
+{ stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
+, sox, accuraterip-checksum, libsndfile, utillinux, substituteAll }:
-python2.pkgs.buildPythonApplication rec {
- name = "whipper-${version}";
- version = "0.7.3";
+python3.pkgs.buildPythonApplication rec {
+ pname = "whipper";
+ version = "0.9.1.dev7+g${stdenv.lib.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "whipper-team";
repo = "whipper";
- rev = "v${version}";
- sha256 = "0ypbgc458i7yvbyvg6wg6agz5yzlwm1v6zw7fmyq9h59xsv27mpr";
+ rev = "9e95f0604fa30ab06445fe46e3bc93bba6092a05";
+ sha256 = "1c2qldw9vxpvdfh5wl6mfcd7zzz3v8r86ffqll311lcp2zin33dg";
};
- pythonPath = with python2.pkgs; [
- pygobject3 musicbrainzngs urllib3 chardet
- pycdio setuptools mutagen CDDB
+ pythonPath = with python3.pkgs; [
+ musicbrainzngs
+ mutagen
+ pycdio
+ pygobject3
requests
+ ruamel_yaml
+ setuptools
+ setuptools_scm
];
- checkInputs = with python2.pkgs; [
+ buildInputs = [ libsndfile ];
+
+ checkInputs = with python3.pkgs; [
twisted
];
@@ -33,6 +40,10 @@ python2.pkgs.buildPythonApplication rec {
"--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ])
];
+ preBuild = ''
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
+ '';
+
# some tests require internet access
# https://github.com/JoeLametta/whipper/issues/291
doCheck = false;
@@ -44,7 +55,7 @@ python2.pkgs.buildPythonApplication rec {
meta = with stdenv.lib; {
homepage = https://github.com/whipper-team/whipper;
description = "A CD ripper aiming for accuracy over speed";
- maintainers = with maintainers; [ rycee ];
+ maintainers = with maintainers; [ rycee emily ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 967f3f4f92ba..bae9cef71501 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -3,12 +3,12 @@
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec {
- version = "20191013";
+ version = "20191215";
pname = "x42-plugins";
src = fetchurl {
url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
- sha256 = "18kn1bmc0s6dp834kc51ibifzzn3bxwya4p8s8yq9f4mpmkghi24";
+ sha256 = "1mwfvhsvc0qgjyiwd8pmmam1mav43lmv39fljhmj9yri558v5g1c";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index b8acaa5a7e49..24620d91ff5a 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -1,20 +1,20 @@
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre
-, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU_combined, minixml, pkgconfig, zlib, xorg
+, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU, libGL, minixml, pkgconfig, zlib, xorg
}:
assert stdenv ? glibc;
stdenv.mkDerivation rec {
pname = "yoshimi";
- version = "1.6.0.2";
+ version = "1.6.0.3";
src = fetchurl {
url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2";
- sha256 = "0q2cw168r53r50zghkdqcxba2cybn44axbdkwacvkm7ag2z0j2l8";
+ sha256 = "1z2mnmm299ng6jcwa61dzr1ilwa5fjgsggxl2wa5smji6b4npmx7";
};
buildInputs = [
- alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU_combined
+ alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU libGL
minixml zlib xorg.libpthreadstubs pcre
];
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index eeeb8ae2ea44..a8236b4b60f1 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:
+{ stdenv, fetchgit , boost, libX11, libGL, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:
stdenv.mkDerivation {
pname = "zam-plugins";
@@ -12,16 +12,18 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ boost libX11 libGLU_combined liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ];
+ buildInputs = [ boost libX11 libGL liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ];
- patchPhase = ''
+ postPatch = ''
patchShebangs ./dpf/utils/generate-ttl.sh
'';
makeFlags = [
- "PREFIX=$(out)"
+ "PREFIX=${placeholder ''out''}"
];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
homepage = http://www.zamaudio.com/?p=976;
description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio";
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
index 7120a1934f6e..d283dc7107d7 100644
--- a/pkgs/applications/backup/deja-dup/default.nix
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -1,20 +1,46 @@
-{ stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext
-, gnome3, libnotify, itstool, glib, gtk3, libxml2, gnome-online-accounts
-, coreutils, libpeas, libsecret, pcre, libxkbcommon, wrapGAppsHook
-, libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror
-, appstream-glib, desktop-file-utils, duplicity
+{ stdenv
+, fetchFromGitLab
+, substituteAll
+, meson
+, ninja
+, pkgconfig
+, vala
+, gettext
+, gnome3
+, libnotify
+, itstool
+, glib
+, gtk3
+, libxml2
+, gnome-online-accounts
+, coreutils
+, libsoup
+, libsecret
+, pcre
+, libxkbcommon
+, wrapGAppsHook
+, libpthreadstubs
+, libXdmcp
+, epoxy
+, at-spi2-core
+, dbus
+, libgpgerror
+, json-glib
+, appstream-glib
+, desktop-file-utils
+, duplicity
}:
stdenv.mkDerivation rec {
pname = "deja-dup";
- version = "38.3";
+ version = "40.6";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = version;
- sha256 = "1bnvmdlm67k1b6115x75j3nl92x5yl4psq5pna2w6cg9npxdd3fa";
+ sha256 = "1d4g34g660wv42a4k2511bxrh90z0vdl3v7ahg0m45phijg9n2n1";
};
patches = [
@@ -22,37 +48,55 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit coreutils;
})
+
+ # Hardcode GSettings path for Nautilus extension to avoid crashes from missing schemas
./hardcode-gsettings.patch
];
postPatch = ''
- substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"}
+ # substitute variable from hardcode-gsettings.patch
+ substituteInPlace deja-dup/nautilus/NautilusExtension.c --subst-var-by DEJA_DUP_GSETTINGS_PATH "${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}"
'';
nativeBuildInputs = [
- meson ninja pkgconfig vala_0_40 gettext itstool
- appstream-glib desktop-file-utils libxml2 wrapGAppsHook
+ meson
+ ninja
+ pkgconfig
+ vala
+ gettext
+ itstool
+ appstream-glib
+ desktop-file-utils
+ libxml2
+ wrapGAppsHook
];
buildInputs = [
- libnotify libpeas glib gtk3 libsecret
- pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
- at-spi2-core dbus gnome-online-accounts libgpgerror
+ libnotify
+ libsoup
+ glib
+ gtk3
+ libsecret
+ pcre
+ libxkbcommon
+ libpthreadstubs
+ libXdmcp
+ epoxy
+ gnome3.nautilus
+ at-spi2-core
+ dbus
+ gnome-online-accounts # GOA not used any more, only for transferring legacy keys
+ libgpgerror
+ json-glib
];
+ # TODO: hard code the path
+ # https://gitlab.gnome.org/World/deja-dup/merge_requests/32
propagatedUserEnvPkgs = [ duplicity ];
+ # install nautilus plug-in to correct path
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
- postInstall = ''
- glib-compile-schemas $out/share/glib-2.0/schemas
- '';
-
- postFixup = ''
- # Unwrap accidentally wrapped library
- mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so
- '';
-
meta = with stdenv.lib; {
description = "A simple backup tool";
longDescription = ''
@@ -60,7 +104,7 @@ stdenv.mkDerivation rec {
of backing up the Right Way (encrypted, off-site, and regular) \
and uses duplicity as the backend.
'';
- homepage = https://wiki.gnome.org/Apps/DejaDup;
+ homepage = "https://wiki.gnome.org/Apps/DejaDup";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jtojnar joncojonathan ];
platforms = platforms.linux;
diff --git a/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch
index 50bf2ba4fbd5..f74dbf73543e 100644
--- a/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch
+++ b/pkgs/applications/backup/deja-dup/hardcode-gsettings.patch
@@ -1,38 +1,16 @@
--- a/deja-dup/nautilus/NautilusExtension.c
+++ b/deja-dup/nautilus/NautilusExtension.c
-@@ -24,6 +24,8 @@
- #include
-
- GList *dirs = NULL;
-+GSettingsSchemaSource *schema_source = NULL;
-+GSettingsSchema *schema = NULL;
- GSettings *settings = NULL;
-
- // This will treat a < b iff a is 'lower' in the file tree than b
-@@ -313,7 +315,13 @@
+@@ -313,7 +313,12 @@
bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-- settings = g_settings_new("org.gnome.DejaDup");
-+ schema_source = g_settings_schema_source_new_from_directory ("@DEJA_DUP_GSETTINGS_PATH@",
+- settings = g_settings_new(APPLICATION_ID);
++ g_autoptr (GSettingsSchemaSource) schema_source = g_settings_schema_source_new_from_directory ("@DEJA_DUP_GSETTINGS_PATH@",
+ g_settings_schema_source_get_default (), TRUE, NULL);
+
-+ schema = g_settings_schema_source_lookup (schema_source,
-+ "org.gnome.DejaDup", FALSE);
++ g_autoptr (GSettingsSchema) schema = g_settings_schema_source_lookup (schema_source, APPLICATION_ID, FALSE);
+
+ settings = g_settings_new_full (schema, NULL, NULL);
g_signal_connect(settings, "changed::include-list",
update_include_excludes, NULL);
g_signal_connect(settings, "changed::exclude-list",
-@@ -329,7 +337,11 @@
-
- void nautilus_module_shutdown(void)
- {
-+ g_settings_schema_source_unref(schema_source);
-+ g_settings_schema_unref(schema);
- g_object_unref(settings);
-+ schema_source = NULL;
-+ schema = NULL;
- settings = NULL;
-
- update_include_excludes(); /* will clear it now that settings is NULL */
diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix
index 0c806a890156..d872204c6b0e 100644
--- a/pkgs/applications/blockchains/bitcoin-abc.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db53, boost
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db53, boost
, zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent
, withGui }:
with stdenv.lib;
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
- version = "0.20.5";
+ version = "0.20.8";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
- sha256 = "1adps3g99m7cxs58c48g2dgyihfv0v8d198klzcbbf4dq0s5v45c";
+ sha256 = "0srjc11i7azqn3flipjwzm67w20ji24yslkmchy1a834fyb1gmx1";
};
patches = [ ./fix-bitcoin-qt-build.patch ];
diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix
index a75b20b39109..c0d51e66db33 100644
--- a/pkgs/applications/blockchains/bitcoin-unlimited.nix
+++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version;
- version = "1.6.0.1";
+ version = "1.7.0.0";
src = fetchFromGitHub {
owner = "bitcoinunlimited";
repo = "bitcoinunlimited";
rev = "bucash${version}";
- sha256 = "0f0mnal4jf8xdj7w5m4rdlcqkrkbpxi88c006m5k45lmjmj141zr";
+ sha256 = "0lil6rivrj4cnr8a7n8zn9rp9f4h2nk88jjxc29m6dwqn5gk6f1i";
};
nativeBuildInputs = [ pkgconfig autoreconfHook python3 ]
diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix
index b1d84f91251e..2fa8ea6467c1 100644
--- a/pkgs/applications/blockchains/bitcoin.nix
+++ b/pkgs/applications/blockchains/bitcoin.nix
@@ -1,27 +1,47 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck
-, zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, protobuf, python3, qrencode, libevent
+, zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, python3, qrencode, libevent
, withGui }:
with stdenv.lib;
-stdenv.mkDerivation rec{
- name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "0.18.1";
+
+let
+ version = "0.19.0.1";
+ majorMinorVersion = versions.majorMinor version;
+
+ desktop = fetchurl {
+ url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop";
+ sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha";
+ };
+
+ pixmap = fetchurl {
+ url = "https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png";
+ sha256 = "08p7j7dg50jlj783kkgdw037klmx0spqjikaprmbkzgcb620r25d";
+ };
+
+in stdenv.mkDerivation rec {
+ pname = if withGui then "bitcoin" else "bitcoind";
+ inherit version;
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 = "5c7d93f15579e37aa2d1dc79e8f5ac675f59045fceddf604ae0f1550eb03bf96";
+ sha256 = "7ac9f972249a0a16ed01352ca2a199a5448fe87a4ea74923404a40b4086de284";
};
nativeBuildInputs =
[ pkgconfig autoreconfHook ]
++ optional withGui wrapQtAppsHook;
buildInputs = [ openssl db48 boost zlib zeromq
- miniupnpc protobuf libevent]
+ miniupnpc libevent]
++ optionals stdenv.isLinux [ utillinux ]
++ optionals withGui [ qtbase qttools qrencode ];
+ postInstall = optional withGui ''
+ install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
+ install -Dm644 ${pixmap} $out/share/pixmaps/bitcoin128.png
+ '';
+
configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
"--disable-bench"
] ++ optionals (!doCheck) [
diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix
index 61c2acab563a..f6c9fee7a1c5 100644
--- a/pkgs/applications/blockchains/clightning.nix
+++ b/pkgs/applications/blockchains/clightning.nix
@@ -4,11 +4,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "clightning";
- version = "0.7.3";
+ version = "0.8.0";
src = fetchurl {
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
- sha256 = "ef2193940146d1b8ff0cc03602842c4d81db9ca6a5e73927e4f8932715e931a4";
+ sha256 = "053e43bbe71564e9be8b2b56346a88986646ef6849a0af67cece01858b93306a";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix
index e5f149a0efe7..02744e50647e 100644
--- a/pkgs/applications/blockchains/dogecoin.nix
+++ b/pkgs/applications/blockchains/dogecoin.nix
@@ -7,13 +7,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "1.14.1";
+ version = "1.14.2";
src = fetchFromGitHub {
owner = "dogecoin";
repo = "dogecoin";
rev = "v${version}";
- sha256 = "0nmbi5gmms16baqs3fmdp2xm0yf8wawnyz80gcmca4j5ph2zka1v";
+ sha256 = "1gw46q63mjzwvb17ck6p1bap2xpdrap08szw2kjhasa3yvd5swyy";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index 07d16494646a..34cfe868c0b3 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -1,22 +1,39 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit }:
+{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "go-ethereum";
- version = "1.9.6";
-
- goPackagePath = "github.com/ethereum/go-ethereum";
-
- # Fix for usb-related segmentation faults on darwin
- propagatedBuildInputs =
- stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+ version = "1.9.9";
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
- sha256 = "08k6p7mbszlg8mq8k3vi5xrfnhfbxlh2ynd0nr0j64qdhmhcdnq6";
+ sha256 = "00fhqn0b9grqz8iigzbijg7b1va58vccjb15fpy6yfr301z3ib1q";
};
+ modSha256 = "1rn1x3qc23wfcx9c61sw1sc6iqwvv2b9pv006lk1az4zbwh09dbm";
+
+ subPackages = [
+ "cmd/abigen"
+ "cmd/bootnode"
+ "cmd/checkpoint-admin"
+ "cmd/clef"
+ "cmd/devp2p"
+ "cmd/ethkey"
+ "cmd/evm"
+ "cmd/faucet"
+ "cmd/geth"
+ "cmd/p2psim"
+ "cmd/puppeth"
+ "cmd/rlpdump"
+ "cmd/utils"
+ "cmd/wnode"
+ ];
+
+ # Fix for usb-related segmentation faults on darwin
+ propagatedBuildInputs =
+ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+
meta = with stdenv.lib; {
homepage = "https://geth.ethereum.org/";
description = "Official golang implementation of the Ethereum protocol";
diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
deleted file mode 100644
index 0898e469a6fd..000000000000
--- a/pkgs/applications/blockchains/jormungandr/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv
-, lib
-, fetchgit
-, rustPlatform
-, openssl
-, pkgconfig
-, protobuf
-, darwin
-}:
-
-rustPlatform.buildRustPackage rec {
- pname = "jormungandr";
- version = "0.7.0-rc4";
-
- src = fetchgit {
- url = "https://github.com/input-output-hk/${pname}";
- rev = "v${version}";
- sha256 = "1cjdapy0r2bikqck64cl09vzs307wcfi628hfmpczrg33i81pr3g";
- fetchSubmodules = true;
- };
-
- cargoSha256 = "0546ahgwcczaxda1hc1r20skzi93s40isq2ys40y9165sgdydn4i";
-
- nativeBuildInputs = [ pkgconfig protobuf ];
- buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
-
- patchPhase = ''
- sed -i "s~SCRIPTPATH=.*~SCRIPTPATH=$out/templates/~g" scripts/bootstrap
- '';
-
- installPhase = ''
- install -d $out/bin $out/templates
- install -m755 target/*/release/jormungandr $out/bin/
- install -m755 target/*/release/jcli $out/bin/
- install -m755 target/*/release/jormungandr-scenario-tests $out/bin/
- install -m755 scripts/send-transaction $out/templates
- install -m755 scripts/jcli-helpers $out/bin/
- install -m755 scripts/bootstrap $out/bin/jormungandr-bootstrap
- install -m644 scripts/faucet-send-money.shtempl $out/templates/
- install -m644 scripts/create-account-and-delegate.shtempl $out/templates/
- install -m644 scripts/faucet-send-certificate.shtempl $out/templates/
- '';
-
- PROTOC = "${protobuf}/bin/protoc";
-
- # Disabling integration tests
- doCheck = false;
-
- meta = with stdenv.lib; {
- description = "An aspiring blockchain node";
- homepage = "https://input-output-hk.github.io/jormungandr/";
- license = licenses.mit;
- maintainers = [ maintainers.mmahut ];
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 09cb3c329b91..f18eee3b87bf 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
- version = "1.15.0";
+ version = "1.19.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
- sha256 = "0r7gm7q7gj39v36jd5xz20931za94nf2fpf3clbghkhlbrm0kbnq";
+ sha256 = "1qgk0gwn7ijz00zfwf9rfl755lhgsig9xa6c3icj6l6wyzybz0z6";
};
appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix
index 27f10c963c0f..fd18b3fa3997 100644
--- a/pkgs/applications/blockchains/lnd.nix
+++ b/pkgs/applications/blockchains/lnd.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lnd";
- version = "0.7.1-beta";
+ version = "0.8.1-beta";
src = fetchFromGitHub {
owner = "lightningnetwork";
repo = "lnd";
rev = "v${version}";
- sha256 = "1c0sm0lavdai4w6d283q54knggw9d42vvqmglnv2h9swbw1l23ry";
+ sha256 = "0f9fx2y66l3wxiax2vl2966avamjarkv3vbn9dy0wbxkwg4pfayb";
};
- modSha256 = "13hjaf4bswk8g57lyxzdlqqp4a6ddl3qm6n4jja4b1h58mlbil73";
+ modSha256 = "1i6xw2amkg4azvzybcl4pqxif9c0mv8ayrhz9hm8x85bz7i6a787";
meta = with lib; {
description = "Lightning Network Daemon";
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index 14fc7782c532..0311169deb24 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -1,27 +1,27 @@
-{ mkDerivation, lib, makeDesktopItem, fetchFromGitHub
+{ stdenv, wrapQtAppsHook, makeDesktopItem, fetchFromGitHub
, qtbase, qmake, qtmultimedia, qttools
, qtgraphicaleffects, qtdeclarative
, qtlocation, qtquickcontrols, qtquickcontrols2
, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns
, monero, unbound, readline, boost, libunwind
, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
-, hidapi
+, hidapi, randomx
}:
-with lib;
+with stdenv.lib;
-mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "monero-gui";
- version = "0.14.1.2";
+ version = "0.15.0.1";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
- sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k";
+ sha256 = "08j8kkncdn57xql0bhmlzjpjkdfhqbpda1p07r797q8qi0nl4w8n";
};
- nativeBuildInputs = [ qmake pkgconfig ];
+ nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
buildInputs = [
qtbase qtmultimedia qtgraphicaleffects
@@ -30,7 +30,7 @@ mkDerivation rec {
qtwebchannel qtwebengine qtx11extras
qtxmlpatterns monero unbound readline
boost libunwind libsodium pcsclite zeromq
- cppzmq hidapi
+ cppzmq hidapi randomx
];
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];
diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix
index b6f074528616..7eb4238679eb 100644
--- a/pkgs/applications/blockchains/monero/default.nix
+++ b/pkgs/applications/blockchains/monero/default.nix
@@ -1,43 +1,41 @@
-{ stdenv, fetchgit
-, cmake, pkgconfig, git
+{ stdenv, fetchFromGitHub
+, cmake, pkgconfig
, boost, miniupnpc, openssl, unbound, cppzmq
, zeromq, pcsclite, readline, libsodium, hidapi
-, python3Packages
+, python3Packages, randomx, rapidjson
, CoreData, IOKit, PCSC
}:
assert stdenv.isDarwin -> IOKit != null;
-with stdenv.lib;
-
stdenv.mkDerivation rec {
pname = "monero";
- version = "0.14.1.0";
+ version = "0.15.0.1";
- src = fetchgit {
- url = "https://github.com/monero-project/monero.git";
- rev = "v${version}";
- sha256 = "1asa197fad81jfv12qgaa7y7pdr1r1pda96m9pvivkh4v30cx0nh";
+ src = fetchFromGitHub {
+ owner = "monero-project";
+ repo = "monero";
+ rev = "v${version}";
+ sha256 = "0sypa235lf2bbib4b71xpaw39h9304slgsvnsz8wmy9fq1zx009m";
+ fetchSubmodules = true;
};
- nativeBuildInputs = [ cmake pkgconfig git ];
+ nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline
- libsodium hidapi
+ libsodium hidapi randomx rapidjson
python3Packages.protobuf
- ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
"-DBUILD_GUI_DEPS=ON"
"-DReadline_ROOT_DIR=${readline.dev}"
- ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
+ ] ++ stdenv.lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
- hardeningDisable = [ "fortify" ];
-
- meta = {
+ meta = with stdenv.lib; {
description = "Private, secure, untraceable currency";
homepage = https://getmonero.org/;
license = licenses.bsd3;
diff --git a/pkgs/applications/blockchains/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix
index a26a1b7cc771..ffa509d2320e 100644
--- a/pkgs/applications/blockchains/parity/beta.nix
+++ b/pkgs/applications/blockchains/parity/beta.nix
@@ -1,6 +1,6 @@
let
- version = "2.6.4";
- sha256 = "11l93w97961zig4gqf345j9l20g0mjp7fayl1mdwdp14hhd5zk5g";
- cargoSha256 = "1q6cbms7j1h726bvq38npxkjkmz14b5ir9c4z7pb0jcy7gkplyxx";
+ version = "2.6.6";
+ sha256 = "1gx5qg9c588d5m564bnbly86663yrzb2hmlgv9zplwba7p0lpphl";
+ cargoSha256 = "1xqmnirx2r91q5gy1skxl0f79xvaqzimq3l0cj4xvfms7mpdfbg1";
in
import ./parity.nix { inherit version sha256 cargoSha256; }
diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix
index 299bb0639b6c..1b5870b429b1 100644
--- a/pkgs/applications/blockchains/parity/default.nix
+++ b/pkgs/applications/blockchains/parity/default.nix
@@ -1,6 +1,6 @@
let
- version = "2.5.9";
- sha256 = "06gmfw5l8n5i35dimsmj6dn0fxhbp53zjrdvbkff63r5kfqnwnx2";
- cargoSha256 = "1kdy0bnmyqx4rhpq0a8gliy6mws68n035kfkxrfa6cxr2cn53dyb";
+ version = "2.5.11";
+ sha256 = "1x2p559g2f30520v3kn46n737l5s1kwrn962dv73s6mb6n1lhs55";
+ cargoSha256 = "16nf6y0hyffwdhxn1w4ms4zycs5lkzir8sj6c2lgsabig057hb6z";
in
import ./parity.nix { inherit version sha256 cargoSha256; }
diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index 681268b4f327..b50b14258ccc 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0v7g03rbml2afw0splmyjh9nqpjg0ldjw09hyc0jqd3qlhgxiiyj";
};
- cargoSha256 = "19xcxpbkrbygghz9qi52vzviksxg28m7ibvl359vlhqv1cjxmpsq";
+ cargoSha256 = "0gc3w0cwdyk8f7cgpp9sfawczk3n6wd7q0nhfvk87sry71b8vvwq";
buildInputs = [ pkgconfig openssl openssl.dev ];
diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix
index 6a5532f92c95..9599dc9407c3 100644
--- a/pkgs/applications/blockchains/wasabiwallet/default.nix
+++ b/pkgs/applications/blockchains/wasabiwallet/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wasabiwallet";
- version = "1.1.9";
+ version = "1.1.9.2";
src = fetchurl {
url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz";
- sha256 = "1dz05ivhadfjfp4yfpz492401yznm3rlnx7g4nqzxwh4cmqzisrm";
+ sha256 = "0qcgrw106rqcls6p5iq02sq3w6xrzhc5z7w8v5almbw7ikv6f0s2";
};
dontBuild = true;
diff --git a/pkgs/applications/blockchains/wownero.nix b/pkgs/applications/blockchains/wownero.nix
index 365afb5a2411..8b25e098b2fe 100644
--- a/pkgs/applications/blockchains/wownero.nix
+++ b/pkgs/applications/blockchains/wownero.nix
@@ -1,27 +1,25 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, git
-, boost, miniupnpc_2, openssl, unbound, cppzmq
-, zeromq, pcsclite, readline, libsodium, rapidjson
+{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc_2, openssl, unbound
+, readline, libsodium, rapidjson
}:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "wownero";
+ version = "0.7.0";
- version = "0.6.1.2";
src = fetchFromGitHub {
owner = "wownero";
repo = "wownero";
rev = "v${version}";
- sha256 = "03q3pviyhrldpa3f4ly4d97jr39hvrz37chl102bap0790d9lk09";
+ sha256 = "0lji24s6346qxcj4pmylv8byb8fnqzpmz81rx4i3zhc1bcsvdwas";
fetchSubmodules = true;
};
- nativeBuildInputs = [ cmake pkgconfig git ];
+ nativeBuildInputs = [ cmake ];
buildInputs = [
- boost miniupnpc_2 openssl unbound rapidjson
- cppzmq zeromq pcsclite readline libsodium
+ boost miniupnpc_2 openssl unbound rapidjson readline libsodium
];
cmakeFlags = [
@@ -30,13 +28,16 @@ stdenv.mkDerivation rec {
];
meta = {
- description = "Wownero is a fork of the cryptocurrency Monero with primary alterations";
+ description = ''
+ A privacy-centric memecoin that was fairly launched on April 1, 2018 with
+ no pre-mine, stealth-mine or ICO
+ '';
longDescription = ''
- Wownero’s emission is capped and supply is finite. Wownero is a fairly
- launched coin with no premine. It’s not a fork of another blockchain. With
- its own genesis block there is no degradation of privacy caused by ring
- signatures using different participants for the same transaction outputs.
- Unlike opposing forks.
+ Wownero has a maximum supply of around 184 million WOW with a slow and
+ steady emission over 50 years. It is a fork of Monero, but with its own
+ genesis block, so there is no degradation of privacy due to ring
+ signatures using different participants for the same tx outputs on
+ opposing forks.
'';
homepage = http://wownero.org/;
license = licenses.bsd3;
diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index 1852d72d326f..f6114b3c2134 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
@@ -1,37 +1,29 @@
-{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost
-, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent
-, libsnark, withGui }:
+{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost17x
+, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent }:
let librustzcash = callPackage ./librustzcash {};
in
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "1.0.13";
+ pname = "zcash";
+ version = "2.1.0-1";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
rev = "v${version}";
- sha256 = "05y7wxs66anxr5akbf05r36mmjfzqpwawn6vyh3jhpva51hzzzyz";
+ sha256 = "05bnn4lxrrcv1ha3jdfrgwg4ar576161n3j9d4gpc14ww3zgf9vz";
};
- # Dependencies are underspecified: "make -C src gtest/zcash_gtest-test_merkletree.o"
- # fails with "fatal error: test/data/merkle_roots.json.h: No such file or directory"
- enableParallelBuilding = false;
-
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib
- protobuf libevent libsodium librustzcash libsnark ]
- ++ optionals stdenv.isLinux [ utillinux ]
- ++ optionals withGui [ qt4 qrencode ];
+ buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib
+ protobuf libevent libsodium librustzcash ]
+ ++ optionals stdenv.isLinux [ utillinux ];
- configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
- ] ++ optionals withGui [ "--with-gui=qt4" ];
+ configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ];
patchPhase = ''
- sed -i"" 's,-lboost_system-mt,-lboost_system,' configure.ac
sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am
'';
@@ -42,7 +34,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Peer-to-peer, anonymous electronic cash system";
homepage = https://z.cash/;
- maintainers = with maintainers; [ rht ];
+ maintainers = with maintainers; [ rht tkerber ];
license = licenses.mit;
platforms = platforms.linux;
};
diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
index 634d4e8538a1..31703f8fb2a5 100644
--- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
@@ -2,28 +2,30 @@
rustPlatform.buildRustPackage rec {
pname = "librustzcash-unstable";
- version = "2017-03-17";
+ version = "2018-10-27";
src = fetchFromGitHub {
owner = "zcash";
repo = "librustzcash";
- rev = "91348647a86201a9482ad4ad68398152dc3d635e";
- sha256 = "02l1f46frpvw1r6k1wfh77mrsnmsdvifqx0vnscxz4xgb9ia9d1c";
+ rev = "06da3b9ac8f278e5d4ae13088cf0a4c03d2c13f5";
+ sha256 = "0md0pp3k97iv7kfjpfkg14pjanhrql4vafa8ggbxpkajv1j4xldv";
};
- cargoSha256 = "1xlq8vkzfyr5q8gxvzkwi8r1kxg4rg8l1ckdwfdxlkhnw0yscbra";
+ cargoSha256 = "166v8cxlpfslbs5gljbh7wp0lxqakayw47ikxm9r9a39n7j36mq1";
installPhase = ''
mkdir -p $out/lib
cp target/release/librustzcash.a $out/lib/
mkdir -p $out/include
- cp include/librustzcash.h $out/include/
+ cp librustzcash/include/librustzcash.h $out/include/
'';
+ doCheck = false;
+
meta = with stdenv.lib; {
description = "Rust-language assets for Zcash";
homepage = https://github.com/zcash/librustzcash;
- maintainers = with maintainers; [ rht ];
+ maintainers = with maintainers; [ rht tkerber ];
license = with licenses; [ mit asl20 ];
platforms = platforms.unix;
};
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 4d221e970997..c251af74b217 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -27,6 +27,7 @@
, qt4
, withQt5 ? false
, qtbase
+, yelp-tools
}:
with stdenv.lib;
@@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoconf
automake
- gnome3.yelp-tools
+ yelp-tools
gnome3.yelp-xsl
gobject-introspection
gtk-doc
@@ -84,6 +85,12 @@ stdenv.mkDerivation rec {
sha256 = "1zyx1qqajrmqcf9hbsapd39gmdanswd9l78rq7q6rdy4692il3yn";
})
+ # https://github.com/canonical/lightdm/pull/104
+ (fetchpatch {
+ url = "https://github.com/canonical/lightdm/commit/03f218981733e50d810767f9d04e42ee156f7feb.patch";
+ sha256 = "07w18m2gpk29z6ym4y3lzsmg5dk3ffn39sq6lac26ap7narf4ma7";
+ })
+
# Hardcode plymouth to fix transitions.
# For some reason it can't find `plymouth`
# even when it's in PATH in environment.systemPackages.
diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
index 5b1490a6b3be..91fe3e5b22f2 100644
--- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
+++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix
@@ -20,7 +20,7 @@
let
ver_branch = "2.0";
- version = "2.0.6";
+ version = "2.0.7";
in
stdenv.mkDerivation rec {
pname = "lightdm-gtk-greeter";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${pname}-${version}.tar.gz";
- sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15";
+ sha256 = "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms";
};
nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
deleted file mode 100644
index e504c09e43e6..000000000000
--- a/pkgs/applications/display-managers/slim/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng
-, fontconfig, freetype, pam, dbus, makeWrapper }:
-
-stdenv.mkDerivation rec {
- name = "slim-1.3.6";
-
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/${name}.tar.gz";
- sha256 = "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1";
- };
-
- patches =
- [ # Allow the paths of the configuration file and theme directory to
- # be set at runtime.
- ./runtime-paths.patch
-
- # Exit after the user's session has finished. This works around
- # slim's broken PAM session handling (see
- # http://developer.berlios.de/bugs/?func=detailbug&bug_id=19102&group_id=2663).
- ./run-once.patch
-
- # Ensure that sessions appear in sort order, rather than in
- # directory order.
- ./sort-sessions.patch
-
- # Allow to set logfile to a special "/dev/stderr" in order to continue
- # logging to stderr and thus to the journal.
- ./no-logfile.patch
- ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
- url = "https://raw.githubusercontent.com/gentoo/musl/8eddda8072add075ebf56cf6d288bc1450d6b5f8/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch";
- sha256 = "0f82672s2r2cmdqfn2mbg3di76mbla9n0ik20p2gv4igi6p866xm";
- });
-
- preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib";
-
- cmakeFlags = [ "-DUSE_PAM=1" ];
-
- NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype -std=c++11";
-
- enableParallelBuilding = true;
-
- buildInputs =
- [ cmake pkgconfig libjpeg libpng fontconfig freetype
- pam dbus
- xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper
- ];
-
- NIX_CFLAGS_LINK = "-lXmu";
-
- meta = {
- homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
- platforms = stdenv.lib.platforms.linux;
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/applications/display-managers/slim/no-logfile.patch b/pkgs/applications/display-managers/slim/no-logfile.patch
deleted file mode 100644
index f2f5f1549930..000000000000
--- a/pkgs/applications/display-managers/slim/no-logfile.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/log.cpp b/log.cpp
-index b44677a..7c89dda 100644
---- a/log.cpp
-+++ b/log.cpp
-@@ -1,23 +1,31 @@
- #include "log.h"
- #include
-+#include
-
- bool
- LogUnit::openLog(const char * filename)
- {
-- if (logFile.is_open()) {
-+ if (isFile && logFile.is_open()) {
- cerr << APPNAME
- << ": opening a new Log file, while another is already open"
- << endl;
-- logFile.close();
-+ closeLog();
- }
-- logFile.open(filename, ios_base::app);
-
-- return !(logFile.fail());
-+ if (strcmp(filename, "/dev/stderr") == 0) {
-+ isFile = false;
-+ return true;
-+ } else {
-+ logFile.open(filename, ios_base::app);
-+ isFile = true;
-+ return !(logFile.fail());
-+ }
- }
-
- void
- LogUnit::closeLog()
- {
-+ if (!isFile) return;
- if (logFile.is_open())
- logFile.close();
- }
-diff --git a/log.h b/log.h
-index b7810be..ad548a2 100644
---- a/log.h
-+++ b/log.h
-@@ -9,11 +9,14 @@
- #endif
- #include "const.h"
- #include
-+#include
-
- using namespace std;
-
- static class LogUnit {
- ofstream logFile;
-+ bool isFile;
-+ inline ostream &getStream() { return isFile ? logFile : cerr; }
- public:
- bool openLog(const char * filename);
- void closeLog();
-@@ -22,17 +25,17 @@ public:
-
- template
- LogUnit & operator<<(const Type & text) {
-- logFile << text; logFile.flush();
-+ getStream() << text; getStream().flush();
- return *this;
- }
-
- LogUnit & operator<<(ostream & (*fp)(ostream&)) {
-- logFile << fp; logFile.flush();
-+ getStream() << fp; getStream().flush();
- return *this;
- }
-
- LogUnit & operator<<(ios_base & (*fp)(ios_base&)) {
-- logFile << fp; logFile.flush();
-+ getStream() << fp; getStream().flush();
- return *this;
- }
- } logStream;
diff --git a/pkgs/applications/display-managers/slim/run-once.patch b/pkgs/applications/display-managers/slim/run-once.patch
deleted file mode 100644
index 78f1454a883e..000000000000
--- a/pkgs/applications/display-managers/slim/run-once.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
---- slim-1.3.6-orig/app.cpp 2013-10-15 11:02:55.629263422 +0200
-+++ slim-1.3.6/app.cpp 2013-10-15 13:00:10.141210784 +0200
-@@ -816,7 +822,7 @@
- StopServer();
- RemoveLock();
- while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */
-- Run();
-+ exit(OK_EXIT);
- }
-
- void App::KillAllClients(Bool top) {
diff --git a/pkgs/applications/display-managers/slim/runtime-paths.patch b/pkgs/applications/display-managers/slim/runtime-paths.patch
deleted file mode 100644
index 5a8e07bfbf07..000000000000
--- a/pkgs/applications/display-managers/slim/runtime-paths.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ru slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp
---- slim-1.3.6-orig/app.cpp 2013-10-02 00:38:05.000000000 +0200
-+++ slim-1.3.6/app.cpp 2014-03-30 19:01:04.115414201 +0200
-@@ -200,7 +200,9 @@
-
- /* Read configuration and theme */
- cfg = new Cfg;
-- cfg->readConf(CFGFILE);
-+ char *cfgfile = getenv("SLIM_CFGFILE");
-+ if (!cfgfile) cfgfile = CFGFILE;
-+ cfg->readConf(cfgfile);
- string themebase = "";
- string themefile = "";
- string themedir = "";
-@@ -208,7 +210,9 @@
- if (testing) {
- themeName = testtheme;
- } else {
-- themebase = string(THEMESDIR) + "/";
-+ char *themesdir = getenv("SLIM_THEMESDIR");
-+ if (!themesdir) themesdir = THEMESDIR;
-+ themebase = string(themesdir) + "/";
- themeName = cfg->getOption("current_theme");
- string::size_type pos;
- if ((pos = themeName.find(",")) != string::npos) {
-diff -ru slim-1.3.6-orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt
---- slim-1.3.6-orig/CMakeLists.txt 2013-10-02 00:38:05.000000000 +0200
-+++ slim-1.3.6/CMakeLists.txt 2014-03-30 19:16:48.445069729 +0200
-@@ -23,7 +23,7 @@
-
- set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory")
- set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim")
--set(SYSCONFDIR "/etc")
-+set(SYSCONFDIR "$ENV{out}/etc")
- set(LIBDIR "/lib")
- set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
-
-@@ -40,7 +40,7 @@
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPACKAGE=\"slim\"")
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DVERSION=\"${SLIM_VERSION}\"")
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"")
--set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"")
-+set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"/etc\"")
-
- # Flags
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2")
-Only in slim-1.3.6: CMakeLists.txt~
-diff -ru slim-1.3.6-orig/slimlock.cpp slim-1.3.6/slimlock.cpp
---- slim-1.3.6-orig/slimlock.cpp 2013-10-02 00:38:05.000000000 +0200
-+++ slim-1.3.6/slimlock.cpp 2014-03-30 19:01:04.115414201 +0200
-@@ -106,13 +106,17 @@
- unsigned int cfg_passwd_timeout;
- // Read user's current theme
- cfg = new Cfg;
-- cfg->readConf(CFGFILE);
-+ char *cfgfile = getenv("SLIM_CFGFILE");
-+ if (!cfgfile) cfgfile = CFGFILE;
-+ cfg->readConf(cfgfile);
- cfg->readConf(SLIMLOCKCFG);
- string themebase = "";
- string themefile = "";
- string themedir = "";
- themeName = "";
-- themebase = string(THEMESDIR) + "/";
-+ char *themesdir = getenv("SLIM_THEMESDIR");
-+ if (!themesdir) themesdir = THEMESDIR;
-+ themebase = string(themesdir) + "/";
- themeName = cfg->getOption("current_theme");
- string::size_type pos;
- if ((pos = themeName.find(",")) != string::npos) {
diff --git a/pkgs/applications/display-managers/slim/sort-sessions.patch b/pkgs/applications/display-managers/slim/sort-sessions.patch
deleted file mode 100644
index cab5610f44fb..000000000000
--- a/pkgs/applications/display-managers/slim/sort-sessions.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ru -x '*~' slim-1.3.6-orig/cfg.cpp slim-1.3.6/cfg.cpp
---- slim-1.3.6-orig/cfg.cpp 2013-10-02 00:38:05.000000000 +0200
-+++ slim-1.3.6/cfg.cpp 2016-01-30 10:35:51.108766802 +0100
-@@ -14,6 +14,7 @@
- #include
- #include
- #include
-+#include
-
- #include
- #include
-@@ -293,6 +294,8 @@
-
- sessions.clear();
-
-+ typedef pair session_t;
-+
- if( !strSessionDir.empty() ) {
- DIR *pDir = opendir(strSessionDir.c_str());
-
-@@ -325,7 +328,7 @@
- }
- }
- desktop_file.close();
-- pair session(session_name,session_exec);
-+ session_t session(session_name,session_exec);
- sessions.push_back(session);
- cout << session_exec << " - " << session_name << endl;
- }
-@@ -341,6 +344,10 @@
- pair session("","");
- sessions.push_back(session);
- }
-+
-+ std::sort(sessions.begin(), sessions.end(), [](session_t& a, session_t& b) -> bool{
-+ return a.first < b.first;
-+ });
- }
-
- pair Cfg::nextSession() {
diff --git a/pkgs/applications/display-managers/slim/themes.nix b/pkgs/applications/display-managers/slim/themes.nix
deleted file mode 100644
index b1be24f3e1d6..000000000000
--- a/pkgs/applications/display-managers/slim/themes.nix
+++ /dev/null
@@ -1,183 +0,0 @@
-{ stdenv, fetchurl, slim }:
-
-# Inspired on aspell buildDict expression
-
-let
- buildTheme =
- {fullName, src, version ? "testing"}:
-
- stdenv. mkDerivation rec {
- name = "${fullName}-${version}";
-
- inherit src;
-
- buildInputs = [ slim ];
-
- dontBuild = true;
-
- installPhase = ''
- install -dm755 $out/share/slim/themes/${name}
- install -m644 * $out/share/slim/themes/${name}
- '';
-
- meta = {
- description = "Slim theme for ${fullName}";
- platforms = stdenv.lib.platforms.linux;
- };
- };
-
-in {
-
- archlinuxSimple = buildTheme {
- fullName = "archlinux-simple";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-archlinux-simple.tar.gz";
- sha256 = "7d60d6782fa86302646fe67253467c04692d247f89bdbe87178f690f32b270db";
- };
- };
-
- capernoited = buildTheme {
- fullName = "capernoited";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-capernoited.tar.gz";
- sha256 = "fb9163c6a2656d60f088dc4f2173aa7556a6794495122acfa7d3be7182f16b41";
- };
- };
-
- debianMoreblue = buildTheme {
- fullName = "debian-moreblue";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-debian-moreblue.tar.bz2";
- sha256 = "5b76929827d4a4d604ddca4f42668cca3309b6f7bd659901021c6f49d6d2c481";
- };
- };
-
- fingerprint = buildTheme {
- fullName = "fingerprint";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-fingerprint.tar.gz";
- sha256 = "48b703f84ce7b814cda0824f65cafebf695cd71a14166b481bb44616097d3144";
- };
- };
-
- flat = buildTheme {
- fullName = "flat";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-flat.tar.gz";
- sha256 = "0092d531540f9da8ef07ad173e527c4ef9c088d04962d142be3c11f0c5c0c5e9";
- };
- };
-
- flower2 = buildTheme {
- fullName = "flower2";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-flower2.tar.gz";
- sha256 = "840faf6459ffd6c2c363160c85cb98000717f9a425102976336f5d8f68ed95ee";
- };
- };
-
- gentooSimple = buildTheme {
- fullName = "gentoo-simple";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-gentoo-simple.tar.bz2";
- sha256 = "27c8614cc930ca200acf81f1192febc102501744939d5cbe997141e37c96d8c2";
- };
- };
-
- lake = buildTheme {
- fullName = "lake";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-lake.tar.gz";
- sha256 = "f7d662e37068a6c64cbf910adf3c192f1b50724baa427a8c9487cb9f7ed95851";
- };
- };
-
- lunar = buildTheme {
- fullName = "lunar-0.4";
- version = "";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-lunar-0.4.tar.bz2";
- sha256 = "1543eb45e4d664377e0dd4f7f954aba005823034ba9692624398b3d58be87d76";
- };
- };
-
- mindlock = buildTheme {
- fullName = "mindlock";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-mindlock.tar.gz";
- sha256 = "99a6e6acd55bf55ece18a3f644299517b71c1adc49efd87ce2d7e654fb67033c";
- };
- };
-
- parallelDimensions = buildTheme {
- fullName = "parallel-dimensions";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-parallel-dimensions.tar.gz";
- sha256 = "2b17c3e6d3967a6a0744e20e6e05c9d3938f4ef04c62d49ddbd416bc4743046f";
- };
- };
-
- previous = buildTheme {
- fullName = "previous";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-previous.tar.gz";
- sha256 = "1f2a69f8fc0dc8ed8eb86a4c1d1087ba7be486973fb81efab52a63c661d726f8";
- };
- };
-
- rainbow = buildTheme {
- fullName = "rainbow";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-rainbow.tar.gz";
- sha256 = "d83e3afdb05be50cff7da037bb31208b2c152539d1a009740b13857f5f910072";
- };
- };
-
- rear-window = buildTheme {
- fullName = "rear-window";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-rear-window.tar.gz";
- sha256 = "0b123706ccb67e94f626c183530ec5732b209bab155bc661d6a3f5cd5ee39511";
- };
- };
-
- scotlandRoad = buildTheme {
- fullName = "scotland-road";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-scotland-road.tar.gz";
- sha256 = "fd60a434496ed39b968ffa1e5457b36cd12f64a4e2ecedffc675f97ca3f3bba1";
- };
- };
-
- subway = buildTheme {
- fullName = "subway";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-subway.tar.gz";
- sha256 = "0205568e3e157973b113a83b26d8829ce9962a85ef7eb8a33d3ae2f3f9292253";
- };
- };
-
- wave = buildTheme {
- fullName = "wave";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-wave.tar.gz";
- sha256 = "be75676da5bf8670daa48379bb9cc1be0b9a5faa09adbea967dfd7125320b959";
- };
- };
-
- zenwalk = buildTheme {
- fullName = "zenwalk";
- src = fetchurl {
- url = "mirror://sourceforge/slim.berlios/slim-zenwalk.tar.gz";
- sha256 = "f0f41d17ea505b0aa96a036e978fabaf673a51d3f81a919cb0d43364d4bc7a57";
- };
- };
-
- nixosSlim = buildTheme {
- fullName = "nixos-slim";
- src = fetchurl {
- url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz";
- sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8";
- };
- };
-}
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index 93c9b4c04fb5..bd1685f7cdbe 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -3,6 +3,7 @@
{ alsaLib
, bash
, buildFHSUserEnv
+, cacert
, coreutils
, dbus
, expat
@@ -21,6 +22,7 @@
, freetype
, libpulseaudio
, libGL
+, libuuid
, libX11
, libxcb
, libXcomposite
@@ -114,6 +116,7 @@ let
dbus
expat
libpulseaudio
+ libuuid
libX11
libxcb
libXcomposite
@@ -152,7 +155,16 @@ let
# environment is used as a work around for that.
fhsEnv = buildFHSUserEnv {
name = "${drvName}-fhs-env";
- multiPkgs = pkgs: [ pkgs.ncurses5 ];
+ multiPkgs = pkgs: [
+ pkgs.ncurses5
+
+ # Flutter can only search for certs Fedora-way.
+ (runCommand "fedoracert" {}
+ ''
+ mkdir -p $out/etc/pki/tls/
+ ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs
+ '')
+ ];
};
in runCommand
drvName
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 817bd13e7da9..fcd15355a101 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,19 +8,19 @@ let
inherit (gnome2) GConf gnome_vfs;
};
stableVersion = {
- version = "3.5.1.0"; # "Android Studio 3.5.1"
- build = "191.5900203";
- sha256Hash = "0afxlif8pkrl6m1lhiqri1qv4vf5mfm1yg6qk5rad0442hm3kz4l";
+ version = "3.5.3.0"; # "Android Studio 3.5.3"
+ build = "191.6010548";
+ sha256Hash = "1nsm4d3vdx90szqd78a8mjq65xc9m5ipd35cqrlx3c3ny900sqxg";
};
betaVersion = {
- version = "3.6.0.14"; # "Android Studio 3.6 Beta 2"
- build = "192.5947919";
- sha256Hash = "09l7mdjkzwnkkcgxp0x66bzm125ignrfssy7n141wvs2rd66i2fs";
+ version = "3.6.0.18"; # "Android Studio 3.6 RC 1"
+ build = "192.6071332";
+ sha256Hash = "0xpcihr5xxr9l1kv6aflywshs8fww3s7di0g98mz475whhxwzf3q";
};
latestVersion = { # canary & dev
- version = "4.0.0.1"; # "Android Studio 4.0 Canary 1"
- build = "192.5959023";
- sha256Hash = "1d9hvyk0wnfiip1612ci4sbw58rq93cyy026cx6s33rvjk3cwfrl";
+ version = "4.0.0.6"; # "Android Studio 4.0 Canary 6"
+ build = "193.6052267";
+ sha256Hash = "1naxyfnrj7milqha7xbwbcvyi81a7fqb7jsm03hhq5xs2sw55m1c";
};
in {
# Attributes are named by their corresponding release channels
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 13db2d13567d..4b3a7e11f3bb 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -13,11 +13,10 @@ assert stdenv ? glibc;
let
platform_major = "4";
- platform_minor = "13";
+ platform_minor = "14";
year = "2019";
- month = "09";
- timestamp = "201909161045";
-
+ month = "12";
+ timestamp = "201912100610";
in rec {
buildEclipse = import ./build-eclipse.nix {
@@ -30,11 +29,11 @@ in rec {
eclipse-cpp = buildEclipse {
name = "eclipse-cpp-${platform_major}.${platform_minor}";
- description = "Eclipse IDE for C/C++ Developers, Oxygen release";
+ description = "Eclipse IDE for C/C++ Developers";
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "0s9wvxd1bahlcdw7l6cyfi59p78j6gym3a3mn1z6dm6swxgyb2wjjl7hx8bkg0zs8x31bwllpdq22y2vcm6j57h40v53l3xkhy73m8v";
+ sha512 = "28h8z45j7zlcbvvabzsniwqls1lns21isx69y6l207a869rknp9vzg6506q6zalj9b49j8c7ynkn379xgbzp07i6zw3dzk3pqp2rgam";
};
};
@@ -46,7 +45,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "09nc7ipv67h0gr7lkxsbxrgj9gn48348asn03ylcvflyrcxghqs8n11a75rwvdj98igdzpw922saicx5lqq5g2flfqiga97lwwhfiz5";
+ sha512 = "1g1zsz3c2kx4vs1mjpcisbk81lk4hsr1z2fw46lih825c53vwf59snp8d97c8yw2i25y0ml48nc1nskib6qnif8m2h6rpah7kgmi8ay";
};
};
@@ -58,7 +57,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
- sha512 = "2c40wwrc2ip32n0m5cs8ds0g7cs7018acw8gjkd23msa4pr9x9511c3dj6rbnn1hwzf9yjq6vnjmib5qarxd3vly76jwxhf867l1f7v";
+ sha512 = "05nsldw937l1g9fj964njivgkf2ipk1rh1jg5w8svdhpp3v1pp3iinfm2mz9kk8namwfkx8krsvsxcgvqyzgrkhf42wqh53vqrjf70h";
};
};
@@ -88,7 +87,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
- sha512 = "2vm646d1crzzzysll3p5pjfljfjzxx4qd37dqcp6xjm91zg8iskli688h0lgla0rmbwz5kj509jp22m4rxkp3cbgd006dd0jr3icdls";
+ sha512 = "0dcbxzjqc27v1faz16yxqcm6zrbna4kkd32xy7paadiwn125y6ijx8zvda4kc7bih6v5b9ch2i0z5ndra1lcjcc88z6cklh0vngjkh1";
};
};
@@ -100,7 +99,7 @@ in rec {
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
- sha512 = "3zyxqd8iwrfgjjg91dfi4bda61rd2717hy53swmbygi48zaaam70swx997yp5qzxwjp3macdslfk6sqhq2qlcdwcdl6dmkry018jh7b";
+ sha512 = "21lhgv3z23mn8q0gffgxlfwhyxb348zjnzv716zsys7h7kj5vigl45q9mz0qrl11524rxx7jwi901jjd4l258w9kp7wzlq0d5n1r39m";
};
};
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index b2fdeafd37c3..364d432f1e34 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -254,12 +254,12 @@ rec {
cdt = buildEclipseUpdateSite rec {
name = "cdt-${version}";
- version = "9.9.0";
+ version = "9.10.0";
src = fetchzip {
stripRoot = false;
- url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.9/${name}/${name}.zip";
- sha256 = "1vgx7ggilfwmx0bjrhk7mwlwg1c8lb141ilj3vzwxivlffihy054";
+ url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.10/${name}/${name}.zip";
+ sha256 = "0rjm91j0h1aq9lq4sdwgp9b2yp4w9lr13n82z32dw3gz3nby1mvi";
};
meta = with stdenv.lib; {
@@ -474,12 +474,12 @@ rec {
jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
- version = "4.13";
+ version = "4.14";
src = fetchzip {
stripRoot = false;
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.13-201909161045/org.eclipse.jdt-4.13.zip;
- sha256 = "0sfpxph0cszcx1cihzzjn60qid8sxgl2xyr9x46fld4ian5a7vbr";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.14-201912100610/org.eclipse.jdt-4.14.zip;
+ sha256 = "16c5v59mkb0cyfhf2475ds1ajma65bhqfxjr6v59hianqxq9h9la";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index 0de514233f8e..1161fc8256cb 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,19 +1,11 @@
-{ stdenv, fetchFromGitHub, fetchpatch, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
+{ stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
stdenv.mkDerivation rec {
pname = "edbrowse";
- version = "3.7.4";
+ version = "3.7.6";
buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
- patches = [
- # Fix build against recent libcurl
- (fetchpatch {
- url = https://github.com/CMB/edbrowse/commit/5d2b9e21fdf019f461ebe62738d615428d5db963.diff;
- sha256 = "167q8n0syj3iv6lxrbpv4kvb63j4byj4qxrxayy08bah3pss3gky";
- })
- ];
-
postPatch = ''
for i in ./tools/*.pl
do
@@ -21,13 +13,16 @@ stdenv.mkDerivation rec {
done
'';
- makeFlags = "-C src prefix=$(out)";
+ makeFlags = [
+ "-C src"
+ "prefix=${placeholder "out"}"
+ ];
src = fetchFromGitHub {
owner = "CMB";
repo = "edbrowse";
rev = "v${version}";
- sha256 = "0i9ivyfy1dd16c89f392kwx6wxgkkpyq2hl32jhzra0fb0zyl0k6";
+ sha256 = "0yk4djb9q8ll94fs57y706bsqlar4pfx6ysasvkzj146926lrh8a";
};
meta = with stdenv.lib; {
description = "Command Line Editor Browser";
@@ -39,8 +34,8 @@ stdenv.mkDerivation rec {
edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke.
'';
license = licenses.gpl1Plus;
- homepage = http://edbrowse.org/;
- maintainers = [ maintainers.schmitthenner maintainers.vrthra ];
+ homepage = "https://edbrowse.org/";
+ maintainers = with maintainers; [ schmitthenner vrthra equirosa ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
index 3d34c7a462e3..33f2ad79ea0c 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchzip, emacs, colorTheme}:
+{stdenv, fetchzip, emacs, color-theme}:
let
- commit = "412713a0fcedd520d208a7b783fea03d710bcc61";
+ commit = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee";
in
stdenv.mkDerivation {
name = "color-theme-solarized-1.0.0";
@@ -8,15 +8,14 @@ stdenv.mkDerivation {
src = fetchzip {
url = "https://github.com/sellout/emacs-color-theme-solarized/archive/${commit}.zip";
- sha256 = "1xd2yk7p39zxgcf91s80pqknzdxw9d09cppjb87g7ihj6f0wxqjv";
+ sha256 = "16d7adqi07lzzr0qipl1fbag9l8kiyr3xrqxi528pimcisbg85d3";
};
buildInputs = [ emacs ];
- propagatedUserEnvPkgs = [ colorTheme ];
-
+ propagatedUserEnvPkgs = [ color-theme ];
buildPhase = ''
- emacs -L . -L ${colorTheme}/share/emacs/site-lisp --batch -f batch-byte-compile *.el
+ emacs -L . -L ${color-theme}/share/emacs/site-lisp/elpa/color-theme-* --batch -f batch-byte-compile *.el
'';
installPhase = ''
@@ -30,8 +29,5 @@ stdenv.mkDerivation {
maintainers = [ maintainers.samuelrivas ];
license = licenses.mit;
platforms = platforms.all;
-
- # Fails with `solarized-definitions.el:786:1:Warning: the function `rotatef' is not known to`
- broken = true;
};
}
diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index a6bea779eae0..a6d657199b98 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -40,6 +40,9 @@ self: let
cl-lib = null; # builtin
tle = null; # builtin
advice = null; # builtin
+ seq = if lib.versionAtLeast self.emacs.version "27"
+ then null
+ else super.seq;
};
elpaPackages = super // overrides;
diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix
index df94a7a650a5..d773de4375cb 100644
--- a/pkgs/applications/editors/emacs-modes/manual-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix
@@ -117,6 +117,8 @@
structured-haskell-mode = self.shm;
+ sv-kalender = callPackage ./sv-kalender { };
+
thingatpt-plus = callPackage ./thingatpt-plus { };
tramp = callPackage ./tramp { };
@@ -128,9 +130,7 @@
# From old emacsPackages (pre emacsPackagesNg)
cedet = callPackage ./cedet { };
cedille = callPackage ./cedille { cedille = pkgs.cedille; };
- colorThemeSolarized = callPackage ./color-theme-solarized {
- colorTheme = self.color-theme;
- };
+ colorThemeSolarized = callPackage ./color-theme-solarized { };
emacsSessionManagement = callPackage ./session-management-for-emacs { };
hsc3-mode = callPackage ./hsc3 { };
hol_light_mode = callPackage ./hol_light { };
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index c1fad2dc8651..8d70794a7540 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
- version = "20190527";
+ version = "20191203";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-20190527.tar";
- sha256 = "1fc2nyylzpikjikyb24xq2mcilridcahmjwmg0s426dqrgqpm9ij";
+ url = "http://orgmode.org/elpa/org-20191203.tar";
+ sha256 = "1fcgiswjnqmfzx3xkmlqyyhc4a8ms07vdsv7nkizgxqdh9hwfm2q";
};
packageRequires = [];
meta = {
@@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
- version = "20190527";
+ version = "20191203";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-plus-contrib-20190527.tar";
- sha256 = "16kf47ij25fijf6pbfxzq9xzildj1asdzhnkf5zv5pn4312pvgnq";
+ url = "http://orgmode.org/elpa/org-plus-contrib-20191203.tar";
+ sha256 = "1kvw95492acb7gqn8gxbp1vg4fyw80w43yvflxnfxdf6jnnw2wah";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix
new file mode 100644
index 000000000000..bcd947983a34
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix
@@ -0,0 +1,22 @@
+{ fetchurl, stdenv, trivialBuild }:
+
+trivialBuild {
+ pname = "sv-kalender";
+ version = "1.9";
+
+ src = fetchurl {
+ url = "http://bigwalter.net/daniel/elisp/sv-kalender.el";
+ sha256 = "0kilp0nyhj67qscy13s0g07kygz2qwmddklhan020sk7z7jv3lpi";
+ postFetch = ''
+ echo "(provide 'sv-kalender)" >> $out
+ '';
+ };
+
+ meta = with stdenv.lib; {
+ description = "Swedish calendar for Emacs";
+ homepage = "http://bigwalter.net/daniel/elisp/sv-kalender.el";
+ platforms = platforms.all;
+ license = licenses.gpl3Plus;
+ maintainers = [ maintainer.rycee ];
+ };
+}
diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix
index 76009370473b..42edb7c707e1 100644
--- a/pkgs/applications/editors/emacs/25.nix
+++ b/pkgs/applications/editors/emacs/25.nix
@@ -1,13 +1,13 @@
-{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
+{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, fetchpatch
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
, withX ? !stdenv.isDarwin
, withGTK2 ? false, gtk2 ? null
, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
-, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null
+, withXwidgets ? false, webkitgtk, wrapGAppsHook ? null, glib-networking ? null
, withCsrc ? true
-, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
+, autoconf ? null, automake ? null, texinfo ? null
}:
assert (libXft != null) -> libpng != null; # probably a bug
@@ -16,7 +16,7 @@ assert withGTK2 -> withX || stdenv.isDarwin;
assert withGTK3 -> withX || stdenv.isDarwin;
assert withGTK2 -> !withGTK3 && gtk2 != null;
assert withGTK3 -> !withGTK2 && gtk3 != null;
-assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null;
+assert withXwidgets -> withGTK3 && webkitgtk != null;
let
toolkit =
@@ -46,10 +46,21 @@ stdenv.mkDerivation rec {
url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch";
sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj";
})
+ ] ++ [
+ # Backport patches so we can use webkitgtk with xwidgets.
+ (fetchpatch {
+ name = "0001-Omit-unnecessary-includes-from-xwidget-c.patch";
+ url = "https://github.com/emacs-mirror/emacs/commit/a36ed9b5e95afea5716256bac24d883263aefbaf.patch";
+ sha256 = "1j34c0vkj87il87xy1px23yk6bw73adpr7wqa79ncj89i4lc8qkb";
+ })
+ (fetchpatch {
+ name = "0002-xwidget-Use-WebKit2-API.patch";
+ url = "https://github.com/emacs-mirror/emacs/commit/d781662873f228b110a128f7a2b6583a4d5e0a3a.patch";
+ sha256 = "1lld56zi4cw2hmjxhhdcc0f07k8lbj32h10wcq4ml3asdwa31ryr";
+ })
];
- nativeBuildInputs = [ pkgconfig ]
- ++ lib.optionals srcRepo [ autoconf automake texinfo ]
+ nativeBuildInputs = [ pkgconfig autoconf automake texinfo ]
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
buildInputs =
@@ -61,7 +72,7 @@ stdenv.mkDerivation rec {
++ lib.optional (withX && withGTK2) gtk2
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
++ lib.optional (stdenv.isDarwin && withX) cairo
- ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]
+ ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
++ lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
hardeningDisable = [ "format" ];
@@ -75,7 +86,7 @@ stdenv.mkDerivation rec {
"--with-gif=no" "--with-tiff=no" ])
++ lib.optional withXwidgets "--with-xwidgets";
- preConfigure = lib.optionalString srcRepo ''
+ preConfigure = ''
./autogen.sh
'' + ''
substituteInPlace lisp/international/mule-cmds.el \
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 29a6a8773eff..2862ba7184fa 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
[ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ]
++ lib.optionals withX
- [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
+ [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft
gconf ]
- ++ lib.optionals (withX || withNS) [ imagemagick ]
+ ++ lib.optionals (withX || withNS) [ imagemagick librsvg ]
++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ]
++ lib.optional (withX && withGTK2) gtk2-x11
++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 649997171e9f..e9307c7e80b9 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -4,10 +4,12 @@
}:
stdenv.mkDerivation rec {
- emacsVersion = "26.3";
- emacsName = "emacs-${emacsVersion}";
+ pname = "emacs";
+ version = "26.3";
+
+ emacsName = "emacs-${version}";
macportVersion = "7.7";
- name = "emacs-mac-${emacsVersion}-${macportVersion}";
+ name = "emacs-mac-${version}-${macportVersion}";
src = fetchurl {
url = "mirror://gnu/emacs/${emacsName}.tar.xz";
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index b8b11e5e831e..cbff8e606f2d 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
homepage = http://flpsed.org/flpsed.html;
license = licenses.gpl3;
platforms = platforms.linux;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 1e1a817f092d..d3cc36244193 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -1,36 +1,51 @@
-{ stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file, libintl, hicolor-icon-theme }:
-
-with stdenv.lib;
-
-let
- version = "1.36";
-in
+{ stdenv
+, fetchurl
+, gtk3
+, which
+, pkgconfig
+, intltool
+, file
+, libintl
+, hicolor-icon-theme
+, wrapGAppsHook
+}:
stdenv.mkDerivation rec {
pname = "geany";
- inherit version;
+ version = "1.36";
+
+ outputs = [ "out" "dev" "doc" "man" ];
src = fetchurl {
url = "https://download.geany.org/${pname}-${version}.tar.bz2";
sha256 = "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i";
};
- nativeBuildInputs = [ pkgconfig intltool libintl ];
- buildInputs = [ gtk2 which file hicolor-icon-theme ];
+ nativeBuildInputs = [
+ pkgconfig
+ intltool
+ libintl
+ which
+ file
+ hicolor-icon-theme
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gtk3
+ ];
doCheck = true;
enableParallelBuilding = true;
- patchPhase = "patchShebangs .";
-
- meta = {
+ meta = with stdenv.lib; {
description = "Small and lightweight IDE";
longDescription = ''
Geany is a small and lightweight Integrated Development Environment.
It was developed to provide a small and fast IDE, which has only a few dependencies from other packages.
Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME.
- Geany only requires the GTK2 runtime libraries.
+ Geany only requires the GTK runtime libraries.
Some basic features of Geany:
- Syntax highlighting
- Code folding
@@ -45,7 +60,7 @@ stdenv.mkDerivation rec {
- Simple project management
- Plugin interface
'';
- homepage = https://www.geany.org/;
+ homepage = "https://www.geany.org/";
license = licenses.gpl2;
maintainers = with maintainers; [ frlan ];
platforms = platforms.all;
diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix
index f7351454fb8c..ece5c95f05ab 100644
--- a/pkgs/applications/editors/geany/with-vte.nix
+++ b/pkgs/applications/editors/geany/with-vte.nix
@@ -1,8 +1,24 @@
-{ runCommand, makeWrapper, geany, gnome2 }:
-let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name;
-in
-runCommand name { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } "
- mkdir -p $out
- ln -s ${geany}/share $out
- makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib
-"
+{ symlinkJoin
+, makeWrapper
+, geany
+, lndir
+, vte
+}:
+
+symlinkJoin {
+ name = "geany-with-vte-${geany.version}";
+
+ # TODO: add geany-plugins
+ paths = with geany; [ out doc man ];
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ postBuild = ''
+ # need to replace the directory since it is a symlink
+ rm -r $out/bin; mkdir $out/bin
+ makeWrapper ${geany}/bin/geany $out/bin/geany \
+ --prefix LD_LIBRARY_PATH : ${vte}/lib
+ '';
+
+ inherit (geany.meta);
+}
diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix
new file mode 100644
index 000000000000..0e30d879b0ca
--- /dev/null
+++ b/pkgs/applications/editors/glow/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "glow";
+ version = "0.1.3";
+
+ src = fetchFromGitHub {
+ owner = "charmbracelet";
+ repo = "glow";
+ rev = "v${version}";
+ sha256 = "16zadrp42y01hi83hg47cw6c9zpw8z4xfssb5pxkmd2ynihaxfv5";
+ };
+
+ modSha256 = "1q67j9wg0kgb41zjgdbcrywxbwh597n8shwnwgl2xa6f7fvzpr4f";
+
+ meta = src.meta // {
+ description = "Render markdown on the CLI";
+ maintainers = with lib.maintainers; [ ehmry filalex77 ];
+ license = lib.licenses.mit;
+ };
+}
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix
index 6ac2c6d4964c..bda0552e7529 100644
--- a/pkgs/applications/editors/gnome-builder/default.nix
+++ b/pkgs/applications/editors/gnome-builder/default.nix
@@ -5,6 +5,7 @@
, docbook_xsl
, docbook_xml_dtd_43
, fetchurl
+, fetchpatch
, flatpak
, gnome3
, libgit2-glib
@@ -45,6 +46,18 @@ stdenv.mkDerivation rec {
sha256 = "19018pq94cxf6fywd7fsmy98x56by5zfmh140pl530gaaw84cvhb";
};
+ patches = [
+ # Fix build with Meson 0.52
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f.patch";
+ sha256 = "0n8kg7nnjqmbnyag1ps6dvrlqrxc94djjncqx10d6y7ijwdxf4w8";
+ })
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/da26dfbf78468f5ed724e022b300a07862a95833.patch";
+ sha256 = "0psa65bzjpjj7vc5rknv2w2dz3p50jjv10s6j2fd6lpw8j2800k4";
+ })
+ ];
+
nativeBuildInputs = [
appstream-glib
desktop-file-utils
diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix
index 3abe2834db46..f194227932d0 100644
--- a/pkgs/applications/editors/gobby/default.nix
+++ b/pkgs/applications/editors/gobby/default.nix
@@ -1,5 +1,5 @@
{ avahiSupport ? false # build support for Avahi in libinfinity
-, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook
+, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook, yelp-tools
, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }:
let
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az";
};
- nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool gnome3.yelp-tools wrapGAppsHook ];
+ nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool yelp-tools wrapGAppsHook ];
buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ];
preConfigure = "./autogen.sh";
diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix
new file mode 100644
index 000000000000..ef3635aa8d29
--- /dev/null
+++ b/pkgs/applications/editors/hexdino/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, rustPlatform, ncurses }:
+rustPlatform.buildRustPackage rec {
+ name = "hexdino-${version}";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "Luz";
+ repo = "hexdino";
+ rev = "de5b5d7042129f57e0ab36416a06476126bce389";
+ sha256 = "11mz07735gxqfamjcjjmxya6swlvr1p77sgd377zjcmd6z54gwyf";
+ };
+
+ cargoSha256 = "0qa8ypp5a7sf1gic482zh3i6s94w6k6bgmk5ynfvwi7g49ql7c4z";
+ verifyCargoDeps = true;
+
+ buildInputs = [ ncurses ];
+
+ meta = with stdenv.lib; {
+ description = "A hex editor with vim like keybindings written in Rust";
+ homepage = https://github.com/Luz/hexdino;
+ license = licenses.mit;
+ maintainers = [ maintainers.luz ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 16d5609934dd..48af3c9b014f 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -250,12 +250,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2019.2.3"; /* updated by script */
+ version = "2019.2.5"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "0kiqbcx64rlz1pajbn326zwy0d1vxdxpvk5xpqkcj7nva611pdq1"; /* updated by script */
+ sha256 = "0p0shikhf73ayflv5bm212kz06hiy3brww9h9ijjp6lcadxc9pmf"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -263,12 +263,12 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
- version = "2019.2.5"; /* updated by script */
+ version = "2019.2.6"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
- sha256 = "18frmlchalpvc55j25ig2slf2h33gwmbmm8dvc29jb3kgsl0ny7p"; /* updated by script */
+ sha256 = "0g57njcklyskadxmvwb0r0z3ckq9qmcwh8qd80w396gj8fgbg50g"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
update-channel = "DataGrip RELEASE";
@@ -276,12 +276,12 @@ in
goland = buildGoland rec {
name = "goland-${version}";
- version = "2019.2.2"; /* updated by script */
+ version = "2019.2.4"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "1wq1prgfn6wc7lc6qjhiykm62c56yrb5rv0hyylcsgdw0q3ns6z2"; /* updated by script */
+ sha256 = "0rkyw3532qvr6jhr09m3h0ssdy5ilfgfvqqliyf0cacwzw9lfv0p"; /* updated by script */
};
wmClass = "jetbrains-goland";
update-channel = "GoLand RELEASE";
@@ -289,12 +289,12 @@ in
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2019.2.3"; /* updated by script */
+ version = "2019.2.4"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "0gy42x49yhdnp4ks6445xbc24dxw2vxnl12hdyx03mszdv0r58ni"; /* updated by script */
+ sha256 = "012vmclx6kg85gffgc9mr3fp1ffgx20dz7xvafk7c1iynawx8wgq"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA RELEASE";
@@ -302,12 +302,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2019.2.3"; /* updated by script */
+ version = "2019.2.4"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
- sha256 = "0allnibq8van3n1c5y85gscbpls0wshwffa6b2l2andw1jkhc259"; /* updated by script */
+ sha256 = "09mz4dx3zbnqw0vh4iqr8sn2s8mvgr7zvn4k7kqivsiv8f79g90a"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA RELEASE";
@@ -315,12 +315,12 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2019.2.3"; /* updated by script */
+ version = "2019.2.4"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "0pra0hmyczxcxnvsc7rqiwhwj23ckx97c9m1wcyn7ik612xwik1i"; /* updated by script */
+ sha256 = "1bx8s4hh96pjfyccldwfarwv5fky6kg2kyc0h2arhfzwq1pbaisl"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
update-channel = "PhpStorm RELEASE";
@@ -328,12 +328,12 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2019.2.3"; /* updated by script */
+ version = "2019.2.4"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "02fynwi54libibgigwggh6xaf5p4046n0kjsqsck1kjbnrlghp10"; /* updated by script */
+ sha256 = "00dl3yx13lw8qyc23dirw96vm2d8c6zsx73ds1ha8zycfh6hkxf8"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm RELEASE";
@@ -341,12 +341,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2019.2.3"; /* updated by script */
+ version = "2019.2.4"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "19i3ll8p69n7jw7psv2nkhjq899gljwmc5ixpqhyl203rykavb7n"; /* updated by script */
+ sha256 = "14ab1cvypanwwn0k1hrx3rl964av6pvridgc19z49idw5wpgxgw7"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm RELEASE";
@@ -354,12 +354,12 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "2019.2.2"; /* updated by script */
+ version = "2019.2.3"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
- sha256 = "1wv5vhiv3w1dwyklx1pr5javp4psqyiv4naq37cvxxp9zh7hk8rc"; /* updated by script */
+ sha256 = "13br6zmqpvi9hcd6wdnalkhj50gzr7cwrdh4v2bpda77iby2pz93"; /* updated by script */
};
wmClass = "jetbrains-rider";
update-channel = "Rider RELEASE";
@@ -367,12 +367,12 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
- version = "2019.2.3"; /* updated by script */
+ version = "2019.2.4"; /* updated by script */
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "0g8yxsq9xn8l8wnmcm0y5y0ll5081s83mmwrb62k4bldlsr25iba"; /* updated by script */
+ sha256 = "1dqp222zvi8ikqdkprmqihyjxiq90vd0a0zl5935xjg1mzf8ald9"; /* updated by script */
};
wmClass = "jetbrains-rubymine";
update-channel = "RubyMine RELEASE";
@@ -380,12 +380,12 @@ in
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2019.2.3"; /* updated by script */
+ version = "2019.2.4"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "0l3c3b1d53b3w90d4g99pjw8vmjj716jjaxsv4hy53shh1ncd55g"; /* updated by script */
+ sha256 = "0iz9qgrbhn1rxr8n5q1y7klfs27j1f55pw8hqbl2ln4df94zqi5j"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WebStorm RELEASE";
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
index cb9f10281c70..70b2d3c148db 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, gnome3, gtksourceview3, at-spi2-core, gtksourceviewmm,
+{ stdenv, fetchgit, dconf, gtksourceview3, at-spi2-core, gtksourceviewmm,
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3,
coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
gtksourceviewmm
llvmPackages.clang.cc
llvmPackages.lldb
- gnome3.dconf
+ dconf
];
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 065657d16e2e..a6580581f850 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "kakoune-unwrapped";
- version = "2019.07.01";
+ version = "2019.12.10";
src = fetchFromGitHub {
repo = "kakoune";
owner = "mawww";
rev = "v${version}";
- sha256 = "0jdkldq5rygzc0wcxr1j4fmp2phciy8602ghhf6xq21a9bq2v639";
+ sha256 = "0cb3ndlczxvxnzb91s4idxx0cy30mnrc4znsbjpnch68fvpm0x2f";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];
diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix
index 61e2b3a58459..4e92887bccb3 100644
--- a/pkgs/applications/editors/kakoune/plugins/default.nix
+++ b/pkgs/applications/editors/kakoune/plugins/default.nix
@@ -7,6 +7,7 @@
kak-auto-pairs = pkgs.callPackage ./kak-auto-pairs.nix { };
kak-buffers = pkgs.callPackage ./kak-buffers.nix { };
kak-fzf = pkgs.callPackage ./kak-fzf.nix { };
+ kak-plumb = pkgs.callPackage ./kak-plumb.nix { };
kak-powerline = pkgs.callPackage ./kak-powerline.nix { };
kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { };
}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix
index 48dc7106b626..512f1f09207b 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix
+++ b/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib;
{ description = "Kakoune extension to enable automatic closing of pairs";
homepage = "https://github.com/alexherbo2/auto-pairs.kak";
- license = licenses.publicDoman;
+ license = licenses.unlicense;
maintainers = with maintainers; [ nrdxp ];
platform = platforms.all;
};
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix b/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
index 8a2474f07622..eaf20aeadf8e 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
+++ b/pkgs/applications/editors/kakoune/plugins/kak-buffers.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib;
{ description = "Ease navigation between opened buffers in Kakoune";
homepage = "https://github.com/Delapouite/kakoune-buffers";
- license = licenses.publicDoman;
+ license = licenses.mit;
maintainers = with maintainers; [ nrdxp ];
platform = platforms.all;
};
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
index 9877c72252be..dd0faf63453b 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
+++ b/pkgs/applications/editors/kakoune/plugins/kak-fzf.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib;
{ description = "Kakoune plugin that brings integration with fzf";
homepage = "https://github.com/andreyorst/fzf.kak";
- license = licenses.publicDoman;
+ license = licenses.mit;
maintainers = with maintainers; [ nrdxp ];
platform = platforms.all;
};
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix b/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix
new file mode 100644
index 000000000000..7abef9305310
--- /dev/null
+++ b/pkgs/applications/editors/kakoune/plugins/kak-plumb.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, kakoune-unwrapped, plan9port, ... }:
+
+stdenv.mkDerivation rec {
+ pname = "kak-plumb";
+ version = "0.1.1";
+
+ src = fetchFromGitHub {
+ owner = "eraserhd";
+ repo = "kak-plumb";
+ rev = "v${version}";
+ sha256 = "1rz6pr786slnf1a78m3sj09axr4d2lb5rg7sfa4mfg1zcjh06ps6";
+ };
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/kak/autoload/plugins/
+ substitute rc/plumb.kak $out/share/kak/autoload/plugins/plumb.kak \
+ --replace '9 plumb' '${plan9port}/bin/9 plumb'
+ substitute edit-client $out/bin/edit-client \
+ --replace '9 9p' '${plan9port}/bin/9 9p' \
+ --replace 'kak -p' '${kakoune-unwrapped}/bin/kak -p'
+ chmod +x $out/bin/edit-client
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Kakoune integration with the Plan 9 plumber";
+ homepage = "https://github.com/eraserhd/kak-plumb";
+ license = licenses.unlicense;
+ maintainers = with maintainers; [ eraserhd ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
index 76af06504ea3..d328e47f7e1b 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
+++ b/pkgs/applications/editors/kakoune/plugins/kak-powerline.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib;
{ description = "Kakoune modeline, but with passion";
homepage = "https://github.com/andreyorst/powerline.kak";
- license = licenses.publicDoman;
+ license = licenses.mit;
maintainers = with maintainers; [ nrdxp ];
platform = platforms.all;
};
diff --git a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix b/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
index 280fb664b8f4..7658ba0f7ada 100644
--- a/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
+++ b/pkgs/applications/editors/kakoune/plugins/kak-vertical-selection.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib;
{ description = "Select up and down lines that match the same pattern in Kakoune";
homepage = "https://github.com/occivink/kakoune-vertical-selection";
- license = licenses.publicDoman;
+ license = licenses.unlicense;
maintainers = with maintainers; [ nrdxp ];
platform = platforms.all;
};
diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix
index e367b586f307..19fef1c42dc3 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-php.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-php";
- version = "5.4.2";
+ version = "5.4.5";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "1ilazq2y671wifcrh7pa0zf9yqymqxwj1m2kd389ik2p6wm68jx8";
+ sha256 = "12j0l2k6ii9ajp90lil3apk0xsz56cb549ighabik73a1w3c6ib6";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix
index 1052c5e1ba34..7723b9482a2d 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-python.nix
+++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "kdev-python";
- version = "5.4.2";
+ version = "5.4.5";
src = fetchurl {
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
- sha256 = "1nnspa1mixdb5z0a8m4nbpsk6c4s81iwrirhrl7091hsw02bsx3f";
+ sha256 = "1iq4lxbl8gq4qvydyz34ild4izw21cp22adlz9dc054v0wis331j";
};
cmakeFlags = [
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index 4c2011b5b035..21b469347dfb 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -1,3 +1,4 @@
+
{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules
, qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
@@ -9,11 +10,11 @@
mkDerivation rec {
pname = "kdevelop";
- version = "5.4.2";
+ version = "5.4.5";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
- sha256 = "1i665m4jd1r5bl77pcfybpn9szxzccrajs4m0prqwhlj93d57qjj";
+ sha256 = "08vhbg9ql0402bw3y3xw1kdxhig9sv3ss8g0h4477vy3z17m1h4j";
};
nativeBuildInputs = [
@@ -36,7 +37,7 @@ mkDerivation rec {
# https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b
# required as nixos seems to be unable to find CLANG_BUILTIN_DIR
cmakeFlags = [
- "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${(builtins.parseDrvName llvmPackages.clang.name).version}/include"
+ "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${lib.getVersion llvmPackages.clang}/include"
];
dontWrapQtApps = true;
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix
index a106c3166747..9d0d91f4be54 100644
--- a/pkgs/applications/editors/kodestudio/default.nix
+++ b/pkgs/applications/editors/kodestudio/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
, # Patchelf dependencies:
- alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined
+ alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL
, openssl, xorg, zlib
}:
@@ -56,7 +56,7 @@ in
$out/kodestudio
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGLU_combined}/lib:${openssl.out}/lib" \
+ --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGL}/lib:${libGLU}/lib:${openssl.out}/lib" \
$out/resources/app/extensions/krom/Krom/linux/Krom
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/applications/editors/mle/default.nix
new file mode 100644
index 000000000000..2c36be1c21bc
--- /dev/null
+++ b/pkgs/applications/editors/mle/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, termbox, pcre, uthash, lua5_3 }:
+
+stdenv.mkDerivation rec {
+ pname = "mle";
+ version = "1.4.2";
+
+ src = fetchFromGitHub {
+ owner = "adsr";
+ repo = "mle";
+ rev = "v${version}";
+ sha256 = "053zvxkjx2zwq6lwkycirxz1m9sjc3zi9ic8fvp3mjvbqfri1y3x";
+ };
+
+ # Fix location of Lua 5.3 header and library
+ postPatch = ''
+ substituteInPlace Makefile --replace "-llua5.3" "-llua";
+ substituteInPlace mle.h --replace "&6; }
for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do
@@ -214,23 +187,22 @@ index 9e6a82f4a..3c6d1a89b 100755
if test "X$librubyarg" != "X"; then
diff --git a/src/vim.h b/src/vim.h
-index cb5be6c97..b703b31cd 100644
+index f158aab..a714da9 100644
--- a/src/vim.h
+++ b/src/vim.h
-@@ -241,18 +241,6 @@
+@@ -243,17 +243,6 @@
# define SUN_SYSTEM
#endif
--/* If we're compiling in C++ (currently only KVim), the system
-- * headers must have the correct prototypes or nothing will build.
-- * Conversely, our prototypes might clash due to throw() specifiers and
-- * cause compilation failures even though the headers are correct. For
-- * a concrete example, gcc-3.2 enforces exception specifications, and
-- * glibc-2.2.5 has them in their system headers.
-- */
+-// If we're compiling in C++ (currently only KVim), the system
+-// headers must have the correct prototypes or nothing will build.
+-// Conversely, our prototypes might clash due to throw() specifiers and
+-// cause compilation failures even though the headers are correct. For
+-// a concrete example, gcc-3.2 enforces exception specifications, and
+-// glibc-2.2.5 has them in their system headers.
-#if !defined(__cplusplus) && defined(UNIX) \
-- && !defined(MACOS_X) /* MACOS_X doesn't yet support osdef.h */
--# include "auto/osdef.h" /* bring missing declarations in */
+- && !defined(MACOS_X) // MACOS_X doesn't yet support osdef.h
+-# include "auto/osdef.h" // bring missing declarations in
-#endif
-
#ifdef AMIGA
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 52b9228e7667..9abee88d8b07 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -11,13 +11,13 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "0p4ah1bbz0njl2bk783gq5z1gxfzapa65qzhrkn216v07rba29jm";
- x86_64-darwin = "162bqdhi2dx74q5f56bhs5phz9az66lb4lvfcj1sdygp51xsb93y";
+ x86_64-linux = "1ziw2b851kg17jaf713nwhsv5ikbvivq3h01xximhcglv9vzk93l";
+ x86_64-darwin = "0nndasa130551jf06mfrym593c02c3ypgg9f9rdg1fw5qbyjb8hm";
}.${system};
in
callPackage ./generic.nix rec {
- version = "1.39.2";
+ version = "1.41.0";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index e2386bc11189..310d839088d9 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "013jhmc29angqh9qb8jj0jqk4whqb59id61njm8gwz977sdgpf9l";
- x86_64-darwin = "09jfii132cib1kn3bghwchdlvi4cfjqz5hvw6j5gr53h7j35k37j";
+ x86_64-linux = "1njxa19mzzydz1jacghwmha3dl4a13m9xzzwsb0rbks5zc9a0v7m";
+ x86_64-darwin = "0cpd87q0q3i172l4s43s79by42wa9k5pyik3v2z5mq8zpms8qcq4";
}.${system};
sourceRoot = {
@@ -23,7 +23,7 @@ in
callPackage ./generic.nix rec {
inherit sourceRoot;
- version = "1.39.2";
+ version = "1.41.0";
pname = "vscodium";
executableName = "codium";
@@ -50,7 +50,7 @@ in
homepage = https://github.com/VSCodium/vscodium;
downloadPage = https://github.com/VSCodium/vscodium/releases;
license = licenses.mit;
- maintainers = with maintainers; [];
+ maintainers = with maintainers; [ synthetica ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
};
}
diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix
index fe5fcc1724b4..0f3cd7d136a7 100644
--- a/pkgs/applications/editors/yi/wrapper.nix
+++ b/pkgs/applications/editors/yi/wrapper.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
description = "Allows Yi to find libraries and the compiler easily";
# This wrapper and wrapper only is under PD
license = licenses.publicDomain;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 562a5e616a32..4000c834602b 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
# directory
patches = [ ./no_symbolic_links.patch ];
+ # Correct mysql_config query
+ patchPhase = ''
+ substituteInPlace configure --replace "--libmysqld-libs" "--libs"
+ '';
+
configureFlags = [
"--with-proj-share=${proj}/share/proj"
"--with-proj-includes=${proj.dev}/include"
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
index 82c625310e7a..21d16282edcb 100644
--- a/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
pname = "OpenOrienteering-Mapper";
- version = "0.9.0";
+ version = "0.9.1";
buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
qtsensors clipper zlib proj doxygen cups];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "OpenOrienteering";
repo = "mapper";
rev = "v${version}";
- sha256 = "0wnxj2xf529941dwss6ygb1krfx18lzl6rf67060b0zndc7n6l8f";
+ sha256 = "1fyhvf2y89hj7wj89kxccx3dqcja6ndy3w4rx1vmzrp246jpz7wb";
};
cmakeFlags =
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index b30d8f0ad750..de436088fa76 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -10,7 +10,7 @@ let
[ qscintilla-qt5 gdal jinja2 numpy psycopg2
chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
in mkDerivation rec {
- version = "3.10.0";
+ version = "3.10.1";
pname = "qgis";
name = "${pname}-unwrapped-${version}";
@@ -18,7 +18,7 @@ in mkDerivation rec {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings ["."] ["_"] version}";
- sha256 = "0qq4dznxxbpj8b4ypkz7dixc0b0v6rmf3c5hs4m3ka3rzck8jsqc";
+ sha256 = "0xq0nnp7zdqaihqvh5rsi1129g23vnk5ijkpxfzaggafgmhf5hgz";
};
passthru = {
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index feb79f444b81..90e7af9944d3 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, jasper,
+{ stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma,
libharu, opencv, vigra, postgresql, Cocoa,
unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }:
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
# See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
# for why the have additional buildInputs on darwin
buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma
- jasper qhull giflib ]
+ qhull giflib ]
++ stdenv.lib.optionals stdenv.isDarwin
[ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ];
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 2a4845659565..9cfccc7425bb 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -13,8 +13,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "6.9.10-69";
- sha256 = "0l4lllis16gbwjpvvsyfz91i9nq11zb3lg2zlmyay7v5697jshh6";
+ version = "6.9.10-71";
+ sha256 = "0c69xmr8k8c4dplgzxydm30s2dr8biq71x07hc15bw196nsx3srr";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix
new file mode 100644
index 000000000000..adbc1eac3796
--- /dev/null
+++ b/pkgs/applications/graphics/akira/default.nix
@@ -0,0 +1,76 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, appstream-glib
+, desktop-file-utils
+, meson
+, ninja
+, pantheon
+, pkgconfig
+, python3
+, vala
+, vala-lint
+, wrapGAppsHook
+, cairo
+, glib
+, goocanvas2
+, gtk3
+, gtksourceview3
+, json-glib
+, libarchive
+, libgee
+, libxml2 }:
+
+stdenv.mkDerivation rec {
+ pname = "akira";
+ version = "2019-10-12";
+
+ src = fetchFromGitHub {
+ owner = "akiraux";
+ repo = "Akira";
+ rev = "cab952dee4591b6bde34d670c1f853f5a3ff6b19";
+ sha256 = "1fp3a79hkh6xwwqqdrx4zqq2zhsm236c6fhhl5f2nmi108yxz04q";
+ };
+
+ nativeBuildInputs = [
+ appstream-glib
+ desktop-file-utils
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ vala-lint
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ cairo
+ glib
+ goocanvas2
+ pantheon.granite
+ gtk3
+ gtksourceview3
+ json-glib
+ libarchive
+ libgee
+ libxml2
+ ];
+
+ mesonFlags = [ "-Dprofile=default" ];
+
+ patches = [ ./fix-build-with-vala-0-44-or-later.patch ];
+
+ postPatch = ''
+ chmod +x build-aux/meson/post_install.py
+ patchShebangs build-aux/meson/post_install.py
+ '';
+
+ meta = with lib; {
+ description = "Native Linux Design application built in Vala and GTK";
+ homepage = "https://github.com/akiraux/Akira";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ filalex77 ] ++ pantheon.maintainers;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch b/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch
new file mode 100644
index 000000000000..3c35900c04f5
--- /dev/null
+++ b/pkgs/applications/graphics/akira/fix-build-with-vala-0-44-or-later.patch
@@ -0,0 +1,88 @@
+From bcda8fd53f6f232db0b6411269ba108af551629f Mon Sep 17 00:00:00 2001
+From: Alberto Fanjul
+Date: Tue, 9 Apr 2019 09:45:36 +0200
+Subject: [PATCH] Build on vala >= 0.44.2
+
+---
+ src/FileFormat/JsonObject.vala | 2 +-
+ src/FileFormat/JsonObjectArray.vala | 2 +-
+ src/FileFormat/ZipArchiveHandler.vala | 18 +++++++++++++++++-
+ 3 files changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/src/FileFormat/JsonObject.vala b/src/FileFormat/JsonObject.vala
+index 7bfe46f..805fbad 100644
+--- a/src/FileFormat/JsonObject.vala
++++ b/src/FileFormat/JsonObject.vala
+@@ -31,7 +31,7 @@ public abstract class Akira.FileFormat.JsonObject : GLib.Object {
+
+ private ObjectClass obj_class;
+
+- public JsonObject.from_object (Json.Object object) {
++ protected JsonObject.from_object (Json.Object object) {
+ Object (object: object);
+ }
+
+diff --git a/src/FileFormat/JsonObjectArray.vala b/src/FileFormat/JsonObjectArray.vala
+index 4f6e573..d0a7dad 100644
+--- a/src/FileFormat/JsonObjectArray.vala
++++ b/src/FileFormat/JsonObjectArray.vala
+@@ -31,7 +31,7 @@ public abstract class Akira.FileFormat.JsonObjectArray : Object {
+ *
+ * Your JsonObject implementation should have it's own list of items
+ */
+- public JsonObjectArray (Json.Object object, string property_name) {
++ protected JsonObjectArray (Json.Object object, string property_name) {
+ Object (object: object, property_name: property_name);
+ }
+
+diff --git a/src/FileFormat/ZipArchiveHandler.vala b/src/FileFormat/ZipArchiveHandler.vala
+index ca60dd0..5d65aa2 100644
+--- a/src/FileFormat/ZipArchiveHandler.vala
++++ b/src/FileFormat/ZipArchiveHandler.vala
+@@ -262,11 +262,17 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object {
+ continue;
+ }
+
++ Posix.off_t offset;
++#if VALA_0_42
++ uint8[] buffer;
++ while (archive.read_data_block (out buffer, out offset) == Archive.Result.OK) {
++ if (extractor.write_data_block (buffer, offset) != Archive.Result.OK) {
++#else
+ void* buffer = null;
+ size_t buffer_length;
+- Posix.off_t offset;
+ while (archive.read_data_block (out buffer, out buffer_length, out offset) == Archive.Result.OK) {
+ if (extractor.write_data_block (buffer, buffer_length, offset) != Archive.Result.OK) {
++#endif
+ break;
+ }
+ }
+@@ -316,9 +322,15 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object {
+ // Add an entry to the archive
+ Archive.Entry entry = new Archive.Entry ();
+ entry.set_pathname (initial_folder.get_relative_path (current_file));
++#if VALA_0_42
++ entry.set_size ((Archive.int64_t) file_info.get_size ());
++ entry.set_filetype (Archive.FileType.IFREG);
++ entry.set_perm (Archive.FileType.IFREG);
++#else
+ entry.set_size (file_info.get_size ());
+ entry.set_filetype ((uint) Posix.S_IFREG);
+ entry.set_perm (0644);
++#endif
+
+ if (archive.write_header (entry) != Archive.Result.OK) {
+ critical ("Error writing '%s': %s (%d)", current_file.get_path (), archive.error_string (), archive.errno ());
+@@ -333,7 +345,11 @@ public class Akira.FileFormat.ZipArchiveHandler : GLib.Object {
+ break;
+ }
+
++#if VALA_0_42
++ archive.write_data (buffer[0:bytes_read]);
++#else
+ archive.write_data (buffer, bytes_read);
++#endif
+ }
+ }
+ }
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 3c39aadda98e..5966d6427ed6 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, libpng, python3
-, libGLU_combined, qtbase, ncurses
+, libGLU, libGL, qtbase, wrapQtAppsHook, ncurses
, cmake, flex, lemon
}:
let
- gitRev = "c0038e3ea82fec6119de364bcbc3370955ed46a2";
+ gitRev = "6dfe6822e0279a4cc2f1c60e85b42212627285fe";
gitBranch = "develop";
gitTag = "0.9.3";
in
stdenv.mkDerivation {
pname = "antimony";
- version = "2018-10-20";
+ version = "2019-10-30";
src = fetchFromGitHub {
owner = "mkeeter";
repo = "antimony";
rev = gitRev;
- sha256 = "01cjcjppbb0gvh6npcsaidzpfcfzrqhhi07z4v0jkfyi0fl125v4";
+ sha256 = "07zlkwlk79czq8dy85b6n3ds3g36l8qy4ix849ady6ia3gm8981j";
};
patches = [ ./paths-fix.patch ];
@@ -29,7 +29,8 @@ in
buildInputs = [
libpng python3 python3.pkgs.boost
- libGLU_combined qtbase ncurses
+ libGLU libGL qtbase wrapQtAppsHook
+ ncurses
];
nativeBuildInputs = [ cmake flex lemon ];
@@ -44,7 +45,7 @@ in
meta = with stdenv.lib; {
description = "A computer-aided design (CAD) tool from a parallel universe";
- homepage = "https://github.com/mkeeter/antimony";
+ homepage = https://github.com/mkeeter/antimony;
license = licenses.mit;
maintainers = with maintainers; [ rnhmjoj ];
platforms = platforms.linux;
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 20cbd6fc5cf8..3595908f1437 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "avocode";
- version = "3.9.3";
+ version = "4.2.1";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
- sha256 = "1ki2fpn70p1rzf52q8511a90n7y7dqi86fs2a48qhass1abxlpqx";
+ sha256 = "06g12gqri1sgfklla6jfpi7wm2qjazakcjs2w2rhrphnl50r6ca7";
};
libPath = stdenv.lib.makeLibraryPath (with xorg; [
diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix
deleted file mode 100644
index 57cf6c3f13f4..000000000000
--- a/pkgs/applications/graphics/cinepaint/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms,
- flex, libtiff, libjpeg, libpng, libexif, zlib, perlPackages, libX11,
- pythonPackages, gettext, intltool, babl, gegl,
- glib, makedepend, xorgproto, libXmu, openexr,
- libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
-
-let
- inherit (pythonPackages) python pygtk;
-in stdenv.mkDerivation rec {
- name = "cinepaint-1.1";
-
- src = fetchurl {
- url = "mirror://sourceforge/cinepaint/${name}.tgz";
- sha256 = "0b5g4bkq62yiz1cnb2vfij0a8fw5w5z202v5dm4dh89k7cj0yq4w";
- };
-
- buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg
- libexif zlib libX11 python pygtk gettext intltool babl
- gegl glib makedepend xorgproto libXmu openexr libGLU_combined
- libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
- ] ++ (with perlPackages; [ perl XMLParser ]);
-
- hardeningDisable = [ "format" ];
-
- patches = [ ./install.patch ];
-
- nativeBuildInputs = [ cmake pkgconfig ];
-
- NIX_LDFLAGS = "-lm -llcms -ljpeg -lpng -lX11";
-
- meta = {
- homepage = http://www.cinepaint.org/;
- license = stdenv.lib.licenses.free;
- description = "Image editor which supports images over 8bpp and ICC profiles";
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/applications/graphics/cinepaint/install.patch b/pkgs/applications/graphics/cinepaint/install.patch
deleted file mode 100644
index f15ff1c4414d..000000000000
--- a/pkgs/applications/graphics/cinepaint/install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dfb182f..5adaaa5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -138,7 +138,7 @@ STRING(REPLACE "/" "\\/" ESCAPEDPREFIX ${PREFIX})
- # Note that for MacOS this needs to be revised
- # for the @OSX_ICC...@ variables
- ADD_CUSTOM_COMMAND(
-- OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/gimprc
-+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gimprc
- COMMAND sed -e s/\@platform\@//g
- -e s/\@prefix\@/${ESCAPEDPREFIX}/g
- -e s/\@exec_prefix\@/\${prefix}/g
-@@ -155,8 +155,8 @@ ADD_CUSTOM_COMMAND(
-
- ADD_CUSTOM_TARGET(RCFile ALL echo
- ""
-- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/user_install
-- ${CMAKE_CURRENT_SOURCE_DIR}/gimprc
-+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/user_install
-+ ${CMAKE_CURRENT_BINARY_DIR}/gimprc
- )
-
-
diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix
new file mode 100644
index 000000000000..32d079d85ff3
--- /dev/null
+++ b/pkgs/applications/graphics/cq-editor/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, mkDerivationWith
+, python3Packages
+, fetchFromGitHub
+}:
+
+mkDerivationWith python3Packages.buildPythonApplication rec {
+ pname = "cq-editor";
+ version = "0.1RC1";
+
+ src = fetchFromGitHub {
+ owner = "CadQuery";
+ repo = "CQ-editor";
+ rev = version;
+ sha256 = "0iwcpnj15s64k16948sakvkn1lb4mqwrhmbxk3r03bczs0z33zax";
+ };
+
+ propagatedBuildInputs = with python3Packages; [
+ cadquery
+ Logbook
+ pyqt5
+ pyparsing
+ pyqtgraph
+ spyder
+ pathpy
+ qtconsole
+ requests
+ ];
+
+ postFixup = ''
+ wrapQtApp "$out/bin/cq-editor"
+ '';
+
+ checkInputs = with python3Packages; [
+ pytest
+ pytest-xvfb
+ pytest-mock
+ pytestcov
+ pytest-repeat
+ pytest-qt
+ ];
+
+ checkPhase = ''
+ pytest --no-xvfb
+ '';
+
+ # requires X server
+ doCheck = false;
+
+ meta = with lib; {
+ description = "CadQuery GUI editor based on PyQT";
+ homepage = "https://github.com/CadQuery/CQ-editor";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ costrouc marcus7070 ];
+ };
+
+}
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 4f4f04af28b1..1abde3ddafce 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -7,12 +7,12 @@
}:
stdenv.mkDerivation rec {
- version = "2.6.3";
+ version = "3.0.0";
pname = "darktable";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
- sha256 = "a518999c8458472edfc04577026ce5047d74553052af0f52d10ba8ce601b78f0";
+ sha256 = "7195a5ff7ee95ab7c5a57e4e84f8c90cc4728b2c917359203c21293ab754c0db";
};
nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
description = "Virtual lighttable and darkroom for photographers";
homepage = https://www.darktable.org;
license = licenses.gpl3Plus;
- platforms = platforms.linux ++ platforms.darwin;
+ platforms = platforms.linux;
maintainers = with maintainers; [ goibhniu flosse mrVanDalo ];
};
}
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 1fc15af72441..e6e24e0e56f5 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -9,7 +9,7 @@
, qtwebengine
, akonadi-contacts
-, kcalcore
+, kcalendarcore
, kconfigwidgets
, kcoreaddons
, kdoctools
@@ -26,7 +26,7 @@
, exiv2
, ffmpeg
, flex
-, jasper
+, jasper ? null, withJpeg2k ? false # disable JPEG2000 support, jasper has unfixed CVE
, lcms2
, lensfun
, libgphoto2
@@ -70,7 +70,6 @@ mkDerivation rec {
exiv2
ffmpeg
flex
- jasper
lcms2
lensfun
libgphoto2
@@ -90,7 +89,7 @@ mkDerivation rec {
qtwebengine
akonadi-contacts
- kcalcore
+ kcalendarcore
kconfigwidgets
kcoreaddons
kfilemetadata
@@ -103,7 +102,8 @@ mkDerivation rec {
marble
oxygen
threadweaver
- ];
+ ]
+ ++ lib.optionals withJpeg2k [ jasper ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix
index 821a9e8083e1..7a4db535b2b0 100644
--- a/pkgs/applications/graphics/displaycal/default.nix
+++ b/pkgs/applications/graphics/displaycal/default.nix
@@ -1,8 +1,19 @@
-{buildPythonPackage, stdenv, fetchurl, pkgconfig
- , libXext, libXxf86vm, libX11, libXrandr, libXinerama, libXScrnSaver
- , argyllcms, wxPython, numpy
+{ python2
+, stdenv
+, fetchurl
+, pkgconfig
+, libXext
+, libXxf86vm
+, libX11
+, libXrandr
+, libXinerama
+, libXScrnSaver
+, argyllcms
}:
-buildPythonPackage {
+
+let
+ inherit (python2.pkgs) buildPythonApplication wxPython numpy;
+in buildPythonApplication {
pname = "displaycal";
version = "3.5.0.0";
diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix
index cf5ecfdd043f..e26886b070e5 100644
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/pkgs/applications/graphics/dosage/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ stdenv, python3Packages, fetchFromGitHub }:
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "dosage";
version = "2018.04.08";
PBR_VERSION = version;
@@ -11,10 +11,10 @@ pythonPackages.buildPythonApplication rec {
rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591";
sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh";
};
- checkInputs = with pythonPackages; [ pytest responses ];
- propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ];
+ checkInputs = with python3Packages; [ pytest responses ];
+ propagatedBuildInputs = with python3Packages; [ colorama lxml requests pbr setuptools ];
- disabled = pythonPackages.pythonOlder "3.3";
+ disabled = python3Packages.pythonOlder "3.3";
checkPhase = ''
py.test tests/
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index e59d14f7dd6e..144c723da20f 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
+{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU, libGL, xdg_utils,
dbus, alsaLib, cups, fontconfig, glib, icu, libpng12,
xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc,
libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
@@ -71,7 +71,7 @@ stdenv.mkDerivation {
sha256 = "05lrvml0zkzqg0sj6sj2h8h66hxdmsw5fg9fwz923r1y8j48qxdx";
};
- libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils
+ libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU libGL xdg_utils
dbus alsaLib cups.lib fontconfig glib icu libpng12
xkeyboard_config zlib libxslt libxml2 sqlite orc libX11
libXcursor libXrandr libxcb libXi libSM libICE libXrender
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index 4142310b705a..c71e95b21af8 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
- version = "12.1.7";
+ version = "12.4.2";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
- sha256 = "1vac0cz99yjlz7b186wyy4wk4sxkvlirpjmh3vw65xaxamn8spn3";
+ sha256 = "1mngn90cn9hixa0xkhk7mb02gjp480wnipjy2jzkq8kwpai1gm1m";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index 5744aeb462e9..e64e384a9a7e 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -60,11 +60,11 @@ let
in mkDerivation rec {
pname = "drawpile";
- version = "2.1.12";
+ version = "2.1.15";
src = fetchurl {
url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
- sha256 = "0jvy21xmlidyfkk1p47rgyf4c1ksizcpm8s17n8mwdbnjrf6m55n";
+ sha256 = "0w6bdg1rnnjzjg8xzqv3a9qhw41q41sjvp6f8m0sqxjfax05lqin";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index 562fb8c11dc3..d8b08faf2398 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, ctl }:
+{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU, libGL, ctl }:
stdenv.mkDerivation {
name ="openexr_viewers-2.2.1";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
'';
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ openexr fltk libGLU_combined ctl ];
+ buildInputs = [ openexr fltk libGLU libGL ctl ];
meta = {
description = "Application for viewing OpenEXR images on a display at various exposure settings";
diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index f5560a9b2032..3e64783df316 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Image viewing and manipulation programs";
+ description = "Image viewing and manipulation programs including fbi, fbgs, ida, exiftran and thumbnail.cgi";
homepage = https://www.kraxel.org/blog/linux/fbida/;
license = licenses.gpl2;
maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index fef068eaf0ff..de7d76ec45f2 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -1,16 +1,16 @@
{ stdenv, fetchurl, makeWrapper
, xorg, imlib2, libjpeg, libpng
-, curl, libexif, perlPackages }:
+, curl, libexif, jpegexiforient, perlPackages }:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "feh";
- version = "3.2.1";
+ version = "3.3";
src = fetchurl {
url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
- sha256 = "070axq8jpibcabmjfv4fmjmpk3k349vzvh4qhsi4n62bkcwl35wg";
+ sha256 = "04c8cgwzkax481sz7lbzy23mk79bqmjy3qpvr7vxa4c14mc9k5gk";
};
outputs = [ "out" "man" "doc" ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
installTargets = [ "install" ];
postInstall = ''
- wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \
+ wrapProgram "$out/bin/feh" --prefix PATH : "${makeBinPath [ libjpeg jpegexiforient ]}" \
--add-flags '--theme=feh'
'';
diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix
index ae38730226a4..c364badc1742 100644
--- a/pkgs/applications/graphics/fig2dev/default.nix
+++ b/pkgs/applications/graphics/fig2dev/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, ghostscript, libpng } :
let
- version = "3.2.7a";
+ version = "3.2.7b";
in stdenv.mkDerivation {
pname = "fig2dev";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
- sha256 = "0a7vkfl38fvkhg3na5gr9c4fskas9wbs84y9djg85nzwbshik8mx";
+ sha256 = "1ck8gnqgg13xkxq4hrdy706i4xdgrlckx6bi6wxm1g514121pp27";
};
buildInputs = [ libpng ];
diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix
index e4dff59670a1..3df7ba493c0f 100644
--- a/pkgs/applications/graphics/fondo/default.nix
+++ b/pkgs/applications/graphics/fondo/default.nix
@@ -63,6 +63,13 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
+
meta = with stdenv.lib; {
description = "Find the most beautiful wallpapers for your desktop";
homepage = https://github.com/calo001/fondo;
diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix
index 0bd3421f1b10..57321220fb14 100644
--- a/pkgs/applications/graphics/freepv/default.nix
+++ b/pkgs/applications/graphics/freepv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libjpeg, libGLU_combined, freeglut, zlib, cmake, libX11, libxml2, libpng,
+{ stdenv, fetchurl, libjpeg, libGLU, libGL, freeglut, zlib, cmake, libX11, libxml2, libpng,
libXxf86vm }:
stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56";
};
- buildInputs = [ libjpeg libGLU_combined freeglut zlib cmake libX11 libxml2 libpng
+ buildInputs = [ libjpeg libGLU libGL freeglut zlib cmake libX11 libxml2 libpng
libXxf86vm ];
postPatch = ''
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index e53deb99b5bd..2b3b992d24b5 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -52,6 +52,8 @@ in stdenv.mkDerivation rec {
pname = "gimp";
version = "2.10.14";
+ outputs = [ "out" "dev" ];
+
src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
sha256 = "0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz";
@@ -155,6 +157,8 @@ in stdenv.mkDerivation rec {
"--without-webkit" # old version is required
"--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
"--with-icc-directory=/run/current-system/sw/share/color/icc"
+ # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
+ "--libdir=\${exec_prefix}/lib"
];
# on Darwin,
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 29c1445b9ce8..fa29c979b050 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -68,13 +68,20 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
Filters/Generic/FFT Forward
Filters/Generic/FFT Inverse
*/
- name = "fourier-0.4.1";
+ name = "fourier-0.4.3";
buildInputs = with pkgs; [ fftw ];
- postInstall = "fail";
- installPhase = "installPlugins fourier";
+
src = fetchurl {
- url = "http://registry.gimp.org/files/${name}.tar.gz";
- sha256 = "1pr3y3zl9w8xs1circdrxpr98myz9m8wfzy022al79z4pdanwvs1";
+ url = "https://www.lprp.fr/files/old-web/soft/gimp/${name}.tar.gz";
+ sha256 = "0mf7f8vaqs2madx832x3kcxw3hv3w3wampvzvaps1mkf2kvrjbsn";
+ };
+
+ installPhase = "installPlugins fourier";
+
+ meta = with stdenv.lib; {
+ description = "GIMP plug-in to do the fourier transform";
+ homepage = "https://people.via.ecp.fr/~remi/soft/gimp/gimp_plugin_en.php3#fourier";
+ license = with licenses; [ gpl3Plus ];
};
};
diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix
index 3bfd51d0370d..fef296f45be2 100644
--- a/pkgs/applications/graphics/glabels/default.nix
+++ b/pkgs/applications/graphics/glabels/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, barcode, gnome3, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
-, intltool, itstool, makeWrapper, pkgconfig
+, intltool, itstool, makeWrapper, pkgconfig, yelp-tools
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
buildInputs = [
- barcode gtk3 gtk-doc gnome3.yelp-tools
+ barcode gtk3 gtk-doc yelp-tools
gnome3.gnome-common gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool
];
diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix
index b0e76d23dacb..f8d50a7c7982 100644
--- a/pkgs/applications/graphics/gscan2pdf/default.nix
+++ b/pkgs/applications/graphics/gscan2pdf/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
perlPackages.buildPerlPackage rec {
pname = "gscan2pdf";
- version = "2.5.6";
+ version = "2.6.2";
src = fetchurl {
url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz";
- sha256 = "0wp81nsi5jfypabwmjqiamxr739jq5ij79n5fzn5pbw1hg5gcmfz";
+ sha256 = "0z35lglf4anfczizynjp8sd1jpix5mkmm1nh39n1v94l7ahjxsww";
};
nativeBuildInputs = [ wrapGAppsHook ];
@@ -38,7 +38,7 @@ perlPackages.buildPerlPackage rec {
ListMoreUtils
HTMLParser
ProcProcessTable
- Log4Perl
+ LogLog4perl
TryTiny
DataUUID
DateCalc
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index d7c0f0e0a0cf..f0057f3a1a88 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -33,11 +33,11 @@
stdenv.mkDerivation rec {
pname = "gthumb";
- version = "3.8.1";
+ version = "3.8.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "184zn79w4s9y1zy42ar31p3jsg8rmkxy8k6iry51nz8aizbcs7jb";
+ sha256 = "15wqks35ks5dm7zj046dfd45vvrilan2ayfy2sxiprv7q74cip2q";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index d7888da15ef6..8f7800a7323a 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -1,7 +1,7 @@
{ stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig, fetchpatch
, autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext
, glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi
-, libXmu, libGLU_combined, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
+, libXmu, libGLU, libGL, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
}:
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg
- libpng libtiff libX11 libXi libXmu libGLU_combined openexr panotools sqlite vigra
+ libpng libtiff libX11 libXi libXmu libGLU libGL openexr panotools sqlite vigra
wxGTK zlib
];
diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix
index 61b45ce16032..ba5ee230ce4a 100644
--- a/pkgs/applications/graphics/ideogram/default.nix
+++ b/pkgs/applications/graphics/ideogram/default.nix
@@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "ideogram";
- version = "1.2.2";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "cassidyjames";
repo = pname;
rev = version;
- sha256 = "1qakgg3y4n2vcnykk2004ndvwmjbk2yy0p4j30mlb7p14dxscif6";
+ sha256 = "0ghc7hk4b4r3a0x9r30rrgv3rarxyjr2hf9ig244xwvhh5rn3j10";
};
nativeBuildInputs = [
@@ -45,19 +45,17 @@ stdenv.mkDerivation rec {
xorg.libXtst
];
- patches = [
- # See: https://github.com/cassidyjames/ideogram/issues/26
- (fetchpatch {
- url = "https://github.com/cassidyjames/ideogram/commit/65994ee11bd21f8316b057cec01afbf50639a708.patch";
- sha256 = "12vrvvggpqq53dmhbm7gbbbigncn19m1fjln9wxaady21m0w776c";
- })
- ];
-
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS";
homepage = https://github.com/cassidyjames/ideogram;
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index e3fa897aec63..3996b94ba14d 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, perlPackages, libXft
+{ stdenv, fetchurl, fetchpatch, pkgconfig, perlPackages, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, gtkspell2, cairo, python2, poppler, imagemagick, libwpg, librevenge
@@ -19,6 +19,24 @@ stdenv.mkDerivation rec {
sha256 = "0pjinhjibfsz1aywdpgpj3k23xrsszpj4a1ya5562dkv2yl2vv2p";
};
+ patches = [
+ (fetchpatch {
+ name = "inkscape-poppler_0_76_compat.patch";
+ url = "https://gitlab.com/inkscape/inkscape/commit/e831b034746f8dc3c3c1b88372751f6dcb974831.diff";
+ sha256 = "096rdyi6ppjq1h9jwwsm9hb99nggfrfinik8rm23jkn4h2zl01zf";
+ })
+ (fetchpatch {
+ name = "inkscape-poppler_0_82_compat.patch";
+ url = "https://gitlab.com/inkscape/inkscape/commit/835b6bb62be565efab986d5a3f30a672ad56c7eb.patch";
+ sha256 = "02c6sxi2w52b885vr3pgani6kvxp9gdqqk2jgiykkdzv70hhrnm7";
+ })
+ (fetchpatch {
+ name = "inkscape-poppler_0_83_compat.patch";
+ url = "https://gitlab.com/inkscape/inkscape/commit/b5360a807b12d4e8318475ffd0464b84882788b5.patch";
+ sha256 = "1p44rr2q2i3zkd1y1j7xgdcbgx8yvlq6hq92im8s0bkjby6p5cpz";
+ })
+ ];
+
# Inkscape hits the ARGMAX when linking on macOS. It appears to be
# CMake’s ARGMAX check doesn’t offer enough padding for NIX_LDFLAGS.
# Setting strictDeps it avoids duplicating some dependencies so it
diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix
index 1487fb8adbac..d3bc8deb05e0 100644
--- a/pkgs/applications/graphics/k3d/default.nix
+++ b/pkgs/applications/graphics/k3d/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc
-, cmake, ninja, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
-, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
-, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }:
+, cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
+, libpng, boost, doxygen, cairomm, pkgconfig, libjpeg, libtiff
+, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }:
stdenv.mkDerivation rec {
version = "0.8.0.6";
@@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkgconfig perl asciidoc ];
buildInputs = [
- libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng
- boost cairomm imagemagick libjpeg libtiff
- ftgl glew gtkmm2 glibmm gtkglext pangox_compat libXmu
+ libGLU libGL zlib python expat libxml2 libsigcxx libuuid freetype libpng
+ boost cairomm libjpeg libtiff
+ ftgl glew gtkmm2 glibmm gtkglext libXmu
];
#doCheck = false;
diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix
index 961b0175da9f..47a0687e79da 100644
--- a/pkgs/applications/graphics/kodelife/default.nix
+++ b/pkgs/applications/graphics/kodelife/default.nix
@@ -3,17 +3,17 @@
, alsaLib
, glib
, gst_all_1
-, libGLU_combined
+, libGLU, libGL
, xorg
}:
stdenv.mkDerivation rec {
pname = "kodelife";
- version = "0.8.6.101";
+ version = "0.8.7.105";
src = fetchzip {
url = "https://hexler.net/pub/${pname}/${pname}-${version}-linux-x86_64.zip";
- sha256 = "1ldab1famdcby2djfys657g85d46s8k96m6mr71riw4v336ar238";
+ sha256 = "0ld4lwigzwlikx04qy3gskqqg0wzlk8m3ccrd704ifl8lsp46n5r";
};
dontConfigure = true;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
glib
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
- libGLU_combined
+ libGLU libGL
xorg.libX11
];
in ''
diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix
new file mode 100644
index 000000000000..0a3368ec2abe
--- /dev/null
+++ b/pkgs/applications/graphics/mandelbulber/default.nix
@@ -0,0 +1,64 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, libpng
+, gsl
+, libsndfile
+, lzo
+, qmake
+, qttools
+, qtbase
+, qtmultimedia
+, withOpenCL ? true
+, opencl-clhpp ? null
+, ocl-icd ? null
+}:
+
+assert withOpenCL -> opencl-clhpp != null;
+assert withOpenCL -> ocl-icd != null;
+
+mkDerivation rec {
+ pname = "mandelbulber";
+ version = "2.20";
+
+ src = fetchFromGitHub {
+ owner = "buddhi1980";
+ repo = "mandelbulber2";
+ rev = version;
+ sha256 = "043dks9fimhradyhdzqdc6lb9z0x9lkj3szj10751g424lppp207";
+ };
+
+ nativeBuildInputs = [
+ qmake
+ qttools
+ ];
+ buildInputs = [
+ qtbase
+ qtmultimedia
+ libpng
+ gsl
+ libsndfile
+ lzo
+ ] ++ lib.optionals withOpenCL [
+ opencl-clhpp
+ ocl-icd
+ ];
+
+ sourceRoot = "${src.name}/mandelbulber2";
+
+ qmakeFlags = [
+ "SHARED_PATH=${placeholder ''out''}"
+ (if withOpenCL
+ then "qmake/mandelbulber-opencl.pro"
+ else "qmake/mandelbulber.pro")
+ ];
+
+ meta = with lib; {
+ description = "A 3D fractal rendering engine";
+ longDescription = "Mandelbulber creatively generates three-dimensional fractals. Explore trigonometric, hyper-complex, Mandelbox, IFS, and many other 3D fractals.";
+ homepage = "https://mandelbulber.com";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ kovirobi ];
+ };
+}
diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
deleted file mode 100644
index 7130d21b8ef4..000000000000
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, python27Packages }:
-
-python27Packages.buildPythonApplication rec {
- name = "mcomix-${version}";
- version = "1.2.1";
-
- src = fetchurl {
- url = "mirror://sourceforge/mcomix/${name}.tar.bz2";
- sha256 = "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy";
- };
-
- propagatedBuildInputs = with python27Packages; [ pygtk pillow setuptools ];
-
- doCheck = false;
-
- meta = {
- description = "Image viewer designed to handle comic books";
- longDescription = ''
- MComix is an user-friendly, customizable image viewer. It is specifically
- designed to handle comic books, but also serves as a generic viewer.
- It reads images in ZIP, RAR, 7Zip or tar archives as well as plain image
- files. It is written in Python and uses GTK through the PyGTK bindings,
- and runs on both Linux and Windows.
-
- MComix is a fork of the Comix project, and aims to add bug fixes and
- stability improvements after Comix development came to a halt in late 2009.
- '';
- homepage = http://mcomix.sourceforge.net/;
- license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu AndersonTorres ];
- };
-}
-# TODO:
-# - error in check phase
diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix
deleted file mode 100644
index fbe8f10c72f7..000000000000
--- a/pkgs/applications/graphics/mirage/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pythonPackages, libX11, gettext }:
-
-pythonPackages.buildPythonApplication rec {
- pname = "mirage";
- version = "0.9.5.2";
-
- src = fetchurl {
- url = "mirror://sourceforge/mirageiv/${pname}-${version}.tar.bz2";
- sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c";
- };
-
- doCheck = false;
-
- nativeBuildInputs = [ gettext ];
-
- buildInputs = [ stdenv libX11 gettext ];
-
- patchPhase = ''
- sed -i "s@/usr/local/share/locale@$out/share/locale@" mirage.py
- '';
-
- propagatedBuildInputs = with pythonPackages; [ pygtk pillow ];
-
- meta = {
- description = "Simple image viewer written in PyGTK";
-
- homepage = http://mirageiv.sourceforge.net/;
-
- license = stdenv.lib.licenses.gpl2;
- };
-}
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index c08bbbea7668..1acaf4850ebe 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -1,8 +1,22 @@
-{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobject-introspection
-, gdk-pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, gtk3
+, intltool
+, json_c
+, lcms2
+, libpng
+, librsvg
+, gobject-introspection
+, gdk-pixbuf
+, pkgconfig
+, python2
+, scons
+, swig
+, wrapGAppsHook
+}:
let
- inherit (python2Packages) python pycairo pygobject3 numpy;
+ inherit (python2.pkgs) pycairo pygobject3 numpy;
in stdenv.mkDerivation {
pname = "mypaint";
version = "1.2.1";
@@ -16,18 +30,32 @@ in stdenv.mkDerivation {
};
nativeBuildInputs = [
- intltool pkgconfig scons swig wrapGAppsHook
+ intltool
+ pkgconfig
+ scons
+ swig
+ wrapGAppsHook
gobject-introspection # for setup hook
];
buildInputs = [
- gtk3 gdk-pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python
+ gtk3
+ gdk-pixbuf
+ json_c
+ lcms2
+ libpng
+ librsvg
+ pycairo
+ pygobject3
+ python2
];
- propagatedBuildInputs = [ numpy ];
+ propagatedBuildInputs = [
+ numpy
+ ];
postInstall = ''
- sed -i -e 's|/usr/bin/env python2.7|${python}/bin/python|' $out/bin/mypaint
+ sed -i -e 's|/usr/bin/env python2.7|${python2}/bin/python|' $out/bin/mypaint
'';
preFixup = ''
@@ -36,7 +64,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A graphics application for digital painters";
- homepage = http://mypaint.org/;
+ homepage = "http://mypaint.org/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ goibhniu jtojnar ];
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 62fae518b929..48a79e8844e8 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, mkDerivation
, fetchFromGitHub
+, fetchpatch
, cmake
, pkgconfig
@@ -9,7 +10,7 @@
, qtsvg
, exiv2
-, opencv
+, opencv4
, libraw
, libtiff
, quazip
@@ -28,6 +29,12 @@ mkDerivation rec {
patches = [
./nomacs-iostream.patch
+ (fetchpatch {
+ name = "darwin-less-restrictive-opencv.patch";
+ url = "https://github.com/nomacs/nomacs/commit/d182fce4bcd9a25bd15e3de065ca67849a32458c.patch";
+ sha256 = "0j6sviwrjn69nqf59hjn30c4j838h8az7rnlwcx8ymlb21vd9x2h";
+ stripLen = 1;
+ })
];
enableParallelBuilding = true;
@@ -43,7 +50,7 @@ mkDerivation rec {
qttools
qtsvg
exiv2
- opencv
+ opencv4
libraw
libtiff
quazip];
diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix
index 69cc323b40f4..9c4a8b229391 100644
--- a/pkgs/applications/graphics/openimageio/2.x.nix
+++ b/pkgs/applications/graphics/openimageio/2.x.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
+, fetchpatch
, boost
, cmake
, ilmbase
@@ -14,15 +15,22 @@
stdenv.mkDerivation rec {
pname = "openimageio";
- version = "2.0.11";
+ version = "2.1.9.0";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "Release-${version}";
- sha256 = "1kasp9as81wjvys9qrx10mgdf9bjbdgryhdgjqn05zdmv2rs95nc";
+ sha256 = "1bbxx3bcc5jlb90ffxbk29gb8227097rdr8vg97vj9axw2mjd5si";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/OpenImageIO/oiio/pull/2441/commits/e9bdd69596103edf41b659ad8ab0ca4ce002f6f5.patch";
+ sha256 = "0x1wmjf1jrm19d1izhs1cs3y1if9al1zx48lahkfswyjag3r5dn0";
+ })
+ ];
+
outputs = [ "bin" "out" "dev" "doc" ];
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 9f7fbc8421ba..2c95f6d403f2 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -7,7 +7,7 @@
, flex
, eigen
, boost
-, libGLU_combined
+, libGLU, libGL
, glew
, opencsg
, cgal
@@ -44,7 +44,7 @@ mkDerivation rec {
eigen boost glew opencsg cgal mpfr gmp glib
harfbuzz lib3mf libzip double-conversion freetype fontconfig
qtbase qtmultimedia qscintilla
- ] ++ stdenv.lib.optional stdenv.isLinux libGLU_combined
+ ] ++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL ]
++ stdenv.lib.optional stdenv.isDarwin qtmacextras
;
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 13a00991265f..1a47a3557493 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -1,12 +1,13 @@
{
stdenv, fetchFromGitHub, cmake, makeWrapper
-,qtbase, qttools, python, libGLU_combined
+,qtbase, qttools, python, libGLU, libGL
,libXt, qtx11extras, qtxmlpatterns
+, mkDerivation
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "paraview";
- version = "5.6.0";
+ version = "5.6.3";
# fetching from GitHub instead of taking an "official" source
# tarball because of missing submodules there
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
owner = "Kitware";
repo = "ParaView";
rev = "v${version}";
- sha256 = "1j13yfdgcv4yzfr449i4c8r4rs1c9zr6qd3igr4vv3ani8zixkzi";
+ sha256 = "0zcij59pg47c45gfddnpbin13w16smzhcbivzm1k4pg4366wxq1q";
fetchSubmodules = true;
};
@@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
python
python.pkgs.numpy
- libGLU_combined
+ libGLU libGL
libXt
qtbase
qtx11extras
diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix
index 3d6d04db5539..3df2ab4ab406 100644
--- a/pkgs/applications/graphics/pdfcpu/default.nix
+++ b/pkgs/applications/graphics/pdfcpu/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pdfcpu";
- version = "0.2.5";
+ version = "0.3";
src = fetchFromGitHub {
owner = "pdfcpu";
repo = pname;
rev = "v${version}";
- sha256 = "0fgdq8byb9pp9wiq3dm0vxw32kbspczqnk41agxpzjf303zmv75y";
+ sha256 = "03v4wc531dwmbjqgs3y3ncdn6g3xirv1w6h1mfgglb6sjll8jxp5";
};
modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs";
diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix
new file mode 100644
index 000000000000..e34d5a87a478
--- /dev/null
+++ b/pkgs/applications/graphics/pick-colour-picker/default.nix
@@ -0,0 +1,66 @@
+{ stdenv
+, fetchFromGitHub
+, buildPythonPackage
+, pygobject3
+, pycairo
+, glib
+, gtk3
+, gobject-introspection
+, wrapGAppsHook
+, python
+}:
+
+buildPythonPackage rec {
+ pname = "pick-colour-picker";
+ version = "unstable-2019-10-11"; # "1.5.0-3ec940"
+
+ src = fetchFromGitHub {
+ owner = "stuartlangridge";
+ repo = "ColourPicker";
+ rev = "3ec9406d787ce373f6db0d520ed38a921edb9473";
+ sha256 = "04l8ch9297nhkgcmyhsbg0il424c8vy0isns1c7aypn0zp0dc4zd";
+ };
+
+ nativeBuildInputs = [
+ gobject-introspection
+ wrapGAppsHook
+ ];
+
+ pythonPath = [
+ pygobject3
+ pycairo
+ ];
+
+ buildInputs = [
+ glib
+ gtk3
+ ];
+
+ # https://github.com/NixOS/nixpkgs/issues/56943
+ # this must be false, otherwise the gobject-introspection hook doesn't run
+ strictDeps = false;
+
+ preDistPhases = [ "fixupIconPath" ];
+
+ fixupIconPath = ''
+ pickLoc="$out/${python.sitePackages}/pick"
+ shareLoc=$(echo "$out/${python.sitePackages}/nix/store/"*)
+ mv "$shareLoc/share" "$out/share"
+
+ sed "s|os.environ.get('SNAP'), \"usr\"|'$out'|g" -i "$pickLoc/__main__.py"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://kryogenix.org/code/pick/";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ description = "A colour picker that remembers where you picked colours from";
+ maintainers = [ maintainers.mkg20001 ];
+
+ longDescription = ''
+ Pick lets you pick colours from anywhere on your screen. Choose the colour you want and Pick remembers it, names it, and shows you a screenshot so you can remember where you got it from.
+
+ Zoom all the way in to pixels to pick just the right one. Show your colours in your choice of format: rgba() or hex, CSS or Gdk or Qt, whichever you prefer. Copy to the clipboard ready for pasting into code or graphics apps.
+ '';
+ };
+}
diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index 4279af4cb78b..2e12e18a5a53 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -67,14 +67,16 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
tenacity
];
- makeWrapperArgs = [
- "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
- "--set PYTHONPATH \"$PYTHONPATH\""
- "--prefix PATH : ${stdenv.lib.makeBinPath [ exiftool vmtouch ]}"
- "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libmediainfo ]}"
- "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : \"$GST_PLUGIN_SYSTEM_PATH_1_0\""
- "\${qtWrapperArgs[@]}"
- ];
+ preFixup = ''
+ makeWrapperArgs+=(
+ --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH"
+ --set PYTHONPATH "$PYTHONPATH"
+ --prefix PATH : "${stdenv.lib.makeBinPath [ exiftool vmtouch ]}"
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libmediainfo ]}"
+ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
+ "''${qtWrapperArgs[@]}"
+ )
+ '';
meta = with stdenv.lib; {
description = "Photo and video importer for cameras, phones, and memory cards";
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 12dc066dec38..bda164465245 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
version = "5.7";
- name = "rawtherapee-" + version;
+ pname = "rawtherapee";
src = fetchFromGitHub {
owner = "Beep6581";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
buildInputs = [
- pixman libpthreadstubs gtkmm3 libXau libXdmcp librsvg
- lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun
+ pixman libpthreadstubs gtkmm3 libXau libXdmcp
+ lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun librsvg
];
cmakeFlags = [
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index 594429503a35..426985d312c7 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -1,32 +1,34 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, mkDerivation
, qtbase, qtx11extras, qtsvg, makeWrapper
-, vulkan-loader, xorg
-, python3, bison, pcre, automake, autoconf
+, vulkan-loader, xorg, python3, python3Packages
+, bison, pcre, automake, autoconf, addOpenGLRunpath
}:
let
custom_swig = fetchFromGitHub {
owner = "baldurk";
repo = "swig";
- rev = "renderdoc-modified-6";
- sha256 = "00ykqlzx1k9iwqjlc54kfch7cnzsj53hxn7ql70dj3rxqzrnadc0";
+ rev = "renderdoc-modified-7";
+ sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6";
};
+ pythonPackages = python3Packages;
in
-stdenv.mkDerivation rec {
- version = "1.4";
+mkDerivation rec {
+ version = "1.5";
pname = "renderdoc";
src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "v${version}";
- sha256 = "1iann73r4yzkwnm13h4zqipqrp5i5cnkv27yyap0axz6h3npw94r";
+ sha256 = "0a05f6qfq90wrf4fixchp9knx4nhqhwjxl02n03a7k56xzxxnlci";
};
buildInputs = [
qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3
- ];
+ ]; # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]);
+ # TODO: figure out how to make cmake recognise pyside2
- nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf ];
+ nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf addOpenGLRunpath ];
postUnpack = ''
cp -r ${custom_swig} swig
@@ -40,19 +42,23 @@ stdenv.mkDerivation rec {
"-DBUILD_VERSION_DIST_VER=${version}"
"-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc"
"-DBUILD_VERSION_STABLE=ON"
- # TODO: add once pyside2 is in nixpkgs
- #"-DPYSIDE2_PACKAGE_DIR=${python36Packages.pyside2}"
];
- # Future work: define these in the above array via placeholders
+ # TODO: define these in the above array via placeholders, once those are widely supported
preConfigure = ''
cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/"
cmakeFlags+=" -DRENDERDOC_SWIG_PACKAGE=$PWD/../swig"
'';
+ dontWrapQtApps = true;
preFixup = ''
- wrapProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
- wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
+ wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib"
+ wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib"
+ '';
+
+ # The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh
+ postFixup = ''
+ addOpenGLRunpath $out/lib/librenderdoc.so
'';
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix
index c527ce2b229a..839a87214e64 100644
--- a/pkgs/applications/graphics/runwayml/default.nix
+++ b/pkgs/applications/graphics/runwayml/default.nix
@@ -6,12 +6,12 @@
let
pname = "runwayml";
- version = "0.9.0";
+ version = "0.10.11";
name = "${pname}-${version}";
src = fetchurl {
url = "https://runway-releases.s3.amazonaws.com/Runway%20${version}.AppImage";
- sha256 = "0rg7ipp7kx0l4qgcymfg5d3saz0c6d2j0c6rf28rwqgbm92gbjjq";
+ sha256 = "0f3icgpwj1sk9bkycqw65c8bhrzzpw5yzacw52siv4j1gl4casnl";
name="${pname}-${version}.AppImage";
};
diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix
new file mode 100644
index 000000000000..4e8519d17b67
--- /dev/null
+++ b/pkgs/applications/graphics/rx/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, rustPlatform, fetchFromGitHub, makeWrapper
+, cmake, pkgconfig
+, xorg ? null
+, vulkan-loader ? null }:
+
+assert stdenv.isLinux -> xorg != null;
+assert stdenv.isLinux -> vulkan-loader != null;
+
+let
+ graphicsBackend = if stdenv.isDarwin then "metal" else "vulkan";
+in
+ with stdenv.lib;
+ rustPlatform.buildRustPackage rec {
+ pname = "rx";
+ version = "0.2.0";
+
+ src = fetchFromGitHub {
+ owner = "cloudhead";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0f6cw8zqr45bprj8ibhp89bb2a077g4zinfrdn943csdmh47qzcl";
+ };
+
+ cargoSha256 = "05bqsw0nw24xysq86qa3hx9b5ncf50wfxsgpy388yrs2dfnphwlx";
+
+ nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
+
+ buildInputs = optionals stdenv.isLinux
+ (with xorg; [
+ # glfw-sys dependencies:
+ libX11 libXrandr libXinerama libXcursor libXi libXext
+ ]);
+
+ cargoBuildFlags = [ "--features=${graphicsBackend}" ];
+
+ # TODO: better to factor that into the rust platform
+ checkPhase = ''
+ runHook preCheck
+ echo "Running cargo test"
+ cargo test --features=${graphicsBackend}
+ runHook postCheck
+ '';
+
+ postInstall = optional stdenv.isLinux ''
+ mkdir -p $out/share/applications
+ cp $src/rx.desktop $out/share/applications
+ wrapProgram $out/bin/rx --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
+ '';
+
+ meta = {
+ description = "Modern and extensible pixel editor implemented in Rust";
+ homepage = "https://cloudhead.io/rx/";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ minijackson ];
+ platforms = with platforms; (linux ++ darwin ++ windows);
+ inherit version;
+ };
+ }
diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index 20d5629b83a9..4245acf716d5 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -5,7 +5,7 @@ callPackage ./generic.nix (args // rec {
src = fetchurl {
sha256 = "1j9nbqspaj0rlgalafb5z6r606k0i22kz0rcpd744p176yzlfdr9";
urls = [
- "https://alioth.debian.org/frs/download.php/latestfile/176/sane-backends-${version}.tar.gz"
+ "https://alioth-archive.debian.org/releases/sane/sane-backends/${version}/sane-backends-${version}.tar.gz"
];
};
})
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 92cec3ca82c2..0e8a5f34f6c1 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,5 +1,5 @@
{ stdenv
-, avahi, libjpeg, libusb1, libv4l, net_snmp, libpng
+, avahi, libjpeg, libusb1, libv4l, net-snmp, libpng
, gettext, pkgconfig
# List of { src name backend } attibute sets - see installFirmware below:
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0"
;
- buildInputs = [ avahi libusb1 libv4l net_snmp libpng ];
+ buildInputs = [ avahi libusb1 libv4l net-snmp libpng ];
nativeBuildInputs = [ gettext pkgconfig ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index e746f83e5d49..2edd739068d9 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -5,6 +5,6 @@ callPackage ./generic.nix (args // {
src = fetchgit {
sha256 = "0qf7d7268kdxnb723c03m6icxhbgx0vw8gqvck2q1w5b948dy9g8";
rev = "e895ee55bec8a3320a0e972b32c05d35b47fe226";
- url = "git://alioth.debian.org/git/sane/sane-backends.git";
+ url = "https://gitlab.com/sane-project/backends.git";
};
})
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index 66473c4a155f..b00f8f6c58d7 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.0.14";
src = fetchurl {
- url = "https://alioth.debian.org/frs/download.php/latestfile/175/${pname}-${version}.tar.gz";
+ url = "https://alioth-archive.debian.org/releases/sane/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7";
};
diff --git a/pkgs/applications/graphics/seg3d/cstdio.patch b/pkgs/applications/graphics/seg3d/cstdio.patch
deleted file mode 100644
index 0d9eed07a367..000000000000
--- a/pkgs/applications/graphics/seg3d/cstdio.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/Core/Geometry/Transform.cc b/Core/Geometry/Transform.cc
-index 4f16fdc..0da4679 100644
---- a/Core/Geometry/Transform.cc
-+++ b/Core/Geometry/Transform.cc
-@@ -28,6 +28,7 @@
-
- #include
- #include
-+#include
-
- #include
- #include
-diff --git a/Core/Util/FullFileName.cc b/Core/Util/FullFileName.cc
-index 7a2cad7..7710e92 100644
---- a/Core/Util/FullFileName.cc
-+++ b/Core/Util/FullFileName.cc
-@@ -29,6 +29,7 @@
-
- #include
- #include
-+#include
-
- namespace SCIRun {
-
-diff --git a/Externals/particle-system-mm/src/sizingfield/LFS.cxx b/Externals/particle-system-mm/src/sizingfield/LFS.cxx
-index d1fa5aa..a5a4358 100644
---- a/Externals/particle-system-mm/src/sizingfield/LFS.cxx
-+++ b/Externals/particle-system-mm/src/sizingfield/LFS.cxx
-@@ -1,5 +1,6 @@
- #include
- #include
-+#include
- #include
-
- using namespace std;
-diff --git a/Externals/slivr/Point.cc b/Externals/slivr/Point.cc
-index d3be03e..ed4e503 100644
---- a/Externals/slivr/Point.cc
-+++ b/Externals/slivr/Point.cc
-@@ -42,6 +42,7 @@
- #include
- #include
- #include
-+#include
-
- namespace SLIVR {
-
-diff --git a/Externals/slivr/Transform.cc b/Externals/slivr/Transform.cc
-index c0a4430..520179f 100644
---- a/Externals/slivr/Transform.cc
-+++ b/Externals/slivr/Transform.cc
-@@ -47,6 +47,7 @@
- #include
- #include
- #include
-+#include
-
- using namespace SLIVR;
- using namespace std;
-diff --git a/Externals/slivr/Vector.cc b/Externals/slivr/Vector.cc
-index 8370d65..8b04bb9 100644
---- a/Externals/slivr/Vector.cc
-+++ b/Externals/slivr/Vector.cc
-@@ -43,6 +43,7 @@
- #include
- #include
- #include
-+#include
-
- using std::istream;
- using std::ostream;
-diff --git a/Externals/vispack/src/image/imagefile.txx b/Externals/vispack/src/image/imagefile.txx
-index ced2590..13a32b2 100644
---- a/Externals/vispack/src/image/imagefile.txx
-+++ b/Externals/vispack/src/image/imagefile.txx
-@@ -1,3 +1,5 @@
-+#include
-+
- template
- int write_raw(const char* name, const VISImage& im)
- {
diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix
deleted file mode 100644
index 58cec2ec1703..000000000000
--- a/pkgs/applications/graphics/seg3d/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ fetchurl, stdenv, cmake, wxGTK, itk, libGLU_combined, libXft, libXext, libXi, zlib, libXmu,
-libuuid }:
-
-assert (stdenv ? glibc);
-
-stdenv.mkDerivation {
- name = "seg3d-1.12_20090930";
- src = fetchurl {
- url = https://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz;
- sha256 = "1wr6rc6v5qjjkmws8yrc03z35h3iydxk1z28p06v1wdnca0y71z8";
- };
-
- patches = [ ./cstdio.patch ];
-
- cmakeFlags = [
- "-DM_LIBRARY=${stdenv.glibc.out}/lib/libm.so"
- "-DDL_LIBRARY=${stdenv.glibc.out}/lib/libdl.so"
- "-DBUILD_UTILS=1"
- "-DBUILD_SEG3D=1"
- "-DBUILD_DATAFLOW=0"
- "-DBUILD_SHARED_LIBS=0"
- "-DWITH_X11=1"
- "-DBUILD_BIOMESH3D=1"
- "-DWITH_TETGEN=1"
- "-DBUILD_TYPE=Release"
- "-DWITH_WXWIDGETS=ON"
- "-DITK_DIR=${itk}/lib/InsightToolkit"
- "-DGDCM_LIBRARY=${itk}/lib/libitkgdcm.a"
- ];
-
-
- makeFlags = "VERBOSE=1";
-
- preBuild = ''
- export LD_LIBRARY_PATH=`pwd`/lib
- export NIX_LDFLAGS="$NIX_LDFLAGS -lGLU -lSM -lICE -lX11 -lXext -luuid";
- '';
-
- preUnpack = ''
- set -x
- sourceRoot=`pwd`/src
- '';
-
- postInstall = ''
- cp Seg3D $out/bin
- exit 1
- '';
-
- buildInputs = [ cmake wxGTK itk libGLU_combined libXft libXext libXi zlib libXmu libuuid ];
-
- meta = {
- broken = true;
- };
-}
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index acbbf73465df..99c151f8c80b 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/muennich/sxiv;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
- maintainers = with maintainers; [ jfrankenau fuuzetsu ];
+ maintainers = with maintainers; [ jfrankenau ];
};
}
diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix
index 232eeeb01153..0f1020b0b078 100644
--- a/pkgs/applications/graphics/write_stylus/default.nix
+++ b/pkgs/applications/graphics/write_stylus/default.nix
@@ -1,4 +1,12 @@
{ stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }:
+let
+ # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon
+ # license: Free for commercial use
+ desktopIcon = fetchurl {
+ url = "https://www.iconfinder.com/icons/50835/download/png/256";
+ sha256 = "0abdya42yf9alxbsmc2nf8jwld50zfria6z3d4ncvp1zw2a9jhb8";
+ };
+in
stdenv.mkDerivation rec {
pname = "write_stylus";
version = "209";
@@ -7,7 +15,7 @@ stdenv.mkDerivation rec {
name = "Write";
exec = "Write";
comment = "A word processor for handwriting";
- icon = "write_stylus";
+ icon = desktopIcon;
desktopName = "Write";
genericName = "Write";
categories = "Office;Graphics";
@@ -18,13 +26,6 @@ stdenv.mkDerivation rec {
sha256 = "1p6glp4vdpwl8hmhypayc4cvs3j9jfmjfhhrgqm2xkgl5bfbv2qd";
};
- # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon
- # license: Free for commercial use
- icon = fetchurl {
- url = "https://oyra.eu/write/icon.tar.gz";
- sha256 = "1zd98g63apwi17qc1hm1g14maain5d18g4afadxm30qjz2s0mvs8";
- };
-
sourceRoot = ".";
dontBuild = true;
@@ -35,9 +36,6 @@ stdenv.mkDerivation rec {
# symlink the binary to bin/
ln -s $out/Write/Write $out/bin/Write
- # untar icons
- tar -xzf ${icon} *.tar.gz -C $out/
-
mkdir -p $out/share/applications
ln -s ${desktopItem}/share/applications/* $out/share/applications/
'';
diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
index 3597b97fae63..76f8e03fa13f 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -23,13 +23,13 @@
stdenv.mkDerivation rec {
pname = "xournalpp";
- version = "1.0.15";
+ version = "1.0.16";
src = fetchFromGitHub {
owner = "xournalpp";
repo = pname;
rev = version;
- sha256 = "1q716hn2ajkxfba0dxp7vcnqfa31hx36ax09yz4d13sdw43rfjf4";
+ sha256 = "1bdmxxkcqpjvkckizmrz2839b4yspw4xv69bqkrrgkcyvxsr804w";
};
nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix
index ce6b6f75f93c..121e93d3f5c0 100644
--- a/pkgs/applications/kde/akonadi-calendar.nix
+++ b/pkgs/applications/kde/akonadi-calendar.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- akonadi, akonadi-contacts, kcalcore, kcalutils, kcontacts,
+ akonadi, akonadi-contacts, kcalendarcore, kcalutils, kcontacts,
kidentitymanagement, kio, kmailtransport,
}:
@@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
- akonadi akonadi-contacts kcalcore kcalutils kcontacts kidentitymanagement
+ akonadi akonadi-contacts kcalendarcore kcalutils kcontacts kidentitymanagement
kio kmailtransport
];
outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix
index 617c086ad9c9..23ee6b1b9cc4 100644
--- a/pkgs/applications/kde/akonadi-search.nix
+++ b/pkgs/applications/kde/akonadi-search.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- akonadi, akonadi-mime, kcalcore, kcmutils, kcontacts, kcoreaddons, kmime,
+ akonadi, akonadi-mime, kcalendarcore, kcmutils, kcontacts, kcoreaddons, kmime,
krunner, qtbase, xapian
}:
@@ -14,7 +14,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcmutils krunner xapian ];
propagatedBuildInputs = [
- akonadi akonadi-mime kcalcore kcontacts kcoreaddons kmime qtbase
+ akonadi akonadi-mime kcalendarcore kcontacts kcoreaddons kmime qtbase
];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix
index 1470406d5a43..a02400847bb4 100644
--- a/pkgs/applications/kde/akonadiconsole.nix
+++ b/pkgs/applications/kde/akonadiconsole.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,
+ akonadi, akonadi-contacts, calendarsupport, kcalendarcore, kcompletion,
kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim,
ktextwidgets, kxmlgui, messagelib, qtbase, akonadi-search, xapian
}:
@@ -14,7 +14,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets
+ akonadi akonadi-contacts calendarsupport kcalendarcore kcompletion kconfigwidgets
kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
messagelib qtbase libkdepim akonadi-search xapian
];
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index 6015cb69d778..76cc423f5460 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -22,6 +22,7 @@ in
mkDerivation {
name = "ark";
meta = {
+ description = "Graphical file compression/decompression utility";
license = with lib.licenses;
[ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 70a716a760c6..40e69f8c9bcb 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -138,6 +138,7 @@ let
konquest = callPackage ./konquest.nix {};
konqueror = callPackage ./konqueror.nix {};
korganizer = callPackage ./korganizer.nix {};
+ kpat = callPackage ./kpat.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
ksmtp = callPackage ./ksmtp {};
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 083debb1c99d..a335b0ef8e8a 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/19.08.2/ )
+WGET_ARGS=( https://download.kde.org/stable/applications/19.08.3/ )
diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix
index 9978e7ff6674..a1dec1179cc6 100644
--- a/pkgs/applications/kde/kalarm.nix
+++ b/pkgs/applications/kde/kalarm.nix
@@ -6,7 +6,7 @@
kguiaddons, ki18n, kiconthemes, kjobwidgets, kcmutils, kdelibs4support, kio,
knotifications, kservice, kwidgetsaddons, kwindowsystem, kxmlgui, phonon,
- kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalcore, kcalutils,
+ kimap, akonadi, akonadi-contacts, akonadi-mime, kalarmcal, kcalendarcore, kcalutils,
kholidays, kidentitymanagement, libkdepim, mailcommon, kmailtransport, kmime,
pimcommon, kpimtextedit, kdepim-apps-libs, messagelib,
@@ -27,7 +27,7 @@ mkDerivation {
kguiaddons ki18n kiconthemes kjobwidgets kcmutils kdelibs4support kio
knotifications kservice kwidgetsaddons kwindowsystem kxmlgui phonon
- kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalcore kcalutils
+ kimap akonadi akonadi-contacts akonadi-mime kalarmcal kcalendarcore kcalutils
kholidays kidentitymanagement libkdepim mailcommon kmailtransport kmime
pimcommon kpimtextedit kdepim-apps-libs messagelib
diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix
index 46832477cc60..356c1e4812d6 100644
--- a/pkgs/applications/kde/kalarmcal.nix
+++ b/pkgs/applications/kde/kalarmcal.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement,
+ akonadi, kcalendarcore, kdelibs4support, kholidays, kidentitymanagement,
kpimtextedit, kcalutils
}:
@@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
- akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils
+ akonadi kcalendarcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils
];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index 91faaef623a4..16fc6c517774 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,7 +1,8 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
- karchive, ki18n, kio, perl, python, php, qttools,
+ karchive, ki18n, kio, perl, python, php, qttools
+ , kdbusaddons
}:
mkDerivation {
@@ -11,5 +12,5 @@ mkDerivation {
maintainers = with lib.maintainers; [ orivej ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ karchive ki18n kio perl python php qttools ];
+ buildInputs = [ karchive ki18n kio perl python php qttools kdbusaddons ];
}
diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix
index 1628af7e2202..2e389ec4ac7d 100644
--- a/pkgs/applications/kde/kcalutils.nix
+++ b/pkgs/applications/kde/kcalutils.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- grantlee, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
+ grantlee, kcalendarcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
kidentitymanagement, kpimtextedit,
}:
@@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- grantlee kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
+ grantlee kcalendarcore kconfig kontactinterface kcoreaddons kdelibs4support
kidentitymanagement kpimtextedit
];
outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix
index 0fe33ea017da..e47aae89e603 100644
--- a/pkgs/applications/kde/kdepim-addons.nix
+++ b/pkgs/applications/kde/kdepim-addons.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, shared-mime-info,
akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
- incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
+ incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass,
kitinerary, kontactinterface
@@ -17,7 +17,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
buildInputs = [
akonadi-import-wizard akonadi-notes calendarsupport eventviews
- incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative
+ incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative
kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
libksieve mailcommon mailimporter messagelib poppler prison kpkpass
kitinerary kontactinterface
diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix
index 8112460549b4..ce66de251dca 100644
--- a/pkgs/applications/kde/kitinerary.nix
+++ b/pkgs/applications/kde/kitinerary.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, extra-cmake-modules
, qtbase, qtdeclarative, ki18n, kmime, kpkpass
-, poppler, kcontacts, kcalcore
+, poppler, kcontacts, kcalendarcore
}:
mkDerivation {
@@ -13,7 +13,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
qtbase qtdeclarative ki18n kmime kpkpass poppler
- kcontacts kcalcore
+ kcontacts kcalendarcore
];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix
index 703f62aa72c0..d5832db570cc 100644
--- a/pkgs/applications/kde/kmailtransport.nix
+++ b/pkgs/applications/kde/kmailtransport.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, cyrus_sasl, kcmutils,
ki18n, kio, kmime, kwallet, ksmtp, libkgapi,
- kcalcore, kcontacts
+ kcalendarcore, kcontacts
}:
mkDerivation {
@@ -13,7 +13,7 @@ mkDerivation {
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalcore kcontacts ];
+ buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalendarcore kcontacts ];
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/knotes.nix b/pkgs/applications/kde/knotes.nix
index ced046c2f4e2..2dc2f48c1497 100644
--- a/pkgs/applications/kde/knotes.nix
+++ b/pkgs/applications/kde/knotes.nix
@@ -9,7 +9,7 @@
grantlee, grantleetheme, qtx11extras,
akonadi, akonadi-notes, akonadi-search, kcalutils,
kontactinterface, libkdepim, kmime, pimcommon, kpimtextedit,
- kcalcore
+ kcalendarcore
}:
mkDerivation {
@@ -24,6 +24,6 @@ mkDerivation {
akonadi akonadi-notes kcalutils kontactinterface
libkdepim kmime pimcommon kpimtextedit
akonadi-search
- kcalcore
+ kcalendarcore
];
}
diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix
index bb44762e65c5..978baa925e5a 100644
--- a/pkgs/applications/kde/kontact.nix
+++ b/pkgs/applications/kde/kontact.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
qtwebengine,
- kcmutils, kcrash, kdbusaddons, kwindowsystem,
+ kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem,
akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
mailcommon, libkdepim
}:
@@ -16,7 +16,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
qtwebengine
- kcmutils kcrash kdbusaddons kwindowsystem
+ kcmutils kcrash kdbusaddons kparts kwindowsystem
akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
mailcommon libkdepim
];
diff --git a/pkgs/applications/kde/kpat.nix b/pkgs/applications/kde/kpat.nix
new file mode 100644
index 000000000000..9ee573532378
--- /dev/null
+++ b/pkgs/applications/kde/kpat.nix
@@ -0,0 +1,25 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, knewstuff
+, shared-mime-info
+, libkdegames
+, freecell-solver
+}:
+
+mkDerivation {
+ name = "kpat";
+ nativeBuildInputs = [
+ extra-cmake-modules
+ shared-mime-info
+ ];
+ buildInputs = [
+ knewstuff
+ libkdegames
+ freecell-solver
+ ];
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = with lib.maintainers; [ rnhmjoj ];
+ };
+}
diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix
index b5a3834869db..61f8672e47d9 100644
--- a/pkgs/applications/kde/ktnef.nix
+++ b/pkgs/applications/kde/ktnef.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- kcalcore, kcalutils, kcontacts, kdelibs4support
+ kcalendarcore, kcalutils, kcontacts, kdelibs4support
}:
mkDerivation {
@@ -12,7 +12,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
- kcalcore kcalutils kcontacts kdelibs4support
+ kcalendarcore kcalutils kcontacts kdelibs4support
];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix
index 998e65f28347..9d2d41c41d7f 100644
--- a/pkgs/applications/kde/libkgapi.nix
+++ b/pkgs/applications/kde/libkgapi.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- qtwebengine, kio, kcalcore, kcontacts,
+ qtwebengine, kio, kcalendarcore, kcontacts,
cyrus_sasl
}:
@@ -12,5 +12,5 @@ mkDerivation {
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ qtwebengine kio kcalcore kcontacts cyrus_sasl ];
+ buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ];
}
diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix
index 9f2117b41fb4..82cdf19df948 100644
--- a/pkgs/applications/kde/pim-data-exporter.nix
+++ b/pkgs/applications/kde/pim-data-exporter.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
- akonadi, akonadi-notes, kcalcore, kcmutils, kcrash, kdbusaddons,
+ akonadi, akonadi-notes, kcalendarcore, kcmutils, kcrash, kdbusaddons,
kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications,
knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo,
pimcommon, qttools, karchive, mailcommon, messagelib
@@ -15,7 +15,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
- akonadi akonadi-notes kcalcore kcmutils kcrash kdbusaddons
+ akonadi akonadi-notes kcalendarcore kcmutils kcrash kdbusaddons
kidentitymanagement kldap kmailtransport knewstuff knotifications
knotifyconfig kparts kross ktexteditor kwallet libkdepim libkleo pimcommon
qttools karchive mailcommon messagelib
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index 8ace4562cbd7..f869f984e001 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -20,4 +20,10 @@ mkDerivation {
kwidgetsaddons kitemviews kio kwindowsystem plasma-framework qtdeclarative
];
outputs = [ "out" "dev" ];
+ # Fix build with cups deprecations etc.
+ # See: https://github.com/NixOS/nixpkgs/issues/73334
+ NIX_CFLAGS_COMPILE = [
+ "-Wno-error=deprecated-declarations"
+ "-Wno-error=format-security"
+ ];
}
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 400dfcd7cec1..8d199a291c44 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1739 +3,1739 @@
{
akonadi = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/akonadi-19.08.2.tar.xz";
- sha256 = "f67f0fac07d480739b2d6715862ee47a93fd38f057ac7ef888ed8ddfdc99934f";
- name = "akonadi-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/akonadi-19.08.3.tar.xz";
+ sha256 = "cfdfa4767b1bd420c7979cf5125cc56d3926181f8484dc39ecd84a9e0808ee6c";
+ name = "akonadi-19.08.3.tar.xz";
};
};
akonadi-calendar = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/akonadi-calendar-19.08.2.tar.xz";
- sha256 = "5beba24af485c8dae96944e4b5bd570460eb2868ba069580c2e5d784be38a3c8";
- name = "akonadi-calendar-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/akonadi-calendar-19.08.3.tar.xz";
+ sha256 = "1ec66241551b0bd3e2cabd2df1547e3622b3c74e0ddaec535b5666141180a094";
+ name = "akonadi-calendar-19.08.3.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/akonadi-calendar-tools-19.08.2.tar.xz";
- sha256 = "a352c2bf8659ad7939f31009b8e35e8b1e629162f681a70999e5e88f9aaf6cbb";
- name = "akonadi-calendar-tools-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/akonadi-calendar-tools-19.08.3.tar.xz";
+ sha256 = "539bef47c9586f1edb87cedf63cce140dab4f19b6a94fbe08b0cd4c083cf6ffc";
+ name = "akonadi-calendar-tools-19.08.3.tar.xz";
};
};
akonadiconsole = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/akonadiconsole-19.08.2.tar.xz";
- sha256 = "273b8f3d56ea65bd71a51103867b0e718d883478432bb971a262df1ea4c6df6c";
- name = "akonadiconsole-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/akonadiconsole-19.08.3.tar.xz";
+ sha256 = "37253a4b56afc34e52a05b58f63d1cdce221a11432c713f159b5c033a6018947";
+ name = "akonadiconsole-19.08.3.tar.xz";
};
};
akonadi-contacts = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/akonadi-contacts-19.08.2.tar.xz";
- sha256 = "eafeb550faea91a56109821864eedfbd619dc7850887746d31c1724ea7561920";
- name = "akonadi-contacts-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/akonadi-contacts-19.08.3.tar.xz";
+ sha256 = "a95ff2621e198e2685b7cd591e39437e68b5670cd710ce06088bd16618d281df";
+ name = "akonadi-contacts-19.08.3.tar.xz";
};
};
akonadi-import-wizard = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/akonadi-import-wizard-19.08.2.tar.xz";
- sha256 = "038713e7d30686eb1b8e49c595ec853ffa52d335e435a5b0bdf2f2a2448cae45";
- name = "akonadi-import-wizard-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/akonadi-import-wizard-19.08.3.tar.xz";
+ sha256 = "1a11207826ecc59af73ca2dae1b6299a6cd9c71c093e634043295747ba8f6553";
+ name = "akonadi-import-wizard-19.08.3.tar.xz";
};
};
akonadi-mime = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/akonadi-mime-19.08.2.tar.xz";
- sha256 = "16f8034d7990828c50a85474fe16641dfa46e22d00f49d8045d3483c61815264";
- name = "akonadi-mime-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/akonadi-mime-19.08.3.tar.xz";
+ sha256 = "e779a2b73b628702aec52b1d4345533f54f06624915b193766af3ef6a16d030f";
+ name = "akonadi-mime-19.08.3.tar.xz";
};
};
akonadi-notes = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/akonadi-notes-19.08.2.tar.xz";
- sha256 = "64684c50d06664d8ccda098f8bfa536e861e4938c8f27688ef97653f7788fdde";
- name = "akonadi-notes-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/akonadi-notes-19.08.3.tar.xz";
+ sha256 = "7c701d8a032161f9a58a55dd7e71a9a261fed8044ddc59d6d5f04bb742801b65";
+ name = "akonadi-notes-19.08.3.tar.xz";
};
};
akonadi-search = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/akonadi-search-19.08.2.tar.xz";
- sha256 = "75c9713b84a03c60a68ff36652decbf57f4f56a0fb39579f53e7ed80a5ee8525";
- name = "akonadi-search-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/akonadi-search-19.08.3.tar.xz";
+ sha256 = "3a04a82b7f13aad0a5c283931b347a951b8b4bf299bfc6f8cdbc5ba299d01f9b";
+ name = "akonadi-search-19.08.3.tar.xz";
};
};
akregator = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/akregator-19.08.2.tar.xz";
- sha256 = "cefc0785f40508a80fbf4534eef4d1164e349cfd50455483cef044945d1888c4";
- name = "akregator-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/akregator-19.08.3.tar.xz";
+ sha256 = "c3aab6ebba25eab8c76b113a900af33a90222257f957650d0bbc0c47d5cf4bc9";
+ name = "akregator-19.08.3.tar.xz";
};
};
analitza = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/analitza-19.08.2.tar.xz";
- sha256 = "cbd51fd14d5ba74a7a3590ddca18ed688cbf724cd40f21c87b905f12fadf9399";
- name = "analitza-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/analitza-19.08.3.tar.xz";
+ sha256 = "9247172f3ffbc0fd3308b4b40f5d76eaa2a5012dc49525c3087caf5cdfc1513e";
+ name = "analitza-19.08.3.tar.xz";
};
};
ark = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ark-19.08.2.tar.xz";
- sha256 = "63fcec0a32d806cfc82fb1c136b5e037bfe75459b148ac08c00be7e45ac70c50";
- name = "ark-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ark-19.08.3.tar.xz";
+ sha256 = "bc1fcd84632c628a10e8536d56b65a7acbd4235ed0e034fec864b78bdc36f8f1";
+ name = "ark-19.08.3.tar.xz";
};
};
artikulate = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/artikulate-19.08.2.tar.xz";
- sha256 = "b2b0778f18f04096b84caf72c28dd4bdfdbbc8f0a22ef118b8d18dba19a3f85b";
- name = "artikulate-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/artikulate-19.08.3.tar.xz";
+ sha256 = "99831d51bf8cb4032ba9af7c4ae0712f7b3668b7c51bce8f942808c1e5e42f85";
+ name = "artikulate-19.08.3.tar.xz";
};
};
audiocd-kio = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/audiocd-kio-19.08.2.tar.xz";
- sha256 = "383c0e9055b0093661b589395288bb8d173372572490a4ba4960d214b2746b3a";
- name = "audiocd-kio-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/audiocd-kio-19.08.3.tar.xz";
+ sha256 = "98d836def762b839b9636acc540158d5b4789a84d1bdb535ae139b10e9e144a4";
+ name = "audiocd-kio-19.08.3.tar.xz";
};
};
baloo-widgets = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/baloo-widgets-19.08.2.tar.xz";
- sha256 = "529f3b587098eb9b7d1aaa8b311f98c58d16ed88384fa0900f9fb9f8e242c070";
- name = "baloo-widgets-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/baloo-widgets-19.08.3.tar.xz";
+ sha256 = "edb9284b1a7d73b0c824390aa875593650880eb77c2680a2942c9fd65f436a2d";
+ name = "baloo-widgets-19.08.3.tar.xz";
};
};
blinken = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/blinken-19.08.2.tar.xz";
- sha256 = "7f9d909bb845c365dbf49388b79687e7491c271dd7d2f9481a20397153a670f6";
- name = "blinken-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/blinken-19.08.3.tar.xz";
+ sha256 = "620fe5ffb656f829a7ca72a2df40c19ff0562e3700f51bd66b7d8a6a486ed3c9";
+ name = "blinken-19.08.3.tar.xz";
};
};
bomber = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/bomber-19.08.2.tar.xz";
- sha256 = "26285fe9e510cd334bb933281c615c2971084bfa787618ba0190175c36ada741";
- name = "bomber-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/bomber-19.08.3.tar.xz";
+ sha256 = "3a0ef6ca5a05253b1554218a1dc699c5547a073da5cecdf75445e0f72b687fd3";
+ name = "bomber-19.08.3.tar.xz";
};
};
bovo = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/bovo-19.08.2.tar.xz";
- sha256 = "63f7a3860de2344be69366f636e841cd3db19743a8a29c42e14402256ed3122b";
- name = "bovo-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/bovo-19.08.3.tar.xz";
+ sha256 = "2f950820ebdb52f1c81476b36b5ea07808fe8da154e7757a85ca8ac2c1b37735";
+ name = "bovo-19.08.3.tar.xz";
};
};
calendarsupport = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/calendarsupport-19.08.2.tar.xz";
- sha256 = "9ae448463ca60e075f1ea9a22489f0acf6ea672c00f9bd7b49027e548e82c2af";
- name = "calendarsupport-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/calendarsupport-19.08.3.tar.xz";
+ sha256 = "2406dd3387383cc58eb0e6f10bf50cc1b206c75096c6c6af27c1102c6d818ec3";
+ name = "calendarsupport-19.08.3.tar.xz";
};
};
cantor = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/cantor-19.08.2.tar.xz";
- sha256 = "039bb1e61b996ab3776502db9367ed1f7fb7e674292647f1b28f5bd9b1c1b9cb";
- name = "cantor-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/cantor-19.08.3.tar.xz";
+ sha256 = "5b0f0b0b3990c83a927d2545baa9596119025dbf25242a9d46b1c76a26fcbfe5";
+ name = "cantor-19.08.3.tar.xz";
};
};
cervisia = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/cervisia-19.08.2.tar.xz";
- sha256 = "7cbff9d32e2721f6f594a84b42feef6dd76f830e2cc27c6d442d9b6ccbe7fceb";
- name = "cervisia-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/cervisia-19.08.3.tar.xz";
+ sha256 = "bf156c080f000b342f81e7a8450d6ca942627e5a08cc5ac9c02fc5b44d1f37a7";
+ name = "cervisia-19.08.3.tar.xz";
};
};
dolphin = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/dolphin-19.08.2.tar.xz";
- sha256 = "0c56515737fc0f96020b3c157a93023095d1a1e23637e7670e068c6c286bbc3b";
- name = "dolphin-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/dolphin-19.08.3.tar.xz";
+ sha256 = "de71f52324c15d692448ac4c79c1e0fcf35df5c03349a8bcbebfae20d9f69d4e";
+ name = "dolphin-19.08.3.tar.xz";
};
};
dolphin-plugins = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/dolphin-plugins-19.08.2.tar.xz";
- sha256 = "da2114bd8ed0a70fba3c3cba82a5543cce2f91af7e1dc12bc7457eeffc03099d";
- name = "dolphin-plugins-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/dolphin-plugins-19.08.3.tar.xz";
+ sha256 = "82860ef615954e94f3f382ad60fb144fcfcf7777b8a890f281c0cce55da13a55";
+ name = "dolphin-plugins-19.08.3.tar.xz";
};
};
dragon = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/dragon-19.08.2.tar.xz";
- sha256 = "3924dba504f370415c0d68cb5079acfc941aa761e9d9d2df2ea48b302ef9ce61";
- name = "dragon-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/dragon-19.08.3.tar.xz";
+ sha256 = "f9172f6ddf75cf8e4be19d50f80994d59545fdea966674fb67abe7a7c934810a";
+ name = "dragon-19.08.3.tar.xz";
};
};
eventviews = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/eventviews-19.08.2.tar.xz";
- sha256 = "48da7f85c86bcc7a64d475c5bbcbb531471e70cfc9f4bda76030280f0671132d";
- name = "eventviews-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/eventviews-19.08.3.tar.xz";
+ sha256 = "3c110fb5001e71d664aaa3b09a3689c0bb16ca12ee169e98f6ff454a0ee81ba4";
+ name = "eventviews-19.08.3.tar.xz";
};
};
ffmpegthumbs = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ffmpegthumbs-19.08.2.tar.xz";
- sha256 = "deba57ff10525efdf404401f6b605c1be0f02ec0bfe00465e080b42dc379d570";
- name = "ffmpegthumbs-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ffmpegthumbs-19.08.3.tar.xz";
+ sha256 = "c91ad8e83df474971cf9766f2398e88e45d02dd2e51a7a794ace02f22c38c0f0";
+ name = "ffmpegthumbs-19.08.3.tar.xz";
};
};
filelight = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/filelight-19.08.2.tar.xz";
- sha256 = "313ff23fceb427509b37efa012535e651618d42bde35c62cdc7732e463c346a6";
- name = "filelight-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/filelight-19.08.3.tar.xz";
+ sha256 = "95fa38574292a2aa8d3d90749fbbb61c5005889ef1df1aaa04d2d789bbf4fb00";
+ name = "filelight-19.08.3.tar.xz";
};
};
granatier = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/granatier-19.08.2.tar.xz";
- sha256 = "81a0c288edd0be6d7c994a8ad1469679b7e78174d641f9c4f90d31613bad4b47";
- name = "granatier-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/granatier-19.08.3.tar.xz";
+ sha256 = "eac24bb0b0bcf7e12e4059187e0fd542503bae620637a4f35a339e6f63ab3890";
+ name = "granatier-19.08.3.tar.xz";
};
};
grantlee-editor = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/grantlee-editor-19.08.2.tar.xz";
- sha256 = "8e65ca3d949dcdd2b6c2edd582351b123eef49eb104a2dd6c027028315c2d502";
- name = "grantlee-editor-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/grantlee-editor-19.08.3.tar.xz";
+ sha256 = "4d81e56ee89bf8ff19ba112b2ecaf6080b7fbc6768030b4dbb4f15a1099a5bce";
+ name = "grantlee-editor-19.08.3.tar.xz";
};
};
grantleetheme = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/grantleetheme-19.08.2.tar.xz";
- sha256 = "a9d4e70089debdfaffb4af881cf2064ba68a0ad3fe007985c8e5997f0cf0e836";
- name = "grantleetheme-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/grantleetheme-19.08.3.tar.xz";
+ sha256 = "ab1b0f55399c520191cf1241d85881e3f5b441ee82b387e7fbef55e77dc0e748";
+ name = "grantleetheme-19.08.3.tar.xz";
};
};
gwenview = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/gwenview-19.08.2.tar.xz";
- sha256 = "fa49352a208c9472c911d3579f7601fb915831ad42caf74a053ed749bf5bb1fb";
- name = "gwenview-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/gwenview-19.08.3.tar.xz";
+ sha256 = "7e7ad69eaa7a6b2d0549e94d1dab0d012107c822d66483d54aa8268900820255";
+ name = "gwenview-19.08.3.tar.xz";
};
};
incidenceeditor = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/incidenceeditor-19.08.2.tar.xz";
- sha256 = "f2f7bf3a12af21e6f9e4a5f2ba93346e06a6988366af7b452d6268ac9fb4fc3d";
- name = "incidenceeditor-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/incidenceeditor-19.08.3.tar.xz";
+ sha256 = "e6753efc2841a5b0b63a2b02f07c5b77274214576e5e9fc66b962b18c516266d";
+ name = "incidenceeditor-19.08.3.tar.xz";
};
};
juk = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/juk-19.08.2.tar.xz";
- sha256 = "b3f0e006d6defa58e0724088a1c99c1c412bc5764f8d1bebadf31b5f331d51d3";
- name = "juk-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/juk-19.08.3.tar.xz";
+ sha256 = "6ef343b31b4b996d3a576e91a8a0b57b55b61ed76e9ddc51c5072a6243cb3030";
+ name = "juk-19.08.3.tar.xz";
};
};
k3b = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/k3b-19.08.2.tar.xz";
- sha256 = "a16796a873018bc5fd9f562297fea56d3f6d32a1e903a3e145814ea7d9be5209";
- name = "k3b-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/k3b-19.08.3.tar.xz";
+ sha256 = "197ea67fa9ef66f8ee084608fd1907e2b3db108eec643d5bd6a0980f838f2b23";
+ name = "k3b-19.08.3.tar.xz";
};
};
kaccounts-integration = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kaccounts-integration-19.08.2.tar.xz";
- sha256 = "b422c23eb3eefc3a79c4ccb9360ae6269a86982575e981bb949c0782f1f813ce";
- name = "kaccounts-integration-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kaccounts-integration-19.08.3.tar.xz";
+ sha256 = "9106718c3ac8beeb11dc8a8d2ad53c7cc4a364ab6246ca9a24ea05dfe7415723";
+ name = "kaccounts-integration-19.08.3.tar.xz";
};
};
kaccounts-providers = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kaccounts-providers-19.08.2.tar.xz";
- sha256 = "d5ad6882ff151d2f0cff2b76a83e38cf37c72a0dbdf4a0aff64420903266a309";
- name = "kaccounts-providers-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kaccounts-providers-19.08.3.tar.xz";
+ sha256 = "55093c9ab5e001f126e86e1dbf55209c5f6365d9aad392cf506eab6a95d59a23";
+ name = "kaccounts-providers-19.08.3.tar.xz";
};
};
kaddressbook = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kaddressbook-19.08.2.tar.xz";
- sha256 = "4d67480ebf8ee96fcde85e66f8ad32119b006e36c87f4e4ac20ecfa967599260";
- name = "kaddressbook-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kaddressbook-19.08.3.tar.xz";
+ sha256 = "e343187628af4b6142cc7177ea67a3460b6f2b96c608a5b4bd469f2d314bf4ae";
+ name = "kaddressbook-19.08.3.tar.xz";
};
};
kajongg = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kajongg-19.08.2.tar.xz";
- sha256 = "08c80ea5d44ee25812de9d9e95d7800cc84c1c02006f59eb08e54f2a0d4c756b";
- name = "kajongg-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kajongg-19.08.3.tar.xz";
+ sha256 = "dcf4738fb312762363caa88f9e26e7f7ab2102ad29ce938b71ed36177fb98662";
+ name = "kajongg-19.08.3.tar.xz";
};
};
kalarm = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kalarm-19.08.2.tar.xz";
- sha256 = "54d61b469042d27b8df903c5fc95dd68c1d108218f1402a733d974ab02576d24";
- name = "kalarm-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kalarm-19.08.3.tar.xz";
+ sha256 = "34d73be35b0cdf6189bf3792e939fa9557bffff8271966d9fc49217e488317e8";
+ name = "kalarm-19.08.3.tar.xz";
};
};
kalarmcal = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kalarmcal-19.08.2.tar.xz";
- sha256 = "4dc6e1cd8a9cbf6e3f8e593e68ef6fa912819ece56efa64852ab33e3f582e6b7";
- name = "kalarmcal-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kalarmcal-19.08.3.tar.xz";
+ sha256 = "f6e9d0c99d228fc922e52ae3ddb33f2b691290e58a48edc816de72fc44d73871";
+ name = "kalarmcal-19.08.3.tar.xz";
};
};
kalgebra = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kalgebra-19.08.2.tar.xz";
- sha256 = "351a0df1bf637b14683d1a38d8f1eff0153596c5f93723f28f799aead6ee0757";
- name = "kalgebra-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kalgebra-19.08.3.tar.xz";
+ sha256 = "7832584a161c2f611ce980ad98932533c998d37e6e4e2b7afbd0b4e98ce88a65";
+ name = "kalgebra-19.08.3.tar.xz";
};
};
kalzium = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kalzium-19.08.2.tar.xz";
- sha256 = "e63d88526c86dd67ab133694dc23b6a35fd5514643bd7a7f1790db8c2a8490d9";
- name = "kalzium-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kalzium-19.08.3.tar.xz";
+ sha256 = "5dc3423a0f2646b59233f92b6a6e81b4a0bcdb819aa543c83270fe4cc5592933";
+ name = "kalzium-19.08.3.tar.xz";
};
};
kamera = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kamera-19.08.2.tar.xz";
- sha256 = "2db474afa6201f330631640e04e1bd6ebb96838ce4c16d37617a10063b1fa757";
- name = "kamera-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kamera-19.08.3.tar.xz";
+ sha256 = "93a8a3dc6c4927b28a6ee0f09f1709e67f5bc38281b3775390513f2e69086942";
+ name = "kamera-19.08.3.tar.xz";
};
};
kamoso = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kamoso-19.08.2.tar.xz";
- sha256 = "2b84b3b3fb7f423bbe69716114563f018e02d63ce7b9b85084d098123e4e29b8";
- name = "kamoso-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kamoso-19.08.3.tar.xz";
+ sha256 = "437ddca6849ff3ad964737794ab8d22f8d152ad4aa9172dd838c77c59fc81448";
+ name = "kamoso-19.08.3.tar.xz";
};
};
kanagram = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kanagram-19.08.2.tar.xz";
- sha256 = "251d08a8b73e85af4b90ed429d873b17f56c1e094c4a62116eee3b6bffc96388";
- name = "kanagram-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kanagram-19.08.3.tar.xz";
+ sha256 = "74f7daaed8db4f2b445479307dbe974d3f3f1c8197ab8604712e109c8a4d36d2";
+ name = "kanagram-19.08.3.tar.xz";
};
};
kapman = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kapman-19.08.2.tar.xz";
- sha256 = "240d7b0c611728bd1974230227c669bdcfe80081cff2ddae6278d5393bab7a4e";
- name = "kapman-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kapman-19.08.3.tar.xz";
+ sha256 = "0edc811df5d4e729851e4af980fb414d70af66218091c017c16054a5181af80e";
+ name = "kapman-19.08.3.tar.xz";
};
};
kapptemplate = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kapptemplate-19.08.2.tar.xz";
- sha256 = "2b719cf75bf8e9b495a8d9aa8288ddb528617c2e76bd1312cfdb2a43b27d6208";
- name = "kapptemplate-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kapptemplate-19.08.3.tar.xz";
+ sha256 = "23776b6b56e97fac0d8372d856a6fc9014b057f98ad5a96298b0685943c3da2a";
+ name = "kapptemplate-19.08.3.tar.xz";
};
};
kate = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kate-19.08.2.tar.xz";
- sha256 = "9897f652996e3ebca8a749562cc2d609d704c80b08ec4716622def38f5980b47";
- name = "kate-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kate-19.08.3.tar.xz";
+ sha256 = "ab9f076e7e825fca64252b366e637e34157f1f875aa573bdae333fc240e0ec71";
+ name = "kate-19.08.3.tar.xz";
};
};
katomic = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/katomic-19.08.2.tar.xz";
- sha256 = "822963024107e122a3f53f55ae6863a10d92ca59eef5966cded6c9daf5f989b3";
- name = "katomic-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/katomic-19.08.3.tar.xz";
+ sha256 = "a02df5d0d03fdd478ead1ba705089514b6debfae553be8d814edfb6952149eac";
+ name = "katomic-19.08.3.tar.xz";
};
};
kbackup = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kbackup-19.08.2.tar.xz";
- sha256 = "1678ac00c1930f430d620f542dc7913bf1575106654cc9d4b534aed65e023fb8";
- name = "kbackup-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kbackup-19.08.3.tar.xz";
+ sha256 = "c71156528087e0c799b4c957b6525b85763bdeb35ebc58ba480878f2f0daf97d";
+ name = "kbackup-19.08.3.tar.xz";
};
};
kblackbox = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kblackbox-19.08.2.tar.xz";
- sha256 = "4ed8e2fe00e4d2ce0b194f85491f46ceaeec28114ff2dc667c0b112f8237a9ca";
- name = "kblackbox-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kblackbox-19.08.3.tar.xz";
+ sha256 = "16f885a5baa0ee593c85f745246f2b3af9106a3befb0c9b7aa8695e3aed382f4";
+ name = "kblackbox-19.08.3.tar.xz";
};
};
kblocks = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kblocks-19.08.2.tar.xz";
- sha256 = "8b52c949e2d446a4ccf81b09818fc90234f2f55d8722c385491ee67e1f2abf93";
- name = "kblocks-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kblocks-19.08.3.tar.xz";
+ sha256 = "9d2553472a3f61e1be584bed2d9295a60b8074fdcd264213d67dc20f63033563";
+ name = "kblocks-19.08.3.tar.xz";
};
};
kblog = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kblog-19.08.2.tar.xz";
- sha256 = "f4d9017d38746b9669efebf5b6cfdc5ebf1cbaf1bbf45ab331530ade3c21cbb5";
- name = "kblog-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kblog-19.08.3.tar.xz";
+ sha256 = "7b030a13c79a6add2b6f46b840e347609b39099c937d5bc5fb9310e2da987164";
+ name = "kblog-19.08.3.tar.xz";
};
};
kbounce = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kbounce-19.08.2.tar.xz";
- sha256 = "8436ba58bb88360b08c2d220c1a92c924b15587769103f04881ac17583cc93c8";
- name = "kbounce-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kbounce-19.08.3.tar.xz";
+ sha256 = "21e4bc2e2f3c23d4b954c8b336aab9faa5ba6021ca1487baf39595ff31d82e0b";
+ name = "kbounce-19.08.3.tar.xz";
};
};
kbreakout = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kbreakout-19.08.2.tar.xz";
- sha256 = "9550d3ee6f6d412816bd12686272c3f0f0b5b9194242f9b22e2085c39d9720a9";
- name = "kbreakout-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kbreakout-19.08.3.tar.xz";
+ sha256 = "1c49d80dcbaa7745932c6b64c520072099e66767e8d1f725a332f79a7ee89f3f";
+ name = "kbreakout-19.08.3.tar.xz";
};
};
kbruch = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kbruch-19.08.2.tar.xz";
- sha256 = "a2cead23cab880b21769e41086505b50de659630860d056b6a8504caafd4dcf0";
- name = "kbruch-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kbruch-19.08.3.tar.xz";
+ sha256 = "9674aba5a6683e418ed03cc011e3817eb28418538dd9200a808f9813e5112dfc";
+ name = "kbruch-19.08.3.tar.xz";
};
};
kcachegrind = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kcachegrind-19.08.2.tar.xz";
- sha256 = "baf17a5c11f21deb7b019a7e3a9819348ec8d20af5c8c4a6108b96266e425b46";
- name = "kcachegrind-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kcachegrind-19.08.3.tar.xz";
+ sha256 = "8fc5e0643bb826b07cb5d283b8bd6fd5da4979f6125b43b1db3a9db60b02a36a";
+ name = "kcachegrind-19.08.3.tar.xz";
};
};
kcalc = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kcalc-19.08.2.tar.xz";
- sha256 = "94a6d004266813449b6b9efbe0e3b0da3e5368059134668277a344a720f65fd9";
- name = "kcalc-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kcalc-19.08.3.tar.xz";
+ sha256 = "7c61d96bcd45621d021ae8a56224dcf81999cb14ab7b1d7976a47eee2be25d2e";
+ name = "kcalc-19.08.3.tar.xz";
};
};
kcalcore = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kcalcore-19.08.2.tar.xz";
- sha256 = "f7d33ec65cf954a0460258694ecb2e14bf6c00cee5ea9fdc3e015e78947d896a";
- name = "kcalcore-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kcalcore-19.08.3.tar.xz";
+ sha256 = "86d0467d3929eb6471507cbc790277968eb8f0aa4449e1b3ee8ecc555d32dbaa";
+ name = "kcalcore-19.08.3.tar.xz";
};
};
kcalutils = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kcalutils-19.08.2.tar.xz";
- sha256 = "3f789a18348152f9fc70965dbc2e9a8bd0ba872968c3d0631afacd0e78d3ce13";
- name = "kcalutils-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kcalutils-19.08.3.tar.xz";
+ sha256 = "821742c98dd55a1334c13ea9d59e177ade048b1d3ade4775803eb288c98c93da";
+ name = "kcalutils-19.08.3.tar.xz";
};
};
kcharselect = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kcharselect-19.08.2.tar.xz";
- sha256 = "ff2a8c78fc4a12dd727e8ad8677216d5a480a8c82aff97269397ee8ae01e36df";
- name = "kcharselect-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kcharselect-19.08.3.tar.xz";
+ sha256 = "f294965fc7cf8b1063b611233a98fab13a00263f1d4fd254fb8b53b3f125bc52";
+ name = "kcharselect-19.08.3.tar.xz";
};
};
kcolorchooser = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kcolorchooser-19.08.2.tar.xz";
- sha256 = "4eb50f314b190f1980e73212a45fe86db39f278f789288cd76cb0763f3176edc";
- name = "kcolorchooser-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kcolorchooser-19.08.3.tar.xz";
+ sha256 = "0c3d45ceb9029f0d316e61b3f403838b4c7de82a3211a231b539e6755386c657";
+ name = "kcolorchooser-19.08.3.tar.xz";
};
};
kcontacts = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kcontacts-19.08.2.tar.xz";
- sha256 = "0677177d6810047876a219445232c0bf91dc1cdba3cbe4133a0a7eda98c381e8";
- name = "kcontacts-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kcontacts-19.08.3.tar.xz";
+ sha256 = "17778fc501f9de9b5c8c58b57aebb09c4be088bcd9aefa5fc9afbd92f2e5626c";
+ name = "kcontacts-19.08.3.tar.xz";
};
};
kcron = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kcron-19.08.2.tar.xz";
- sha256 = "270ee81cba5ef9d92158a3fc71cf8c50c658468018eb0415c9d3d0bc7abea5e5";
- name = "kcron-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kcron-19.08.3.tar.xz";
+ sha256 = "b2270bb3390570ee49b887e5cda1c596c351fd0cd83183f091ef1b078fa55669";
+ name = "kcron-19.08.3.tar.xz";
};
};
kdav = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdav-19.08.2.tar.xz";
- sha256 = "8572a77ee3d0f8a7e09e4975fcf0420394c16e908c4a19aecc409415770595f9";
- name = "kdav-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdav-19.08.3.tar.xz";
+ sha256 = "e85a0a8dcfdccc1dc0afaee364c45d57c6807fadb6926ae1a5afc54c4fb0a9f0";
+ name = "kdav-19.08.3.tar.xz";
};
};
kdebugsettings = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdebugsettings-19.08.2.tar.xz";
- sha256 = "2823e53da647dec2bd780a3029c6b093917faad3db973147ef74eb8f1c1733df";
- name = "kdebugsettings-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdebugsettings-19.08.3.tar.xz";
+ sha256 = "10ccbc85c36a81ba7fdf3230f16c3b9974d240d17347d21aa7b67e9b5f85c78d";
+ name = "kdebugsettings-19.08.3.tar.xz";
};
};
kde-dev-scripts = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kde-dev-scripts-19.08.2.tar.xz";
- sha256 = "9a47b048cec42eedcec05602eb84d4124a1f67d451c22095e688cb24f7057327";
- name = "kde-dev-scripts-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kde-dev-scripts-19.08.3.tar.xz";
+ sha256 = "c7998753f67c6efbe818ca1f96c5681c7abe3078ce6beeb307562309ca243c28";
+ name = "kde-dev-scripts-19.08.3.tar.xz";
};
};
kde-dev-utils = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kde-dev-utils-19.08.2.tar.xz";
- sha256 = "30bbcfa632cbf76a2b3a27f1044ff9708509921882b91a5623cc2a30d40acb32";
- name = "kde-dev-utils-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kde-dev-utils-19.08.3.tar.xz";
+ sha256 = "82a573941c1a99480294fe3e8658440da64e652eb62e2a7354751894a6a899e2";
+ name = "kde-dev-utils-19.08.3.tar.xz";
};
};
kdeedu-data = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdeedu-data-19.08.2.tar.xz";
- sha256 = "0ead96a7a10ecbf98c88464f9987e7d8e2efdf7879782e5262b5cda694f3e343";
- name = "kdeedu-data-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdeedu-data-19.08.3.tar.xz";
+ sha256 = "dfdbe10415247bdd1b6926f6fcea943d13c6e0a1ab1a562aac6e0b7109420286";
+ name = "kdeedu-data-19.08.3.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdegraphics-mobipocket-19.08.2.tar.xz";
- sha256 = "9621b0b3564ce7fcd6890c15c48e11d00c1cf2d3b408b255ec590bd6d113439f";
- name = "kdegraphics-mobipocket-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdegraphics-mobipocket-19.08.3.tar.xz";
+ sha256 = "d9ea38255c967dcf0de820e6ad663e721188f5541c18c459e611f6d72ddc8e8f";
+ name = "kdegraphics-mobipocket-19.08.3.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdegraphics-thumbnailers-19.08.2.tar.xz";
- sha256 = "12e2b096d65c5dfde6d16bc2c35b236343ce02ba1ef1b3b68b11257250da02c8";
- name = "kdegraphics-thumbnailers-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdegraphics-thumbnailers-19.08.3.tar.xz";
+ sha256 = "14d342336e92b3913d46a415da9fcf53d239f0ceb16aed99c1e095641ce6ddb4";
+ name = "kdegraphics-thumbnailers-19.08.3.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdenetwork-filesharing-19.08.2.tar.xz";
- sha256 = "ceffdaabd3417db306c05ecd6a62b521d0b3eb5996d320d65ae5c51ea46bfdda";
- name = "kdenetwork-filesharing-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdenetwork-filesharing-19.08.3.tar.xz";
+ sha256 = "4074d996c693bdd69fd88e6f2acede79c05b2eceef1d3ed81f311247640ef366";
+ name = "kdenetwork-filesharing-19.08.3.tar.xz";
};
};
kdenlive = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdenlive-19.08.2.tar.xz";
- sha256 = "5ca3b7a2457d2aa355309bc7471791f691edd8774af9a19cbfc8fac39ad53c78";
- name = "kdenlive-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdenlive-19.08.3.tar.xz";
+ sha256 = "64ab3cf06222b95f021941d8c430c70918c04c3ea988f7ccf5ef87c6b69b4465";
+ name = "kdenlive-19.08.3.tar.xz";
};
};
kdepim-addons = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdepim-addons-19.08.2.tar.xz";
- sha256 = "1e7d647689d2bfa243a2f4583df7030238409fb05bbcda5b168ef024e6accc89";
- name = "kdepim-addons-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdepim-addons-19.08.3.tar.xz";
+ sha256 = "8c85cec6b827da6025364ec6bbccdf2ab22c73380933aed69cf3c86be52cff24";
+ name = "kdepim-addons-19.08.3.tar.xz";
};
};
kdepim-apps-libs = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdepim-apps-libs-19.08.2.tar.xz";
- sha256 = "d542b1d532d3ce3d9f1c63f4455175c7e855cd1e095a1addf1322074afc11923";
- name = "kdepim-apps-libs-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdepim-apps-libs-19.08.3.tar.xz";
+ sha256 = "3c478455a0f4704aa4f8a42e92f0657e01b749c568dc6e89bfae5496eefeab83";
+ name = "kdepim-apps-libs-19.08.3.tar.xz";
};
};
kdepim-runtime = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdepim-runtime-19.08.2.tar.xz";
- sha256 = "9b98980003d2d107596e9acc9482dfc3ea26a2485c75a700bd82b53b9be72ebf";
- name = "kdepim-runtime-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdepim-runtime-19.08.3.tar.xz";
+ sha256 = "2673967456b7eacbd69ca678761e479bfa65a0ec6455c86b3a83c76d766a71ea";
+ name = "kdepim-runtime-19.08.3.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdesdk-kioslaves-19.08.2.tar.xz";
- sha256 = "308bdbbd484f60d14bd4f75e72af1e3308c497696a5f7b011b18bc0f203fd7e5";
- name = "kdesdk-kioslaves-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdesdk-kioslaves-19.08.3.tar.xz";
+ sha256 = "cd957c67712616b9c7f00c8d733f723d98779c5805561770970bb3e2173478e0";
+ name = "kdesdk-kioslaves-19.08.3.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdesdk-thumbnailers-19.08.2.tar.xz";
- sha256 = "d607f956e9c62ee9e9aa000d5444d33e68621e0741072d0d8c14e52bd4cc96be";
- name = "kdesdk-thumbnailers-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdesdk-thumbnailers-19.08.3.tar.xz";
+ sha256 = "62757c71653d9a9541410104f13035b024e8bab7b21b729a306cb2ac445db8ac";
+ name = "kdesdk-thumbnailers-19.08.3.tar.xz";
};
};
kdf = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdf-19.08.2.tar.xz";
- sha256 = "f0a27bbf25d5791272cc8598561e53afed9840d38bf08ed3146f36701dfb7b04";
- name = "kdf-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdf-19.08.3.tar.xz";
+ sha256 = "eef733c2089ce8fc40405653fa5e3aaafe67a1cc5d074f744e49b185291c0617";
+ name = "kdf-19.08.3.tar.xz";
};
};
kdialog = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdialog-19.08.2.tar.xz";
- sha256 = "7aef7b5a5f340cc0066e02572ec8cef8b227bc6c7f5b066677ef6422632db95a";
- name = "kdialog-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdialog-19.08.3.tar.xz";
+ sha256 = "2fa2e07fb9975e2e32e26a2a17350ef253b93471017e5945a2df0fef2eeba787";
+ name = "kdialog-19.08.3.tar.xz";
};
};
kdiamond = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kdiamond-19.08.2.tar.xz";
- sha256 = "e0e6104a34711864bc00d12acc5d4ac0143acfaefc5fec8a7f9ec5f7242d32e7";
- name = "kdiamond-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kdiamond-19.08.3.tar.xz";
+ sha256 = "6a433c8b628f105d210efd5b5532763e09a4e7190d71f8cf11931ab1605abeec";
+ name = "kdiamond-19.08.3.tar.xz";
};
};
keditbookmarks = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/keditbookmarks-19.08.2.tar.xz";
- sha256 = "6a22c3ccdd89d07ad13b34b89704afcc9bf3b5a177d4dc137dcb5eaf1580f6dd";
- name = "keditbookmarks-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/keditbookmarks-19.08.3.tar.xz";
+ sha256 = "ce2e90f24cac8dabe3e3804232715b47e247d51c86699162e2f7f63d1f290b05";
+ name = "keditbookmarks-19.08.3.tar.xz";
};
};
kfind = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kfind-19.08.2.tar.xz";
- sha256 = "7ce5255fa4ef3e98db937eb23e8cdc89bd6b5e5429ccb5fea769e99da2bc424a";
- name = "kfind-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kfind-19.08.3.tar.xz";
+ sha256 = "6ebb7d361a8456e3a3bc7bac995a0224cd76eefd724ff62ba0d6348f7eb1f4f2";
+ name = "kfind-19.08.3.tar.xz";
};
};
kfloppy = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kfloppy-19.08.2.tar.xz";
- sha256 = "743f9043bdc24855bb597d3f7cf2bbf4793c58be22eb73cd72ff1e3f8cff2f69";
- name = "kfloppy-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kfloppy-19.08.3.tar.xz";
+ sha256 = "aed5533db83513e7ad9d4108920fc0241569d6b1b649d95ef36a36bbc1f72cab";
+ name = "kfloppy-19.08.3.tar.xz";
};
};
kfourinline = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kfourinline-19.08.2.tar.xz";
- sha256 = "14d1cd1be7f1524758697f79d55c0c40e8e6359f2039929349e017a97acdc4dc";
- name = "kfourinline-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kfourinline-19.08.3.tar.xz";
+ sha256 = "c35b52b41398616798d75e62fa77488bf84e924e91a432cd1b96b1c09ad1f9ee";
+ name = "kfourinline-19.08.3.tar.xz";
};
};
kgeography = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kgeography-19.08.2.tar.xz";
- sha256 = "ca535319e5dd3938e572d9d4f4a216a29a5435546742bb6616d2a716f1a1dfcc";
- name = "kgeography-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kgeography-19.08.3.tar.xz";
+ sha256 = "1f2969db9ed5b9cc3d56a8cc12fa24cdace473edcd05baaf3c7b460fa7b2da8c";
+ name = "kgeography-19.08.3.tar.xz";
};
};
kget = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kget-19.08.2.tar.xz";
- sha256 = "e93795eec8f51cac2719ab31cfa6f5f4f642b166ffbb3f876ab3c866a4cd7df1";
- name = "kget-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kget-19.08.3.tar.xz";
+ sha256 = "5a107da8313731114e7b5528f4c0cf6e0ab62867e20a9caa802de23812c69800";
+ name = "kget-19.08.3.tar.xz";
};
};
kgoldrunner = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kgoldrunner-19.08.2.tar.xz";
- sha256 = "fc719386cd1f0784c9be9813326e3fded8eb2951096abf7fcc4d577e5ed5501a";
- name = "kgoldrunner-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kgoldrunner-19.08.3.tar.xz";
+ sha256 = "44aec483cbd9d0bffb4eb9606d456ba375cb772fe72ab2c9d76a64930ede2c9b";
+ name = "kgoldrunner-19.08.3.tar.xz";
};
};
kgpg = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kgpg-19.08.2.tar.xz";
- sha256 = "90795c649cd32b65b6030ed965e0db5b0570719afa36abb5d4893268461aa841";
- name = "kgpg-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kgpg-19.08.3.tar.xz";
+ sha256 = "85bb9adbd7a7213bdd4913c2153582e938543db49cf2414b8794a850f63f3ab6";
+ name = "kgpg-19.08.3.tar.xz";
};
};
khangman = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/khangman-19.08.2.tar.xz";
- sha256 = "dfa7d2f19ab7cd7aa90d91bab1818d48e6df88ddebf729732cca8d6aca15d1f3";
- name = "khangman-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/khangman-19.08.3.tar.xz";
+ sha256 = "82e34738f34efef5f03bf98a3a99a0590a5a265cce016b4a2f25ca05e9d078c3";
+ name = "khangman-19.08.3.tar.xz";
};
};
khelpcenter = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/khelpcenter-19.08.2.tar.xz";
- sha256 = "22b9f5225dfb9e8ad85becb7c2986cbee2a1366f84257fcbf76d5d7292dccdd9";
- name = "khelpcenter-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/khelpcenter-19.08.3.tar.xz";
+ sha256 = "a03817fb16739b1b235dc54ddeda2c2ebc6605a0c7678e02af24c05271c0b77a";
+ name = "khelpcenter-19.08.3.tar.xz";
};
};
kidentitymanagement = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kidentitymanagement-19.08.2.tar.xz";
- sha256 = "8f93f9546d570c8f7b2602a3a171641d488595ec8da3c47b0a08ef4f5083e884";
- name = "kidentitymanagement-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kidentitymanagement-19.08.3.tar.xz";
+ sha256 = "6ed512d3b42378a767299660c2b9fe142b840cdaaae70c522104c37275221f37";
+ name = "kidentitymanagement-19.08.3.tar.xz";
};
};
kig = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kig-19.08.2.tar.xz";
- sha256 = "60bab2ccdf69df8ebaed672dc9201e468563d78761f191c43ee5673f9a54246a";
- name = "kig-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kig-19.08.3.tar.xz";
+ sha256 = "69dacdbb10bcefe43e5141b0b33b51ca4704f5a5b933e194a4891be92affd21c";
+ name = "kig-19.08.3.tar.xz";
};
};
kigo = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kigo-19.08.2.tar.xz";
- sha256 = "c53a85b312e4acfcc35905a7e5602f3d623e45227fbd3644410b3fd962a9f1a0";
- name = "kigo-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kigo-19.08.3.tar.xz";
+ sha256 = "2e20837b52550c7c33bd2e5f741a2395a8a1666b793e4b034bd27714177b8502";
+ name = "kigo-19.08.3.tar.xz";
};
};
killbots = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/killbots-19.08.2.tar.xz";
- sha256 = "c4407bf534dc9de604d6c169cf278b8cb9ca03055d96b71cbfe3916dbafea479";
- name = "killbots-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/killbots-19.08.3.tar.xz";
+ sha256 = "75f5d53eda4dbe96250caa2faa16514d7c68538d7e8c9deea4eff0d80e3628e2";
+ name = "killbots-19.08.3.tar.xz";
};
};
kimagemapeditor = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kimagemapeditor-19.08.2.tar.xz";
- sha256 = "3be222d94bad94adf4d589fb98c9556af0f0e6c66106a217ee3b9ab031412597";
- name = "kimagemapeditor-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kimagemapeditor-19.08.3.tar.xz";
+ sha256 = "9c69541c774d15ac02164c52c9e4ba523e76e195231bf6db528fd94407347434";
+ name = "kimagemapeditor-19.08.3.tar.xz";
};
};
kimap = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kimap-19.08.2.tar.xz";
- sha256 = "250479c78517610aab810f54184d8826fb981438ec9f0d5c423ad781a796ee00";
- name = "kimap-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kimap-19.08.3.tar.xz";
+ sha256 = "46ca8d265b7191d75db8c6a4d988624385c9ab8eae702a42e6eb4b81be581051";
+ name = "kimap-19.08.3.tar.xz";
};
};
kio-extras = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kio-extras-19.08.2.tar.xz";
- sha256 = "a0b8f08ab8f9d36cfdc950470f75726e90e9fba159bc2035931cfa6efbfe4394";
- name = "kio-extras-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kio-extras-19.08.3.tar.xz";
+ sha256 = "e38e872f78ff24fe512ec7ff9ed4f6b6a8e1fef6111fdb0222c133bed0a8861f";
+ name = "kio-extras-19.08.3.tar.xz";
};
};
kipi-plugins = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kipi-plugins-19.08.2.tar.xz";
- sha256 = "2894f50989a14f7fd4be0035efec3cb14583d2285ff11729605b641af0fed192";
- name = "kipi-plugins-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kipi-plugins-19.08.3.tar.xz";
+ sha256 = "f540e517421503b54e906633c71c2f688bb920c5aefe7d05a13d0eeaf0356a9b";
+ name = "kipi-plugins-19.08.3.tar.xz";
};
};
kirigami-gallery = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kirigami-gallery-19.08.2.tar.xz";
- sha256 = "db6cf765cd3c7126d9e4d94cacf66478711fe8b676c9505c22604863092d975e";
- name = "kirigami-gallery-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kirigami-gallery-19.08.3.tar.xz";
+ sha256 = "4ceeb854aa95902effb99cb2e5956a2f237ac3880f5b5d8e22849ed7887288df";
+ name = "kirigami-gallery-19.08.3.tar.xz";
};
};
kiriki = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kiriki-19.08.2.tar.xz";
- sha256 = "8aa1749e2b14dbb4b508515a0b1f5164243ee793141ec2af7bfc6be1f6eb67da";
- name = "kiriki-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kiriki-19.08.3.tar.xz";
+ sha256 = "1ceaea286294d8a5371d0792ee38cf4b8922495587cc430b6b01bd92642be2f5";
+ name = "kiriki-19.08.3.tar.xz";
};
};
kiten = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kiten-19.08.2.tar.xz";
- sha256 = "e35552dd49507c66574ae7fc22fe75597a954044a09522652cc1e457d3425edc";
- name = "kiten-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kiten-19.08.3.tar.xz";
+ sha256 = "6759463f195c50bdcdb2378a8142d1e00a1cea05b769d95a69d2cfdeb1864601";
+ name = "kiten-19.08.3.tar.xz";
};
};
kitinerary = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kitinerary-19.08.2.tar.xz";
- sha256 = "d814a2f1deaadce5fec85b1122aab6ff926c53ca8f020aadc99401bd31597eaa";
- name = "kitinerary-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kitinerary-19.08.3.tar.xz";
+ sha256 = "d13e701b8a988999477c030fffe687b4c333a330717a15b72651458f35e6e151";
+ name = "kitinerary-19.08.3.tar.xz";
};
};
kjumpingcube = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kjumpingcube-19.08.2.tar.xz";
- sha256 = "7ff90a22670818eee7d02fd8119923761e003e059d0666873d5299cd31c96eb3";
- name = "kjumpingcube-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kjumpingcube-19.08.3.tar.xz";
+ sha256 = "a1e6147105a0d467629118bf6cac974a1a698d15f48563e494ce75e126fec734";
+ name = "kjumpingcube-19.08.3.tar.xz";
};
};
kldap = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kldap-19.08.2.tar.xz";
- sha256 = "79c540693b85c138ae7bf4f72213dfad6dfa48dfc0ab414004d93f15d2ffac6e";
- name = "kldap-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kldap-19.08.3.tar.xz";
+ sha256 = "b65ba5fefab7ecb92a7d38ac718e53077d9d9a87d73f121e32019aad90b48bae";
+ name = "kldap-19.08.3.tar.xz";
};
};
kleopatra = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kleopatra-19.08.2.tar.xz";
- sha256 = "7d0667b71796f8cbf9081c74c80def1e6618366400d4fbe56e690bb7049e4085";
- name = "kleopatra-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kleopatra-19.08.3.tar.xz";
+ sha256 = "44b9873fbdeb88416d33b54491b75d35eac1589d70ef70505456e89068eb1caf";
+ name = "kleopatra-19.08.3.tar.xz";
};
};
klettres = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/klettres-19.08.2.tar.xz";
- sha256 = "919fc2b5d722bfdd741f0b1202f31c9aefc5d240ceb88ab785c2acd98a1b8284";
- name = "klettres-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/klettres-19.08.3.tar.xz";
+ sha256 = "205ed817469a72caaf73683c618fcd0800176038345e46555c4c78d644b3a1bf";
+ name = "klettres-19.08.3.tar.xz";
};
};
klickety = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/klickety-19.08.2.tar.xz";
- sha256 = "97e165d250d88a5a9f00fc5e111f641c43bed8e1445fd9d7c59f986cf5517271";
- name = "klickety-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/klickety-19.08.3.tar.xz";
+ sha256 = "7e4509d47c363173630d536b401d8f1ccb7db4c62d75dd4a449e89dc56c9632e";
+ name = "klickety-19.08.3.tar.xz";
};
};
klines = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/klines-19.08.2.tar.xz";
- sha256 = "1e7f5600b32a43ed4e5b7490430fb20309837e35aceb6b9b904951f23beec86f";
- name = "klines-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/klines-19.08.3.tar.xz";
+ sha256 = "aaa7825b4bfd61b650ddf28dd975b04cebdb7c09c9b137f17d686570a5212ebc";
+ name = "klines-19.08.3.tar.xz";
};
};
kmag = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kmag-19.08.2.tar.xz";
- sha256 = "6e8ecfab87dca12804a5a8d0a8adf1545e9e17039e0f9667b10a8f2832512e71";
- name = "kmag-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kmag-19.08.3.tar.xz";
+ sha256 = "216e5db763f72ff1f4ada339912dc686fa7a6cea0dafc8b9eab35601edabc950";
+ name = "kmag-19.08.3.tar.xz";
};
};
kmahjongg = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kmahjongg-19.08.2.tar.xz";
- sha256 = "8b2c4b0e3cb9bb85fa6d5f0fc5c55fcca96149e510cde25be2bcd688834a8d08";
- name = "kmahjongg-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kmahjongg-19.08.3.tar.xz";
+ sha256 = "d74446083f6ead6d7571e0ca4ff37af3f8167cc16ed7f67576155a000b41ca22";
+ name = "kmahjongg-19.08.3.tar.xz";
};
};
kmail = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kmail-19.08.2.tar.xz";
- sha256 = "0ad2a5439da7f255923eeb4c4cf267ece721619aa046a04439f56763aeabac85";
- name = "kmail-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kmail-19.08.3.tar.xz";
+ sha256 = "d39d40ed61fc6828af06ad2a713b4c741685cec68471c57e18001277d3be4d3f";
+ name = "kmail-19.08.3.tar.xz";
};
};
kmail-account-wizard = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kmail-account-wizard-19.08.2.tar.xz";
- sha256 = "769b151d0de47d49e41eaeca501526de41c174f9df99b46418e955163c38e9a8";
- name = "kmail-account-wizard-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kmail-account-wizard-19.08.3.tar.xz";
+ sha256 = "eb998583eb99f9e06eda35c7d44819ffac33fbe1a068c597bc43db271f194f68";
+ name = "kmail-account-wizard-19.08.3.tar.xz";
};
};
kmailtransport = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kmailtransport-19.08.2.tar.xz";
- sha256 = "c545fb5546e82f7dfcea4c6e1a8b565ad04e34851c33876c9bf74c9fbc3165c7";
- name = "kmailtransport-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kmailtransport-19.08.3.tar.xz";
+ sha256 = "24cf570b2ab77a69e55adb013e1d7e3eaf17f5ced900d8e5166890bb3ab64d12";
+ name = "kmailtransport-19.08.3.tar.xz";
};
};
kmbox = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kmbox-19.08.2.tar.xz";
- sha256 = "82e2f64b90a1386100e13f9b2afea5d71952a1cb9547f965ddcdb3b8c59c35b1";
- name = "kmbox-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kmbox-19.08.3.tar.xz";
+ sha256 = "e29d0df5344babb08f1befce2be9eae6a2e872f74757367454651ad26dd8658d";
+ name = "kmbox-19.08.3.tar.xz";
};
};
kmime = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kmime-19.08.2.tar.xz";
- sha256 = "f153332bb71de9d4451b8d28135a914059f5156fc8dda33f6375671603477771";
- name = "kmime-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kmime-19.08.3.tar.xz";
+ sha256 = "e659e1154fbc11db624f1b76bc1a8e5cf8c7f6731cef7b4ff6fad9ccf90580dd";
+ name = "kmime-19.08.3.tar.xz";
};
};
kmines = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kmines-19.08.2.tar.xz";
- sha256 = "735a3b7b844fbfc970187ddc9d4fe312a5dd6c037e8ad87712388578482d12d8";
- name = "kmines-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kmines-19.08.3.tar.xz";
+ sha256 = "4ebb5d932ab43f11f81d0fa64aef871ffecaab4a2c3a5c4dbf10416a86fa8329";
+ name = "kmines-19.08.3.tar.xz";
};
};
kmix = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kmix-19.08.2.tar.xz";
- sha256 = "5d852df8b54d3abca98db4aa2b259973231fed0a597d511d54fb41c6389ce61a";
- name = "kmix-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kmix-19.08.3.tar.xz";
+ sha256 = "cf71abee1ab35423b0daeaf1fbddbcdcb2f40fd946dfabf0cb19b8762b8582bc";
+ name = "kmix-19.08.3.tar.xz";
};
};
kmousetool = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kmousetool-19.08.2.tar.xz";
- sha256 = "7cdc327e82548bf70c4ef4feab7a30938f3aefa1e80fccb343ce0d5ca8976ccb";
- name = "kmousetool-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kmousetool-19.08.3.tar.xz";
+ sha256 = "0434d4883d5478168c696ec1a43164ff09a15999416ff198b749d45981983399";
+ name = "kmousetool-19.08.3.tar.xz";
};
};
kmouth = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kmouth-19.08.2.tar.xz";
- sha256 = "7a71d9d15d6a5f72c86f41e874f7cb3b45d8edaae2b3bd5409b20bd7bad4a0d3";
- name = "kmouth-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kmouth-19.08.3.tar.xz";
+ sha256 = "b962dec13a0fa610b4e9fa03f4f0c9ce28cb8c45e8fc18243c26452783ebf2a9";
+ name = "kmouth-19.08.3.tar.xz";
};
};
kmplot = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kmplot-19.08.2.tar.xz";
- sha256 = "62017429db210c5b8f99301a6768a6eb10becd0f1f6af6d886a539657d8518a0";
- name = "kmplot-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kmplot-19.08.3.tar.xz";
+ sha256 = "777408873baa5d6ce236d71bc2935a89fa414fb9f59049ba6e1ae88d581f580e";
+ name = "kmplot-19.08.3.tar.xz";
};
};
knavalbattle = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/knavalbattle-19.08.2.tar.xz";
- sha256 = "31f25b5397c36434c1910bf8968f92548019ad172b4d5399e6c01939389915ba";
- name = "knavalbattle-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/knavalbattle-19.08.3.tar.xz";
+ sha256 = "e4a50d3873865e8ab4803a9d7350bfc56ee3d59fd718b8abe860ac89e995ae69";
+ name = "knavalbattle-19.08.3.tar.xz";
};
};
knetwalk = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/knetwalk-19.08.2.tar.xz";
- sha256 = "057b8571f165a716a6cc13ec6489e7b5f9b4c14fa72080180a2098fa0fa028a1";
- name = "knetwalk-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/knetwalk-19.08.3.tar.xz";
+ sha256 = "ed74cd88364eb263209574655e1cdf77f4776bf339f3313ce20dbf4f950664c4";
+ name = "knetwalk-19.08.3.tar.xz";
};
};
knights = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/knights-19.08.2.tar.xz";
- sha256 = "2b70338d1cb2b770157a5b061a797620d8dd7dd8c6da0bcb7e2a9db375e71a07";
- name = "knights-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/knights-19.08.3.tar.xz";
+ sha256 = "1a60de6e31340ecdd3b454d0a90f74f9ab0b81ff9166869d402da77d0acdc93e";
+ name = "knights-19.08.3.tar.xz";
};
};
knotes = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/knotes-19.08.2.tar.xz";
- sha256 = "aa0aa4d215507750b055e9af91f552e723aee8163b36f65a3dd19786cf327cf3";
- name = "knotes-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/knotes-19.08.3.tar.xz";
+ sha256 = "07ad3c7c8f5e7429c1f112aca10c164468dbbd5c356b504aa1fc172bb1bb1889";
+ name = "knotes-19.08.3.tar.xz";
};
};
kolf = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kolf-19.08.2.tar.xz";
- sha256 = "88b9a58885eda34bf5b349db5e84c20df9beb1462922ed6e973a61bd95d853e8";
- name = "kolf-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kolf-19.08.3.tar.xz";
+ sha256 = "1c864f1abb31b168fd1402217ffc4c00d495f8ebece61ddc1f8c954c29684e1b";
+ name = "kolf-19.08.3.tar.xz";
};
};
kollision = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kollision-19.08.2.tar.xz";
- sha256 = "f2e7d851181033ce39d43a038601ca70c608ae9d0cb0e88228512ca1dbd0cf19";
- name = "kollision-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kollision-19.08.3.tar.xz";
+ sha256 = "2240563774c22bf0552504a501710e37eb468afcbc4c3313db7779d086cdf8dc";
+ name = "kollision-19.08.3.tar.xz";
};
};
kolourpaint = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kolourpaint-19.08.2.tar.xz";
- sha256 = "e8bde8d516159ae93dfe56565eea2919d2154606fd1814202f30caf21f659cda";
- name = "kolourpaint-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kolourpaint-19.08.3.tar.xz";
+ sha256 = "aac61cfc561b4d4759b086508c53c525db6899ae11a2400c4ca701fcb5649c8d";
+ name = "kolourpaint-19.08.3.tar.xz";
};
};
kompare = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kompare-19.08.2.tar.xz";
- sha256 = "b14f23ac6eb72622a06e2e489fc2d684124f520ad13e032338397fef342659eb";
- name = "kompare-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kompare-19.08.3.tar.xz";
+ sha256 = "d0adbae35e979212e9705cb815e309059d8b3d0b7a815d7ff2cd7197eff65f44";
+ name = "kompare-19.08.3.tar.xz";
};
};
konqueror = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/konqueror-19.08.2.tar.xz";
- sha256 = "336da877ea44fb100ca5396bc843994d77d0939fe3c969ad8fa85f0e1644d111";
- name = "konqueror-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/konqueror-19.08.3.tar.xz";
+ sha256 = "d0ff5b409bbbef5394aeb0bafeb6fea6265feff929fbf4b6a451adc030542d9b";
+ name = "konqueror-19.08.3.tar.xz";
};
};
konquest = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/konquest-19.08.2.tar.xz";
- sha256 = "3dda62a480e37d97aabdc4670a8ac1cf209605ed274c872ee3575ff1ecff6936";
- name = "konquest-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/konquest-19.08.3.tar.xz";
+ sha256 = "619a834341377475fed24485cf2c3f2ae68f1a8d6cea01b10e0a8408a7eef209";
+ name = "konquest-19.08.3.tar.xz";
};
};
konsole = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/konsole-19.08.2.tar.xz";
- sha256 = "4702fe52279c99e7d8da313285ace26955776669a78bdcb6dac7aec76cabe5ed";
- name = "konsole-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/konsole-19.08.3.tar.xz";
+ sha256 = "2cc610109ff8ddc6efa6ea83f0153f4b1d72e4be65d8dbde9cfd526c257e7025";
+ name = "konsole-19.08.3.tar.xz";
};
};
kontact = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kontact-19.08.2.tar.xz";
- sha256 = "d24023381304fbe388a0840921599d13c86912a1285acfc0a7d607962e37c5cf";
- name = "kontact-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kontact-19.08.3.tar.xz";
+ sha256 = "2bc81b4c051856894d5405532e9663a59abf25bfed1cf0394ee24e219b4752d5";
+ name = "kontact-19.08.3.tar.xz";
};
};
kontactinterface = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kontactinterface-19.08.2.tar.xz";
- sha256 = "cbd34915ddf6fbcf02395f7c876050f2b732f3769627489f04979e419cfdc869";
- name = "kontactinterface-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kontactinterface-19.08.3.tar.xz";
+ sha256 = "67827b27e46d381a207bcd6986b0285c0b7629ec9b93048e9503768662e211dc";
+ name = "kontactinterface-19.08.3.tar.xz";
};
};
kopete = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kopete-19.08.2.tar.xz";
- sha256 = "cf4e4f6ff6dcd6e42a1c3d5339be4a65ed0379ef786155c12cf13f8af339e022";
- name = "kopete-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kopete-19.08.3.tar.xz";
+ sha256 = "d4e407516754cdf66f447e4439f41080586af2ec30c07bd1c88712b089f21221";
+ name = "kopete-19.08.3.tar.xz";
};
};
korganizer = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/korganizer-19.08.2.tar.xz";
- sha256 = "969930b66a445873a28bfe2e67876388259e35e89ffce45607583b4a668d9194";
- name = "korganizer-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/korganizer-19.08.3.tar.xz";
+ sha256 = "b675b6c7a2a28a51bd377872c69795157825fd04fbef6dd4c97c33f659adadc7";
+ name = "korganizer-19.08.3.tar.xz";
};
};
kpat = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kpat-19.08.2.tar.xz";
- sha256 = "6322d86e12996da3d95f6d4afd1d2e70cfd1771698bab393aaf987fd4fe0ef67";
- name = "kpat-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kpat-19.08.3.tar.xz";
+ sha256 = "b1414eb0c04396468f40ea84fe71077b98476b4b76c0d3abb95ae4afd49e27a7";
+ name = "kpat-19.08.3.tar.xz";
};
};
kpimtextedit = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kpimtextedit-19.08.2.tar.xz";
- sha256 = "e565774d77f310165fc44c8b109ef835aae82a2f763d89d1ffb6e5b820cd850d";
- name = "kpimtextedit-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kpimtextedit-19.08.3.tar.xz";
+ sha256 = "75ff2300e771a1fe02a19ef57e2a28489179a92dc184c924be495e878b4444ab";
+ name = "kpimtextedit-19.08.3.tar.xz";
};
};
kpkpass = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kpkpass-19.08.2.tar.xz";
- sha256 = "daf4da30fd5c834915e6210bf64609adc116e5c6919365d000a400b6cd5f3e26";
- name = "kpkpass-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kpkpass-19.08.3.tar.xz";
+ sha256 = "6d70d3bcc949e83543ae7cf9d22280c270107bd9c9cb2882d6b37f6d036f5126";
+ name = "kpkpass-19.08.3.tar.xz";
};
};
kqtquickcharts = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kqtquickcharts-19.08.2.tar.xz";
- sha256 = "3341f99ba3a35e9c4fd70911faebaf4312d7700a342edd242de2118f9a77c9fb";
- name = "kqtquickcharts-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kqtquickcharts-19.08.3.tar.xz";
+ sha256 = "f1c54caccbcc97219f8666bdf97cfecdb008c532f1453f27a6971ca54ec5994f";
+ name = "kqtquickcharts-19.08.3.tar.xz";
};
};
krdc = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/krdc-19.08.2.tar.xz";
- sha256 = "c5e6193115afe742f25365bacb55aea21428acf38407659f77636217c589d8ff";
- name = "krdc-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/krdc-19.08.3.tar.xz";
+ sha256 = "d4cbaebaa3cd56ef5ec728a1d09edf72e8dfc18174e59f954a5f7ec8494acfdc";
+ name = "krdc-19.08.3.tar.xz";
};
};
kreversi = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kreversi-19.08.2.tar.xz";
- sha256 = "345c72ad38b9bd759f7569c7c0541c08a2cdad5ab92d08c1db8b6cf8ffaf1ce2";
- name = "kreversi-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kreversi-19.08.3.tar.xz";
+ sha256 = "30f15e40e1347c7d746bfdef7dffc0a0a9aecef8a960c875b68fab255c43d82c";
+ name = "kreversi-19.08.3.tar.xz";
};
};
krfb = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/krfb-19.08.2.tar.xz";
- sha256 = "08877020abf6b7ac38e393443c34e7791456fc5bea8c43c552551148fd67b67e";
- name = "krfb-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/krfb-19.08.3.tar.xz";
+ sha256 = "c708e10b909151dee362205af9db72946b9bbb86f3d87aaf2d2a9956a9242e1d";
+ name = "krfb-19.08.3.tar.xz";
};
};
kross-interpreters = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kross-interpreters-19.08.2.tar.xz";
- sha256 = "e0c63d73441c08c1b5b6627e9c02172c72f079ac0baeb596849a49ad38f8723c";
- name = "kross-interpreters-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kross-interpreters-19.08.3.tar.xz";
+ sha256 = "525527db9e471a062c15b9b22b715dad2e164fb1b19580fc5b963cc7269ce5b5";
+ name = "kross-interpreters-19.08.3.tar.xz";
};
};
kruler = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kruler-19.08.2.tar.xz";
- sha256 = "2a3c51a60f503807694cf49796b3bf82c6992ec4c0c15cf38adae92a8dbc24cc";
- name = "kruler-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kruler-19.08.3.tar.xz";
+ sha256 = "1825ec4b7f6a0ffc00f1ed09d2879a8d9925da49e62bad0a7484d4e90903df79";
+ name = "kruler-19.08.3.tar.xz";
};
};
kshisen = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kshisen-19.08.2.tar.xz";
- sha256 = "3c18bc546f2dadcff03af2a25b6f468357967560b7fddf916aea2b27d22c2364";
- name = "kshisen-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kshisen-19.08.3.tar.xz";
+ sha256 = "bae9f0ed77f7b1b33f21a53dc07481665f6acdb9daad71dd550512a710a905af";
+ name = "kshisen-19.08.3.tar.xz";
};
};
ksirk = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ksirk-19.08.2.tar.xz";
- sha256 = "6016d929de52d6e03ae1c1ba483e5e505542f16edfbd37c8dfbb9d0913e7f7f8";
- name = "ksirk-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ksirk-19.08.3.tar.xz";
+ sha256 = "8ab94b45767e648341ead545a2b427c94ee0f71c8abbe7dbb6b85c28748f3cac";
+ name = "ksirk-19.08.3.tar.xz";
};
};
ksmtp = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ksmtp-19.08.2.tar.xz";
- sha256 = "0d1308fd01f7261e78bedb465983be2ccf5a1514cfa31125e0a3488f67ab6590";
- name = "ksmtp-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ksmtp-19.08.3.tar.xz";
+ sha256 = "16b389a8dcb938ed3f1e2f4b10a5aa31c16eac8df89963a71c08af3e54ada8dd";
+ name = "ksmtp-19.08.3.tar.xz";
};
};
ksnakeduel = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ksnakeduel-19.08.2.tar.xz";
- sha256 = "bb13aa91d0e75c1099a57606e0ea1f567a3ffe8f4efbf6a94420bd372ff10289";
- name = "ksnakeduel-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ksnakeduel-19.08.3.tar.xz";
+ sha256 = "d6361ce5a46d6e8ca4b5e674f31017a545245ddb907f33963afba2aeaecdf956";
+ name = "ksnakeduel-19.08.3.tar.xz";
};
};
kspaceduel = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kspaceduel-19.08.2.tar.xz";
- sha256 = "3e2af55afcf78f74ca1fa67ea46da2db4cbc6fd9f522a94d3adb9bed6b518aa8";
- name = "kspaceduel-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kspaceduel-19.08.3.tar.xz";
+ sha256 = "88e25bc037034e3a22f4cea71729fc160d25bcefb978da00d3f7681841b4f7c2";
+ name = "kspaceduel-19.08.3.tar.xz";
};
};
ksquares = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ksquares-19.08.2.tar.xz";
- sha256 = "f16fa641f02a6462085d291ed8d3262891cdeeeff8bbbde4e0aabfdac3dc7bc9";
- name = "ksquares-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ksquares-19.08.3.tar.xz";
+ sha256 = "7e1798e6a306d6ef948035915bdb904ee9efb238dc5a04b4a747185d34856843";
+ name = "ksquares-19.08.3.tar.xz";
};
};
ksudoku = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ksudoku-19.08.2.tar.xz";
- sha256 = "4630117e12c10c2f326a4e55dceed7f19d183b597eadc3d4308aecf5a5455156";
- name = "ksudoku-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ksudoku-19.08.3.tar.xz";
+ sha256 = "82bf07385d131968ffd49a58404984fd506481158097aa063d954618d2679a65";
+ name = "ksudoku-19.08.3.tar.xz";
};
};
ksystemlog = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ksystemlog-19.08.2.tar.xz";
- sha256 = "742bff9c71cc42d7a57a7732f039a944f60fe4dd70cf71c32f37ba914b57b5de";
- name = "ksystemlog-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ksystemlog-19.08.3.tar.xz";
+ sha256 = "97fca55ae5481d77628531482da99ece40cef2c81de633fe4c1e99206d17391d";
+ name = "ksystemlog-19.08.3.tar.xz";
};
};
kteatime = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kteatime-19.08.2.tar.xz";
- sha256 = "075470af370b7913fdb085dd6984da91f863b6c03a4b713854e85437e6f9cdbe";
- name = "kteatime-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kteatime-19.08.3.tar.xz";
+ sha256 = "dbe96fdd20545dc5ebe8103aed878dbbca5e015a42827129485a32fdcbf0d592";
+ name = "kteatime-19.08.3.tar.xz";
};
};
ktimer = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktimer-19.08.2.tar.xz";
- sha256 = "81be41497e14f5fb72150e238805744c9b09463ac261cf5d7d2ca011a41a05a0";
- name = "ktimer-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktimer-19.08.3.tar.xz";
+ sha256 = "d8c80c3929e21a0450574d2e05e2a2384978c70f812eaab25e32402fe3a2f6c5";
+ name = "ktimer-19.08.3.tar.xz";
};
};
ktnef = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktnef-19.08.2.tar.xz";
- sha256 = "d8efabe72eedd5e89f3de9637a1a6d68ce670ec071e031470aa6852f9ad8561d";
- name = "ktnef-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktnef-19.08.3.tar.xz";
+ sha256 = "86ae57b54047f51d31292fb71f2410660dd5bf7ca54e847b78108c600884ee4d";
+ name = "ktnef-19.08.3.tar.xz";
};
};
ktouch = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktouch-19.08.2.tar.xz";
- sha256 = "d36659c21d05465c7a77330dbfbbab09946093eac1db6c02147d81a838eba636";
- name = "ktouch-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktouch-19.08.3.tar.xz";
+ sha256 = "8a288377a37f5afbd657c452c45628186646b27585a67312e35930a9fb581d37";
+ name = "ktouch-19.08.3.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktp-accounts-kcm-19.08.2.tar.xz";
- sha256 = "7995813bc983c80b200cddf6b0f55fa8c48be3297ee03e3e0a7601cbc86b8dd8";
- name = "ktp-accounts-kcm-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktp-accounts-kcm-19.08.3.tar.xz";
+ sha256 = "79d2af8b3863d2f4fda51c0bc04b696648d297f2af33e09237b0eed9dd24509f";
+ name = "ktp-accounts-kcm-19.08.3.tar.xz";
};
};
ktp-approver = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktp-approver-19.08.2.tar.xz";
- sha256 = "74670d519578486e05237f5085a51fe0a8ce833be413c06702f38b27b27913ec";
- name = "ktp-approver-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktp-approver-19.08.3.tar.xz";
+ sha256 = "6051059761a1fe05ad696846a20752707ed6c9ce164aa551e86e3a5ddca4a65f";
+ name = "ktp-approver-19.08.3.tar.xz";
};
};
ktp-auth-handler = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktp-auth-handler-19.08.2.tar.xz";
- sha256 = "b13304909d8e66adc2a0658081fd41e72b0ef7513e041b9a8f3261a8ffd7bb22";
- name = "ktp-auth-handler-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktp-auth-handler-19.08.3.tar.xz";
+ sha256 = "6275ea746a28857cc77cc031a75a5f2278cf85dd1ef3c04e47006c4316975659";
+ name = "ktp-auth-handler-19.08.3.tar.xz";
};
};
ktp-call-ui = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktp-call-ui-19.08.2.tar.xz";
- sha256 = "0d735c34f937a436e82e994c9d60b851473d31b3dc07f1d2ec7eeeab63b83658";
- name = "ktp-call-ui-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktp-call-ui-19.08.3.tar.xz";
+ sha256 = "9245d11a28c2022ec98de6368d03ba8d9a53d8364d4f87efb142a0f843eea67d";
+ name = "ktp-call-ui-19.08.3.tar.xz";
};
};
ktp-common-internals = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktp-common-internals-19.08.2.tar.xz";
- sha256 = "b08cb6dc05e325c80f9d1753db23d1969fc6c2defc571401e7b2e87772721f7e";
- name = "ktp-common-internals-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktp-common-internals-19.08.3.tar.xz";
+ sha256 = "7ec6466ebaa0f4acb7e38707b013989ef0a7d50bad5520d1a53fcf17b5ef5670";
+ name = "ktp-common-internals-19.08.3.tar.xz";
};
};
ktp-contact-list = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktp-contact-list-19.08.2.tar.xz";
- sha256 = "ab5778049e1351bc5cec29e3bfd98588f24b9877d385e787eb1f68715d624d34";
- name = "ktp-contact-list-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktp-contact-list-19.08.3.tar.xz";
+ sha256 = "508085b52fff2e542ea28acb853f1cb3fcdf99d1f72ed99bc42991784fb2efd6";
+ name = "ktp-contact-list-19.08.3.tar.xz";
};
};
ktp-contact-runner = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktp-contact-runner-19.08.2.tar.xz";
- sha256 = "6ec9fd151b98c2f48d1ef4361c063e83fe51562fc34868c032d39495ab38fb85";
- name = "ktp-contact-runner-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktp-contact-runner-19.08.3.tar.xz";
+ sha256 = "fe343560b80a4d9734f0160c8257fffe762801364e5dcbb9cf82edd6ded5683c";
+ name = "ktp-contact-runner-19.08.3.tar.xz";
};
};
ktp-desktop-applets = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktp-desktop-applets-19.08.2.tar.xz";
- sha256 = "96975cf9208d215da1844619e2792be0919238a03ede71073813584042d6c774";
- name = "ktp-desktop-applets-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktp-desktop-applets-19.08.3.tar.xz";
+ sha256 = "318b6a8f40cbbd7a82a1ed55788f8832133ee8d5685182783a4c00e1b2e6fa2a";
+ name = "ktp-desktop-applets-19.08.3.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktp-filetransfer-handler-19.08.2.tar.xz";
- sha256 = "cd2a8fb944e76b6a1ea4f8c956db2d9914a0d5bd472c3fac2e9b568144bf87ab";
- name = "ktp-filetransfer-handler-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktp-filetransfer-handler-19.08.3.tar.xz";
+ sha256 = "cdc90313da9a238197b69d0ebc11d8e4c6ce617063acbf2864d966aff6df1e94";
+ name = "ktp-filetransfer-handler-19.08.3.tar.xz";
};
};
ktp-kded-module = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktp-kded-module-19.08.2.tar.xz";
- sha256 = "340bffd880fee602868cb44bc4c5474db1c34be62375298affedf3cc7eb1579f";
- name = "ktp-kded-module-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktp-kded-module-19.08.3.tar.xz";
+ sha256 = "c16d46035874460f98c4f59e04d50e197c1c70ae9b441dfeb53dd4b319e96d15";
+ name = "ktp-kded-module-19.08.3.tar.xz";
};
};
ktp-send-file = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktp-send-file-19.08.2.tar.xz";
- sha256 = "30a4a27b4c37c8ca75ebc407c6070395197b9b88ba8e422d7055eee93ec0ae9d";
- name = "ktp-send-file-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktp-send-file-19.08.3.tar.xz";
+ sha256 = "db03d482f7bb101e1655262cd99d46e4a551141b8784bae67162d941fb13644f";
+ name = "ktp-send-file-19.08.3.tar.xz";
};
};
ktp-text-ui = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktp-text-ui-19.08.2.tar.xz";
- sha256 = "a0b7d8469b12ae6820541cc38dd57fad8866ad6e236c4864b7cf94629ca0cc33";
- name = "ktp-text-ui-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktp-text-ui-19.08.3.tar.xz";
+ sha256 = "6779fad4ae6198ebf2e0759b53a8a0792bfca477df2c1f538bc00d1da281eae8";
+ name = "ktp-text-ui-19.08.3.tar.xz";
};
};
ktuberling = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/ktuberling-19.08.2.tar.xz";
- sha256 = "e6cfcd7175c7ed081ecd743c2fdd845f88b25d6cb4d46f9e6d58e35eb11c66ad";
- name = "ktuberling-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/ktuberling-19.08.3.tar.xz";
+ sha256 = "5204b6eee57554e90d542dc4eca45fbbf0246f261fb1c231b53440c90d26aee1";
+ name = "ktuberling-19.08.3.tar.xz";
};
};
kturtle = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kturtle-19.08.2.tar.xz";
- sha256 = "1f1245c444aba511aea0630f80953171dd11334f55f6b9547a844e25293cf833";
- name = "kturtle-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kturtle-19.08.3.tar.xz";
+ sha256 = "a622b22ea3b98666dbd32f6f6db2093b7f3859be52515b3bedc72684ef7780e7";
+ name = "kturtle-19.08.3.tar.xz";
};
};
kubrick = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kubrick-19.08.2.tar.xz";
- sha256 = "89c181f8c82db143cd671fe78105e95a229e43fd64cab17ccdb80774b4ca8638";
- name = "kubrick-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kubrick-19.08.3.tar.xz";
+ sha256 = "fd11e0969ae08e42316044535008511b3fcae7752c7a86b2ae9ae24c94e44855";
+ name = "kubrick-19.08.3.tar.xz";
};
};
kwalletmanager = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kwalletmanager-19.08.2.tar.xz";
- sha256 = "5c0cd648d6bf4515cd71b4575ab8051004dcf505c2bfe502fb42b7ba01cb51b2";
- name = "kwalletmanager-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kwalletmanager-19.08.3.tar.xz";
+ sha256 = "00c1362d1454f4593e1f99847b97b3da99931c74ceafc3c3350337af0038b985";
+ name = "kwalletmanager-19.08.3.tar.xz";
};
};
kwave = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kwave-19.08.2.tar.xz";
- sha256 = "7836b7737d3f578f6d44b40dddf8b3abae53eaa84b3352bfed242eb6ef3d5604";
- name = "kwave-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kwave-19.08.3.tar.xz";
+ sha256 = "bde8d2c3805b52bdcf0371c28e870d20fdfdd8b69831a9ba4e59ee9ae0a863ef";
+ name = "kwave-19.08.3.tar.xz";
};
};
kwordquiz = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/kwordquiz-19.08.2.tar.xz";
- sha256 = "9bb9abc4058b8520a9229317d7da6cbbddb8a715549ca487c04af5f9eb425019";
- name = "kwordquiz-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/kwordquiz-19.08.3.tar.xz";
+ sha256 = "9561e4817b5b273f74e7591d1ecb82db45140eea2ea36ab3e2f21d81faa1b66d";
+ name = "kwordquiz-19.08.3.tar.xz";
};
};
libgravatar = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libgravatar-19.08.2.tar.xz";
- sha256 = "393370a9d7d4a74627469b2e67bb3f7a0ef73dac8b11a3ab5af6c384c20a0de5";
- name = "libgravatar-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libgravatar-19.08.3.tar.xz";
+ sha256 = "7f3421d1074065221e7ff892ba5f32614aef08b9ee407b5d8301e20f414bf8fb";
+ name = "libgravatar-19.08.3.tar.xz";
};
};
libkcddb = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkcddb-19.08.2.tar.xz";
- sha256 = "f3e4c650b0abe10f281037bd6c805243a656fecdfc046a8586324c760ba90e48";
- name = "libkcddb-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkcddb-19.08.3.tar.xz";
+ sha256 = "56fe09cfab0455581057aa1681cec01777159a51af1871419cd1b5fb9d4e8ae6";
+ name = "libkcddb-19.08.3.tar.xz";
};
};
libkcompactdisc = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkcompactdisc-19.08.2.tar.xz";
- sha256 = "e185f528a4c6fea1b789186fe64a183197afc447c8cb939c9b6b9957f60d04e0";
- name = "libkcompactdisc-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkcompactdisc-19.08.3.tar.xz";
+ sha256 = "912b885badf6aff6b0378fba993633c9fb5cf026dc6791e4cda0c4c27913f425";
+ name = "libkcompactdisc-19.08.3.tar.xz";
};
};
libkdcraw = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkdcraw-19.08.2.tar.xz";
- sha256 = "735ab40633efec394c6265d83f86ad7caf278f63d1dd33cc6edf572da4925fcb";
- name = "libkdcraw-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkdcraw-19.08.3.tar.xz";
+ sha256 = "7fe4ade52c2e1e1ec3074fe52ebfc8838193b50791f2f26256f04178015ef87e";
+ name = "libkdcraw-19.08.3.tar.xz";
};
};
libkdegames = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkdegames-19.08.2.tar.xz";
- sha256 = "83456cec44502a1f79c0be00c983090e32fd8aea5fec1461fbfbd37b5f8866ac";
- name = "libkdegames-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkdegames-19.08.3.tar.xz";
+ sha256 = "019cdc0c702b8c9cacabc36ec2c81951e43ff80dbdfe527cba0dc5f5649dbb89";
+ name = "libkdegames-19.08.3.tar.xz";
};
};
libkdepim = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkdepim-19.08.2.tar.xz";
- sha256 = "67578e4c98e7e5d94249144e3720ae5fbc17231d4ecc46cb0e1be6e7ced4a71b";
- name = "libkdepim-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkdepim-19.08.3.tar.xz";
+ sha256 = "36c9457868fd98648a911304a485e8509689bfc280f9d4ad2631ba15f849b059";
+ name = "libkdepim-19.08.3.tar.xz";
};
};
libkeduvocdocument = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkeduvocdocument-19.08.2.tar.xz";
- sha256 = "74338cb3fcb9346a981585484f758aabd372d1a43afe9facd93d94c229424250";
- name = "libkeduvocdocument-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkeduvocdocument-19.08.3.tar.xz";
+ sha256 = "19d816ae3dd2395f53c8bc19a4d62dcd6fcec0bcebbc8ebfe32987afdb87ee14";
+ name = "libkeduvocdocument-19.08.3.tar.xz";
};
};
libkexiv2 = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkexiv2-19.08.2.tar.xz";
- sha256 = "abdafabe834862e157356f2686ae871f00302d82ae639dbf89030d19ccc54b1b";
- name = "libkexiv2-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkexiv2-19.08.3.tar.xz";
+ sha256 = "4c8a1acc4fe6c7105130ac93f5486ddbffb09921a9f34d3af418bd7e1695435e";
+ name = "libkexiv2-19.08.3.tar.xz";
};
};
libkgapi = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkgapi-19.08.2.tar.xz";
- sha256 = "b220908dd4a21e589a25b964b7786f1154f63ca98bf90c43ced3120adf4fb0a6";
- name = "libkgapi-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkgapi-19.08.3.tar.xz";
+ sha256 = "085878396ae2a8bed7e9121d985de848c515992a3c6c989b9510125bc859e67c";
+ name = "libkgapi-19.08.3.tar.xz";
};
};
libkgeomap = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkgeomap-19.08.2.tar.xz";
- sha256 = "145692b900d87a84b74507b53ddc05947e6c1cce46381d8960559b5907296219";
- name = "libkgeomap-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkgeomap-19.08.3.tar.xz";
+ sha256 = "858a6327fe45b67bd31e1f592412a30e0c0f64eb353279480f62b19e51df9576";
+ name = "libkgeomap-19.08.3.tar.xz";
};
};
libkipi = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkipi-19.08.2.tar.xz";
- sha256 = "fcaf576afb961d9a36c1f69c034c43b9f0991cbd0726ea684c2c49096f36d5c6";
- name = "libkipi-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkipi-19.08.3.tar.xz";
+ sha256 = "4b06a880a66eae18dc3ed7f4b39e877691c21d60af7603c7679ebcac5a0a7d4b";
+ name = "libkipi-19.08.3.tar.xz";
};
};
libkleo = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkleo-19.08.2.tar.xz";
- sha256 = "0acf296ffb0144096071e47ce1365b9e5b07b59cad4700f89c875c7bee4573bd";
- name = "libkleo-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkleo-19.08.3.tar.xz";
+ sha256 = "5f1a3276646c786e8e25e6765d0f4e6b6ac0e4dccd094c1810b10a10e401576e";
+ name = "libkleo-19.08.3.tar.xz";
};
};
libkmahjongg = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkmahjongg-19.08.2.tar.xz";
- sha256 = "8699949fae90c0e92dd046b904b0624f79c37fecaa46557c808f20f24e215947";
- name = "libkmahjongg-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkmahjongg-19.08.3.tar.xz";
+ sha256 = "fd7d036ba3b17246fad42e0366003233c42f5b03df881d6bc6886518c2acb165";
+ name = "libkmahjongg-19.08.3.tar.xz";
};
};
libkomparediff2 = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libkomparediff2-19.08.2.tar.xz";
- sha256 = "c5738f96dbda3d7272ad08ff9518722ae9b7ee737ab7e27c9e88cedb418371d7";
- name = "libkomparediff2-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libkomparediff2-19.08.3.tar.xz";
+ sha256 = "a1ba5616fda806d5aedab3fb080bbcef5e13c04153fd9659d9d47f0a1a11125d";
+ name = "libkomparediff2-19.08.3.tar.xz";
};
};
libksane = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libksane-19.08.2.tar.xz";
- sha256 = "97e05423f4a9205b9db0bbce5111615d6bf8e8d53a391d3398275babccd91aa0";
- name = "libksane-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libksane-19.08.3.tar.xz";
+ sha256 = "97808ced0a0c6800c31fa8e810d2a00a3dbda410ed6691e114173b0412b94f93";
+ name = "libksane-19.08.3.tar.xz";
};
};
libksieve = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/libksieve-19.08.2.tar.xz";
- sha256 = "5c5bb9182e53a2a928d70985f6dd514c8b308891c4899b942784e80d221318f6";
- name = "libksieve-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/libksieve-19.08.3.tar.xz";
+ sha256 = "a10311192a57d1b7073d73477f5cefdf7c42d0a720d0eaf406986e4f1835ce60";
+ name = "libksieve-19.08.3.tar.xz";
};
};
lokalize = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/lokalize-19.08.2.tar.xz";
- sha256 = "3fe3af9f647bcda7f89eab5c3ebb7bce4e9ceb0b7cfb5206c2f6ecdf9cdbe3ee";
- name = "lokalize-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/lokalize-19.08.3.tar.xz";
+ sha256 = "e25de54944ca32b32b4eeddd85e8ca9764a04de7c1d7a2d350d41cbda8105aef";
+ name = "lokalize-19.08.3.tar.xz";
};
};
lskat = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/lskat-19.08.2.tar.xz";
- sha256 = "3ae219b92cbc4c9acfacbb16e262e82b03cd5ddba024820e82d8de7312327a9c";
- name = "lskat-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/lskat-19.08.3.tar.xz";
+ sha256 = "499334ffff57a46973caa4f8571b06ae482bccff9e17dcd9ba82ac7f448365e2";
+ name = "lskat-19.08.3.tar.xz";
};
};
mailcommon = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/mailcommon-19.08.2.tar.xz";
- sha256 = "39df1544c0278600d5a1a57697835828358ae44203087e29430ce1bd0c355e20";
- name = "mailcommon-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/mailcommon-19.08.3.tar.xz";
+ sha256 = "55ccf161f40b3647f269f71309f9a2fcdf1e2327da53e96c3d8510fc664252bf";
+ name = "mailcommon-19.08.3.tar.xz";
};
};
mailimporter = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/mailimporter-19.08.2.tar.xz";
- sha256 = "27780c381919ebc9e6fc0de7021cd03277dd3962d4c4c15770fcf44cd6126814";
- name = "mailimporter-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/mailimporter-19.08.3.tar.xz";
+ sha256 = "fbdfbfe093bb0af05d26492c0839a94ac0a5c0577081bd726626b943be7cb96e";
+ name = "mailimporter-19.08.3.tar.xz";
};
};
marble = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/marble-19.08.2.tar.xz";
- sha256 = "4add63522a51fdea7b425f29bd3d35c558a0b881336ff6a90bfc07483acbf6a6";
- name = "marble-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/marble-19.08.3.tar.xz";
+ sha256 = "cd5d7f758d2234dc8e2fa638b9e1326461655e10dbe21910dbef029e80ef7a68";
+ name = "marble-19.08.3.tar.xz";
};
};
mbox-importer = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/mbox-importer-19.08.2.tar.xz";
- sha256 = "644175d6fcb66b878309de899f4a3e060e29d4f31ce337d44ee6e1af5901044f";
- name = "mbox-importer-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/mbox-importer-19.08.3.tar.xz";
+ sha256 = "77fadf4d2dc14830704135237fb7c5f0285204acb9822277944cc03f70b8dc3c";
+ name = "mbox-importer-19.08.3.tar.xz";
};
};
messagelib = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/messagelib-19.08.2.tar.xz";
- sha256 = "d761e94d2fa71c2de6a52e0c1756f52f0006ada35711189b343eccdafe0a0390";
- name = "messagelib-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/messagelib-19.08.3.tar.xz";
+ sha256 = "db2e48e48d87922f9533ebd3eb021549e6bf8dea5828d83bfdfecb36b1426728";
+ name = "messagelib-19.08.3.tar.xz";
};
};
minuet = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/minuet-19.08.2.tar.xz";
- sha256 = "1713ac758388443bbd1e2f5158cba594c35c3afdc5122a993fc66d70b07eb904";
- name = "minuet-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/minuet-19.08.3.tar.xz";
+ sha256 = "8af3e0b5fd17d7043499391273232a1649ea3dec5e69faab5a4dc4452080605c";
+ name = "minuet-19.08.3.tar.xz";
};
};
okular = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/okular-19.08.2.tar.xz";
- sha256 = "ff3d2eac444a110a611add71c30b0556085f5aaccdd821a80bd070a646c9f6b3";
- name = "okular-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/okular-19.08.3.tar.xz";
+ sha256 = "cea30fe0c2c2b8394e76efe5c945eab1cc9619097291bd9236794b42b09523e5";
+ name = "okular-19.08.3.tar.xz";
};
};
palapeli = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/palapeli-19.08.2.tar.xz";
- sha256 = "bae810595c7ba7bdac0fa5c27e6c2a3a9bb1bbdae3521cfc036ec0cdcd9ef1a7";
- name = "palapeli-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/palapeli-19.08.3.tar.xz";
+ sha256 = "fc8e4ddd92def4998a0e8b11bc0a45671e5b07e065313aec135e74c056f321bd";
+ name = "palapeli-19.08.3.tar.xz";
};
};
parley = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/parley-19.08.2.tar.xz";
- sha256 = "1201945d55657d6b89e309220edb1a60a61debf0bbf59b508d1c0a21a8dc407e";
- name = "parley-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/parley-19.08.3.tar.xz";
+ sha256 = "a3d11ddf5a6c8244e5a22c10f6e256ad8bd857802d994550549c7f73f8ed8da8";
+ name = "parley-19.08.3.tar.xz";
};
};
picmi = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/picmi-19.08.2.tar.xz";
- sha256 = "ecfa211043327991a0927be852c185223adebe5f15cdc39e79e31022802f904b";
- name = "picmi-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/picmi-19.08.3.tar.xz";
+ sha256 = "6ed444d40a388e5c1f5f7bda24d35fa119fa5b5ee488def02321f14476bd357d";
+ name = "picmi-19.08.3.tar.xz";
};
};
pimcommon = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/pimcommon-19.08.2.tar.xz";
- sha256 = "ccdf2624a055a9db31b0b8109c791776d111ae91438f41ed50dcb9faca287e4c";
- name = "pimcommon-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/pimcommon-19.08.3.tar.xz";
+ sha256 = "76a67c28db71e1187fa192f0e1a07279c690dea313a2a376b2d21b82ab0784ca";
+ name = "pimcommon-19.08.3.tar.xz";
};
};
pim-data-exporter = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/pim-data-exporter-19.08.2.tar.xz";
- sha256 = "e4703d7a10935814738394a38c5ad54f9923c58e43c397e2e78a4b1b1176f4c2";
- name = "pim-data-exporter-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/pim-data-exporter-19.08.3.tar.xz";
+ sha256 = "f89b6588822dd5501e1b93ed3abd9b822725944246ab834777ed0f91f5ab6b91";
+ name = "pim-data-exporter-19.08.3.tar.xz";
};
};
pim-sieve-editor = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/pim-sieve-editor-19.08.2.tar.xz";
- sha256 = "ae9f7de78ab9adffe2575bf1367b1ae4928afee1fd299bb91ca2d26b3bb86c03";
- name = "pim-sieve-editor-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/pim-sieve-editor-19.08.3.tar.xz";
+ sha256 = "5e8aa5d71ea923baf4376986db77b6dee16d6e281caf22855e97cfeebfb4c1fe";
+ name = "pim-sieve-editor-19.08.3.tar.xz";
};
};
poxml = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/poxml-19.08.2.tar.xz";
- sha256 = "c5e36bd10d3a8d0474f903eebd45e026ca306beb74829c43a1e7be4ed34ca9e8";
- name = "poxml-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/poxml-19.08.3.tar.xz";
+ sha256 = "be5feaf46d424a4a4edc5936924f9a8a6d1d5467ecedd0e415aa88e2c3170502";
+ name = "poxml-19.08.3.tar.xz";
};
};
print-manager = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/print-manager-19.08.2.tar.xz";
- sha256 = "c0702208b6f485e2e44337aaf203b9e391adda22d6526bf0dd34b31230e0fb05";
- name = "print-manager-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/print-manager-19.08.3.tar.xz";
+ sha256 = "c6420dfa711fc68a6d681d27521eac3c9f1060e57f048594b43f2941a78320ee";
+ name = "print-manager-19.08.3.tar.xz";
};
};
rocs = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/rocs-19.08.2.tar.xz";
- sha256 = "4e61226334f79a260f0ccc7789a099a91c7643d9fdfcdd052b002f2fe6f64885";
- name = "rocs-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/rocs-19.08.3.tar.xz";
+ sha256 = "533ab2f17160c402550479d7d3be9132b49e1d745c021c7735f0687d12236c8e";
+ name = "rocs-19.08.3.tar.xz";
};
};
signon-kwallet-extension = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/signon-kwallet-extension-19.08.2.tar.xz";
- sha256 = "2521cd2c4f25717f5caf9915474f75614be7dec7053f1e94c1429fac7045cc29";
- name = "signon-kwallet-extension-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/signon-kwallet-extension-19.08.3.tar.xz";
+ sha256 = "273ff874bf08dd97a12b3b07215bc0ce9fd3c3c59b6bb1f61000411454211a65";
+ name = "signon-kwallet-extension-19.08.3.tar.xz";
};
};
spectacle = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/spectacle-19.08.2.tar.xz";
- sha256 = "4cf2f0903cec2787a03a8bbdbd219acc29ac412f352a4ff94ef50ae9a6eb459e";
- name = "spectacle-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/spectacle-19.08.3.tar.xz";
+ sha256 = "3717b7ebd314cac47c263c304c54c14b0115b15cfa4b87201f5ea27a2f4e9b8a";
+ name = "spectacle-19.08.3.tar.xz";
};
};
step = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/step-19.08.2.tar.xz";
- sha256 = "dede94c073b2903fa4fa6806623cb980ebe93d15cc76376aadac4ca8cd61a96c";
- name = "step-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/step-19.08.3.tar.xz";
+ sha256 = "1197b38d9ef14305cf341eba4cd2df08695a9b3f53e2bebff8abb7cbd7a9e2aa";
+ name = "step-19.08.3.tar.xz";
};
};
svgpart = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/svgpart-19.08.2.tar.xz";
- sha256 = "6c6510b604bba3aebbeca136ec9534c416bc0ba55125227bdd0af2a86052855c";
- name = "svgpart-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/svgpart-19.08.3.tar.xz";
+ sha256 = "1ad667fc6988b64fd379cfb79d00a7c04c97de530e4b61a9ae8a525971ea2a94";
+ name = "svgpart-19.08.3.tar.xz";
};
};
sweeper = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/sweeper-19.08.2.tar.xz";
- sha256 = "da65cbfc952d8b63ddfbcba373d9a828ef5acefc68196ddd4c2c602c672cbb5f";
- name = "sweeper-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/sweeper-19.08.3.tar.xz";
+ sha256 = "0451b9319c4390cfae497922cc135d7d8c4ef74ac81f2c05d2f94458bb3fc8be";
+ name = "sweeper-19.08.3.tar.xz";
};
};
umbrello = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/umbrello-19.08.2.tar.xz";
- sha256 = "69a721d27ecedbe694d232e04469002dcf2319dd320982aacc2a02e32430c382";
- name = "umbrello-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/umbrello-19.08.3.tar.xz";
+ sha256 = "c4c56354d2765c0d03ffda02cc098cc3e9d72b0c7c22bb0c1cc03dcf5ac31a6a";
+ name = "umbrello-19.08.3.tar.xz";
};
};
yakuake = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/yakuake-19.08.2.tar.xz";
- sha256 = "3ebf477069c85a8705302b6b51902a74af7bb92349fab41000f71484a4de5aee";
- name = "yakuake-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/yakuake-19.08.3.tar.xz";
+ sha256 = "1ad2cc026eea9449690aa037ac94b09cd18696d71025204e648501fa7f2cfbaf";
+ name = "yakuake-19.08.3.tar.xz";
};
};
zeroconf-ioslave = {
- version = "19.08.2";
+ version = "19.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/19.08.2/src/zeroconf-ioslave-19.08.2.tar.xz";
- sha256 = "19e31534d1a4503d1dd4bd8ef60cfb48a91ee167dd4b0db99e53b318a355dae0";
- name = "zeroconf-ioslave-19.08.2.tar.xz";
+ url = "${mirror}/stable/applications/19.08.3/src/zeroconf-ioslave-19.08.3.tar.xz";
+ sha256 = "b7b00edcc987c298e1dc885e3ceb6acbcbfe40141423d90406a3ccecef2471ed";
+ name = "zeroconf-ioslave-19.08.3.tar.xz";
};
};
}
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 24f788ef4687..2db8f7b26f3d 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -52,16 +52,16 @@ let
];
in buildRustPackage rec {
pname = "alacritty";
- version = "0.3.3";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "jwilm";
repo = pname;
rev = "v${version}";
- sha256 = "1h9zid7bi19qga3a8a2d4x3ma9wf1njmj74s4xnw7nzqqf3dh750";
+ sha256 = "0adaqdbma6gskb2g14yscrgr9gch5wf2g2clchplv72c2qr1k427";
};
- cargoSha256 = "1rxb5ljgvn881jkxm8772kf815mmp08ci7sqmn2x1jwdcrphhxr1";
+ cargoSha256 = "1r267g8f986nxh8ms5yhp50qy1yl8gly2jr78p738qqc6frlxlhv";
nativeBuildInputs = [
cmake
@@ -76,10 +76,6 @@ in buildRustPackage rec {
++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ];
outputs = [ "out" "terminfo" ];
- postPatch = ''
- substituteInPlace alacritty_terminal/src/config/mouse.rs \
- --replace xdg-open ${xdg_utils}/bin/xdg-open
- '';
postBuild = lib.optionalString stdenv.isDarwin "make app";
@@ -105,7 +101,7 @@ in buildRustPackage rec {
gzip -c extra/alacritty.man > "$out/share/man/man1/alacritty.1.gz"
install -dm 755 "$terminfo/share/terminfo/a/"
- tic -x -o "$terminfo/share/terminfo" extra/alacritty.info
+ tic -xe alacritty,alacritty-direct -o "$terminfo/share/terminfo" extra/alacritty.info
mkdir -p $out/nix-support
echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
@@ -118,7 +114,7 @@ in buildRustPackage rec {
description = "GPU-accelerated terminal emulator";
homepage = https://github.com/jwilm/alacritty;
license = with licenses; [ asl20 ];
- maintainers = with maintainers; [ mic92 ];
+ maintainers = with maintainers; [ filalex77 mic92 ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
};
}
diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix
index 398e14a9c252..cda75ac4c050 100644
--- a/pkgs/applications/misc/appeditor/default.nix
+++ b/pkgs/applications/misc/appeditor/default.nix
@@ -40,11 +40,22 @@ stdenv.mkDerivation rec {
libgee
];
+ patches = [
+ # See: https://github.com/donadigo/appeditor/issues/88
+ ./fix-build-vala-0.46.patch
+ ];
+
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "Edit the Pantheon desktop application menu";
homepage = https://github.com/donadigo/appeditor;
diff --git a/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch b/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch
new file mode 100644
index 000000000000..f6c0b4cfd287
--- /dev/null
+++ b/pkgs/applications/misc/appeditor/fix-build-vala-0.46.patch
@@ -0,0 +1,22 @@
+diff --git a/src/DesktopApp.vala b/src/DesktopApp.vala
+index 0e6fa47..ebcde0c 100644
+--- a/src/DesktopApp.vala
++++ b/src/DesktopApp.vala
+@@ -130,7 +130,7 @@ public class AppEditor.DesktopApp : Object {
+
+ public unowned string get_path () {
+ if (path == null) {
+- unowned string _path = info.get_string (KeyFileDesktop.KEY_PATH);
++ string _path = info.get_string (KeyFileDesktop.KEY_PATH);
+ if (_path == null) {
+ _path = "";
+ }
+@@ -150,7 +150,7 @@ public class AppEditor.DesktopApp : Object {
+ }
+
+ public bool get_should_show () {
+- return info.should_show () && !get_terminal ();
++ return info.should_show () && !get_terminal ();
+ }
+
+ public string[] get_categories () {
diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix
index d8325e19e266..10e46176c6e6 100644
--- a/pkgs/applications/misc/barrier/default.nix
+++ b/pkgs/applications/misc/barrier/default.nix
@@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation,
+ openssl, wrapGAppsHook,
avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }
}:
@@ -13,12 +14,17 @@ mkDerivation rec {
sha256 = "1gbg3p7c0vcsdzsjj1ssx6k8xpj3rpyvais12266f0xvnbvihczd";
};
- buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ];
+ buildInputs = [ curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ];
+ nativeBuildInputs = [ cmake wrapGAppsHook ];
postFixup = ''
substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier"
'';
+ qtWrapperArgs = [
+ ''--prefix PATH : ${stdenv.lib.makeBinPath [ openssl ]}''
+ ];
+
meta = {
description = "Open-source KVM software";
longDescription = ''
diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix
deleted file mode 100644
index 8b994c55de3f..000000000000
--- a/pkgs/applications/misc/batti/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, fetchurl
-, pkgconfig, gettext, pythonPackages
-, gtk2, gdk-pixbuf, upower
-, makeWrapper }:
-
-let
- inherit (pythonPackages) dbus-python pygtk python;
-in stdenv.mkDerivation rec {
-
- pname = "batti";
- version = "0.3.8";
-
- src = fetchurl {
- url = "https://batti-gtk.googlecode.com/files/${pname}-${version}.tar.gz";
- sha256 = "072d92gpsiiin631589nj77i2w1425p6db0qxyml7myscfy9jgx6";
- };
-
- buildInputs = with stdenv.lib;
- [ pkgconfig gettext python gtk2 pygtk dbus-python gdk-pixbuf upower makeWrapper ];
-
- dontConfigure = true;
-
- buildPhase = ''
- python setup.py build
- '';
-
- installPhase = ''
- python setup.py install --prefix $out
- wrapProgram "$out/bin/batti" \
- --set PYTHONPATH "$PYTHONPATH:$(toPythonPath $out)" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
-
- meta = with stdenv.lib; {
- description = "An {UPower,GTK}-based battery monitor for the system tray";
- longDescription = ''
- Batti is a simple battery monitor for the system tray. Batti
- uses UPower, and if that is missing DeviceKit.Power, for it's
- power information.
- '';
- homepage = http://batti-gtk.googlecode.com/;
- license = licenses.lgpl2Plus;
- maintainers = [ maintainers.AndersonTorres ];
- platforms = platforms.linux;
- broken = true; # see https://github.com/NixOS/nixpkgs/pull/4031#issuecomment-56283520
- };
-}
-
-# TODO: fix the "icon not found" problems...
diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix
new file mode 100644
index 000000000000..39ecaa995d14
--- /dev/null
+++ b/pkgs/applications/misc/birdtray/default.nix
@@ -0,0 +1,40 @@
+{ mkDerivation
+ , lib
+ , fetchFromGitHub
+
+ , cmake
+ , pkgconfig
+ , qtbase
+ , qttools
+ , qtx11extras
+ , sqlite
+}:
+
+mkDerivation rec {
+ pname = "birdtray";
+ version = "1.7.0";
+
+ src = fetchFromGitHub {
+ owner = "gyunaev";
+ repo = pname;
+ rev = "RELEASE_${version}";
+ sha256 = "0wj2lq5bz1p0cf6yj43v3ifxschcrh5amwx30wqw2m4bb8syzjw1";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [
+ qtbase qtx11extras sqlite
+ ];
+
+ installPhase = ''
+ install -Dm755 birdtray $out/bin/birdtray
+ '';
+
+ meta = with lib; {
+ description = "Mail system tray notification icon for Thunderbird";
+ homepage = https://github.com/gyunaev/birdtray;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ Flakebi ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
index 3f13972de9bb..225a5c5fc376 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/pkgs/applications/misc/bleachbit/default.nix
@@ -1,16 +1,43 @@
-{ stdenv, pythonPackages, fetchurl, gettext }:
+{ stdenv
+, pythonPackages
+, fetchurl
+, gettext
+, gobject-introspection
+, wrapGAppsHook
+, glib
+, gtk3
+, libnotify
+}:
+
pythonPackages.buildPythonApplication rec {
pname = "bleachbit";
- version = "2.2";
+ version = "3.0";
format = "other";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "1yj9bc3k6s1aib7znb79h5rybfv691zz4szxkwf9fm9nr0dws603";
+ sha256 = "18ns9hms671b4l0189m1m2agprkydnpvyky9q2f5hxf35i9cn67d";
};
- nativeBuildInputs = [ gettext ];
+ nativeBuildInputs = [
+ gettext
+ gobject-introspection
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ gtk3
+ libnotify
+ ];
+
+ propagatedBuildInputs = with pythonPackages; [
+ chardet
+ pygobject3
+ requests
+ scandir
+ ];
# Patch the many hardcoded uses of /usr/share/ and /usr/bin
postPatch = ''
@@ -20,15 +47,17 @@ pythonPackages.buildPythonApplication rec {
dontBuild = true;
- installFlags = [ "prefix=${placeholder "out"}" ];
+ installFlags = [
+ "prefix=${placeholder "out"}"
+ ];
- propagatedBuildInputs = with pythonPackages; [ pygtk ];
+ strictDeps = false;
- meta = {
+ meta = with stdenv.lib; {
homepage = http://bleachbit.sourceforge.net;
description = "A program to clean your computer";
longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy.";
- license = stdenv.lib.licenses.gpl3;
- maintainers = with stdenv.lib.maintainers; [ leonardoce ];
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ leonardoce ];
};
}
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 3b98114c7107..0af78852204d 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,7 +1,8 @@
{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
-, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, python3Packages
+, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio, openjpeg_1, python3Packages
+, openvdb, libXxf86vm, tbb
, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
, jackaudioSupport ? false, libjack2
, cudaSupport ? config.cudaSupport or false, cudatoolkit
@@ -15,20 +16,21 @@ let python = python3Packages.python; in
stdenv.mkDerivation rec {
pname = "blender";
- version = "2.80";
+ version = "2.81a";
src = fetchurl {
- url = "https://download.blender.org/source/${pname}-${version}.tar.gz";
- sha256 = "1h550jisdbis50hxwk5kxrvrk1a6sh2fsri3yyj66vhzbi87x7fd";
+ url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
+ sha256 = "1zl0ar95qkxsrbqw9miz2hrjijlqjl06vg3clfk9rm7krr2l3b2j";
};
nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath;
buildInputs =
[ boost ffmpeg gettext glew ilmbase
libXi libX11 libXext libXrender
- freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal
+ freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU libGL openal
opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc
(opensubdiv.override { inherit cudaSupport; })
+ openvdb libXxf86vm tbb
makeWrapper
]
++ optional jackaudioSupport libjack2
@@ -56,6 +58,9 @@ stdenv.mkDerivation rec {
"-DWITH_PYTHON_INSTALL=OFF"
"-DWITH_PYTHON_INSTALL_NUMPY=OFF"
"-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python.sitePackages}"
+ "-DWITH_OPENVDB=ON"
+ "-DWITH_TBB=ON"
+ "-DWITH_IMAGE_OPENJPEG=ON"
]
++ optional jackaudioSupport "-DWITH_JACK=ON"
++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"
diff --git a/pkgs/applications/misc/blugon/default.nix b/pkgs/applications/misc/blugon/default.nix
new file mode 100644
index 000000000000..e6f956cc0910
--- /dev/null
+++ b/pkgs/applications/misc/blugon/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, python3, libX11, libXrandr }:
+
+stdenv.mkDerivation rec {
+ pname = "blugon";
+ version = "1.11.4";
+
+ src = fetchFromGitHub {
+ owner = "jumper149";
+ repo = pname;
+ rev = version;
+ sha256 = "0x320w2h5nlcgha4345i8ns15akb4kmrdgkh710s4r1n1by4x11r";
+ };
+
+ buildInputs = [ python3 libX11 libXrandr ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "Simple and configurable Blue Light Filter for X";
+ longDescription = ''
+ blugon is a simple and fast Blue Light Filter, that is highly configurable and provides a command line interface.
+ The program can be run just once or as a daemon (manually or via systemd).
+ There are several different backends available.
+ blugon calculates the screen color from your local time and configuration.
+ '';
+ license = licenses.asl20;
+ homepage = "https://github.com/jumper149/blugon";
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ jumper149 ];
+ };
+}
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index ac65341d4988..98f6e2895d18 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -27,6 +27,7 @@ with python3.pkgs; buildPythonApplication rec {
requests
urllib3
flask
+ flask-admin
flask-api
flask-bootstrap
flask-paginate
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 22ae573353ea..9701db3c0b79 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -47,7 +47,7 @@ mkDerivation rec {
poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils
] ++ (with pypkgs; [
- apsw cssselect css-parser dateutil dnspython html5-parser lxml markdown netifaces pillow
+ apsw cssselect css-parser dateutil dnspython feedparser html5-parser lxml markdown netifaces pillow
python pyqt5_with_qtwebkit sip
regex msgpack beautifulsoup4 html2text
# the following are distributed with calibre, but we use upstream instead
diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix
index ef47e3e03586..cdcfcc00481a 100644
--- a/pkgs/applications/misc/cipher/default.nix
+++ b/pkgs/applications/misc/cipher/default.nix
@@ -10,18 +10,17 @@
, glib
, gtk3
, libgee
-, xdg_utils
, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "cipher";
- version = "2.0.0";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "arshubham";
repo = "cipher";
rev = version;
- sha256 = "0n5aigcyxnl4k52mdmavbxx6afc1ixymn3k3l2ryhyzi5q31x0x3";
+ sha256 = "00azc5ck17zkdypfza6x1viknwhimd9fqgk2ybff3mx6aphmla7a";
};
nativeBuildInputs = [
@@ -42,12 +41,18 @@ stdenv.mkDerivation rec {
];
postPatch = ''
- substituteInPlace data/com.github.arshubham.cipher.desktop.in \
- --replace xdg-open ${xdg_utils}/bin/xdg-open
- chmod +x post_install.py
- patchShebangs post_install.py
+ substituteInPlace data/com.github.arshubham.cipher.desktop.in \
+ --replace "gio" "${glib.bin}/bin/gio"
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "A simple application for encoding and decoding text, designed for elementary OS";
homepage = "https://github.com/arshubham/cipher";
diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix
index 43ff1d73f78f..f9c08d1f00a1 100644
--- a/pkgs/applications/misc/clight/clightd.nix
+++ b/pkgs/applications/misc/clight/clightd.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "clightd";
- version = "3.4";
+ version = "4.0";
src = fetchFromGitHub {
owner = "FedeDP";
repo = "Clightd";
rev = version;
- sha256 = "0g6kawizwfhvigkwm7rbfq6rg872xn8igy8n355w4d7mmcxk0jf8";
+ sha256 = "0cskxy3xsy187in5vg8xcs3kwcx2s160qv009v0ahkcalp29ghz4";
};
# dbus-1.pc has datadir=/etc
diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix
index 829fd4e12231..a2e452562698 100644
--- a/pkgs/applications/misc/clight/default.nix
+++ b/pkgs/applications/misc/clight/default.nix
@@ -1,18 +1,18 @@
{ lib, stdenv, fetchFromGitHub
, dbus, cmake, pkgconfig, bash-completion
-, gsl, popt, clightd, systemd, libconfig
+, gsl, popt, clightd, systemd, libconfig, libmodule
, withGeoclue ? true, geoclue2
, withUpower ? true, upower }:
stdenv.mkDerivation rec {
pname = "clight";
- version = "3.1";
+ version = "4.0";
src = fetchFromGitHub {
owner = "FedeDP";
repo = "Clight";
rev = version;
- sha256 = "0rzcr1x9h4llnmklhgzs9r7xwhsrw1qkqvfffkp8fs90nycaqx81";
+ sha256 = "101fp9kwmfmfffpdvv41wf96kdjw0b16xk49g43w32a5wlr74zrq";
};
# bash-completion.pc completionsdir=${bash-completion.out}
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
systemd
geoclue2
libconfig
+ libmodule
] ++ optional withGeoclue geoclue2
++ optional withUpower upower;
diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix
index cc57e58c56a4..9f86ec94f184 100644
--- a/pkgs/applications/misc/cmatrix/default.nix
+++ b/pkgs/applications/misc/cmatrix/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
CMatrix simulates the display from "The Matrix" and is based
on the screensaver from the movie's website.
'';
- homepage = http://www.asty.org/cmatrix/;
+ homepage = https://github.com/abishekvashok/cmatrix;
platforms = ncurses.meta.platforms;
maintainers = [ maintainers.AndersonTorres ];
};
diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix
index cba9c1d4227b..29700774219e 100644
--- a/pkgs/applications/misc/cointop/default.nix
+++ b/pkgs/applications/misc/cointop/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "cointop";
- version = "1.3.6";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "miguelmota";
repo = pname;
rev = version;
- sha256 = "0xm616yjqf6qq98yjbdj6lihib2p4fh6jd91dcb59arkbs2l1nbg";
+ sha256 = "067jsn66xs30d5yz9z8cvpxbvh8a95kllkb2wk134c43bfxy2m34";
};
goPackagePath = "github.com/miguelmota/cointop";
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 825053483a4b..58a85f8f6e97 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "CopyQ";
- version = "3.9.2";
+ version = "3.9.3";
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
- sha256 = "02zs444i7hnqishs1i6vp8ffjxlxk3xkrw935pdwnwppv9s9v202";
+ sha256 = "0wlwq9xg8rzsbj0b29z358k4mbrqy04iraa8x0p26pa95yskgcma";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix
index 0601514546f2..c09457d2c656 100644
--- a/pkgs/applications/misc/coursera-dl/default.nix
+++ b/pkgs/applications/misc/coursera-dl/default.nix
@@ -5,13 +5,13 @@ let
in pythonPackages.buildPythonApplication rec {
pname = "coursera-dl";
- version = "0.11.4";
+ version = "0.11.5";
src = fetchFromGitHub {
owner = "coursera-dl";
repo = "coursera-dl";
rev = version;
- sha256 = "0dn7a6s98dwba62r0dyabq8pryzga4b2wpx88i9bmp7ja1b1f92f";
+ sha256 = "0akgwzrsx094jj30n4bd2ilwgva4qxx38v3bgm69iqfxi8c2bqbk";
};
nativeBuildInputs = with pythonPackages; [ pandoc ];
diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix
index 0e9ff40cffa4..dae25f6b8176 100644
--- a/pkgs/applications/misc/cpp-ethereum/default.nix
+++ b/pkgs/applications/misc/cpp-ethereum/default.nix
@@ -13,7 +13,7 @@
, miniupnpc
, libmicrohttpd
, gmp
-, libGLU_combined
+, libGLU, libGL
, extraCmakeFlags ? []
}:
stdenv.mkDerivation rec {
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
miniupnpc
libmicrohttpd
gmp
- libGLU_combined
+ libGLU libGL
];
dontStrip = true;
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 702a9c585a31..7187b8c00991 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "cura";
- version = "4.3.0";
+ version = "4.4.0";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "Cura";
- rev = version;
- sha256 = "1wf60qr0wqsci5skp55qr8h56s3x5s2icxbn58ia9s4a5hhvnsmf";
+ rev = "v${version}";
+ sha256 = "131n36qhdfky584wr3zv73ckjjprwaqb5fih8yln2syf8b7ziwlz";
};
materials = fetchFromGitHub {
diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix
index 20c58ddfb1db..35d6c97fa0b5 100644
--- a/pkgs/applications/misc/cura/plugins.nix
+++ b/pkgs/applications/misc/cura/plugins.nix
@@ -6,13 +6,13 @@ let
octoprint = stdenv.mkDerivation rec {
pname = "Cura-OctoPrintPlugin";
- version = "3.5.8";
+ version = "3.5.11";
src = fetchFromGitHub {
owner = "fieldOfView";
repo = pname;
- rev = "a82a42a87bbeb390b80b991afb1a6741c46a3432";
- sha256 = "0q5yd7pw626qls2ks2y39hb9czd6lgh71jalzl2drwdi6a8mwsfz";
+ rev = "3cef0a955ae7ccfa5c07d20d9d147c530cc9d6ec";
+ sha256 = "0q9bkwgpsbfwkp1bfaxq3wm9pbwx5d7ji0jr7cwc4y5nizji81is";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 06c5d1585652..6594deb84a5a 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "curaengine";
- version = "4.3.0";
+ version = "4.4.0";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
- sha256 = "074qcaj1v2ri9wppx9lr066nlidkrsp9m1rrrk2hs2b61x0340ff";
+ sha256 = "1m89bp4g0dldh7vv1clj110m29ajiaghdq7b49mb3y8ifgrf8rdi";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 1549ab00a4f7..dfb9e1dd9214 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "dbeaver-ce";
- version = "6.2.4";
+ version = "6.3.1";
desktopItem = makeDesktopItem {
name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "1k3aan290kfy2b53gl8r4yxvb8jas6sms1r052m3jld3i8frqgva";
+ sha256 = "0w7nsxm66gbwwql1zk7zh6zvvsjcn78qm0miv0w8nj1qk24zr494";
};
installPhase = ''
diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix
index 37ed8eb23fb6..957d3ee72bbb 100644
--- a/pkgs/applications/misc/diffpdf/default.nix
+++ b/pkgs/applications/misc/diffpdf/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }:
+{ stdenv, mkDerivation, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
version = "2.1.3";
pname = "diffpdf";
diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch b/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch
new file mode 100644
index 000000000000..89ff3759451d
--- /dev/null
+++ b/pkgs/applications/misc/djvulibre/CVE-2019-15142.patch
@@ -0,0 +1,72 @@
+commit 970fb11a296b5bbdc5e8425851253d2c5913c45e
+Author: Leon Bottou
+Date: Tue Mar 26 20:36:31 2019 -0400
+
+ Fix bug#296
+
+diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp
+index a6a39e0..0a0fac6 100644
+--- a/libdjvu/DjVmDir.cpp
++++ b/libdjvu/DjVmDir.cpp
+@@ -299,42 +299,44 @@ DjVmDir::decode(const GP &gstr)
+ memcpy((char*) strings+strings_size, buffer, length);
+ }
+ DEBUG_MSG("size of decompressed names block=" << strings.size() << "\n");
+- if (strings[strings.size()-1] != 0)
+- {
+- int strings_size=strings.size();
+- strings.resize(strings_size+1);
+- strings[strings_size] = 0;
+- }
++ int strings_size=strings.size();
++ strings.resize(strings_size+3);
++ memset((char*) strings+strings_size, 0, 4);
+
+- // Copy names into the files
++ // Copy names into the files
+ const char * ptr=strings;
+ for(pos=files_list;pos;++pos)
+ {
+ GP file=files_list[pos];
+-
++ if (ptr >= (const char*)strings + strings_size)
++ G_THROW( "DjVu document is corrupted (DjVmDir)" );
+ file->id=ptr;
+ ptr+=file->id.length()+1;
+ if (file->flags & File::HAS_NAME)
+ {
+- file->name=ptr;
+- ptr+=file->name.length()+1;
+- } else
++ file->name=ptr;
++ ptr+=file->name.length()+1;
++ }
++ else
+ {
+ file->name=file->id;
+ }
+ if (file->flags & File::HAS_TITLE)
+ {
+- file->title=ptr;
+- ptr+=file->title.length()+1;
+- } else
+- file->title=file->id;
+- /* msr debug: multipage file, file->title is null.
++ file->title=ptr;
++ ptr+=file->title.length()+1;
++ }
++ else
++ {
++ file->title=file->id;
++ }
++ /* msr debug: multipage file, file->title is null.
+ DEBUG_MSG(file->name << ", " << file->id << ", " << file->title << ", " <<
+ file->offset << ", " << file->size << ", " <<
+ file->is_page() << "\n"); */
+ }
+
+- // Check that there is only one file with SHARED_ANNO flag on
++ // Check that there is only one file with SHARED_ANNO flag on
+ int shared_anno_cnt=0;
+ for(pos=files_list;pos;++pos)
+ {
diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch b/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch
new file mode 100644
index 000000000000..ef1905338fba
--- /dev/null
+++ b/pkgs/applications/misc/djvulibre/CVE-2019-15143.patch
@@ -0,0 +1,39 @@
+commit b1f4e1b2187d9e5010cd01ceccf20b4a11ce723f
+Author: Leon Bottou
+Date: Tue Mar 26 20:45:46 2019 -0400
+
+ fix for bug #297
+
+diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp
+index 0a0fac6..5a49015 100644
+--- a/libdjvu/DjVmDir.cpp
++++ b/libdjvu/DjVmDir.cpp
+@@ -309,7 +309,7 @@ DjVmDir::decode(const GP &gstr)
+ {
+ GP file=files_list[pos];
+ if (ptr >= (const char*)strings + strings_size)
+- G_THROW( "DjVu document is corrupted (DjVmDir)" );
++ G_THROW( ByteStream::EndOfFile );
+ file->id=ptr;
+ ptr+=file->id.length()+1;
+ if (file->flags & File::HAS_NAME)
+diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp
+index 0e487f0..c2fdbe4 100644
+--- a/libdjvu/GBitmap.cpp
++++ b/libdjvu/GBitmap.cpp
+@@ -890,11 +890,13 @@ GBitmap::read_rle_raw(ByteStream &bs)
+ int c = 0;
+ while (n >= 0)
+ {
+- bs.read(&h, 1);
++ if (bs.read(&h, 1) <= 0)
++ G_THROW( ByteStream::EndOfFile );
+ int x = h;
+ if (x >= (int)RUNOVERFLOWVALUE)
+ {
+- bs.read(&h, 1);
++ if (bs.read(&h, 1) <= 0)
++ G_THROW( ByteStream::EndOfFile );
+ x = h + ((x - (int)RUNOVERFLOWVALUE) << 8);
+ }
+ if (c+x > ncolumns)
diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch b/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch
new file mode 100644
index 000000000000..6094be883385
--- /dev/null
+++ b/pkgs/applications/misc/djvulibre/CVE-2019-15144.patch
@@ -0,0 +1,111 @@
+commit e15d51510048927f172f1bf1f27ede65907d940d
+Author: Leon Bottou
+Date: Mon Apr 8 22:25:55 2019 -0400
+
+ bug 299 fixed
+
+diff --git a/libdjvu/GContainer.h b/libdjvu/GContainer.h
+index 96b067c..0140211 100644
+--- a/libdjvu/GContainer.h
++++ b/libdjvu/GContainer.h
+@@ -550,52 +550,61 @@ public:
+ template void
+ GArrayTemplate::sort(int lo, int hi)
+ {
+- if (hi <= lo)
+- return;
+- if (hi > hibound || lo hibound || lo=lo) && !(data[j]<=tmp))
+- data[j+1] = data[j];
+- data[j+1] = tmp;
++ for (int i=lo+1; i<=hi; i++)
++ {
++ int j = i;
++ TYPE tmp = data[i];
++ while ((--j>=lo) && !(data[j]<=tmp))
++ data[j+1] = data[j];
++ data[j+1] = tmp;
++ }
++ return;
+ }
+- return;
+- }
+- // -- determine suitable quick-sort pivot
+- TYPE tmp = data[lo];
+- TYPE pivot = data[(lo+hi)/2];
+- if (pivot <= tmp)
+- { tmp = pivot; pivot=data[lo]; }
+- if (data[hi] <= tmp)
+- { pivot = tmp; }
+- else if (data[hi] <= pivot)
+- { pivot = data[hi]; }
+- // -- partition set
+- int h = hi;
+- int l = lo;
+- while (l < h)
+- {
+- while (! (pivot <= data[l])) l++;
+- while (! (data[h] <= pivot)) h--;
+- if (l < h)
++ // -- determine median-of-three pivot
++ TYPE tmp = data[lo];
++ TYPE pivot = data[(lo+hi)/2];
++ if (pivot <= tmp)
++ { tmp = pivot; pivot=data[lo]; }
++ if (data[hi] <= tmp)
++ { pivot = tmp; }
++ else if (data[hi] <= pivot)
++ { pivot = data[hi]; }
++ // -- partition set
++ int h = hi;
++ int l = lo;
++ while (l < h)
+ {
+- tmp = data[l];
+- data[l] = data[h];
+- data[h] = tmp;
+- l = l+1;
+- h = h-1;
++ while (! (pivot <= data[l])) l++;
++ while (! (data[h] <= pivot)) h--;
++ if (l < h)
++ {
++ tmp = data[l];
++ data[l] = data[h];
++ data[h] = tmp;
++ l = l+1;
++ h = h-1;
++ }
++ }
++ // -- recurse, small partition first
++ // tail-recursion elimination
++ if (h - lo <= hi - l) {
++ sort(lo,h);
++ lo = l; // sort(l,hi)
++ } else {
++ sort(l,hi);
++ hi = h; // sort(lo,h)
+ }
+ }
+- // -- recursively restart
+- sort(lo, h);
+- sort(l, hi);
+ }
+
+ template inline TYPE&
diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch b/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch
new file mode 100644
index 000000000000..01108f9ee738
--- /dev/null
+++ b/pkgs/applications/misc/djvulibre/CVE-2019-15145.patch
@@ -0,0 +1,28 @@
+commit 9658b01431cd7ff6344d7787f855179e73fe81a7
+Author: Leon Bottou
+Date: Mon Apr 8 22:55:38 2019 -0400
+
+ fix bug #298
+
+diff --git a/libdjvu/GBitmap.h b/libdjvu/GBitmap.h
+index e8e0c9b..ca89a19 100644
+--- a/libdjvu/GBitmap.h
++++ b/libdjvu/GBitmap.h
+@@ -566,7 +566,7 @@ GBitmap::operator[](int row)
+ {
+ if (!bytes)
+ uncompress();
+- if (row<0 || row>=nrows) {
++ if (row<0 || row>=nrows || !bytes) {
+ #ifndef NDEBUG
+ if (zerosize < bytes_per_row + border)
+ G_THROW( ERR_MSG("GBitmap.zero_small") );
+@@ -581,7 +581,7 @@ GBitmap::operator[](int row) const
+ {
+ if (!bytes)
+ ((GBitmap*)this)->uncompress();
+- if (row<0 || row>=nrows) {
++ if (row<0 || row>=nrows || !bytes) {
+ #ifndef NDEBUG
+ if (zerosize < bytes_per_row + border)
+ G_THROW( ERR_MSG("GBitmap.zero_small") );
diff --git a/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch b/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch
new file mode 100644
index 000000000000..132fed794888
--- /dev/null
+++ b/pkgs/applications/misc/djvulibre/CVE-2019-18804.patch
@@ -0,0 +1,32 @@
+commit c8bec6549c10ffaa2f2fbad8bbc629efdf0dd125
+Author: Leon Bottou
+Date: Thu Oct 17 22:20:31 2019 -0400
+
+ Fixed bug 309
+
+diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp
+index 00752a0..f81eaeb 100644
+--- a/libdjvu/IW44EncodeCodec.cpp
++++ b/libdjvu/IW44EncodeCodec.cpp
+@@ -405,7 +405,7 @@ filter_fv(short *p, int w, int h, int rowsize, int scale)
+ int y = 0;
+ int s = scale*rowsize;
+ int s3 = s+s+s;
+- h = ((h-1)/scale)+1;
++ h = (h>0) ? ((h-1)/scale)+1 : 0;
+ y += 1;
+ p += s;
+ while (y-3 < h)
+diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp
+index 6d0df3b..7109952 100644
+--- a/tools/ddjvu.cpp
++++ b/tools/ddjvu.cpp
+@@ -279,7 +279,7 @@ render(ddjvu_page_t *page, int pageno)
+ prect.h = (ih * 100) / dpi;
+ }
+ /* Process aspect ratio */
+- if (flag_aspect <= 0)
++ if (flag_aspect <= 0 && iw>0 && ih>0)
+ {
+ double dw = (double)iw / prect.w;
+ double dh = (double)ih / prect.h;
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix
index 182ab51dbc2c..afb7b6cf1391 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@@ -24,6 +24,17 @@ stdenv.mkDerivation rec {
libiconv
];
+ patches = [
+ ./CVE-2019-18804.patch
+ # This one is needed to make the following
+ # two CVE patches apply cleanly
+ ./fix_hongfuzz_crash.patch
+ ./CVE-2019-15142.patch
+ ./CVE-2019-15143.patch
+ ./CVE-2019-15144.patch
+ ./CVE-2019-15145.patch
+ ];
+
meta = with stdenv.lib; {
description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files";
homepage = "http://djvu.sourceforge.net";
diff --git a/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch b/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch
new file mode 100644
index 000000000000..609b41cd9db7
--- /dev/null
+++ b/pkgs/applications/misc/djvulibre/fix_hongfuzz_crash.patch
@@ -0,0 +1,51 @@
+commit 89d71b01d606e57ecec2c2930c145bb20ba5bbe3
+Author: Leon Bottou
+Date: Fri Jul 13 08:46:22 2018 -0400
+
+ fix hongfuzz crash.
+
+diff --git a/libdjvu/DjVmDir.cpp b/libdjvu/DjVmDir.cpp
+index d322323..a6a39e0 100644
+--- a/libdjvu/DjVmDir.cpp
++++ b/libdjvu/DjVmDir.cpp
+@@ -299,7 +299,13 @@ DjVmDir::decode(const GP &gstr)
+ memcpy((char*) strings+strings_size, buffer, length);
+ }
+ DEBUG_MSG("size of decompressed names block=" << strings.size() << "\n");
+-
++ if (strings[strings.size()-1] != 0)
++ {
++ int strings_size=strings.size();
++ strings.resize(strings_size+1);
++ strings[strings_size] = 0;
++ }
++
+ // Copy names into the files
+ const char * ptr=strings;
+ for(pos=files_list;pos;++pos)
+diff --git a/libdjvu/miniexp.cpp b/libdjvu/miniexp.cpp
+index 6a5cd90..828addc 100644
+--- a/libdjvu/miniexp.cpp
++++ b/libdjvu/miniexp.cpp
+@@ -1065,7 +1065,7 @@ print_c_string(const char *s, char *d, int flags, size_t len)
+ c = (unsigned char)(*s++);
+ if (char_quoted(c, flags))
+ {
+- char buffer[10];
++ char buffer[16]; /* 10+1 */
+ static const char *tr1 = "\"\\tnrbf";
+ static const char *tr2 = "\"\\\t\n\r\b\f";
+ buffer[0] = buffer[1] = 0;
+diff --git a/tools/csepdjvu.cpp b/tools/csepdjvu.cpp
+index 7ed13ad..fab9472 100644
+--- a/tools/csepdjvu.cpp
++++ b/tools/csepdjvu.cpp
+@@ -1834,7 +1834,7 @@ main(int argc, const char **argv)
+ ByteStream::create(GURL::Filename::UTF8(arg),"rb");
+ BufferByteStream ibs(*fbs);
+ do {
+- char pagename[16];
++ char pagename[20];
+ sprintf(pagename, "p%04d.djvu", ++pageno);
+ if (opts.verbose > 1)
+ DjVuPrintErrorUTF8("%s","--------------------\n");
diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix
new file mode 100644
index 000000000000..0e7155f374d1
--- /dev/null
+++ b/pkgs/applications/misc/dupeguru/default.nix
@@ -0,0 +1,62 @@
+{stdenv, python3Packages, gettext, qt5, fetchFromGitHub}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "dupeguru";
+ version = "4.0.4";
+
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "arsenetar";
+ repo = "dupeguru";
+ rev = "${version}";
+ sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy";
+ fetchSubmodules = true;
+ };
+
+ nativeBuildInputs = [
+ gettext
+ python3Packages.pyqt5
+ qt5.wrapQtAppsHook
+ ];
+
+ pythonPath = with python3Packages; [
+ pyqt5
+ send2trash
+ sphinx
+ polib
+ hsaudiotag3k
+ ];
+
+ makeFlags = [
+ "PREFIX=${placeholder ''out''}"
+ "NO_VENV=1"
+ ];
+
+ # TODO: package pytest-monkeyplus for running tests
+ # https://github.com/NixOS/nixpkgs/pull/75054/files#r357690123
+ doCheck = false;
+
+ # Avoid double wrapping Python programs.
+ dontWrapQtApps = true;
+
+ preFixup = ''
+ # TODO: A bug in python wrapper
+ # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916
+ makeWrapperArgs="''${qtWrapperArgs[@]}"
+ '';
+
+ postFixup = ''
+ # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py
+ # so wrapPythonPrograms hook does not handle it automatically.
+ wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "GUI tool to find duplicate files in a system";
+ homepage = "https://github.com/arsenetar/dupeguru";
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.novoxudonoser ];
+ };
+}
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index d0429d135d75..e6cfca5667e1 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -1,14 +1,14 @@
-{ lib, fetchurl, python3Packages, qtbase, wrapQtAppsHook }:
+{ lib, fetchFromGitHub, python3Packages, qtbase, wrapQtAppsHook }:
python3Packages.buildPythonApplication rec {
pname = "electron-cash";
- version = "4.0.10";
+ version = "4.0.11";
- src = fetchurl {
- url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
- # Verified using official SHA-1 and signature from
- # https://github.com/fyookball/keys-n-hashes
- sha256 = "48270e12956a2f4ef4d2b0cb60611e47f136b734a3741dab176542a32ae59ee5";
+ src = fetchFromGitHub {
+ owner = "Electron-Cash";
+ repo = "Electron-Cash";
+ rev = version;
+ sha256 = "1k4zbaj0g8bgk1l5vrb835a8bqfay2707bcb4ql2vx4igcwpb680";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix
index 8ba562de1cb7..fc5192bb5e47 100644
--- a/pkgs/applications/misc/electrum/dash.nix
+++ b/pkgs/applications/misc/electrum/dash.nix
@@ -42,5 +42,6 @@ python2Packages.buildPythonApplication rec {
homepage = https://github.com/dashpay/electrum-dash;
license = licenses.gpl3;
maintainers = with maintainers; [ np ];
+ knownVulnerabilities = [ "CVE-2018-1000022" ];
};
}
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 0ebeb1beffa1..df95b26b9c5b 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -74,6 +74,7 @@ python3Packages.buildPythonApplication {
tlslite-ng
# plugins
+ ckcc-protocol
keepkey
trezor
btchip
diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix
index acfbc7ec917f..3d71d9855d04 100644
--- a/pkgs/applications/misc/elogind/default.nix
+++ b/pkgs/applications/misc/elogind/default.nix
@@ -29,13 +29,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "elogind";
- version = "239.5";
+ version = "241.4";
src = fetchFromGitHub {
owner = "elogind";
repo = pname;
rev = "v${version}";
- sha256 = "1gdiy4vbx4gs2hnb79x14zi530mlq26glxpzp3c95w8l058wj4ba";
+ sha256 = "13nd0chackqclgvw43910k4pkw2q773dh6wq9s5f3d97ibnik48k";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/epr/default.nix b/pkgs/applications/misc/epr/default.nix
new file mode 100644
index 000000000000..f67c15f0a994
--- /dev/null
+++ b/pkgs/applications/misc/epr/default.nix
@@ -0,0 +1,21 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "epr";
+ version = "2.3.0b";
+
+ src = fetchFromGitHub {
+ owner = "wustho";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1a6md3015284hzmx0sby5kl59p7lwv73sq7sid35vrr15zrl0aw7";
+ };
+
+ meta = with lib; {
+ description = "CLI Epub Reader";
+ homepage = "https://github.com/wustho/epr";
+ license = licenses.mit;
+ maintainers = [ maintainers.filalex77 ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix
index d8b355efe86d..2cf8813aac40 100644
--- a/pkgs/applications/misc/et/default.nix
+++ b/pkgs/applications/misc/et/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "et";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "geistesk";
repo = "et";
rev = version;
- sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc";
+ sha256 = "0i0lgmnly8n7y4y6pb10pxgxyz8s5zk26k8z1g1578v1wan01lnq";
};
buildInputs = [ libnotify gdk-pixbuf ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Minimal libnotify-based (egg) timer";
- homepage = https://github.com/geistesk/et;
+ homepage = "https://github.com/geistesk/et";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ geistesk ];
diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index bbbf1a0aff9b..6c4ecf6fa392 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
configureFlags = [ "--with-ssl=${openssl.dev}" ];
meta = {
- homepage = http://www.fetchmail.info/;
+ homepage = https://www.fetchmail.info/;
description = "A full-featured remote-mail retrieval and forwarding utility";
longDescription = ''
A full-featured, robust, well-documented remote-mail retrieval and
diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
index dad954900124..edb47e11dd7f 100644
--- a/pkgs/applications/misc/font-manager/default.nix
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch,
- pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg,
+ pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools,
vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
itstool
desktop-file-utils
vala
- gnome3.yelp-tools
+ yelp-tools
wrapGAppsHook
# For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build
gobject-introspection
diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix
index d81e21f73ed9..7cb1e7dfebba 100644
--- a/pkgs/applications/misc/formatter/default.nix
+++ b/pkgs/applications/misc/formatter/default.nix
@@ -20,13 +20,13 @@
stdenv.mkDerivation rec {
pname = "formatter";
- version = "0.3.0";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "Djaler";
repo = "Formatter";
rev = version;
- sha256 = "145742dk16736zxj30rzn61h4k0xpggfsbqkxllxd302mgbmxlzq";
+ sha256 = "1ghxd2h0pklhlrjslfr46vza1kjsm3mr0sdzzjiqi9jd6hddnk7i";
};
patches = [
@@ -61,6 +61,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "A simple formatter designed for elementary OS";
homepage = "https://github.com/Djaler/Formatter";
diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix
index 00e11858fb41..bbc78efe5cd2 100644
--- a/pkgs/applications/misc/fsv/default.nix
+++ b/pkgs/applications/misc/fsv/default.nix
@@ -26,6 +26,11 @@ in stdenv.mkDerivation rec {
sha256 = "0n09jd7yqj18mx6zqbg7kab4idg5llr15g6avafj74fpg1h7iimj";
};
+ postPatch = ''
+ # fix build with gettext 0.20
+ sed -i 's/AM_GNU_GETTEXT/AM_GNU_GETTEXT([external])/' configure.in
+ '';
+
nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];
buildInputs = [ file gtk2 libGLU gtkglarea ];
diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index b1cd6a36e085..b27e456e9661 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "gallery_dl";
- version = "1.10.6";
+ version = "1.12.1";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "0jbfp072rnb3pkqp10xds57bnlcn87vqjaz68nhpzkwvwhs3hr4w";
+ sha256 = "0y1bzqcacik030zjchgmzrwpfb49mi68wdivli9ydb64w1zql9im";
};
doCheck = false;
diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix
new file mode 100644
index 000000000000..57060179473f
--- /dev/null
+++ b/pkgs/applications/misc/geoipupdate/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "geoipupdate";
+ version = "4.1.5";
+
+ src = fetchFromGitHub {
+ owner = "maxmind";
+ repo = "geoipupdate";
+ rev = "v${version}";
+ sha256 = "1k0bmsqgw35sdmaafinlr4qd5910fi598i8irxrz11394d3c8giv";
+ };
+
+ modSha256 = "0mk6zp6byq3jc6wipx53bg5igry114klq5w8isc0z6r63zjsk6f6";
+
+ meta = with stdenv.lib; {
+ description = "Automatic GeoIP database updater";
+ homepage = "https://github.com/maxmind/geoipupdate";
+ license = with licenses; [ asl20 ];
+ platforms = platforms.all;
+ maintainers = with maintainers; [ das_j ];
+ };
+}
diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix
index 6f5146161a6d..519df42c789a 100644
--- a/pkgs/applications/misc/glava/default.nix
+++ b/pkgs/applications/misc/glava/default.nix
@@ -8,7 +8,7 @@ let
wrapperScript = writeScript "glava" ''
#!${runtimeShell}
case "$1" in
- --copy-config)
+ --copy-config|-C)
# The binary would symlink it, which won't work in Nix because the
# garbage collector will eventually remove the original files after
# updates
@@ -45,6 +45,14 @@ in
];
preConfigure = ''
+ for f in $(find -type f);do
+ substituteInPlace $f \
+ --replace /etc/xdg $out/etc/xdg
+ done
+
+ substituteInPlace Makefile \
+ --replace '$(DESTDIR)$(SHADERDIR)' '$(SHADERDIR)'
+
substituteInPlace Makefile \
--replace 'unknown' 'v${version}'
diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix
index 9e71837c0f5d..b8f13d01424c 100644
--- a/pkgs/applications/misc/glom/default.nix
+++ b/pkgs/applications/misc/glom/default.nix
@@ -30,6 +30,7 @@
, postgresql
, gnome3
, gobject-introspection
+, yelp-tools
, wrapGAppsHook
}:
@@ -67,7 +68,7 @@ in stdenv.mkDerivation rec {
libtool
mm-common
intltool
- gnome3.yelp-tools
+ yelp-tools
itstool
doxygen
graphviz
diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix
deleted file mode 100644
index 41d535b35106..000000000000
--- a/pkgs/applications/misc/gnome15/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, gnome_python, gnome_python_desktop }:
-
-stdenv.mkDerivation {
- name = "gnome15-2016-06-10";
-
- src = fetchFromGitHub {
- owner = "achilleas-k";
- repo = "gnome15";
- rev = "1077c890d9ba8ef7a5e448e70a792de5c7443c84";
- sha256 = "0z5k2rgvv5zyi3lbbk6svncypidj44qzfchivb4vlr7clmh16m95";
- };
-
- nativeBuildInputs = [ autoreconfHook pkgconfig python2.pkgs.wrapPython ];
- buildInputs = [ python2 ];
- propagatedBuildInputs = with python2.pkgs; [
- pygtk keyring virtkey pillow dbus-python pyinotify lxml pyxdg pyusb gnome_python gnome_python_desktop
- python-uinput xlib pyudev pyinputevent
- ];
-
- postPatch = ''
- touch README
- export UDEV_RULES_PATH="$out/lib/udev/rules.d"
- '';
-
- postFixup = ''
- wrapPythonPrograms
- '';
-
- meta = with stdenv.lib; {
- description = "A set of tools for configuring the Logitech G15 keyboard";
- # Doesn't work with new `keyring` library which is Python 3-only now.
- # https://github.com/Gnome15/gnome15/issues/29
- broken = true;
- license = licenses.gpl3;
- homepage = https://gnome15.org/;
- platforms = platforms.linux;
- maintainers = with maintainers; [ abbradar ];
- };
-}
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 7fba1d49d747..dde1c32e805f 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, mkDerivation
-, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools
-, qtconnectivity, qtcharts
+, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
+, qtconnectivity, qtcharts, libusb
, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
}:
@@ -16,18 +16,18 @@ let
};
in mkDerivation rec {
pname = "golden-cheetah";
- version = "3.5-DEV1903";
+ version = "3.5-RC2X";
src = fetchFromGitHub {
owner = "GoldenCheetah";
repo = "GoldenCheetah";
- rev = "v${version}";
- sha256 = "130b0hm04i0hf97rs1xrdfhbal5vjsknj3x4cdxjh7rgbg2p1sm3";
+ rev = "V${version}";
+ sha256 = "1d85700gjbcw2badwz225rjdr954ai89900vp8sal04sk79wbr6g";
};
buildInputs = [
- qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools zlib
- qtconnectivity qtcharts
+ qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib
+ qtconnectivity qtcharts libusb
];
nativeBuildInputs = [ flex makeWrapper qmake yacc ];
@@ -39,7 +39,14 @@ in mkDerivation rec {
cp src/gcconfig.pri.in src/gcconfig.pri
cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri
+ echo 'LIBUSB_INSTALL = ${libusb}' >> src/gcconfig.pri
+ echo 'LIBUSB_INCLUDE = ${libusb.dev}/include' >> src/gcconfig.pri
+ echo 'LIBUSB_LIBS = -L${libusb}/lib -lusb' >> src/gcconfig.pri
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
+
+ # Use qtwebengine instead of qtwebkit
+ substituteInPlace src/gcconfig.pri \
+ --replace "#DEFINES += NOWEBKIT" "DEFINES += NOWEBKIT"
'';
installPhase = ''
@@ -53,9 +60,6 @@ in mkDerivation rec {
runHook postInstall
'';
- # RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm'
- enableParallelBuilding = false;
-
meta = with stdenv.lib; {
description = "Performance software for cyclists, runners and triathletes";
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index 6cd77318754c..8ecb546df703 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
- charlock_holmes (0.7.6)
+ charlock_holmes (0.7.7)
diff-lcs (1.3)
gemojione (3.3.0)
json
@@ -29,17 +29,17 @@ GEM
sanitize (~> 2.1.1, >= 2.1.1)
stringex (~> 2.6)
twitter-text (= 1.14.7)
- json (2.2.0)
+ json (2.3.0)
kramdown (1.9.0)
- mime-types (3.2.2)
+ mime-types (3.3)
mime-types-data (~> 3.2015)
- mime-types-data (3.2019.0331)
+ mime-types-data (3.2019.1009)
mini_portile2 (2.4.0)
mustache (0.99.8)
- nokogiri (1.10.4)
+ nokogiri (1.10.7)
mini_portile2 (~> 2.4.0)
posix-spawn (0.3.13)
- rack (1.6.11)
+ rack (1.6.12)
rack-protection (1.5.5)
rack
rouge (2.2.1)
@@ -50,7 +50,7 @@ GEM
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
stringex (2.8.5)
- tilt (2.0.9)
+ tilt (2.0.10)
twitter-text (1.14.7)
unf (~> 0.1.0)
unf (0.1.4)
@@ -65,4 +65,4 @@ DEPENDENCIES
gollum
BUNDLED WITH
- 1.17.2
+ 1.17.3
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index f9bdf94db179..61e0db781b87 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -4,10 +4,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
+ sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p";
type = "gem";
};
- version = "0.7.6";
+ version = "0.7.7";
};
diff-lcs = {
groups = ["default"];
@@ -89,10 +89,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
+ sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
type = "gem";
};
- version = "2.2.0";
+ version = "2.3.0";
};
kramdown = {
groups = ["default"];
@@ -110,20 +110,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
+ sha256 = "0g7l18igjb9z7q4b2ykvyxyvjxlx5pwsmx5z3ibdbr6372xgfglk";
type = "gem";
};
- version = "3.2.2";
+ version = "3.3";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
+ sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh";
type = "gem";
};
- version = "3.2019.0331";
+ version = "3.2019.1009";
};
mini_portile2 = {
groups = ["default"];
@@ -151,10 +151,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
+ sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln";
type = "gem";
};
- version = "1.10.4";
+ version = "1.10.7";
};
posix-spawn = {
groups = ["default"];
@@ -171,10 +171,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
+ sha256 = "1riq0z408dwvqcqrpq05bp2w879l4sjxzb4cbrbx55kpi6h2g1cj";
type = "gem";
};
- version = "1.6.11";
+ version = "1.6.12";
};
rack-protection = {
dependencies = ["rack"];
@@ -234,10 +234,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
+ sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
type = "gem";
};
- version = "2.0.9";
+ version = "2.0.10";
};
twitter-text = {
dependencies = ["unf"];
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
index 961efe4b0576..181273752ea8 100644
--- a/pkgs/applications/misc/googleearth/default.nix
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv
+{ stdenv, fetchurl, glibc, libGLU, libGL, freetype, glib, libSM, libICE, libXi, libXv
, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11
, zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }:
@@ -20,7 +20,7 @@ let
libICE
libXi
libXv
- libGLU_combined
+ libGLU libGL
libXrender
libXrandr
libXfixes
diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index 12eb8839b8a8..60feecd665de 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchFromGitHub, python}:
+{ stdenv, fetchFromGitHub, python }:
stdenv.mkDerivation rec {
- version = "3.9";
pname = "googler";
+ version = "4.0";
src = fetchFromGitHub {
owner = "jarun";
- repo = "googler";
+ repo = pname;
rev = "v${version}";
- sha256 = "0zqq157i0rfrja8yqnqr9rfrp5apzc7cxb7d7ppv6abkc5bckyqc";
+ sha256 = "13jj15ph0vmbyxjslzl6z4h5b7wyllvhwgsrb6zf7qlkcmkd4vwy";
};
propagatedBuildInputs = [ python ];
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
makeFlags = "PREFIX=$(out)";
meta = with stdenv.lib; {
- homepage = https://github.com/jarun/googler;
+ homepage = "https://github.com/jarun/googler";
description = "Google Search, Google Site Search, Google News from the terminal";
license = licenses.gpl3;
- maintainers = with maintainers; [ koral ];
+ maintainers = with maintainers; [ koral filalex77 ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index bf7bec38afb5..07918d3d599d 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -3,17 +3,15 @@
stdenv.mkDerivation rec {
pname = "gpscorrelate";
- version = "unstable-2019-09-03";
+ version = "2.0";
src = fetchFromGitHub {
owner = "dfandrich";
repo = pname;
- rev = "e1dd44a34f67b1ab7201440e60a840258ee448d2";
- sha256 = "0gjwwdqh9dprzylmmnk3gm41khka9arkij3i9amd8y7d49pm9rlv";
+ rev = version;
+ sha256 = "1wkpb0nqnm0ik46hp2sibf96h2gxi6n951zm8c72scgmh4ciq4fl";
};
- patches = [ ./fix-localedir.diff ];
-
nativeBuildInputs = [
desktop-file-utils
docbook_xml_dtd_42
@@ -30,7 +28,6 @@ stdenv.mkDerivation rec {
makeFlags = [
"prefix=${placeholder "out"}"
- "GTK=3"
"CC=cc"
"CXX=c++"
"CFLAGS=-DENABLE_NLS"
@@ -60,7 +57,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl2Plus;
- homepage = "https://github.com/dfandrich/gpscorrelate";
+ homepage = "https://dfandrich.github.io/gpscorrelate/";
platforms = platforms.linux;
maintainers = with maintainers; [ sikmir ];
};
diff --git a/pkgs/applications/misc/gpscorrelate/fix-localedir.diff b/pkgs/applications/misc/gpscorrelate/fix-localedir.diff
deleted file mode 100644
index 5f9cb296ecd5..000000000000
--- a/pkgs/applications/misc/gpscorrelate/fix-localedir.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git i/Makefile w/Makefile
-index 47919ca..408fd68 100644
---- i/Makefile
-+++ w/Makefile
-@@ -33,8 +33,9 @@ datadir = $(prefix)/share
- mandir = $(datadir)/man
- docdir = $(datadir)/doc/gpscorrelate
- applicationsdir = $(datadir)/applications
-+localedir = ${datadir}/locale
-
--DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
-+DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-
- TARGETS = gpscorrelate-gui$(EXEEXT) gpscorrelate$(EXEEXT) doc/gpscorrelate.1 doc/gpscorrelate.html
-
-diff --git i/main-gui.c w/main-gui.c
-index fdace6f..8a6197b 100644
---- i/main-gui.c
-+++ w/main-gui.c
-@@ -40,6 +40,7 @@
- int main(int argc, char* argv[])
- {
- /* Initialize gettext (gtk_init initializes the locale) */
-+ (void) bindtextdomain(TEXTDOMAIN, PACKAGE_LOCALE_DIR);
- (void) textdomain(TEXTDOMAIN);
- (void) bind_textdomain_codeset(TEXTDOMAIN, "UTF-8");
-
diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix
new file mode 100644
index 000000000000..b4778f9f4f8b
--- /dev/null
+++ b/pkgs/applications/misc/gpxlab/default.nix
@@ -0,0 +1,34 @@
+{ mkDerivation, lib, fetchFromGitHub, qmake, qttools, qttranslations }:
+
+mkDerivation rec {
+ pname = "gpxlab";
+ version = "0.7.0";
+
+ src = fetchFromGitHub {
+ owner = "BourgeoisLab";
+ repo = "GPXLab";
+ rev = "v${version}";
+ sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84";
+ };
+
+ nativeBuildInputs = [ qmake ];
+ buildInputs = [ qttools qttranslations ];
+
+ preConfigure = ''
+ lrelease GPXLab/locale/*.ts
+ '';
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ homepage = "https://github.com/BourgeoisLab/GPXLab";
+ description = "Program to show and manipulate GPS tracks";
+ longDescription = ''
+ GPXLab is an application to display and manage GPS tracks
+ previously recorded with a GPS tracker.
+ '';
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ sikmir ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 674b0061d6da..9a9edba512aa 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "gpxsee";
- version = "7.16";
+ version = "7.18";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- sha256 = "1mkfhb2c9qafjpva600nyn6yik49l4q1k6id1xvrci37wsn6ijav";
+ sha256 = "1z3knfqfv0rwsq66adk0qngw1r500yvy4z259bygqkzbn2l5fcjk";
};
nativeBuildInputs = [ qmake ];
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index 68d373d7a9a1..36ca31707c8a 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -2,11 +2,11 @@
, curl, cdparanoia, libid3tag, ncurses, libtool }:
stdenv.mkDerivation rec {
- name = "grip-4.0.0";
+ name = "grip-4.0.1";
src = fetchurl {
url = "mirror://sourceforge/grip/${name}.tar.gz";
- sha256 = "1k4mnzz2ky3wps147sdpxx7pz87zpfws2hdyl3x68iji54697qi0";
+ sha256 = "0blh5j3d4g16bhsqmhv71qhbsyyzcqywzpqsjjiiw465mjlwxka6";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 97303c43fb1a..d403ddc8b26c 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -1,10 +1,21 @@
-{ stdenv, fetchFromGitHub, python3, gettext, gobject-introspection, wrapGAppsHook, glibcLocales
-, gtk3, keybinder3, libnotify, libutempter, vte, libwnck3 }:
+{ stdenv
+, fetchFromGitHub
+, python3
+, gettext
+, gobject-introspection
+, wrapGAppsHook
+, gtk3
+, keybinder3
+, libnotify
+, libutempter
+, vte
+, libwnck3
+}:
-let
+python3.pkgs.buildPythonApplication rec {
+ pname = "guake";
version = "3.6.3";
-in python3.pkgs.buildPythonApplication {
- name = "guake-${version}";
+
format = "other";
src = fetchFromGitHub {
@@ -19,18 +30,34 @@ in python3.pkgs.buildPythonApplication {
# and https://github.com/NixOS/nixpkgs/issues/56943
strictDeps = false;
- nativeBuildInputs = [ gettext gobject-introspection wrapGAppsHook python3.pkgs.pip glibcLocales ];
+ nativeBuildInputs = [
+ gettext
+ gobject-introspection
+ wrapGAppsHook
+ python3.pkgs.pip
+ ];
- buildInputs = [ gtk3 keybinder3 libnotify python3 vte ];
+ buildInputs = [
+ gtk3
+ keybinder3
+ libnotify
+ libwnck3
+ python3
+ vte
+ ];
- propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 libwnck3 ];
-
- LC_ALL = "en_US.UTF-8"; # fixes weird encoding error, see https://github.com/NixOS/nixpkgs/pull/38642#issuecomment-379727699
+ propagatedBuildInputs = with python3.pkgs; [
+ dbus-python
+ pbr
+ pycairo
+ pygobject3
+ setuptools
+ ];
PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var
makeFlags = [
- "prefix=$(out)"
+ "prefix=${placeholder ''out''}"
];
preFixup = ''
@@ -39,9 +66,9 @@ in python3.pkgs.buildPythonApplication {
meta = with stdenv.lib; {
description = "Drop-down terminal for GNOME";
- homepage = http://guake-project.org;
+ homepage = "http://guake-project.org";
license = licenses.gpl2;
- platforms = platforms.linux;
maintainers = [ maintainers.msteen ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix
index 273be11ac63a..d1daec284826 100644
--- a/pkgs/applications/misc/gummi/default.nix
+++ b/pkgs/applications/misc/gummi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, makeWrapper
+{ stdenv, pkgs, makeWrapper, pango
, glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler
, pkgconfig, intltool, autoreconfHook, wrapGAppsHook
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
pkgconfig intltool autoreconfHook makeWrapper wrapGAppsHook
];
buildInputs = [
- glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler
+ glib gnome2.gtksourceview pango gtk2-x11 gtkspell2 poppler
gnome3.adwaita-icon-theme
];
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
deleted file mode 100644
index 9360e220ab6a..000000000000
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils
-, intltool, dbus-glib, gnome_python
-, hicolor-icon-theme
-, wafHook
-}:
-
-# TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes
-# this message:
-#
-# WARNING:root:Could not import wnck - workspace tracking will be disabled
-
-pythonPackages.buildPythonApplication rec {
- name = "hamster-time-tracker-1.04";
-
- src = fetchzip {
- name = "${name}-src";
- url = "https://github.com/projecthamster/hamster/archive/${name}.tar.gz";
- sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g";
- };
-
- nativeBuildInputs = [ wafHook intltool ];
- buildInputs = [
- docbook2x libxslt gnome-doc-utils dbus-glib hicolor-icon-theme
- ];
-
- propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];
-
- postFixup = ''
- wrapPythonProgramsIn $out/lib/hamster-time-tracker "$out $pythonPath"
- '';
-
- # error: invalid command 'test'
- doCheck = false;
-
- meta = with stdenv.lib; {
- description = "Time tracking application";
- homepage = https://projecthamster.wordpress.com/;
- license = licenses.gpl3;
- platforms = platforms.all;
- maintainers = [ maintainers.bjornfor ];
- };
-}
diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix
index 84f5bad24d21..e452ec0511e7 100644
--- a/pkgs/applications/misc/hivemind/default.nix
+++ b/pkgs/applications/misc/hivemind/default.nix
@@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "hivemind";
- version = "1.0.4";
+ version = "1.0.6";
goPackagePath = "github.com/DarthSim/hivemind";
src = fetchFromGitHub {
owner = "DarthSim";
repo = "hivemind";
rev = "v${version}";
- sha256 = "1z2izvyf0j3gi0cas5v22kkmkls03sg67182k8v3p6kwhzn0jw67";
+ sha256 = "0afcnd03wsdphbbpha65rv5pnv0x6ldnnm6rnv1m6xkkywgnzx95";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 88c87eaca871..279791561d90 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc }:
+{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc, addOpenGLRunpath }:
let
ld_library_path = builtins.concatStringsSep ":" [
@@ -24,19 +24,20 @@ let
zlib
libpng
dbus
+ addOpenGLRunpath.driverLink
])
];
license_dir = "~/.config/houdini";
in
stdenv.mkDerivation rec {
- version = "17.0.352";
+ version = "17.5.327";
pname = "houdini-runtime";
src = requireFile rec {
name = "houdini-${version}-linux_x86_64_gcc6.3.tar.gz";
- sha256 = "0cl5fkgaplb0cvv7mli06ffc9j4ngpy8hl5zqabj3d645gcgafjg";
+ sha256 = "1byigmhmby8lgi2vmgxy9jlrrqk7jyr507zqkihq5bv8kfsanv1x";
message = ''
This nix expression requires that ${name} is already part of the store.
- Download it from https://sidefx.com and add it to the nix store with:
+ Download it from https://www.sidefx.com and add it to the nix store with:
nix-prefetch-url
@@ -77,7 +78,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "3D animation application software";
- homepage = https://sidefx.com;
+ homepage = https://www.sidefx.com;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.canndrew ];
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index 0d25d3d686c9..31ecfccd5848 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "hstr";
- version = "2.0";
+ version = "2.2";
src = fetchFromGitHub {
owner = "dvorka";
repo = "hstr";
rev = version;
- sha256 = "1y9vsfbg07gbic0daqy569d9pb9i1d07fym3q7a0a99hbng85s20";
+ sha256 = "07fkilqlkpygvf9kvxyvl58g3lfq0bwwdp3wczy4hk8qlbhmgihn";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json
index 31d26559dd2d..2fd29444dade 100644
--- a/pkgs/applications/misc/hubstaff/revision.json
+++ b/pkgs/applications/misc/hubstaff/revision.json
@@ -1,5 +1,5 @@
{
- "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.0-4309ed45/Hubstaff-1.5.0-4309ed45.sh",
- "version": "1.5.0-4309ed45",
- "sha256": "1rfxizb28b8r344d18jh6shfcxz35vx8vh10c3j6zdcc998zkcr1"
+ "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.2-bead991b/Hubstaff-1.5.2-bead991b.sh",
+ "version": "1.5.2-bead991b",
+ "sha256": "068b0q94ydldyjmzbka1j94vr1xdxvkxq79pp7ria81hvpp68yxf"
}
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 840f4c32e52a..4251d2c1f368 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "hugo";
- version = "0.58.3";
+ version = "0.62.0";
goPackagePath = "github.com/gohugoio/hugo";
src = fetchFromGitHub {
- owner = "gohugoio";
- repo = pname;
- rev = "v${version}";
- sha256 = "00dhb6xilkwr9yhncpyc6alzqw77ch3vd85dc7lzsmhw1c80n0lc";
+ owner = "gohugoio";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "0z14qhsjgwqgm7kj25y0zh4b42bwd7zhcmwjxzkk6chzw7fwq375";
};
- modSha256 = "0d6zc7hxb246zsvwsjz4ds6gdd2m95x6l3djh3mmciwfg9cd7prx";
+ modSha256 = "0dwv5qnglv00jj7vlps76zlfpkzsplf93401j2l03xfvmvadifrs";
buildFlags = "-tags extended";
@@ -21,8 +21,8 @@ buildGoModule rec {
meta = with stdenv.lib; {
description = "A fast and modern static website engine.";
- homepage = https://gohugo.io;
+ homepage = "https://gohugo.io";
license = licenses.asl20;
- maintainers = with maintainers; [ schneefux ];
+ maintainers = with maintainers; [ schneefux filalex77 ];
};
}
diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix
index c197e1a8fd38..3ee4fd8259a9 100644
--- a/pkgs/applications/misc/icesl/default.nix
+++ b/pkgs/applications/misc/icesl/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }:
+{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM, libXext, dialog, makeWrapper }:
let
- lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ];
+ lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext ];
in
stdenv.mkDerivation rec {
pname = "iceSL";
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index 54c703bb8592..f75889904326 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -1,28 +1,28 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.0.0)
+ activesupport (6.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- zeitwerk (~> 2.1, >= 2.1.8)
- addressable (2.6.0)
- public_suffix (>= 2.0.2, < 4.0)
+ zeitwerk (~> 2.2)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
colorator (1.1.0)
concurrent-ruby (1.1.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
- ffi (1.11.1)
+ ffi (1.11.2)
forwardable-extended (2.6.0)
gemoji (3.0.1)
- html-pipeline (2.12.0)
+ html-pipeline (2.12.2)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
- i18n (1.6.0)
+ i18n (1.7.0)
concurrent-ruby (~> 1.0)
jekyll (4.0.0)
addressable (~> 2.4)
@@ -44,7 +44,7 @@ GEM
jekyll-mentions (1.5.1)
html-pipeline (~> 2.3)
jekyll (>= 3.7, < 5.0)
- jekyll-sass-converter (2.0.0)
+ jekyll-sass-converter (2.0.1)
sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.6.1)
jekyll (>= 3.3, < 5.0)
@@ -60,25 +60,23 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
- listen (3.1.5)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- ruby_dep (~> 1.2)
+ listen (3.2.0)
+ rb-fsevent (~> 0.10, >= 0.10.3)
+ rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.4.0)
- minitest (5.11.3)
- nokogiri (1.10.4)
+ minitest (5.13.0)
+ nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (3.1.1)
+ public_suffix (4.0.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
- rouge (3.9.0)
- ruby_dep (1.5.0)
+ rouge (3.13.0)
safe_yaml (1.0.5)
- sassc (2.1.0)
+ sassc (2.2.1)
ffi (~> 1.9)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
@@ -86,7 +84,7 @@ GEM
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
- zeitwerk (2.1.9)
+ zeitwerk (2.2.1)
PLATFORMS
ruby
@@ -100,4 +98,4 @@ DEPENDENCIES
jemoji
BUNDLED WITH
- 1.17.2
+ 1.17.3
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index 41e599c02020..7fd9abd82a3f 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0b24ch7zmrdb4h6aismahk9785lc4ij30lmdr6ydv19kkljsjq5v";
+ sha256 = "190xv21yz03zz8nlfly557ir859jr5zkwi89naziy65hskdnkw1s";
type = "gem";
};
- version = "6.0.0";
+ version = "6.0.1";
};
addressable = {
dependencies = ["public_suffix"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
type = "gem";
};
- version = "2.6.0";
+ version = "2.7.0";
};
colorator = {
groups = ["default"];
@@ -67,10 +67,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
+ sha256 = "0cbads5da12lb3j0mg2hjrd57s5qkkairxh2y6r9bqyblb5b8xbw";
type = "gem";
};
- version = "1.11.1";
+ version = "1.11.2";
};
forwardable-extended = {
groups = ["default"];
@@ -98,10 +98,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk";
+ sha256 = "19hc7njr029pzqljpfhzhdi0p2rgn8ihn3bdnai2apy6nj1g1sg2";
type = "gem";
};
- version = "2.12.0";
+ version = "2.12.2";
};
"http_parser.rb" = {
groups = ["default"];
@@ -119,10 +119,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
+ sha256 = "0hmypvx9iyc0b4hski7aic2xzm09cg1c7q1qlpnk3k8s5acxzyhl";
type = "gem";
};
- version = "1.6.0";
+ version = "1.7.0";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@@ -163,10 +163,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fbc25p8vqyzmg8wpmgacqjkk3jhrr6kz9y45m43ygck74h2cad2";
+ sha256 = "0xjzqpp35qr2vnf2zpak0srn773mp21glcq81a0iqpnrva7h80m3";
type = "gem";
};
- version = "2.0.0";
+ version = "2.0.1";
};
jekyll-seo-tag = {
dependencies = ["jekyll"];
@@ -244,15 +244,15 @@
version = "4.0.3";
};
listen = {
- dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
+ dependencies = ["rb-fsevent" "rb-inotify"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx";
+ sha256 = "1j3s7bprp2jfhgb959wd1h98978zg3207nl87yg8k5w7k08f7snb";
type = "gem";
};
- version = "3.1.5";
+ version = "3.2.0";
};
mercenary = {
groups = ["default"];
@@ -279,10 +279,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+ sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi";
type = "gem";
};
- version = "5.11.3";
+ version = "5.13.0";
};
nokogiri = {
dependencies = ["mini_portile2"];
@@ -290,10 +290,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
+ sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
type = "gem";
};
- version = "1.10.4";
+ version = "1.10.5";
};
pathutil = {
dependencies = ["forwardable-extended"];
@@ -311,10 +311,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
+ sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
type = "gem";
};
- version = "3.1.1";
+ version = "4.0.1";
};
rb-fsevent = {
groups = ["default"];
@@ -342,20 +342,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cn6fin40ngrasqi6qis85mqwx6phnbkzhkkd93acm9vrcf3rkl3";
+ sha256 = "1y90nx9ph9adnrpcsvs2adca2l3dyz8am2d2kzxkwd3a086ji7aw";
type = "gem";
};
- version = "3.9.0";
- };
- ruby_dep = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5";
- type = "gem";
- };
- version = "1.5.0";
+ version = "3.13.0";
};
safe_yaml = {
groups = ["default"];
@@ -373,10 +363,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06kwfqvpwf33cvkvbv1l9g5ln3q721hz5d3dyasq0k9d28x9w4fs";
+ sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.1";
};
terminal-table = {
dependencies = ["unicode-display_width"];
@@ -425,9 +415,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gaiqg207j99cvqpgmn4ps6a14hz1rrh5zaxfdkiiavapbc5vpzw";
+ sha256 = "0w7w7y4jr6pcbgnzmh113fh8wz0f00xixl7qvf2rpvnanb68d5gw";
type = "gem";
};
- version = "2.1.9";
+ version = "2.2.1";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index 6410b885ea47..43a2d0cf2d0b 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -1,14 +1,14 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.0.0)
+ activesupport (6.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- zeitwerk (~> 2.1, >= 2.1.8)
- addressable (2.6.0)
- public_suffix (>= 2.0.2, < 4.0)
+ zeitwerk (~> 2.2)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
classifier-reborn (2.2.0)
fast-stemmer (~> 1.0)
coderay (1.1.2)
@@ -23,17 +23,17 @@ GEM
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
execjs (2.7.0)
- faraday (0.15.4)
+ faraday (0.17.0)
multipart-post (>= 1.2, < 3)
fast-stemmer (1.0.2)
- ffi (1.11.1)
+ ffi (1.11.2)
forwardable-extended (2.6.0)
gemoji (3.0.1)
- html-pipeline (2.12.0)
+ html-pipeline (2.12.2)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
- i18n (1.6.0)
+ i18n (1.7.0)
concurrent-ruby (~> 1.0)
jekyll (4.0.0)
addressable (~> 2.4)
@@ -52,10 +52,10 @@ GEM
terminal-table (~> 1.8)
jekyll-avatar (0.7.0)
jekyll (>= 3.0, < 5.0)
- jekyll-coffeescript (1.2.2)
+ jekyll-coffeescript (2.0.0)
coffee-script (~> 2.2)
coffee-script-source (~> 1.12)
- jekyll-feed (0.12.1)
+ jekyll-feed (0.13.0)
jekyll (>= 3.7, < 5.0)
jekyll-gist (1.5.0)
octokit (~> 4.2)
@@ -65,7 +65,7 @@ GEM
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.15.0)
jekyll (>= 3.3, < 5.0)
- jekyll-sass-converter (2.0.0)
+ jekyll-sass-converter (2.0.1)
sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.6.1)
jekyll (>= 3.3, < 5.0)
@@ -86,32 +86,30 @@ GEM
liquid (4.0.3)
liquid-c (4.0.0)
liquid (>= 3.0.0)
- listen (3.1.5)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- ruby_dep (~> 1.2)
+ listen (3.2.0)
+ rb-fsevent (~> 0.10, >= 0.10.3)
+ rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
- mime-types (3.2.2)
+ mime-types (3.3)
mime-types-data (~> 3.2015)
- mime-types-data (3.2019.0331)
+ mime-types-data (3.2019.1009)
mini_portile2 (2.4.0)
- minitest (5.11.3)
+ minitest (5.13.0)
multipart-post (2.1.1)
- nokogiri (1.10.4)
+ nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
- public_suffix (3.1.1)
+ public_suffix (4.0.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
- rdoc (6.1.1)
- rouge (3.9.0)
- ruby_dep (1.5.0)
+ rdoc (6.2.0)
+ rouge (3.13.0)
safe_yaml (1.0.5)
- sassc (2.1.0)
+ sassc (2.2.1)
ffi (~> 1.9)
sawyer (0.8.2)
addressable (>= 2.3.5)
@@ -124,7 +122,7 @@ GEM
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
yajl-ruby (1.4.1)
- zeitwerk (2.1.9)
+ zeitwerk (2.2.1)
PLATFORMS
ruby
@@ -150,4 +148,4 @@ DEPENDENCIES
yajl-ruby (~> 1.4)
BUNDLED WITH
- 1.17.2
+ 1.17.3
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index 80d67022e7af..2b1c03ce882d 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0b24ch7zmrdb4h6aismahk9785lc4ij30lmdr6ydv19kkljsjq5v";
+ sha256 = "190xv21yz03zz8nlfly557ir859jr5zkwi89naziy65hskdnkw1s";
type = "gem";
};
- version = "6.0.0";
+ version = "6.0.1";
};
addressable = {
dependencies = ["public_suffix"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
type = "gem";
};
- version = "2.6.0";
+ version = "2.7.0";
};
classifier-reborn = {
dependencies = ["fast-stemmer"];
@@ -132,10 +132,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
+ sha256 = "0jk2bar4x6miq2cr73lv0lsbmw4cymiljvp29xb85jifsb3ba6az";
type = "gem";
};
- version = "0.15.4";
+ version = "0.17.0";
};
fast-stemmer = {
groups = ["default"];
@@ -164,10 +164,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
+ sha256 = "0cbads5da12lb3j0mg2hjrd57s5qkkairxh2y6r9bqyblb5b8xbw";
type = "gem";
};
- version = "1.11.1";
+ version = "1.11.2";
};
forwardable-extended = {
groups = ["default"];
@@ -195,10 +195,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk";
+ sha256 = "19hc7njr029pzqljpfhzhdi0p2rgn8ihn3bdnai2apy6nj1g1sg2";
type = "gem";
};
- version = "2.12.0";
+ version = "2.12.2";
};
"http_parser.rb" = {
groups = ["default"];
@@ -216,10 +216,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
+ sha256 = "0hmypvx9iyc0b4hski7aic2xzm09cg1c7q1qlpnk3k8s5acxzyhl";
type = "gem";
};
- version = "1.6.0";
+ version = "1.7.0";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@@ -249,10 +249,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "040i6cyv20qmxlpm74kh5hfci8208ja4903yxdv4x0qs0z172kl9";
+ sha256 = "17fjk0bfm0rs3myid24y2scsf5vzzza185bissjmcc44cbxp571j";
type = "gem";
};
- version = "1.2.2";
+ version = "2.0.0";
};
jekyll-feed = {
dependencies = ["jekyll"];
@@ -260,10 +260,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01f0ivjdr3qc9dh9n8lj6paiy7zmlb7hs9nk6rgni6jjn5plslg3";
+ sha256 = "1lx8nvkhd8l1wm3b6s506rycwbmpbzbsbjl65p21asjz6vbwf1ir";
type = "gem";
};
- version = "0.12.1";
+ version = "0.13.0";
};
jekyll-gist = {
dependencies = ["octokit"];
@@ -314,10 +314,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fbc25p8vqyzmg8wpmgacqjkk3jhrr6kz9y45m43ygck74h2cad2";
+ sha256 = "0xjzqpp35qr2vnf2zpak0srn773mp21glcq81a0iqpnrva7h80m3";
type = "gem";
};
- version = "2.0.0";
+ version = "2.0.1";
};
jekyll-seo-tag = {
dependencies = ["jekyll"];
@@ -441,15 +441,15 @@
version = "4.0.0";
};
listen = {
- dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
+ dependencies = ["rb-fsevent" "rb-inotify"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx";
+ sha256 = "1j3s7bprp2jfhgb959wd1h98978zg3207nl87yg8k5w7k08f7snb";
type = "gem";
};
- version = "3.1.5";
+ version = "3.2.0";
};
mercenary = {
groups = ["default"];
@@ -467,20 +467,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
+ sha256 = "0g7l18igjb9z7q4b2ykvyxyvjxlx5pwsmx5z3ibdbr6372xgfglk";
type = "gem";
};
- version = "3.2.2";
+ version = "3.3";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
+ sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh";
type = "gem";
};
- version = "3.2019.0331";
+ version = "3.2019.1009";
};
mini_portile2 = {
groups = ["default"];
@@ -497,10 +497,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+ sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi";
type = "gem";
};
- version = "5.11.3";
+ version = "5.13.0";
};
multipart-post = {
groups = ["default"];
@@ -518,10 +518,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
+ sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
type = "gem";
};
- version = "1.10.4";
+ version = "1.10.5";
};
octokit = {
dependencies = ["sawyer"];
@@ -550,10 +550,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
+ sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
type = "gem";
};
- version = "3.1.1";
+ version = "4.0.1";
};
rb-fsevent = {
groups = ["default"];
@@ -581,30 +581,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07b7ac2nls2yskaicqshxgip6dwpxl80hlx4pslq90jgpxgs2kkp";
+ sha256 = "1gh7sc3xd4rgl9z90181cq580r1xqn063mmv51wdrhhsrkkw2bi9";
type = "gem";
};
- version = "6.1.1";
+ version = "6.2.0";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1cn6fin40ngrasqi6qis85mqwx6phnbkzhkkd93acm9vrcf3rkl3";
+ sha256 = "1y90nx9ph9adnrpcsvs2adca2l3dyz8am2d2kzxkwd3a086ji7aw";
type = "gem";
};
- version = "3.9.0";
- };
- ruby_dep = {
- groups = ["default"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5";
- type = "gem";
- };
- version = "1.5.0";
+ version = "3.13.0";
};
safe_yaml = {
groups = ["default"];
@@ -622,10 +612,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06kwfqvpwf33cvkvbv1l9g5ln3q721hz5d3dyasq0k9d28x9w4fs";
+ sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.1";
};
sawyer = {
dependencies = ["addressable" "faraday"];
@@ -717,9 +707,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gaiqg207j99cvqpgmn4ps6a14hz1rrh5zaxfdkiiavapbc5vpzw";
+ sha256 = "0w7w7y4jr6pcbgnzmh113fh8wz0f00xixl7qvf2rpvnanb68d5gw";
type = "gem";
};
- version = "2.1.9";
+ version = "2.2.1";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 857cc6c74560..a3cbdabeacf6 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "josm";
- version = "15390";
+ version = "15492";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "1wxncd3mjd4j14svgpmvrxc0nkzfkpn0xlci7m7wp9hfp1l81v9f";
+ sha256 = "0x7ndcrlvrvk2fd4pyn10npr3778khcwg6xzzh19vdw4glh5zfcl";
};
buildInputs = [ jdk11 makeWrapper ];
diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index a2eba8e08c27..aedfff40d702 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -3,7 +3,7 @@
, enableGSL ? true, gsl
, enableGhostScript ? true, ghostscript
, enableMuPDF ? true, mupdf
-, enableJPEG2K ? true, jasper
+, enableJPEG2K ? false, jasper ? null # disabled by default, jasper has unfixed CVE
, enableDJVU ? true, djvulibre
, enableGOCR ? false, gocr # Disabled by default due to crashes
, enableTesseract ? true, leptonica, tesseract4
diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index e3c75b25b47f..d3cef00bbe8a 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kanboard";
- version = "1.2.10";
+ version = "1.2.12";
src = fetchFromGitHub {
owner = "kanboard";
repo = "kanboard";
rev = "v${version}";
- sha256 = "0k45vfiacvwmrglpqwjq22pvdg4n0mf75x0r8nb79bmxp8sk0j0c";
+ sha256 = "1m1drgbyk1m6mf69xqlz9gqcj650n9m4y2fdj7d2yv20q8r31489";
};
dontBuild = true;
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index ed3c86722699..e8bdcb371189 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -16,6 +16,7 @@
, sshfs
, makeWrapper
, kwayland
+, kio
}:
mkDerivation rec {
@@ -30,7 +31,7 @@ mkDerivation rec {
buildInputs = [
libfakekey libXtst
ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications
- qca-qt5 qtx11extras makeWrapper kwayland
+ qca-qt5 qtx11extras makeWrapper kwayland kio
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 8670371b0061..06fc04ba8fb4 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -26,19 +26,21 @@
, withKeePassKeeShareSecure ? true
, withKeePassSSHAgent ? true
, withKeePassNetworking ? false
+, withKeePassTouchID ? true
+, withKeePassFDOSecrets ? true
}:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "keepassxc";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = version;
- sha256 = "053z6mzcn22w3vkf09i7kdi5p0c6zcd9g62v3p5i3yhd14cgviqr";
+ sha256 = "0dkya9smx81c5cgcwk2gi2m1pabfff1v9gd3ngl42sdvyb63wgdq";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [
@@ -69,6 +71,8 @@ stdenv.mkDerivation rec {
++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON")
++ (optional withKeePassKeeShareSecure "-DWITH_XC_KEESHARE_SECURE=ON")
++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON")
+ ++ (optional (withKeePassTouchID && stdenv.isDarwin) "-DWITH_XC_TOUCHID=ON")
+ ++ (optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON")
++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON");
doCheck = true;
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 99b9c38d53f8..1c6708c51c97 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,36 +1,15 @@
-{ stdenv, fetchurl, glibcLocales, python3 }:
+{ stdenv, glibcLocales, python3 }:
-let
- python = python3.override {
- packageOverrides = self: super: {
-
- # https://github.com/pimutils/khal/issues/780
- python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec {
- version = "2.6.1";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca";
- };
- });
-
- };
- };
-
-in with python.pkgs; buildPythonApplication rec {
- version = "0.14.0";
+python3.pkgs.buildPythonApplication rec {
+ version = "0.15.1";
pname = "khard";
- namePrefix = "";
- src = fetchurl {
- url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
- sha256 = "0m1pc67jz663yfc0xzfpknymn8jj2bpfxaph3pl0mjd3h1zjfyaq";
+ src = python3.pkgs.fetchPypi {
+ inherit pname version;
+ sha256 = "18ba2xgfq8sw0bg6xmlfjpizid1hkzgswcfcc54gl21y2dwfda2w";
};
- # setup.py reads the UTF-8 encoded readme.
- LC_ALL = "en_US.UTF-8";
- buildInputs = [ glibcLocales ];
-
- propagatedBuildInputs = [
+ propagatedBuildInputs = with python3.pkgs; [
atomicwrites
configobj
vobject
@@ -43,9 +22,6 @@ in with python.pkgs; buildPythonApplication rec {
install -D misc/zsh/_khard $out/share/zsh/site-functions/_khard
'';
- # Fails; but there are no tests anyway.
- doCheck = false;
-
meta = {
homepage = https://github.com/scheibler/khard;
description = "Console carddav client";
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index e87d09b50ccf..6900f305c0f8 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, fetchFromGitHub, python3Packages, glfw, libunistring,
+{ stdenv, substituteAll, fetchFromGitHub, python3Packages, libunistring,
harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel,
libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
libxkbcommon, libXi, libXext, wayland-protocols, wayland,
@@ -21,14 +21,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
- version = "0.14.6";
+ version = "0.15.1";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
- sha256 = "1rb5ys9xsdhd2qa3kz5gqzz111c6b14za98va6hlglk69wqlmb51";
+ sha256 = "0y25w8123rjd6f5875mk8yv7mdr75mgswl3sh6zixm7b9r771s9p";
};
buildInputs = [
@@ -45,7 +45,7 @@ buildPythonApplication rec {
python3
zlib
] ++ stdenv.lib.optionals stdenv.isLinux [
- fontconfig glfw libunistring libcanberra libX11
+ fontconfig libunistring libcanberra libX11
libXrandr libXinerama libXcursor libxkbcommon libXi libXext
wayland-protocols wayland dbus
];
@@ -64,9 +64,13 @@ buildPythonApplication rec {
outputs = [ "out" "terminfo" ];
patches = [
+ ./fix-paths.patch
+ ] ++ stdenv.lib.optionals stdenv.isLinux [
(substituteAll {
- src = ./fix-paths.patch;
+ src = ./library-paths.patch;
libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so";
+ libcanberra = "${libcanberra}/lib/libcanberra.so";
+ libEGL = "${stdenv.lib.getLib libGL}/lib/libEGL.so.1";
})
] ++ stdenv.lib.optionals stdenv.isDarwin [
./no-lto.patch
@@ -74,10 +78,6 @@ buildPythonApplication rec {
./png2icns.patch
];
- preConfigure = stdenv.lib.optional (!stdenv.isDarwin) ''
- substituteInPlace glfw/egl_context.c --replace "libEGL.so.1" "${stdenv.lib.getLib libGL}/lib/libEGL.so.1"
- '';
-
buildPhase = if stdenv.isDarwin then ''
${python.interpreter} setup.py kitty.app --update-check-interval=0
'' else ''
diff --git a/pkgs/applications/misc/kitty/fix-paths.patch b/pkgs/applications/misc/kitty/fix-paths.patch
index 704605813071..380f6d749146 100644
--- a/pkgs/applications/misc/kitty/fix-paths.patch
+++ b/pkgs/applications/misc/kitty/fix-paths.patch
@@ -1,14 +1,3 @@
---- a/kitty/desktop.c
-+++ b/kitty/desktop.c
-@@ -30,7 +30,7 @@
- static PyObject*
- init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) {
- static bool done = false;
-- static const char* libname = "libstartup-notification-1.so";
-+ static const char* libname = "@libstartup_notification@";
- // some installs are missing the .so symlink, so try the full name
- static const char* libname2 = "libstartup-notification-1.so.0";
-
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,7 +3,7 @@
diff --git a/pkgs/applications/misc/kitty/library-paths.patch b/pkgs/applications/misc/kitty/library-paths.patch
new file mode 100644
index 000000000000..5f8daacc3c23
--- /dev/null
+++ b/pkgs/applications/misc/kitty/library-paths.patch
@@ -0,0 +1,32 @@
+--- a/glfw/egl_context.c
++++ b/glfw/egl_context.c
+@@ -314,7 +314,7 @@ bool _glfwInitEGL(void)
+ #elif defined(__CYGWIN__)
+ "libEGL-1.so",
+ #else
+- "libEGL.so.1",
++ "@libEGL@",
+ #endif
+ NULL
+ };
+
+--- a/kitty/desktop.c
++++ b/kitty/desktop.c
+@@ -30,7 +30,7 @@
+ static PyObject*
+ init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) {
+ static bool done = false;
+- static const char* libname = "libstartup-notification-1.so";
++ static const char* libname = "@libstartup_notification@";
+ // some installs are missing the .so symlink, so try the full name
+ static const char* libname2 = "libstartup-notification-1.so.0";
+ static const char* libname3 = "libstartup-notification-1.so.0.0.0";
+@@ -105,7 +105,7 @@ load_libcanberra_functions(void) {
+
+ static void
+ load_libcanberra(void) {
+- static const char* libname = "libcanberra.so";
++ static const char* libname = "@libcanberra@";
+ // some installs are missing the .so symlink, so try the full name
+ static const char* libname2 = "libcanberra.so.0";
+ static const char* libname3 = "libcanberra.so.0.2.5";
diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch
index 8217b5ef51a6..bc1b369d98d9 100644
--- a/pkgs/applications/misc/kitty/no-werror.patch
+++ b/pkgs/applications/misc/kitty/no-werror.patch
@@ -1,11 +1,11 @@
--- a/setup.py
+++ b/setup.py
-@@ -212,7 +212,7 @@
+@@ -217,7 +217,7 @@ def init_env(
cflags = os.environ.get(
'OVERRIDE_CFLAGS', (
- '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
+ '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
+ ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
).format(
+ float_conversion,
optimize,
- ' '.join(sanitize_args),
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index 0bd919944185..f3daedfb96b6 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -3,11 +3,11 @@
mkDerivation rec {
pname = "latte-dock";
- version = "0.8.9";
+ version = "0.9.5";
src = fetchurl {
url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
- sha256 = "1kkpxa39crjpqgamrcpgp1mrcdg0aq9850yb6cf7lw7d3x2fdrxj";
+ sha256 = "1g8a2lmg9agcs2kwbwh6sj9hkrbzad7bkxk39nx5536svnifbg1c";
name = "${pname}-${version}.tar.xz";
};
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 2c2acb6a7434..25f9b10b1e85 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, substituteAll, makeWrapper, fetchgit, ocaml, mupdf, libX11,
-libGLU_combined, freetype, xclip, inotify-tools, procps }:
+libGLU, libGL, freetype, xclip, inotify-tools, procps }:
assert lib.versionAtLeast (lib.getVersion ocaml) "4.07";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
});
nativeBuildInputs = [ makeWrapper ];
- buildInputs = [ ocaml mupdf libX11 libGLU_combined freetype ];
+ buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype ];
dontStrip = true;
diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix
new file mode 100644
index 000000000000..5dd5fa0f5122
--- /dev/null
+++ b/pkgs/applications/misc/lsd2dsl/default.nix
@@ -0,0 +1,36 @@
+{ mkDerivation, lib, fetchFromGitHub, cmake
+, boost, libvorbis, libsndfile, minizip, gtest }:
+
+mkDerivation rec {
+ pname = "lsd2dsl";
+ version = "0.4.1";
+
+ src = fetchFromGitHub {
+ owner = "nongeneric";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "15xjp5xxvl0qc4zp553n7djrbvdp63sfjw406idgxqinfmkqkqdr";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ boost libvorbis libsndfile minizip gtest ];
+
+ NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
+
+ installPhase = ''
+ install -Dm755 lsd2dsl $out/bin/lsd2dsl
+ install -m755 qtgui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui
+ '';
+
+ meta = with lib; {
+ homepage = "https://rcebits.com/lsd2dsl/";
+ description = "Lingvo dictionaries decompiler";
+ longDescription = ''
+ A decompiler for ABBYY Lingvo’s proprietary dictionaries.
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ sikmir ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix
index 16bf65262cc3..58492259b090 100644
--- a/pkgs/applications/misc/lutris/chrootenv.nix
+++ b/pkgs/applications/misc/lutris/chrootenv.nix
@@ -5,7 +5,7 @@
let
qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ];
- gnome3Deps = pkgs: with pkgs.gnome3; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ];
+ gnome3Deps = pkgs: with pkgs; [ gnome3.zenity gtksourceview gnome3.gnome-desktop gnome3.libgnome-keyring webkitgtk ];
xorgDeps = pkgs: with pkgs.xorg; [
libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite
@@ -23,7 +23,7 @@ in buildFHSUserEnv {
allegro dumb
# Desmume
- lua agg soundtouch openal desktop-file-utils pangox_compat atk
+ lua agg soundtouch openal desktop-file-utils atk
# DGen // TODO: libarchive is broken
@@ -92,7 +92,7 @@ in buildFHSUserEnv {
multiPkgs = pkgs: with pkgs; [
# Common
libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio
- libao libusb libevdev libudev libgcrypt libxml2 libusb libpng libmpeg2 libv4l
+ libao libusb libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l
libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio
libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib
alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 1474ea2fc4f2..5df4a1b8d93c 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,15 +1,12 @@
{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, wrapQtAppsHook }:
-let
- version = "5.4.10";
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "masterpdfeditor";
- inherit version;
+ version = "5.4.38";
src = fetchurl {
- url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
- sha256 = "1902ahb2g9xanrip1n0ihr31az8sv9fsvzddnzf70kbwlfclnqf7";
+ url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.amd64.tar.gz";
+ sha256 = "0fidy8gd4mqvyfgmrwdiz8z53dyzihqqhgfrffj0z0idm2zi4mcq";
};
nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ];
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 3023a5b5930c..e643c212225b 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,20 +1,20 @@
{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj
-, qtbase, qtsvg, qtwebkit }:
+, qtbase, qtsvg, qtwebview, qtwebkit }:
stdenv.mkDerivation rec {
pname = "merkaartor";
- version = "0.18.3";
+ version = "unstable-2019-11-12";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "merkaartor";
- rev = version;
- sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88";
+ rev = "29b3388680a03f1daac0037a2b504ea710da879a";
+ sha256 = "0h3d3srzl06p2ajq911j05zr4vkl88qij18plydx45yqmvyvh0xz";
};
nativeBuildInputs = [ makeWrapper qmake pkgconfig ];
- buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ];
+ buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix
index 4b92a43451a3..5c31cdf6e727 100644
--- a/pkgs/applications/misc/minder/default.nix
+++ b/pkgs/applications/misc/minder/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "minder";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "phase1geo";
repo = pname;
rev = version;
- sha256 = "0lhmv3z2jifv4cksxa27jigdfj9n81myjsxg38xp28fx5x3h8bzc";
+ sha256 = "1z3if8bbiigb3m5py641y0j8d9z0s6kbb325waxbqs240pcxipml";
};
nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ];
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 303b9fe5e8bc..0c8ad9ae1b3c 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "mlterm";
- version = "3.8.8";
+ version = "3.8.9";
src = fetchurl {
url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "1jq3fv2wqhszfipkzj8d0lykr6g0zzksn7xy4d3kwincmzfskv7k";
+ sha256 = "1iy7wq953gcnygr1d04h5ddvhpmy8l575n5is2w0rj3ck31ihpqd";
};
nativeBuildInputs = [ pkgconfig autoconf ];
@@ -86,8 +86,9 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
+ description = "Multi Lingual TERMinal emulator on X11";
homepage = http://mlterm.sourceforge.net/;
- license = licenses.bsd2;
+ license = licenses.bsd3;
maintainers = with maintainers; [ vrthra ramkromberg ];
platforms = with platforms; linux;
};
diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix
index a2678d6067f9..ab8802a1b691 100644
--- a/pkgs/applications/misc/multibootusb/default.nix
+++ b/pkgs/applications/misc/multibootusb/default.nix
@@ -1,21 +1,33 @@
-{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5, runtimeShell }:
+{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps,
+ python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }:
+
+# Note: Multibootusb is tricky to maintain. It relies on the
+# $PYTHONPATH variable containing some of their code, so that
+# something like:
+#
+# from scripts import config
+#
+# works. It also relies on the current directory to find some runtime
+# resources thanks to a use of __file__.
+#
+# https://github.com/mbusb/multibootusb/blob/0d34d70c3868f1d7695cfd141141b17c075de967/scripts/osdriver.py#L59
+
python36Packages.buildPythonApplication rec {
pname = "multibootusb";
name = "${pname}-${version}";
version = "9.2.0";
+ nativeBuildInputs = [
+ wrapQtAppsHook
+ ];
+
buildInputs = [
- python36Packages.dbus-python
- python36Packages.pyqt5
- python36Packages.pytest-shutil
- python36Packages.python
- python36Packages.pyudev
- python36Packages.six
libxcb
mtools
p7zip
parted
procps
+ python36Packages.python
qt5.full
utillinux
];
@@ -28,32 +40,44 @@ python36Packages.buildPythonApplication rec {
sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3";
};
- # Skip the fixup stage where stuff is shrinked (can't shrink text files)
- phases = [ "unpackPhase" "installPhase" ];
+ # Tests can't run inside the NixOS sandbox
+ # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory"
+ doCheck = false;
- installPhase = ''
- share="$out/share/${pname}"
- mkdir -p "$share"
- cp -r data "$share/data"
- cp -r scripts "$share/scripts"
- cp "${pname}" "$share/${pname}"
+ pythonPath = [
+ python36Packages.dbus-python
+ python36Packages.pyqt5
+ python36Packages.pytest-shutil
+ python36Packages.pyudev
+ python36Packages.six
+ ];
- mkdir "$out/bin"
- cat > "$out/bin/${pname}" <= 1.1.0
+ url = "https://github.com/networkupstools/nut/commit/612c05efb3c3b243da603a3a050993281888b6e3.patch";
+ sha256 = "0jdbii1z5sqyv24286j5px65j7b3gp8zk3ahbph83pig6g46m3hs";
+ })
+ ];
- nativeBuildInputs = [ pkgconfig makeWrapper ];
+ buildInputs = [ neon libusb openssl udev avahi freeipmi ];
+
+ nativeBuildInputs = [ autoreconfHook libtool pkgconfig makeWrapper ];
configureFlags =
[ "--with-all"
@@ -26,7 +36,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
-
postInstall = ''
wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
"$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib"
@@ -39,7 +48,7 @@ stdenv.mkDerivation rec {
interface for monitoring and administering UPS, PDU and SCD hardware.
It uses a layered approach to connect all of the parts.
'';
- homepage = http://www.networkupstools.org/;
+ homepage = https://networkupstools.org/;
repositories.git = https://github.com/networkupstools/nut.git;
platforms = platforms.linux;
maintainers = [ maintainers.pierron ];
diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix
index 79e3317e64da..1e578cde512a 100644
--- a/pkgs/applications/misc/onboard/default.nix
+++ b/pkgs/applications/misc/onboard/default.nix
@@ -7,7 +7,7 @@
, bash
, glib
, glibcLocales
-, gnome3
+, dconf
, gobject-introspection
, gsettings-desktop-schemas
, gtk3
@@ -66,7 +66,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [
bash
glib
- gnome3.dconf
+ dconf
gsettings-desktop-schemas
gtk3
hunspell
@@ -89,7 +89,7 @@ python3.pkgs.buildPythonApplication rec {
];
propagatedUserEnvPkgs = [
- gnome3.dconf
+ dconf
];
checkInputs = [
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index b8b6e42d5cf5..e943263600cd 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU_combined }:
+{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }:
stdenv.mkDerivation {
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
install -Dm644 reference.brf $out/share/openBrf/reference.brf
patchelf \
- --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU_combined ]}" \
+ --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU libGL ]}" \
$out/share/openBrf/openBrf
mkdir -p "$out/bin"
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index 9240b5d8910e..375552aaa33a 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "opencpn-unstable";
- version = "2019-05-15";
+ version = "2019-11-21";
src = fetchFromGitHub {
owner = "OpenCPN";
repo = "OpenCPN";
- rev = "83a3c4b5ff011d4eb070f009e0a46d194b177047";
- sha256 = "00s1mxnkf1gg41hrz0zp8ypkp98py0m1c22im2zd09k6lcddxw5p";
+ rev = "e73dc935545b2bbcf193cc61d987a0178c52d7a7";
+ sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 37b93eecf391..1dc6a9cfee56 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,21 +1,47 @@
-{ stdenv, pkgconfig, fetchurl, buildPythonApplication
-, autoreconfHook, wrapGAppsHook, gobject-introspection
-, gettext, yelp-tools, itstool, libxmlxx3
-, python, pygobject3, gtk3, gnome3, substituteAll
-, at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
-, xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas
-, speechd, brltty, liblouis, setproctitle, gst_all_1, gst-python
+{ stdenv
+, pkgconfig
+, fetchurl
+, buildPythonApplication
+, autoreconfHook
+, wrapGAppsHook
+, gobject-introspection
+, gettext
+, yelp-tools
+, itstool
+, libxmlxx3
+, python
+, pygobject3
+, gtk3
+, gnome3
+, substituteAll
+, at-spi2-atk
+, at-spi2-core
+, pyatspi
+, dbus
+, dbus-python
+, pyxdg
+, xkbcomp
+, procps
+, lsof
+, coreutils
+, gsettings-desktop-schemas
+, speechd
+, brltty
+, liblouis
+, setproctitle
+, gst_all_1
+, gst-python
}:
buildPythonApplication rec {
pname = "orca";
- version = "3.34.0";
+ version = "3.34.1";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "10h258cprsxzb2hz9wqrkzv1yrsm19ws46l6fsnspywza5wq0z4p";
+ sha256 = "1q38n7hyshkiszmn361skxjynxr31lcms7a1iny6d0zlpmh1vnk4";
};
patches = [
@@ -29,19 +55,40 @@ buildPythonApplication rec {
];
nativeBuildInputs = [
- autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
- gettext yelp-tools itstool gobject-introspection
+ autoreconfHook
+ wrapGAppsHook
+ pkgconfig
+ libxmlxx3
+ gettext
+ yelp-tools
+ itstool
+ gobject-introspection
];
propagatedBuildInputs = [
- pygobject3 pyatspi dbus-python pyxdg brltty liblouis speechd gst-python setproctitle
+ pygobject3
+ pyatspi
+ dbus-python
+ pyxdg
+ brltty
+ liblouis
+ speechd
+ gst-python
+ setproctitle
];
strictDeps = false;
buildInputs = [
- python gtk3 at-spi2-atk at-spi2-core dbus gsettings-desktop-schemas
- gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+ python
+ gtk3
+ at-spi2-atk
+ at-spi2-core
+ dbus
+ gsettings-desktop-schemas
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
];
passthru = {
@@ -51,7 +98,7 @@ buildPythonApplication rec {
};
meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Projects/Orca;
+ homepage = "https://wiki.gnome.org/Projects/Orca";
description = "Screen reader";
longDescription = ''
A free, open source, flexible and extensible screen reader that provides
diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix
index 19657da607fc..82144e9689f8 100644
--- a/pkgs/applications/misc/osmium-tool/default.nix
+++ b/pkgs/applications/misc/osmium-tool/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "osmium-tool";
- version = "1.11.0";
+ version = "1.11.1";
src = fetchFromGitHub {
owner = "osmcode";
repo = "osmium-tool";
rev = "v${version}";
- sha256 = "164r1w539dzy67ir2rqh21kwdvkjv87isd18gp51qyxbsprz6kq5";
+ sha256 = "199dvajik5d56nybk2061vdjyxwakngfd7frxj99wr2vsrp4aw2b";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
index dfc92e38f63c..0ae9e7379e7c 100644
--- a/pkgs/applications/misc/plank/default.nix
+++ b/pkgs/applications/misc/plank/default.nix
@@ -3,6 +3,7 @@
, vala
, atk
, cairo
+, dconf
, glib
, gnome3
, gtk3
@@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf
glib
gnome-menus
- gnome3.dconf
+ dconf
gtk3
libX11
libXfixes
diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 77e93eaba7e9..8ecc4f974b45 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -47,8 +47,9 @@
propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth setuptools ];
dontWrapQtApps = true;
- makeWrapperArgs = [
- "\${qtWrapperArgs[@]}"
- ];
+
+ preFixup = ''
+ makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+ '';
};
}
diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix
deleted file mode 100644
index bd3796a572b0..000000000000
--- a/pkgs/applications/misc/pmenu/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchFromGitLab, python2Packages, gnome-menus }:
-
-stdenv.mkDerivation {
- pname = "pmenu";
- version = "2018-01-01";
-
- src = fetchFromGitLab {
- owner = "o9000";
- repo = "pmenu";
- rev = "f98a5bdf20deb0b7f0543e5ce6a8f5574f695e07";
- sha256 = "131nqafbmbfpgsgss27pz4cyb9fb29m5h1ai1fyvcn286rr9dnp2";
- };
-
- nativeBuildInputs = [ python2Packages.wrapPython ];
-
- buildInputs = [ python2Packages.pygtk gnome-menus ];
-
- pythonPath = [ python2Packages.pygtk ];
-
- installPhase = ''
- mkdir -p $out/bin $out/share/applications
- ./install.sh $out
- '';
-
- postFixup = ''
- wrapPythonPrograms
- '';
-
- meta = {
- homepage = https://gitlab.com/o9000/pmenu;
- description = "Start menu for Linux/BSD";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.romildo ];
- };
-}
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 9ca8c696184c..fcc6ead550a8 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -1,5 +1,5 @@
{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
-, python2, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage
+, python3, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage
, xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper
# optional packages-- override the variables ending in 'Support' to enable or
@@ -24,15 +24,16 @@ assert nlSupport -> ! iwSupport && libnl != null;
assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null;
assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null;
-stdenv.mkDerivation rec {
+let xcbproto-py3 = xcbproto.override { python = python3; };
+in stdenv.mkDerivation rec {
pname = "polybar";
- version = "3.4.0";
+ version = "3.4.1";
src = fetchFromGitHub {
- owner = "jaagr";
+ owner = pname;
repo = pname;
rev = version;
- sha256 = "1g3zj0788cdlm8inpl19279bw8zjcy7dzj7q4f1l2d8c8g1jhv0m";
+ sha256 = "1z1m6dxh2i5vsnkzaccb9j02ab05wgmcgig5d0l9w856g5jp3zmy";
fetchSubmodules = true;
};
@@ -45,12 +46,12 @@ stdenv.mkDerivation rec {
having a black belt in shell scripting.
'';
license = licenses.mit;
- maintainers = [ maintainers.afldcr ];
- platforms = platforms.unix;
+ maintainers = with maintainers; [ afldcr filalex77 ];
+ platforms = platforms.linux;
};
buildInputs = [
- cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil
+ cairo libXdmcp libpthreadstubs libxcb pcre python3 xcbproto-py3 xcbutil
xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm
(if alsaSupport then alsaLib else null)
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index f3cd6fdb0f62..caf4f270a151 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig
-, boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK30
+, boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK31
, gtest, nlopt, xorg, makeDesktopItem
}:
let
@@ -9,7 +9,7 @@ let
in
stdenv.mkDerivation rec {
pname = "prusa-slicer";
- version = "2.1.0";
+ version = "2.1.1";
enableParallelBuilding = true;
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
glew
libpng
tbb
- wxGTK30
+ wxGTK31
xorg.libX11
] ++ checkInputs;
@@ -59,13 +59,12 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "prusa3d";
repo = "PrusaSlicer";
- sha256 = "172nz01iiqfjzkpcbl78j6almq6av70l71jgrzrcdw6ham1wqnpr";
+ sha256 = "0i393nbc2salb4j5l2hvy03ng7hmf90d2xj653pw9bsikhj0r3jd";
rev = "version_${version}";
};
cmakeFlags = [
"-DSLIC3R_FHS=1"
- "-DSLIC3R_WX_STABLE=1" # necessary when compiling against wxGTK 3.0
];
postInstall = ''
diff --git a/pkgs/development/python-modules/cerberus11/default.nix b/pkgs/applications/misc/pyditz/cerberus.nix
similarity index 80%
rename from pkgs/development/python-modules/cerberus11/default.nix
rename to pkgs/applications/misc/pyditz/cerberus.nix
index 81f6ef1e8371..614e3ca81350 100644
--- a/pkgs/development/python-modules/cerberus11/default.nix
+++ b/pkgs/applications/misc/pyditz/cerberus.nix
@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Cerberus";
- version = "1.3.1";
+ version = "1.1";
src = fetchPypi {
inherit pname version;
- sha256 = "0be48fc0dc84f83202a5309c0aa17cd5393e70731a1698a50d118b762fbe6875";
+ sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5";
};
checkInputs = [ pytestrunner pytest ];
diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix
index 0f4e743aba4e..60de2f9abdc9 100644
--- a/pkgs/applications/misc/pyditz/default.nix
+++ b/pkgs/applications/misc/pyditz/default.nix
@@ -1,18 +1,22 @@
{ stdenv, pythonPackages }:
-pythonPackages.buildPythonApplication rec {
+with pythonPackages;
+
+let
+ cerberus_1_1 = callPackage ./cerberus.nix { };
+in buildPythonApplication rec {
pname = "pyditz";
version = "0.10.3";
- src = pythonPackages.fetchPypi {
+ src = fetchPypi {
inherit pname version;
sha256 = "0hxxz7kxv9gsrr86ccsc31g7bc2agw1ihbxhd659c2m6nrqq5qaf";
};
- nativeBuildInputs = [ pythonPackages.setuptools_scm ];
- propagatedBuildInputs = with pythonPackages; [ pyyaml six jinja2 cerberus11 ];
+ nativeBuildInputs = [ setuptools_scm ];
+ propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ];
checkPhase = ''
- ${pythonPackages.python.interpreter} -m unittest discover
+ ${python.interpreter} -m unittest discover
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index 1f35643dd761..21d4b0031792 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -19,7 +19,7 @@ in mkDerivation rec {
buildInputs = [ perlPackages.perl ];
- preBuild = ''
+ postPatch = ''
substituteInPlace scripts/scripts.pro \
--replace /bin/true ${coreutils}/bin/true
@@ -37,9 +37,8 @@ in mkDerivation rec {
substituteInPlace src/StdCleanup.cpp \
--replace /bin/bash ${bash}/bin/bash
'';
- postPatch = ''
- export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out"
- '';
+
+ qmakeFlags = [ "INSTALL_PREFIX=${placeholder "out"}" ];
postInstall = ''
wrapProgram $out/bin/qdirstat-cache-writer \
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 1256bb96608f..6b68071d4d05 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,5 +1,6 @@
{ lib, mkDerivation, fetchFromGitHub
-, git, gnupg, pass, pwgen
+, git, gnupg, pass, pwgen, qrencode
+, fetchpatch
, qtbase, qtsvg, qttools, qmake
}:
@@ -14,12 +15,27 @@ mkDerivation rec {
sha256 = "0748hjvhjrybi33ci3c8hcr74k9pdrf5jv8npf9hrsrmdyy1kr9x";
};
+ postPatch = ''
+ substituteInPlace src/qtpass.cpp \
+ --replace "/usr/bin/qrencode" "${qrencode}/bin/qrencode"
+ '';
+
buildInputs = [ git gnupg pass qtbase qtsvg ];
nativeBuildInputs = [ qmake qttools ];
enableParallelBuilding = true;
+ patches = [
+ # Fix path to pass-otp plugin `/usr/lib/password-store/extensions/otp.bash` being hardcoded.
+ # TODO: Remove when https://github.com/IJHack/QtPass/pull/499 is merged and available.
+ (fetchpatch {
+ name = "qtpass-Dont-hardcode-pass-otp-usr-lib-path.patch";
+ url = "https://github.com/IJHack/QtPass/commit/2ca9f0ec5a8d709c97a2433c5cd814040c82d4f3.patch";
+ sha256 = "0ljlvqxvarrz2a4j71i66aflrxi84zirb6cg9kvygnvhvm1zbc7d";
+ })
+ ];
+
qmakeFlags = [
# setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too:
"QMAKE_LUPDATE=${qttools.dev}/bin/lupdate"
diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix
new file mode 100644
index 000000000000..6bbbc671bf86
--- /dev/null
+++ b/pkgs/applications/misc/raiseorlaunch/default.nix
@@ -0,0 +1,23 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "raiseorlaunch";
+ version = "2.3.3";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "3d694015d020a888b42564d56559213b94981ca2b32b952a49b2de4d029d2e59";
+ };
+
+ nativeBuildInputs = [ python3Packages.setuptools_scm ];
+ checkInputs = [ python3Packages.pytest ];
+ pythonPath = with python3Packages; [ i3ipc ];
+
+ meta = with lib; {
+ maintainers = with maintainers; [ winpat ];
+ description = "A run-or-raise-application-launcher for i3 window manager";
+ homepage = "https://github.com/open-dynaMIX/raiseorlaunch";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index bee7058293d9..ac62ccc00cbf 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, lib, fetchgit, pkgconfig, libssh2
+{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkgconfig, libssh2
, qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
, qtsvg, qttools, qtquick1, qtcharts
, qmake
}:
let
- breakpad_lss = fetchgit {
+ breakpad_lss = fetchFromGitiles {
url = "https://chromium.googlesource.com/linux-syscall-support";
rev = "08056836f2b4a5747daff75435d10d649bed22f6";
sha256 = "1ryshs2nyxwa0kn3rlbnd5b3fhna9vqm560yviddcfgdm2jyg0hz";
@@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
pname = "redis-desktop-manager";
version = "0.9.1";
- src = fetchgit {
- url = "https://github.com/uglide/RedisDesktopManager.git";
+ src = fetchFromGitHub {
+ owner = "uglide";
+ repo = "RedisDesktopManager";
fetchSubmodules = true;
- rev = "refs/tags/${version}";
+ rev = version;
sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f";
};
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index b751560b301a..e9862041f4a8 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -11,82 +11,108 @@
, withGeoclue ? withGeolocation && stdenv.isLinux, geoclue
}:
-stdenv.mkDerivation rec {
- pname = "redshift";
- version = "1.12";
+let
+ mkRedshift =
+ { pname, version, src, meta }:
+ stdenv.mkDerivation rec {
+ inherit pname version src meta;
- src = fetchFromGitHub {
- owner = "jonls";
- repo = "redshift";
- rev = "v${version}";
- sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6";
+ patches = [
+ # https://github.com/jonls/redshift/pull/575
+ ./575.patch
+ ];
+
+ nativeBuildInputs = [
+ autoconf
+ automake
+ gettext
+ intltool
+ libtool
+ pkgconfig
+ wrapGAppsHook
+ wrapPython
+ ];
+
+ configureFlags = [
+ "--enable-randr=${if withRandr then "yes" else "no"}"
+ "--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
+ "--enable-drm=${if withDrm then "yes" else "no"}"
+ "--enable-quartz=${if withQuartz then "yes" else "no"}"
+ "--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
+ ];
+
+ buildInputs = [
+ gobject-introspection
+ gtk3
+ python
+ ] ++ stdenv.lib.optional withRandr libxcb
+ ++ stdenv.lib.optional withGeoclue geoclue
+ ++ stdenv.lib.optional withDrm libdrm
+ ++ stdenv.lib.optional withQuartz ApplicationServices
+ ++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ]
+ ;
+
+ pythonPath = [ pygobject3 pyxdg ];
+
+ preConfigure = "./bootstrap";
+
+ postFixup = "wrapPythonPrograms";
+
+ # the geoclue agent may inspect these paths and expect them to be
+ # valid without having the correct $PATH set
+ postInstall = ''
+ substituteInPlace $out/share/applications/redshift.desktop \
+ --replace 'Exec=redshift' "Exec=$out/bin/redshift"
+ substituteInPlace $out/share/applications/redshift.desktop \
+ --replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk"
+ '';
+
+ enableParallelBuilding = true;
+ };
+in
+rec {
+ redshift = mkRedshift rec {
+ pname = "redshift";
+ version = "1.12";
+
+ src = fetchFromGitHub {
+ owner = "jonls";
+ repo = "redshift";
+ rev = "v${version}";
+ sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Screen color temperature manager";
+ longDescription = ''
+ Redshift adjusts the color temperature according to the position
+ of the sun. A different color temperature is set during night and
+ daytime. During twilight and early morning, the color temperature
+ transitions smoothly from night to daytime temperature to allow
+ your eyes to slowly adapt. At night the color temperature should
+ be set to match the lamps in your room.
+ '';
+ license = licenses.gpl3Plus;
+ homepage = http://jonls.dk/redshift;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ yegortimoshenko globin ];
+ };
};
- patches = [
- # https://github.com/jonls/redshift/pull/575
- ./575.patch
- ];
+ redshift-wlr = mkRedshift {
+ pname = "redshift-wlr";
+ version = "2019-04-17";
- nativeBuildInputs = [
- autoconf
- automake
- gettext
- intltool
- libtool
- pkgconfig
- wrapGAppsHook
- wrapPython
- ];
+ src = fetchFromGitHub {
+ owner = "minus7";
+ repo = "redshift";
+ rev = "eecbfedac48f827e96ad5e151de8f41f6cd3af66";
+ sha256 = "0rs9bxxrw4wscf4a8yl776a8g880m5gcm75q06yx2cn3lw2b7v22";
+ };
- configureFlags = [
- "--enable-randr=${if withRandr then "yes" else "no"}"
- "--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
- "--enable-drm=${if withDrm then "yes" else "no"}"
- "--enable-quartz=${if withQuartz then "yes" else "no"}"
- "--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
- ];
-
- buildInputs = [
- gobject-introspection
- gtk3
- python
- ] ++ stdenv.lib.optional withRandr libxcb
- ++ stdenv.lib.optional withGeoclue geoclue
- ++ stdenv.lib.optional withDrm libdrm
- ++ stdenv.lib.optional withQuartz ApplicationServices
- ++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ]
- ;
-
- pythonPath = [ pygobject3 pyxdg ];
-
- preConfigure = "./bootstrap";
-
- postFixup = "wrapPythonPrograms";
-
- # the geoclue agent may inspect these paths and expect them to be
- # valid without having the correct $PATH set
- postInstall = ''
- substituteInPlace $out/share/applications/redshift.desktop \
- --replace 'Exec=redshift' "Exec=$out/bin/redshift"
- substituteInPlace $out/share/applications/redshift.desktop \
- --replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk"
- '';
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- description = "Screen color temperature manager";
- longDescription = ''
- Redshift adjusts the color temperature according to the position
- of the sun. A different color temperature is set during night and
- daytime. During twilight and early morning, the color temperature
- transitions smoothly from night to daytime temperature to allow
- your eyes to slowly adapt. At night the color temperature should
- be set to match the lamps in your room.
- '';
- license = licenses.gpl3Plus;
- homepage = http://jonls.dk/redshift;
- platforms = platforms.unix;
- maintainers = with maintainers; [ yegortimoshenko globin ];
+ meta = redshift.meta // {
+ description = redshift.meta.description + "(with wlroots patches)";
+ homepage = https://github.com/minus7/redshift;
+ };
};
}
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index eabf77f0e951..94381d4f6f96 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, makeWrapper
+{ stdenv, lib, fetchurl
, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git
, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
, bison, flex, librsvg, check
@@ -19,16 +19,11 @@ stdenv.mkDerivation rec {
sed -i 's/~root/~nobody/g' test/helper-expand.c
'';
- nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
];
- postInstall = ''
- wrapProgram $out/bin/rofi-theme-selector \
- --prefix XDG_DATA_DIRS : $out/share
- '';
-
doCheck = false;
meta = with lib; {
diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix
index 8c24d27f0752..1c7284a2db26 100644
--- a/pkgs/applications/misc/rofi/wrapper.nix
+++ b/pkgs/applications/misc/rofi/wrapper.nix
@@ -1,6 +1,5 @@
-{ stdenv, rofi-unwrapped, makeWrapper, theme ? null }:
+{ stdenv, rofi-unwrapped, makeWrapper, hicolor-icon-theme, theme ? null }:
-if theme == null then rofi-unwrapped else
stdenv.mkDerivation {
pname = "rofi";
version = rofi-unwrapped.version;
@@ -14,8 +13,15 @@ stdenv.mkDerivation {
rm $out/bin
mkdir $out/bin
ln -s ${rofi-unwrapped}/bin/* $out/bin
+
rm $out/bin/rofi
- makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi --add-flags "-theme ${theme}"
+ makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi \
+ --prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \
+ ${if theme != null then ''--add-flags "-theme ${theme}"'' else ""}
+
+ rm $out/bin/rofi-theme-selector
+ makeWrapper ${rofi-unwrapped}/bin/rofi-theme-selector $out/bin/rofi-theme-selector \
+ --prefix XDG_DATA_DIRS : $out/share
'';
meta = rofi-unwrapped.meta // {
diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix
index c427eda8c773..137ec920f750 100644
--- a/pkgs/applications/misc/rsclock/default.nix
+++ b/pkgs/applications/misc/rsclock/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2";
};
- cargoSha256 = "0zg5q2p9snpfyxl0gx87ix1f46afrfm5jq0m6c7s8qw2x9hpvxzr";
+ cargoSha256 = "03mhlp5hi3nlybb9dkwf1gxgsg056mjq2zsxnb5qh8pdxw7fmdxk";
meta = with stdenv.lib; {
description = "A simple terminal clock written in Rust";
diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
index 4f8315f060a7..4199e198c53f 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -29,6 +29,12 @@ in stdenv.mkDerivation rec {
patchShebangs build-aux/meson_post_install.py
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "Friendly SQL Client";
longDescription = ''
diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix
index f47f2b4e9ebc..30aa45c14ffa 100644
--- a/pkgs/applications/misc/sidequest/default.nix
+++ b/pkgs/applications/misc/sidequest/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
let
pname = "sidequest";
- version = "0.7.2";
+ version = "0.7.6";
desktopItem = makeDesktopItem rec {
name = "SideQuest";
@@ -16,7 +16,7 @@
src = fetchurl {
url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
- sha256 = "035grhzqm3qdfcq5vn4a85lgb188rg60wlgc02r44cnj4sbsyyzj";
+ sha256 = "1yyba5495ydyyfl62pjd4hbga86k7f2a72ds2j2qzkinngyl14j8";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 87125eb1b365..6e4a32b1ef11 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -1,23 +1,37 @@
-{ atomEnv, autoPatchelfHook, dpkg, fetchurl, makeDesktopItem, makeWrapper
-, stdenv, udev, wrapGAppsHook }:
+{ atomEnv
+, autoPatchelfHook
+, dpkg
+, fetchurl
+, makeDesktopItem
+, makeWrapper
+, stdenv
+, udev
+, wrapGAppsHook
+}:
let
inherit (stdenv.hostPlatform) system;
+ throwSystem = throw "Unsupported system: ${system}";
+
pname = "simplenote";
- version = "1.8.0";
+ version = "1.12.0";
sha256 = {
- x86_64-linux = "066gr1awdj5nwdr1z57mmvx7dd1z19g0wzsgbnrrb89bqfj67ykl";
- }.${system};
+ x86_64-linux = "0y9b4haaj7qxr92wnwacziljqrkf4vlyqq3rvis8ribq6zr5b24w";
+ }.${system} or throwSystem;
meta = with stdenv.lib; {
description = "The simplest way to keep notes";
homepage = "https://github.com/Automattic/simplenote-electron";
license = licenses.gpl2;
- maintainers = with maintainers; [ kiwi ];
- platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [
+ kiwi
+ ];
+ platforms = [
+ "x86_64-linux"
+ ];
};
linux = stdenv.mkDerivation rec {
@@ -31,14 +45,14 @@ let
};
desktopItem = makeDesktopItem {
- name = "simplenote";
+ categories = "Development";
comment = "Simplenote for Linux";
+ desktopName = "Simplenote";
exec = "simplenote %U";
icon = "simplenote";
- type = "Application";
+ name = "simplenote";
startupNotify = "true";
- desktopName = "Simplenote";
- categories = "Development";
+ type = "Application";
};
dontBuild = true;
@@ -46,9 +60,14 @@ let
dontPatchELF = true;
dontWrapGApps = true;
- buildInputs = atomEnv.packages;
+ nativeBuildInputs = [
+ autoPatchelfHook
+ dpkg
+ makeWrapper
+ wrapGAppsHook
+ ];
- nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
+ buildInputs = atomEnv.packages;
unpackPhase = "dpkg-deb -x $src .";
@@ -62,14 +81,15 @@ let
cp "${desktopItem}/share/applications/"* "$out/share/applications"
'';
- runtimeDependencies = [ udev.lib ];
+ runtimeDependencies = [
+ udev.lib
+ ];
postFixup = ''
- ls -ahl $out
makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \
- "''${gappsWrapperArgs[@]}"
+ "''${gappsWrapperArgs[@]}"
'';
};
in
- linux
+linux
diff --git a/pkgs/applications/misc/slic3r/boost-compile-error.patch b/pkgs/applications/misc/slic3r/boost-compile-error.patch
new file mode 100644
index 000000000000..4dbdb85f743d
--- /dev/null
+++ b/pkgs/applications/misc/slic3r/boost-compile-error.patch
@@ -0,0 +1,12 @@
+diff --git a/xs/src/libslic3r/GCodeSender.hpp b/xs/src/libslic3r/GCodeSender.hpp
+index cc0b2983..0f39f5a3 100644
+--- a/xs/src/libslic3r/GCodeSender.hpp
++++ b/xs/src/libslic3r/GCodeSender.hpp
+@@ -9,6 +9,7 @@
+ #include
+ #include
+ #include
++#include
+
+ namespace Slic3r {
+
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index cf9e93b87b39..8dbd0cd57767 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit, perl, makeWrapper, makeDesktopItem
-, which, perlPackages, boost
+{ lib, stdenv, fetchgit, perl, makeWrapper
+, makeDesktopItem, which, perlPackages, boost
}:
stdenv.mkDerivation rec {
@@ -40,6 +40,11 @@ stdenv.mkDerivation rec {
sed -i 's|"/usr/include/asm-generic/ioctls.h"||g' xs/src/libslic3r/GCodeSender.cpp
'';
+ # note the boost-compile-error is fixed in
+ # https://github.com/slic3r/Slic3r/commit/90f108ae8e7a4315f82e317f2141733418d86a68
+ # this patch can be probably be removed in the next version after 1.3.0
+ patches = lib.optional (lib.versionAtLeast boost.version "1.56.0") ./boost-compile-error.patch;
+
buildPhase = ''
export SLIC3R_NO_AUTO=true
export LD=$CXX
diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix
index 213f308646ab..75f3be85dadf 100644
--- a/pkgs/applications/misc/stretchly/default.nix
+++ b/pkgs/applications/misc/stretchly/default.nix
@@ -1,8 +1,12 @@
{ GConf
, alsaLib
, at-spi2-atk
+, at-spi2-core
, atk
+, buildFHSUserEnv
, cairo
+, common-updater-scripts
+, coreutils
, cups
, dbus
, expat
@@ -29,15 +33,19 @@
, libnotify
, libpciaccess
, libpng12
+, libuuid
, libxcb
, nspr
, nss
, pango
, pciutils
, pulseaudio
+, runtimeShell
, stdenv
, udev
, wrapGAppsHook
+, writeScript
+, file
}:
let
@@ -45,6 +53,7 @@ let
GConf
alsaLib
at-spi2-atk
+ at-spi2-core
atk
cairo
cups
@@ -71,6 +80,7 @@ let
libnotify
libpciaccess
libpng12
+ libuuid
libxcb
nspr
nss
@@ -82,58 +92,96 @@ let
];
libPath = lib.makeLibraryPath libs;
+
+ stretchly =
+ stdenv.mkDerivation rec {
+ pname = "stretchly";
+ version = "0.21.0";
+
+ src = fetchurl {
+ url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
+ sha256 = "1gyyr22xq8s4miiacs8wqhp7lxnwvkvlwhngnq8671l62s6iyjzl";
+ };
+
+ nativeBuildInputs = [
+ wrapGAppsHook
+ coreutils
+ ];
+
+ buildInputs = libs;
+
+ dontPatchELF = true;
+ dontBuild = true;
+ dontConfigure = true;
+
+ installPhase = ''
+ mkdir -p $out/bin $out/lib/stretchly
+ cp -r ./* $out/lib/stretchly/
+ ln -s $out/lib/stretchly/stretchly $out/bin/
+ '';
+
+ preFixup = ''
+ patchelf --set-rpath "${libPath}" $out/lib/stretchly/libffmpeg.so
+ patchelf --set-rpath "${libPath}" $out/lib/stretchly/libEGL.so
+ patchelf --set-rpath "${libPath}" $out/lib/stretchly/libGLESv2.so
+ patchelf --set-rpath "${libPath}" $out/lib/stretchly/swiftshader/libEGL.so
+ patchelf --set-rpath "${libPath}" $out/lib/stretchly/swiftshader/libGLESv2.so
+
+ patchelf \
+ --set-rpath "$out/lib/stretchly:${libPath}" \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ $out/lib/stretchly/stretchly
+
+ patchelf \
+ --set-rpath "$out/lib/stretchly:${libPath}" \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ $out/lib/stretchly/chrome-sandbox
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A break time reminder app";
+ longDescription = ''
+ stretchly is a cross-platform electron app that reminds you to take
+ breaks when working on your computer. By default, it runs in your tray
+ and displays a reminder window containing an idea for a microbreak for 20
+ seconds every 10 minutes. Every 30 minutes, it displays a window
+ containing an idea for a longer 5 minute break.
+ '';
+ homepage = https://hovancik.net/stretchly;
+ downloadPage = https://hovancik.net/stretchly/downloads/;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ cdepillabout ];
+ platforms = platforms.linux;
+ };
+ };
+
in
-stdenv.mkDerivation rec {
- pname = "stretchly";
- version = "0.19.1";
+buildFHSUserEnv {
+ inherit (stretchly) meta;
- src = fetchurl {
- url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
- sha256 = "1q2wxfqs8qv9b1rfh5lhmyp3rrgdl05m6ihsgkxlgp0yzi07afz8";
- };
+ name = "stretchly";
- nativeBuildInputs = [
- wrapGAppsHook
+ targetPkgs = pkgs: [
+ stretchly
];
- buildInputs = libs;
+ runScript = "stretchly";
- dontPatchELF = true;
- dontBuild = true;
- dontConfigure = true;
+ passthru = {
+ updateScript = writeScript "update-stretchly" ''
+ #!${runtimeShell}
- installPhase = ''
- mkdir -p $out/bin $out/lib/stretchly
- cp -r ./* $out/lib/stretchly/
- ln -s $out/lib/stretchly/libffmpeg.so $out/lib/
- ln -s $out/lib/stretchly/libnode.so $out/lib/
- ln -s $out/lib/stretchly/stretchly $out/bin/
- '';
+ set -eu -o pipefail
- preFixup = ''
- patchelf --set-rpath "${libPath}" $out/lib/stretchly/libffmpeg.so
- patchelf --set-rpath "${libPath}" $out/lib/stretchly/libnode.so
+ # get the latest release version
+ latest_version=$(curl -s https://api.github.com/repos/hovancik/stretchly/releases/latest | jq --raw-output .tag_name | sed -e 's/^v//')
- patchelf \
- --set-rpath "$out/lib/stretchly:${libPath}" \
- --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- $out/lib/stretchly/stretchly
- '';
+ echo "updating to $latest_version..."
- meta = with stdenv.lib; {
- description = "A break time reminder app";
- longDescription = ''
- stretchly is a cross-platform electron app that reminds you to take
- breaks when working on your computer. By default, it runs in your tray
- and displays a reminder window containing an idea for a microbreak for 20
- seconds every 10 minutes. Every 30 minutes, it displays a window
- containing an idea for a longer 5 minute break.
+ ${common-updater-scripts}/bin/update-source-version stretchly.passthru.stretchlyWrapped "$latest_version"
'';
- homepage = https://hovancik.net/stretchly;
- downloadPage = https://hovancik.net/stretchly/downloads/;
- license = licenses.bsd2;
- maintainers = with maintainers; [ cdepillabout ];
- platforms = platforms.linux;
+
+ stretchlyWrapped = stretchly;
};
}
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 9dcdf8fd2b0e..76a62d1762c2 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -3,8 +3,6 @@
let
- getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
-
# TODO: Should we move this to `lib`? Seems like its would be useful in many cases.
extensionOf = filePath:
lib.concatStringsSep "." (lib.tail (lib.splitString "." (builtins.baseNameOf filePath)));
@@ -15,15 +13,15 @@ let
'') icons);
mkSweetHome3D =
- { name, module, version, src, license, description, desktopName, icons }:
+ { pname, module, version, src, license, description, desktopName, icons }:
stdenv.mkDerivation rec {
- inherit name version src description;
+ inherit pname version src description;
exec = stdenv.lib.toLower module;
sweethome3dItem = makeDesktopItem {
inherit exec desktopName;
- name = getDesktopFileName name;
- icon = getDesktopFileName name;
+ name = pname;
+ icon = pname;
comment = description;
genericName = "Computer Aided (Interior) Design";
categories = "Application;Graphics;2DGraphics;3DGraphics;";
@@ -49,7 +47,7 @@ let
mkdir -p $out/bin
cp install/${module}-${version}.jar $out/share/java/.
- ${installIcons (getDesktopFileName name) icons}
+ ${installIcons pname icons}
cp "${sweethome3dItem}/share/applications/"* $out/share/applications
@@ -74,9 +72,9 @@ let
in {
application = mkSweetHome3D rec {
+ pname = stdenv.lib.toLower module + "-application";
version = "6.2";
module = "SweetHome3D";
- name = stdenv.lib.toLower module + "-application-" + version;
description = "Design and visualize your future home";
license = stdenv.lib.licenses.gpl2Plus;
src = fetchsvn {
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index eef5185aaeed..1d3f1a41e162 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -7,20 +7,17 @@ let
m: "sweethome3d-"
+ removeSuffix "libraryeditor" (toLower m)
+ "-editor";
- sweetName = m: v: sweetExec m + "-" + v;
-
- getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
mkEditorProject =
- { name, module, version, src, license, description, desktopName }:
+ { pname, module, version, src, license, description, desktopName }:
stdenv.mkDerivation rec {
application = sweethome3dApp;
- inherit name module version src description;
+ inherit pname module version src description;
exec = sweetExec module;
editorItem = makeDesktopItem {
inherit exec desktopName;
- name = getDesktopFileName name;
+ name = pname;
comment = description;
genericName = "Computer Aided (Interior) Design";
categories = "Application;Graphics;2DGraphics;3DGraphics;";
@@ -66,7 +63,7 @@ in {
textures-editor = mkEditorProject rec {
version = "1.5";
module = "TexturesLibraryEditor";
- name = sweetName module version;
+ pname = module;
description = "Easily create SH3T files and edit the properties of the texture images it contain";
license = stdenv.lib.licenses.gpl2Plus;
src = fetchcvs {
@@ -81,7 +78,7 @@ in {
furniture-editor = mkEditorProject rec {
version = "1.19";
module = "FurnitureLibraryEditor";
- name = sweetName module version;
+ pname = module;
description = "Quickly create SH3F files and edit the properties of the 3D models it contain";
license = stdenv.lib.licenses.gpl2;
src = fetchcvs {
diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index 816ae664f8e8..5a722ffe1119 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -20,14 +20,14 @@
}:
mkDerivation rec {
- version = "0.10.2";
+ version = "0.10.4";
pname = "syncthingtray";
src = fetchFromGitHub {
owner = "Martchus";
repo = "syncthingtray";
rev = "v${version}";
- sha256 = "09iq1rr70wwy5xk0jmfnwzvnigq409hvs2viy1j0khn9jhvnk6z0";
+ sha256 = "068v63bb1bq6vz7byhnd28l6dmr4jmivailxmjv86wakbsqvlhbi";
};
buildInputs = [ qtbase cpp-utilities qtutilities ]
diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix
new file mode 100644
index 000000000000..ee516ac97aa7
--- /dev/null
+++ b/pkgs/applications/misc/taizen/default.nix
@@ -0,0 +1,25 @@
+{ rustPlatform, lib, fetchFromGitHub, ncurses, openssl, pkgconfig }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "taizen";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "NerdyPepper";
+ repo = pname;
+ rev = "5c1876429e2da7424e9d31b1e16f5a3147cc58d0";
+ sha256 = "09izgx7icvizskdy9kplk0am61p7550fsd0v42zcihq2vap2j92z";
+ };
+
+ buildInputs = [ ncurses openssl ];
+ nativeBuildInputs = [ pkgconfig ];
+
+ cargoSha256 = "0h8ybhb17pqhhfjcmq1l70kp8g1yyq38228lcf86byk3r2ar2rkg";
+
+ meta = with lib; {
+ homepage = https://crates.io/crates/taizen;
+ license = licenses.mit;
+ description = "curses based mediawiki browser";
+ maintainers = with maintainers; [ ma27 ];
+ };
+}
diff --git a/pkgs/applications/misc/taskell/default.nix b/pkgs/applications/misc/taskell/default.nix
index 702c3124d8ab..488e49c21817 100644
--- a/pkgs/applications/misc/taskell/default.nix
+++ b/pkgs/applications/misc/taskell/default.nix
@@ -1,8 +1,8 @@
{ lib, haskellPackages, fetchFromGitHub }:
let
- version = "1.6.1";
- sha256 = "047gvpq52pif9sfb4qcfdiwz50x3wlnjvsnnjzypm1qlwyl2rbz1";
+ version = "1.7.3";
+ sha256 = "1439fh79ilc6jvz894cfzhk7gy5r2sv4v79bvqmmqbzbqk9qsbvx";
in (haskellPackages.mkDerivation {
pname = "taskell";
diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
index feb06368de41..931a27fbeff6 100644
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
homepage = http://tasktools.org;
license = licenses.mit;
maintainers = with maintainers; [ matthiasbeyer ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 922b3fd20286..2fa193fc8e7a 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -6,7 +6,7 @@
, python3
, pkgconfig
, dmd
-, gnome3
+, dconf
, dbus
, gsettings-desktop-schemas
, desktop-file-utils
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
buildInputs = [
dbus
gettext
- gnome3.dconf
+ dconf
gsettings-desktop-schemas
gtkd
libsecret
diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index d0419c414d7a..a8b86e71cb13 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchurl, cmake }:
+{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "timewarrior";
- version = "1.1.1";
+ version = "1.2.0";
enableParallelBuilding = true;
- src = fetchurl {
- url = "https://taskwarrior.org/download/timew-${version}.tar.gz";
- sha256 = "1jfcfzdwk5qqhxznj1bgy0sx3lnp3z5lqr9kch9a7iazwmi9lz8z";
+ src = fetchFromGitHub {
+ owner = "GothenburgBitFactory";
+ repo = "timewarrior";
+ rev = "v${version}";
+ sha256 = "0ci8kb7gdp1dsv6xj30nbz8lidrmn50pbriw26wv8mdhs17rfk7w";
+ fetchSubmodules = true;
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix
index cb70d57869c0..bbd3073a4d8e 100644
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/pkgs/applications/misc/tnef/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- version = "1.4.17";
+ version = "1.4.18";
pname = "tnef";
src = fetchFromGitHub {
owner = "verdammelt";
repo = "tnef";
rev = version;
- sha256 = "0cq2xh5wd74qn6k2nnw5rayxgqhjl3jbzf4zlc4babcwxrv32ldh";
+ sha256 = "104g48mcm00bgiyzas2vf86331w7bnw7h3bc11ib4lp7rz6zqfck";
};
doCheck = true;
diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix
index 15c675c902fb..e619ab053e7d 100644
--- a/pkgs/applications/misc/tootle/default.nix
+++ b/pkgs/applications/misc/tootle/default.nix
@@ -62,6 +62,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "Simple Mastodon client designed for elementary OS";
homepage = https://github.com/bleakgrey/tootle;
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index 2aef45748cac..cd58219721c9 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }:
+{ lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }:
-stdenv.mkDerivation {
+mkDerivation {
name = "twmn-git-2018-10-01";
src = fetchFromGitHub {
@@ -29,8 +29,8 @@ stdenv.mkDerivation {
meta = {
description = "A notification system for tiling window managers";
homepage = https://github.com/sboli/twmn;
- platforms = with stdenv.lib.platforms; linux;
- maintainers = [ stdenv.lib.maintainers.matejc ];
- license = stdenv.lib.licenses.lgpl3;
+ platforms = with lib.platforms; linux;
+ maintainers = [ lib.maintainers.matejc ];
+ license = lib.licenses.lgpl3;
};
}
diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix
new file mode 100644
index 000000000000..6d8da4a1007a
--- /dev/null
+++ b/pkgs/applications/misc/variety/default.nix
@@ -0,0 +1,73 @@
+{
+ fehSupport ? false, feh
+, imagemagickSupport ? true, imagemagick
+, stdenv
+, lib
+, python37Packages
+, fetchFromGitHub
+, intltool
+, gtk3
+, gexiv2
+, libnotify
+, wrapGAppsHook
+, gobject-introspection
+, hicolor-icon-theme
+, librsvg
+}:
+
+with python37Packages;
+
+buildPythonApplication rec {
+ pname = "variety";
+ version = "0.7.2-96-g3afe3ab";
+
+ src = fetchFromGitHub {
+ owner = "varietywalls";
+ repo = "variety";
+ rev = "3afe3abf725e5db2aec0db575a17c9907ab20de1";
+ sha256 = "10vw0202dwrwi497nsbq077v4qd3qn5b8cmkfcsgbvvjwlz7ldm5";
+ };
+
+ nativeBuildInputs = [ intltool wrapGAppsHook ];
+
+ buildInputs = [ distutils_extra ];
+
+ doCheck = false;
+
+ prePatch = ''
+ substituteInPlace variety_lib/varietyconfig.py \
+ --replace "__variety_data_directory__ = \"../data\"" "__variety_data_directory__ = \"$out/share/variety\""
+ substituteInPlace data/scripts/set_wallpaper \
+ --replace /bin/bash ${stdenv.shell}
+ substituteInPlace data/scripts/get_wallpaper \
+ --replace /bin/bash ${stdenv.shell}
+ '';
+
+ propagatedBuildInputs =
+ [ gtk3
+ gexiv2
+ libnotify
+ beautifulsoup4
+ lxml
+ pycairo
+ pygobject3
+ configobj
+ pillow
+ setuptools
+ requests
+ httplib2
+ dbus-python
+ gobject-introspection
+ hicolor-icon-theme
+ librsvg
+ ]
+ ++ lib.optional fehSupport feh
+ ++ lib.optional imagemagickSupport imagemagick;
+
+ meta = with lib; {
+ description = "A wallpaper manager for Linux systems. It supports numerous desktops and wallpaper sources, including local files and online services: Flickr, Wallhaven, Unsplash, and more";
+ homepage = https://github.com/varietywalls/variety;
+ license = licenses.gpl3;
+ maintainers = [ maintainers.zfnmxt ];
+ };
+}
diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix
index b6a8b567a503..680573fd304d 100644
--- a/pkgs/applications/misc/verbiste/default.nix
+++ b/pkgs/applications/misc/verbiste/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "verbiste";
- version = "0.1.46";
+ version = "0.1.47";
src = fetchurl {
url = "https://perso.b2b2c.ca/~sarrazip/dev/${pname}-${version}.tar.gz";
- sha256 = "13l8b8mbkdds955sn42hzrjzj48lg1drpd7vhpcjxadckbvlh1p0";
+ sha256 = "02kzin3pky2q2jnihrch8y0hy043kqqmzxq8j741x80kl0j1qxkm";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index 81563254abd7..f71e7a7a9602 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -1,11 +1,15 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, makeWrapper
, pkgconfig
, ncurses, libX11
, utillinux, file, which, groff
+
+ # adds support for handling removable media (vifm-media). Linux only!
+, mediaSupport ? false, python3 ? null, udisks2 ? null, lib ? null
}:
-stdenv.mkDerivation rec {
- pname = "vifm";
+let isFullPackage = mediaSupport;
+in stdenv.mkDerivation rec {
+ pname = if isFullPackage then "vifm-full" else "vifm";
version = "0.10.1";
src = fetchurl {
@@ -13,13 +17,24 @@ stdenv.mkDerivation rec {
sha256 = "0fyhxh7ndjn8fyjhj14ymkr3pjcs3k1xbs43g7xvvq85vdb6y04r";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ ncurses libX11 utillinux file which groff ];
+ postFixup = let
+ path = lib.makeBinPath
+ [ udisks2
+ (python3.withPackages (p: [p.dbus-python]))
+ ];
+
+ wrapVifmMedia = "wrapProgram $out/share/vifm/vifm-media --prefix PATH : ${path}";
+ in ''
+ ${if mediaSupport then wrapVifmMedia else ""}
+ '';
+
meta = with stdenv.lib; {
- description = "A vi-like file manager";
+ description = ''A vi-like file manager${if isFullPackage then "; Includes support for optional features" else ""}'';
maintainers = with maintainers; [ raskin ];
- platforms = platforms.unix;
+ platforms = if mediaSupport then platforms.linux else platforms.unix;
license = licenses.gpl2;
downloadPage = "https://vifm.info/downloads.shtml";
homepage = https://vifm.info/;
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index 6dfe8e713c63..a5024cb7f36b 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -1,18 +1,45 @@
-{ stdenv, fetchurl, pkgconfig, qmake, qtsvg }:
+{ stdenv, mkDerivation, fetchurl, pkgconfig, qmake, qtscript, qtsvg }:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "vym";
- version = "2.6.11";
+ version = "2.7.0";
src = fetchurl {
- url = "mirror://sourceforge/project/vym/2.6.0/${pname}-${version}.tar.bz2";
- sha256 = "1yznlb47jahd662a2blgh1ccwpl5dp5rjz9chsxjzhj3vbkzx3nl";
+ url = "mirror://sourceforge/project/vym/${version}/${pname}-${version}.tar.bz2";
+ sha256 = "1rnrfqlff7wv6yni8bvff8n90pmn82k82zd4sn1jsx9r1n3qsfkh";
};
+ # Hardcoded paths scattered about all have form share/vym
+ # which is encouraging, although we'll need to patch them (below).
+ qmakeFlags = [
+ "DATADIR=${placeholder "out"}/share"
+ "DOCDIR=${placeholder "out"}/share/doc/vym"
+ ];
+
+ postPatch = ''
+ for x in \
+ exportoofiledialog.cpp \
+ main.cpp \
+ mainwindow.cpp \
+ tex/*.{tex,lyx}; \
+ do
+ substituteInPlace $x \
+ --replace /usr/share/vym $out/share/vym \
+ --replace /usr/local/share/vym $out/share/vym \
+ --replace /usr/share/doc $out/share/doc/vym
+ done
+ '';
+
hardeningDisable = [ "format" ];
nativeBuildInputs = [ pkgconfig qmake ];
- buildInputs = [ qtsvg ];
+ buildInputs = [ qtscript qtsvg ];
+
+ postInstall = ''
+ install -Dm755 -t $out/share/man/man1 doc/*.1.gz
+ '';
+
+ dontGzipMan = true;
meta = with stdenv.lib; {
description = "A mind-mapping software";
diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix
index 93f50fb53705..567d299fd3a6 100644
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "wego";
- version = "20170403-${stdenv.lib.strings.substring 0 7 rev}";
+ version = "unstable-2017-04-03";
rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c";
goPackagePath = "github.com/schachmat/wego";
diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix
index 4cf4792696d4..289c60b44029 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/pkgs/applications/misc/wofi/default.nix
@@ -1,25 +1,18 @@
-{ stdenv, lib, fetchhg, pkg-config, wayland, gtk3 }:
+{ stdenv, lib, fetchhg, pkg-config, meson, ninja, wayland, gtk3 }:
stdenv.mkDerivation rec {
pname = "wofi";
- version = "2019-10-28";
+ version = "1.0";
src = fetchhg {
url = "https://hg.sr.ht/~scoopta/wofi";
- rev = "3fac708b2b541bb9927ec1b2389c4eb294e1b35b";
- sha256 = "0sp9hqm1lv9wyxj8z7vazs25nvl6yznd5vfhmwb51axwkr79s2ym";
+ rev = "v${version}";
+ sha256 = "147yarm26nl0zc0a2rs7qi4jd7bz48vvyaygsif1qsv8fx0xiqqf";
};
- nativeBuildInputs = [ pkg-config ];
+ nativeBuildInputs = [ pkg-config meson ninja ];
buildInputs = [ wayland gtk3 ];
- sourceRoot = "hg-archive/Release";
-
- installPhase = ''
- mkdir -p $out/bin
- cp wofi $out/bin/
- '';
-
meta = with lib; {
description = "A launcher/menu program for wlroots based wayland compositors such as sway";
homepage = "https://hg.sr.ht/~scoopta/wofi";
diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix
index 9ad010deb16d..4fc06b5c1ad4 100644
--- a/pkgs/applications/misc/workrave/default.nix
+++ b/pkgs/applications/misc/workrave/default.nix
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
pname = "workrave";
version = "1.10.31";
- src = let
- in fetchFromGitHub {
+ src = fetchFromGitHub {
sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p";
rev = with stdenv.lib;
"v" + concatStringsSep "_" (splitVersion version);
diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index 2706a5ed658a..3dee9844c0c9 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -7,23 +7,21 @@
buildGoModule rec {
pname = "wtf";
- version = "0.23.0";
-
- overrideModAttrs = _oldAttrs : _oldAttrs // {
- preBuild = ''export GOPROXY="https://gocenter.io"'';
- };
+ version = "0.25.0";
src = fetchFromGitHub {
owner = "wtfutil";
repo = pname;
rev = "v${version}";
- sha256 = "0bhk81jmv6rq8h898lmvrh9v356310fbi82lvakmgay7nvzk9a1c";
+ sha256 = "1g76hzlyi8s8dayd36cs4bhnwgrrr731ybflw3xk5pgkgcbs14sd";
};
- modSha256 = "1ndb7zbhaq0cnd8fd05fvb62qi0mxilgydz42qqz2z4fkbx9gp3m";
+ modSha256 = "186m7s20r59dyh5lpby4sd4vw3rvnkfzslylwin0c3r6150yrx8h";
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+ subPackages = [ "." ];
+
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index 6a5e62f54e1e..fb1b59ed01fa 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "xchm";
- version = "1.30";
+ version = "1.31";
src = fetchFromGitHub {
owner = "rzvncj";
repo = "xCHM";
rev = version;
- sha256 = "1sjvh06m8jbb28k6y3knas3nkh1dfvff4mlwjs33x12ilhddhr8v";
+ sha256 = "1mzafbpc1c211byf8bnwl13by7vi8xvxlaykyrajb1bj0ynbmmgp";
};
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix
index b7f8cfce2fb6..56168b348596 100644
--- a/pkgs/applications/misc/xdgmenumaker/default.nix
+++ b/pkgs/applications/misc/xdgmenumaker/default.nix
@@ -1,33 +1,43 @@
-{ stdenv, fetchFromGitHub, txt2tags, python2Packages }:
+{ stdenv, fetchFromGitHub, txt2tags, python3Packages, glib, gobject-introspection, wrapGAppsHook }:
-stdenv.mkDerivation rec {
+python3Packages.buildPythonApplication rec {
pname = "xdgmenumaker";
version = "1.5";
src = fetchFromGitHub {
owner = "gapan";
- repo = "xdgmenumaker";
+ repo = pname;
rev = version;
sha256 = "1vrsp5c1ah7p4dpwd6aqvinpwzd8crdimvyyr3lbm3c6cwpyjmif";
};
+ format = "other";
+
+ strictDeps = false;
+
nativeBuildInputs = [
+ gobject-introspection
txt2tags
- python2Packages.wrapPython
+ wrapGAppsHook
];
- pythonPath = [
- python2Packages.pyxdg
- python2Packages.pygtk
+ buildInputs = [
+ glib
+ ];
+
+ pythonPath = with python3Packages; [
+ pyxdg
+ pygobject3
+ ];
+
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
+
+ installFlags = [
+ "DESTDIR="
];
- installPhase = ''
- make install PREFIX=$out DESTDIR=
- wrapProgram "$out/bin/xdgmenumaker" \
- --prefix XDG_DATA_DIRS : "$out/share"
- wrapPythonPrograms
- '';
-
meta = with stdenv.lib; {
description = "Command line tool that generates XDG menus for several window managers";
homepage = https://github.com/gapan/xdgmenumaker;
diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index 4d7b54536e4a..b6f05ea3094a 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -12,13 +12,13 @@ in
stdenv'.mkDerivation rec {
name = "xmr-stak-${version}";
- version = "2.10.7";
+ version = "2.10.8";
src = fetchFromGitHub {
owner = "fireice-uk";
repo = "xmr-stak";
rev = version;
- sha256 = "1p8hx8gwnv7a49pffq1xmzmrfi3gs6dyra9dn2xi7cl75yn9kfhm";
+ sha256 = "0ilx5mhh91ks7dwvykfyynh53l6vkkignjpwkkss8ss6b2k8gdbj";
};
NIX_CFLAGS_COMPILE = "-O3";
diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 8bd45e2f6138..b1bf98704c58 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig";
- version = "3.2.0";
+ version = "5.4.0";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
- sha256 = "1qb20v3wvd6scx0dnlcqvj947ng4h0lxlvl9kpz0a2a3l5425rjf";
+ sha256 = "1rwnlhzhasfa2iklrp897c0z7nvav2bz2z6nk41fvwwd3bsay2sf";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix
index 09eed4aa4912..fc3070d1dcb4 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/applications/misc/xmrig/proxy.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "xmrig-proxy";
- version = "3.2.0";
+ version = "5.0.1";
src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
- sha256 = "0scz78cc5zcdd6z4gm0zqsb36jf0z8fyn2ki52814ndxrk7nr4xg";
+ sha256 = "0lp11p4lf03l9x2kcpq1j19z7c1zrdvjmcfh2xyvlbw8pqx0hxkv";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index d524482dee70..f5ec9b71503e 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -1,20 +1,22 @@
-{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false
-, stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null
-, cmake, qtbase ? null, qtsvg ? null, wrapQtAppsHook
+{ enableGUI ? true
+, enablePDFtoPPM ? true
+, enablePrinting ? true
+, stdenv, fetchzip, cmake, makeDesktopItem
+, zlib, libpng, cups ? null, freetype ? null
+, qtbase ? null, qtsvg ? null, wrapQtAppsHook
}:
assert enableGUI -> qtbase != null && qtsvg != null && freetype != null;
assert enablePDFtoPPM -> freetype != null;
-assert useT1Lib -> t1lib != null;
+assert enablePrinting -> cups != null;
-assert !useT1Lib; # t1lib has multiple unpatched security vulnerabilities
+stdenv.mkDerivation rec {
+ pname = "xpdf";
+ version = "4.02";
-stdenv.mkDerivation {
- name = "xpdf-4.00";
-
- src = fetchurl {
- url = http://www.xpdfreader.com/dl/xpdf-4.00.tar.gz;
- sha256 = "1mhn89738vjva14xr5gblc2zrdgzmpqbbjdflqdmpqv647294ggz";
+ src = fetchzip {
+ url = "https://xpdfreader-dl.s3.amazonaws.com/${pname}-${version}.tar.gz";
+ sha256 = "0dzwq6fnk013wa4l5mjpvm4mms2mh5hbrxv4rhk2ab5ljbzz7b2w";
};
# Fix "No known features for CXX compiler", see
@@ -26,20 +28,33 @@ stdenv.mkDerivation {
[ cmake ]
++ stdenv.lib.optional enableGUI wrapQtAppsHook;
- cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"];
+ cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON" "-DOPI_SUPPORT=ON"]
+ ++ stdenv.lib.optional (!enablePrinting) "-DXPDFWIDGET_PRINTING=OFF";
buildInputs = [ zlib libpng ] ++
stdenv.lib.optional enableGUI qtbase ++
- stdenv.lib.optional useT1Lib t1lib ++
+ stdenv.lib.optional enablePrinting cups ++
stdenv.lib.optional enablePDFtoPPM freetype;
- # Debian uses '-fpermissive' to bypass some errors on char* constantness.
- CXXFLAGS = "-O2 -fpermissive";
-
hardeningDisable = [ "format" ];
+ desktopItem = makeDesktopItem {
+ name = "xpdf";
+ desktopName = "Xpdf";
+ comment = "Views Adobe PDF files";
+ icon = "xpdf";
+ exec = "xpdf %f";
+ categories = "Office;";
+ terminal = "false";
+ };
+
+ postInstall = ''
+ install -Dm644 ${desktopItem}/share/applications/xpdf.desktop $out/share/applications/xpdf.desktop
+ install -Dm644 $src/xpdf-qt/xpdf-icon.svg $out/share/pixmaps/xpdf.svg
+ '';
+
meta = with stdenv.lib; {
- homepage = https://www.xpdfreader.com;
+ homepage = "https://www.xpdfreader.com";
description = "Viewer for Portable Document Format (PDF) files";
longDescription = ''
XPDF includes multiple tools for viewing and processing PDF files.
@@ -56,5 +71,13 @@ stdenv.mkDerivation {
'';
license = with licenses; [ gpl2 gpl3 ];
platforms = platforms.unix;
+ maintainers = with maintainers; [ sikmir ];
+ knownVulnerabilities = [
+ "CVE-2018-7453: loop in PDF objects"
+ "CVE-2018-16369: loop in PDF objects"
+ "CVE-2019-9587: loop in PDF objects"
+ "CVE-2019-9588: loop in PDF objects"
+ "CVE-2019-16088: loop in PDF objects"
+ ];
};
}
diff --git a/pkgs/applications/misc/zola/cargo-lock.patch b/pkgs/applications/misc/zola/cargo-lock.patch
new file mode 100644
index 000000000000..b9d97e3c328a
--- /dev/null
+++ b/pkgs/applications/misc/zola/cargo-lock.patch
@@ -0,0 +1,28 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index df5fef3..80f071a 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -2158,12 +2158,12 @@ version = "0.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+- "sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+
+ [[package]]
+ name = "sass-sys"
+-version = "0.4.13"
++version = "0.4.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+ "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -3410,7 +3410,7 @@ dependencies = [
+ "checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
+ "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
+ "checksum sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cabcf7c6e55053f359911187ac401409aad2dc14338cae972dec266fee486abd"
+-"checksum sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6e16ac97c2335bc367e2d675f54c1823558f1b19a6c67671d48b70e30ae22972"
++"checksum sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "304b6f9501d1da13f17404aeee85486d7383d06074906669b3ea032f81e83d22"
+ "checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
+ "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
+ "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index b9231f8f0935..178be4911693 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -8,10 +8,11 @@ rustPlatform.buildRustPackage rec {
owner = "getzola";
repo = pname;
rev = "v${version}";
- sha256 = "0dbj2rkn4k5glnwdazsvjhah5pj9cbdb8hwlvm5q4njsmrgpyaw5";
+ sha256 = "13kbgxh7r6124d1fjdf0x599j1kpgixp1y9d299zb5vrd6rf5wy5";
};
+ cargoPatches = [ ./cargo-lock.patch ];
- cargoSha256 = "0i0xqbpbv3md42d2853cfzkhfwlkvxahhz5dldla5x96rm1i2hr8";
+ cargoSha256 = "03rwf5l1l3ap03qi0xqcxsbyvpg3cqmr50j8ql6c5v55xl0ki9w8";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl ]
diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/applications/networking/3proxy/default.nix
new file mode 100644
index 000000000000..a1e54b502289
--- /dev/null
+++ b/pkgs/applications/networking/3proxy/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, coreutils }:
+
+stdenv.mkDerivation rec {
+ pname = "3proxy";
+ version = "0.8.13";
+ src = fetchFromGitHub {
+ owner = "z3APA3A";
+ repo = pname;
+ rev = version;
+ sha256 = "1k5rqldiyakhwhplazlhswkgy3psdkpxhn85605ncwaqx49qy8vk";
+ };
+ makeFlags = [
+ "INSTALL=${coreutils}/bin/install"
+ "prefix=$(out)"
+ ];
+ preConfigure = ''
+ ln -s Makefile.Linux Makefile
+ '';
+ meta = with stdenv.lib; {
+ description = "Tiny free proxy server";
+ homepage = "https://github.com/z3APA3A/3proxy";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.misuzu ];
+ };
+}
diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix
index ce5c7fb41f1f..0c8136724ffc 100644
--- a/pkgs/applications/networking/apache-directory-studio/default.nix
+++ b/pkgs/applications/networking/apache-directory-studio/default.nix
@@ -14,22 +14,23 @@ let
genericName = "Apache Directory Studio";
categories = "Java;Network";
};
-
+ version = "2.0.0-M14";
+ versionWithDate = "2.0.0.v20180908-M14";
in
stdenv.mkDerivation rec {
pname = "apache-directory-studio";
- version = "2.0.0.v20170904-M13";
+ inherit version;
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
- url = "mirror://apache/directory/studio/${version}/ApacheDirectoryStudio-${version}-linux.gtk.x86_64.tar.gz";
- sha256 = "1jfnm6m0ijk31r30hhrxxnizk742dm317iny041p29v897rma7aq";
+ url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86_64.tar.gz";
+ sha256 = "0kq4l3755q69p7bry9xpm5xxw56ksncp76fdqqd1xzbvsg309bps";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
- url = "mirror://apache/directory/studio/${version}/ApacheDirectoryStudio-${version}-linux.gtk.x86.tar.gz";
- sha256 = "1bxmgram42qyhrqkgp5k8770f5mjjdd4c6xl4gj09smiycm1qa4n";
+ url = "mirror://apache/directory/studio/${versionWithDate}/ApacheDirectoryStudio-${versionWithDate}-linux.gtk.x86.tar.gz";
+ sha256 = "038dy8jjgq5gj5r56y9ps3ycqi9gn57i4q1r3mmjx1b1950wmh1q";
}
else throw "Unsupported system: ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index ae3659a21fef..ef0b8ec76190 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "0.69.128";
+ version = "1.1.23";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "1w5p2hbn14k239fbqrbxkw9h3p8wm7cdyjcyvrsss57fj00j8s4r";
+ sha256 = "1kb40h5d76k6p338h75p8lxs0cb88jaasss0cmb7bfc7zykfqmd3";
};
dontConfigure = true;
@@ -151,7 +151,7 @@ stdenv.mkDerivation rec {
contribute to your favorite creators automatically.
'';
license = licenses.mpl20;
- maintainers = [ maintainers.uskudnik ];
+ maintainers = with maintainers; [ uskudnik rht ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index ad7fa78527cd..bbfce71a115c 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -61,7 +61,7 @@ mkChromiumDerivation (base: rec {
meta = {
description = "An open source web browser from Google";
homepage = http://www.chromium.org/;
- maintainers = with maintainers; [ bendlas ivan ];
+ maintainers = with maintainers; [ bendlas ivan thefloweringash ];
license = if enableWideVine then licenses.unfree else licenses.bsd3;
platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 3f7782bb9192..31e699161968 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -13,17 +13,16 @@
, bison, gperf
, glib, gtk3, dbus-glib
, glibc
-, libXScrnSaver, libXcursor, libXtst, libGLU_combined, libGL
+, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
, protobuf, speechd, libXdamage, cups
, ffmpeg, libxslt, libxml2, at-spi2-core
-, jdk
+, jre
# optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport
, libva ? null # useVaapi
# package customization
-, enableNaCl ? false
, useVaapi ? false
, gnomeSupport ? false, gnome ? null
, gnomeKeyringSupport ? false, libgnome-keyring3 ? null
@@ -123,9 +122,9 @@ let
utillinux alsaLib
bison gperf kerberos
glib gtk3 dbus-glib
- libXScrnSaver libXcursor libXtst libGLU_combined
+ libXScrnSaver libXcursor libXtst libGLU libGL
pciutils protobuf speechd libXdamage at-spi2-core
- jdk.jre
+ jre
] ++ optional gnomeKeyringSupport libgnome-keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ]
@@ -136,10 +135,8 @@ let
./patches/nix_plugin_paths_68.patch
./patches/remove-webp-include-69.patch
./patches/no-build-timestamps.patch
- ] ++ optionals (channel == "stable") [
- ./patches/widevine.patch
- ] ++ optionals (channel == "beta" || channel == "dev") [
./patches/widevine-79.patch
+ ./patches/dont-use-ANGLE-by-default.patch
# Unfortunately, chromium regularly breaks on major updates and
# then needs various patches backported in order to be compiled with GCC.
# Good sources for such patches and other hints:
@@ -150,13 +147,9 @@ let
# ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ]
# ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" )
] ++ optionals (useVaapi) [
- # source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi
- ./patches/chromium-vaapi.patch
- ] ++ optional stdenv.isAarch64 (fetchpatch {
- url = https://raw.githubusercontent.com/OSSystems/meta-browser/e4a667deaaf9a26a3a1aeb355770d1f29da549ad/recipes-browser/chromium/files/aarch64-skia-build-fix.patch;
- postFetch = "substituteInPlace $out --replace __aarch64__ SK_CPU_ARM64";
- sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s";
- });
+ # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi
+ ./patches/vaapi-fix.patch
+ ];
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
@@ -234,7 +227,12 @@ let
use_sysroot = false;
use_gnome_keyring = gnomeKeyringSupport;
use_gio = gnomeSupport;
- enable_nacl = enableNaCl;
+ # ninja: error: '../../native_client/toolchain/linux_x86/pnacl_newlib/bin/x86_64-nacl-objcopy',
+ # needed by 'nacl_irt_x86_64.nexe', missing and no known rule to make it
+ enable_nacl = false;
+ # Enabling the Widevine component here doesn't affect whether we can
+ # redistribute the chromium package; the Widevine component is either
+ # added later in the wrapped -wv build or downloaded from Google.
enable_widevine = true;
use_cups = cupsSupport;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 8329bf3ef550..c3522e17379b 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,4 +1,4 @@
-{ newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_8
+{ newScope, config, stdenv, llvmPackages_9
, makeWrapper, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas
, libva ? null
@@ -7,7 +7,6 @@
# package customization
, channel ? "stable"
-, enableNaCl ? false
, gnomeSupport ? false, gnome ? null
, gnomeKeyringSupport ? false
, proprietaryCodecs ? true
@@ -20,11 +19,8 @@
}:
let
- stdenv_ = if stdenv.isAarch64 then gcc8Stdenv else llvmPackages_8.stdenv;
- llvmPackages_ = if stdenv.isAarch64 then llvmPackages else llvmPackages_8;
-in let
- stdenv = stdenv_;
- llvmPackages = llvmPackages_;
+ stdenv = llvmPackages_9.stdenv;
+ llvmPackages = llvmPackages_9;
callPackage = newScope chromium;
@@ -34,9 +30,7 @@ in let
upstream-info = (callPackage ./update.nix {}).getChannel channel;
mkChromiumDerivation = callPackage ./common.nix {
- inherit enableNaCl gnomeSupport gnome
- gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport
- useVaapi;
+ inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi;
};
browser = callPackage ./browser.nix { inherit channel enableWideVine; };
@@ -47,8 +41,8 @@ in let
};
mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}";
- widevine = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation {
- name = "chromium-binary-plugin-widevine";
+ widevineCdm = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation {
+ name = "chrome-widevine-cdm";
# The .deb file for Google Chrome
src = upstream-info.binary;
@@ -58,21 +52,25 @@ in let
phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
unpackCmd = let
- soPath =
+ widevineCdmPath =
if upstream-info.channel == "stable" then
- "./opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"
+ "./opt/google/chrome/WidevineCdm"
else if upstream-info.channel == "beta" then
- "./opt/google/chrome-beta/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"
+ "./opt/google/chrome-beta/WidevineCdm"
else if upstream-info.channel == "dev" then
- "./opt/google/chrome-unstable/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"
+ "./opt/google/chrome-unstable/WidevineCdm"
else
throw "Unknown chromium channel.";
in ''
- mkdir -p plugins
- # Extract just libwidevinecdm.so from upstream's .deb file
- ar p "$src" data.tar.xz | tar xJ -C plugins ${soPath}
- mv plugins/${soPath} plugins/
- rm -rf plugins/opt
+ # Extract just WidevineCdm from upstream's .deb file
+ ar p "$src" data.tar.xz | tar xJ "${widevineCdmPath}"
+
+ # Move things around so that we don't have to reference a particular
+ # chrome-* directory later.
+ mv "${widevineCdmPath}" ./
+
+ # unpackCmd wants a single output directory; let it take WidevineCdm/
+ rm -rf opt
'';
doCheck = true;
@@ -83,12 +81,12 @@ in let
PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ];
patchPhase = ''
- patchelf --set-rpath "$PATCH_RPATH" libwidevinecdm.so
+ patchelf --set-rpath "$PATCH_RPATH" _platform_specific/linux_x64/libwidevinecdm.so
'';
installPhase = ''
- install -vD libwidevinecdm.so \
- "$out/lib/libwidevinecdm.so"
+ mkdir -p $out/WidevineCdm
+ cp -a * $out/WidevineCdm/
'';
meta = {
@@ -105,15 +103,14 @@ in let
# We want users to be able to enableWideVine without rebuilding all of
# chromium, so we have a separate derivation here that copies chromium
- # and adds the unfree libwidevinecdm.so.
+ # and adds the unfree WidevineCdm.
chromiumWV = let browser = chromium.browser; in if enableWideVine then
runCommand (browser.name + "-wv") { version = browser.version; }
''
mkdir -p $out
cp -a ${browser}/* $out/
chmod u+w $out/libexec/chromium
- mkdir -p $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64
- cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64/
+ cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/
''
else browser;
in stdenv.mkDerivation {
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch
deleted file mode 100644
index 38d77e215516..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From abc7295ca1653c85472916909f0eb76e28e79a58 Mon Sep 17 00:00:00 2001
-From: Akarshan Biswas
-Date: Thu, 24 Jan 2019 12:45:29 +0530
-Subject: [PATCH] Enable mojo with VDA2 on Linux
-
----
- chrome/browser/about_flags.cc | 8 ++++----
- chrome/browser/flag_descriptions.cc | 9 +++++++--
- chrome/browser/flag_descriptions.h | 10 ++++++++--
- gpu/config/software_rendering_list.json | 3 ++-
- media/media_options.gni | 9 ++++++---
- media/mojo/services/gpu_mojo_media_client.cc | 4 ++--
- 6 files changed, 29 insertions(+), 14 deletions(-)
-
-diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 0a84c6ac1..be2aa1d8b 100644
---- a/chrome/browser/about_flags.cc
-+++ b/chrome/browser/about_flags.cc
-@@ -1714,7 +1714,7 @@ const FeatureEntry kFeatureEntries[] = {
- "disable-accelerated-video-decode",
- flag_descriptions::kAcceleratedVideoDecodeName,
- flag_descriptions::kAcceleratedVideoDecodeDescription,
-- kOsMac | kOsWin | kOsCrOS | kOsAndroid,
-+ kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
- },
- #if defined(OS_WIN)
-@@ -2345,12 +2345,12 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)},
- #endif // ENABLE_ISOLATED_XR_SERVICE
- #endif // ENABLE_VR
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
- {"disable-accelerated-mjpeg-decode",
- flag_descriptions::kAcceleratedMjpegDecodeName,
-- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
-+ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
- SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
--#endif // OS_CHROMEOS
-+#endif // OS_CHROMEOS // OS_LINUX
- {"v8-cache-options", flag_descriptions::kV8CacheOptionsName,
- flag_descriptions::kV8CacheOptionsDescription, kOsAll,
- MULTI_VALUE_TYPE(kV8CacheOptionsChoices)},
-diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
-index 62637e092..86f89fc6e 100644
---- a/chrome/browser/flag_descriptions.cc
-+++ b/chrome/browser/flag_descriptions.cc
-@@ -3085,15 +3085,20 @@ const char kTextSuggestionsTouchBarDescription[] =
-
- #endif
-
--// Chrome OS -------------------------------------------------------------------
-+// Chrome OS Linux-------------------------------------------------------------------
-
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
-
- const char kAcceleratedMjpegDecodeName[] =
- "Hardware-accelerated mjpeg decode for captured frame";
- const char kAcceleratedMjpegDecodeDescription[] =
- "Enable hardware-accelerated mjpeg decode for captured frame where "
- "available.";
-+#endif
-+
-+// Chrome OS --------------------------------------------------
-+
-+#if defined(OS_CHROMEOS)
-
- const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click";
- const char kAllowTouchpadThreeFingerClickDescription[] =
-diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
-index 5dac660bb..6cc4115da 100644
---- a/chrome/browser/flag_descriptions.h
-+++ b/chrome/browser/flag_descriptions.h
-@@ -1846,13 +1846,19 @@ extern const char kPermissionPromptPersistenceToggleDescription[];
-
- #endif // defined(OS_MACOSX)
-
--// Chrome OS ------------------------------------------------------------------
-+// Chrome OS and Linux ------------------------------------------------------------------
-
--#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
-
- extern const char kAcceleratedMjpegDecodeName[];
- extern const char kAcceleratedMjpegDecodeDescription[];
-
-+#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
-+
-+// Chrome OS ------------------------------------------------------------------------
-+
-+#if defined(OS_CHROMEOS)
-+
- extern const char kAllowTouchpadThreeFingerClickName[];
- extern const char kAllowTouchpadThreeFingerClickDescription[];
-
-diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json
-index 65f37b3f1..ae8a1718f 100644
---- a/gpu/config/software_rendering_list.json
-+++ b/gpu/config/software_rendering_list.json
-@@ -371,11 +371,12 @@
- },
- {
- "id": 48,
-- "description": "Accelerated video decode is unavailable on Linux",
-+ "description": "Accelerated VA-API video decode is not supported on NVIDIA platforms",
- "cr_bugs": [137247],
- "os": {
- "type": "linux"
- },
-+ "vendor_id": "0x10de",
- "features": [
- "accelerated_video_decode"
- ]
---
-2.20.1
-
diff --git a/pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch b/pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch
new file mode 100644
index 000000000000..9f14a304eb34
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch
@@ -0,0 +1,26 @@
+A field trial currently enables the passthrough command decoder, which causes
+gl_factory.cc to try kGLImplementationEGLANGLE first, which causes Chromium to fail
+to load libGLESv2.so on NixOS. It somehow does not try kGLImplementationDesktopGL,
+and so there is no GL support at all.
+
+Revert to using the validating command decoder, which prevents gl_factory.cc
+from touching allowed_impls, allowing it to successfully use kGLImplementationDesktopGL.
+
+diff --git a/ui/gl/gl_utils.cc b/ui/gl/gl_utils.cc
+index 697cbed5fe2d..8419bdb21a2f 100644
+--- a/ui/gl/gl_utils.cc
++++ b/ui/gl/gl_utils.cc
+@@ -71,9 +71,10 @@ bool UsePassthroughCommandDecoder(const base::CommandLine* command_line) {
+ } else if (switch_value == kCmdDecoderValidatingName) {
+ return false;
+ } else {
+- // Unrecognized or missing switch, use the default.
+- return base::FeatureList::IsEnabled(
+- features::kDefaultPassthroughCommandDecoder);
++ // Ignore the field trial that enables it; disable it until
++ // gl_factory.cc kGLImplementationEGLANGLE issues are sorted
++ // out on NixOS.
++ return false;
+ }
+ }
+ }
diff --git a/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch
new file mode 100644
index 000000000000..db9d6082756d
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch
@@ -0,0 +1,54 @@
+--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
+@@ -635,6 +635,7 @@
+ // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
+ // internal decoded frame.
+ if (buffer_allocation_mode_ != BufferAllocationMode::kNone &&
++ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau &&
+ !vpp_vaapi_wrapper_) {
+ vpp_vaapi_wrapper_ = VaapiWrapper::Create(
+ VaapiWrapper::kVideoProcess, VAProfileNone,
+@@ -650,7 +651,8 @@
+ // only used as a copy destination. Therefore, the VaapiWrapper used and
+ // owned by |picture| is |vpp_vaapi_wrapper_|.
+ std::unique_ptr picture = vaapi_picture_factory_->Create(
+- (buffer_allocation_mode_ == BufferAllocationMode::kNone)
++ ((buffer_allocation_mode_ == BufferAllocationMode::kNone) ||
++ (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau))
+ ? vaapi_wrapper_
+ : vpp_vaapi_wrapper_,
+ make_context_current_cb_, bind_image_cb_, buffers[i]);
+@@ -1077,6 +1079,14 @@
+
+ VaapiVideoDecodeAccelerator::BufferAllocationMode
+ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
++ // NVIDIA blobs use VDPAU
++ if (base::StartsWith(VaapiWrapper::GetVendorStringForTesting(),
++ "Splitted-Desktop Systems VDPAU",
++ base::CompareCase::SENSITIVE)) {
++ LOG(INFO) << "VA-API driver on VDPAU backend";
++ return BufferAllocationMode::kWrapVdpau;
++ }
++
+ // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
+ // |output_mode_| as well.
+ if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
+@@ -1089,7 +1099,7 @@
+ // depends on the bitstream and sometimes it's not enough to cover the amount
+ // of frames needed by the client pipeline (see b/133733739).
+ // TODO(crbug.com/911754): Enable for VP9 Profile 2.
+- if (IsGeminiLakeOrLater() &&
++ if (false && IsGeminiLakeOrLater() &&
+ (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) {
+ // Add one to the reference frames for the one being currently egressed, and
+ // an extra allocation for both |client_| and |decoder_|, see
+--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h
++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h
+@@ -204,6 +204,7 @@
+ // Using |client_|s provided PictureBuffers and as many internally
+ // allocated.
+ kNormal,
++ kWrapVdpau,
+ };
+
+ // Decides the concrete buffer allocation mode, depending on the hardware
diff --git a/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch
index 1a3ab33e36f1..32f0ae2fb5e6 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch
+++ b/pkgs/applications/networking/browsers/chromium/patches/widevine-79.patch
@@ -1,11 +1,13 @@
-diff --git a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h
-index dd6efed02646..4d8b2b7d85f7 100644
---- a/third_party/widevine/cdm/widevine_cdm_version.h
-+++ b/third_party/widevine/cdm/widevine_cdm_version.h
-@@ -11,5 +11,6 @@
- // If the Widevine CDM is available define the following:
- // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
- // as a string, e.g., "1.0.123.456").
-+#define WIDEVINE_CDM_VERSION_STRING "undefined"
+diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn
+index ed0e2f5208b..5b431a030d5 100644
+--- a/third_party/widevine/cdm/BUILD.gn
++++ b/third_party/widevine/cdm/BUILD.gn
+@@ -14,7 +14,7 @@ buildflag_header("buildflags") {
- #endif // WIDEVINE_CDM_VERSION_H_
+ flags = [
+ "ENABLE_WIDEVINE=$enable_widevine",
+- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm",
++ "BUNDLE_WIDEVINE_CDM=true",
+ "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component",
+ ]
+ }
diff --git a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch
deleted file mode 100644
index 2de6024141d7..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: enable widevine and set its version string to "undefined"
-Author: Michael Gilbert
-Author: Olivier Tilloy
-
---- a/third_party/widevine/cdm/widevine_cdm_version.h
-+++ b/third_party/widevine/cdm/widevine_cdm_version.h
-@@ -11,5 +11,6 @@
- // If the Widevine CDM is available define the following:
- // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
- // as a string, e.g., "1.0.123.456").
-+#define WIDEVINE_CDM_VERSION_STRING "undefined"
-
- #endif // WIDEVINE_CDM_VERSION_H_
---- a/chrome/common/chrome_content_client.cc
-+++ b/chrome/common/chrome_content_client.cc
-@@ -99,7 +99,7 @@
- // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
- // bundled and not a component. When the Widevine CDM is a component, it is
- // registered in widevine_cdm_component_installer.cc.
--#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
-+#if !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
- #define REGISTER_BUNDLED_WIDEVINE_CDM
- #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
- // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 057118567439..ef0b5ac0eb67 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -45,11 +45,11 @@ let
flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
- version = "32.0.0.270";
+ version = "32.0.0.303";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "1z8nfw7b3dsy79gb50bmmdjz66j5gx6m0hkw1abp35xdgh2sz2ak";
+ sha256 = "0b2cw8y9rif2p0lyy2ir1v5lchxlsh543b9c743a2p85c9p7q62b";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 885fa8dbd203..6a4e46e74bde 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "0pw0z35v04jzcnshsfwbc8cz95cl0dq6405rlmh2a3xz2gxaacqi";
- sha256bin64 = "1xyvaksik5a1jkkv7zqyys33n8x0n7q8xzf5mpgj71iany57z2sv";
- version = "79.0.3945.16";
+ sha256 = "1j9zfbyil16yhf6hzrd0ssy9k49jx468dbmgzhc20l1548fif62g";
+ sha256bin64 = "1jfsswjqzdif6824p9a6raw5j9309y61c80kgfq23247vr514ky9";
+ version = "79.0.3945.88";
};
dev = {
- sha256 = "169iwzqc5zvbmm7cq1q185w2j2y2r716pbgpadps7ng2i47z6rqs";
- sha256bin64 = "0ravjdmmbwlf3ydgmk7hdd5d92zxh67nv49igr5km6mr4fi1xsw2";
- version = "80.0.3955.4";
+ sha256 = "1fbs6llrhm9jkzmk3v3a84d9is6g96kysy91hvpb0bw8f7anl969";
+ sha256bin64 = "04fscphs4w6jb1kdc25jc568r3k4x3nmg0apggjfnbdwzb5zkmf2";
+ version = "80.0.3987.16";
};
stable = {
- sha256 = "0mpb7798hzpysidp10k4x54b56c3fm7wqfj4s3kl7z47835gzxld";
- sha256bin64 = "1y75687w0rls03yps63hi4m0qfdm0qzgq1jhp1jicyyhjkp0xw5q";
- version = "78.0.3904.87";
+ sha256 = "1j9zfbyil16yhf6hzrd0ssy9k49jx468dbmgzhc20l1548fif62g";
+ sha256bin64 = "1k44fnn41n73j1lff4h8s8f79pw8w180n467lwff4g9izh6c2blz";
+ version = "79.0.3945.88";
};
}
diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix
index f3fc9ab6ecb6..ce0617b8d3fd 100644
--- a/pkgs/applications/networking/browsers/ephemeral/default.nix
+++ b/pkgs/applications/networking/browsers/ephemeral/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "ephemeral";
- version = "6.0.0";
+ version = "6.1.1";
src = fetchFromGitHub {
owner = "cassidyjames";
repo = "ephemeral";
rev = version;
- sha256 = "0g9rrx41grmgf4nn2pp17yhjxxayk826gs6nmkfdnimd4gmlf3nk";
+ sha256 = "1i77chbjjg8zda5bnn1wj4h00a88awfls5b3i3dqwgsi356hv4wb";
};
nativeBuildInputs = [
@@ -54,6 +54,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "The always-incognito web browser";
homepage = https://github.com/cassidyjames/ephemeral;
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index d70490f82184..cdd6415fc411 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,965 +1,965 @@
{
- version = "71.0b6";
+ version = "72.0b4";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ach/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ach/firefox-72.0b4.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "0f2aab504455ab3e18b220d3a284d955b0342ef864990d8b100e98fde00cbb9d660ecd9af1a9601d4b93bfd425599a5e111a2566d057932e9b40627b34318857";
+ sha512 = "10778f9e5d8514bcfa645b677fc5fd67af9adfbb425eaccc28698a02e628e96e47a14c7d90d5e30ab7a4a8a2787ff6d9c28dea4a53760843421d56f7cf8374df";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/af/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/af/firefox-72.0b4.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "64ed124236183b2fbf9c31b5130de0caae8d314afbc09fdeab2b3a23217b2af4aaa6c8fdd46aab27402d4079639080af1e8ee68ad3b074f20748e213e6a9f92b";
+ sha512 = "c902ab0e753d6580c523140c723725862794234cfee94a4a2839e450435cbbfe60a761726e5034e5899dd2157e24a6ca0a9f64325447a94ab3a8247ad26e2af1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/an/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/an/firefox-72.0b4.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "ab46ba25db59894be85e8a78074a811d12cc9e233554f79b028bc0ad6cadc452a8b37fbd59c9a15b81b1a0a499050e37b5f75a154c056324f1207c2c1ac1d75a";
+ sha512 = "cea9124311c558030c669bde0c11712436b8ad3dd3e2bcaed28c8e5148e694e286882b0f1fdaa85570e84fba06d95732f5409d968bb183bedf5e5624926d70c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ar/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ar/firefox-72.0b4.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "298682210b8127ab77f509a79b3bc61c3206a1a405a5da44f9697fe7361deb3f936449f32494f3a8e15420b56775cfbd773a77185aa5f07f593aa371d61c74f4";
+ sha512 = "ccf0bb4ed01cb80914a1e208304ff2f5a23cec2dc7a7a5dfac52c1931e2b8b2641adc6afb1b549ff3d72440a480dd9effefe016f211952fd7d25df75e2821f72";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ast/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ast/firefox-72.0b4.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "30221379730f41d32e0738689cf8ebdd8615275c6905a984f186f4a7823f7a84a707ab5ed8ce9448f091750a78373d10df4999a94ca32020e44b0ab81442df29";
+ sha512 = "d2af3df2105238258d1307483dd68056862c269543c434d211143d46225961f2fc8231861a49c03e048c0dd474c8c947a334fdf277baa3fbef5e145f4aff021e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/az/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/az/firefox-72.0b4.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "f948c6bf563012639a6ecaafa8730d0430ec569c193bae617436cbbafd61de197b87116a1ee3e16035048d15bc794b499e9e4f8dbd8522166f20fe8be038d965";
+ sha512 = "46ca85de7d5adc17c7b32a64f8aa7bea926d4bb1c722e2ec3a92d4763225e90ebd0a7a3def868804d7722c71a5b348517750d11f33e7b40031f4c8223481ffb8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/be/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/be/firefox-72.0b4.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "9c7db4af9b692896faf7e9ba3c5b1e8360a5ab2e60b6850a901288b4554bfb0e45c738f167a0d96a3af2db4fb150a557eb1e81b375087f4086e4ee5438b219d8";
+ sha512 = "78a453467e7d97099ade27f2dafe25afa45e2b00b0532aaf60696b4a8867e4d8039e1383f66dd94e8d9986bccf9b17db2ba48d83979ef9268720755ed26839c5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/bg/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/bg/firefox-72.0b4.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "ea01ee47f6febd71a1f77b883bb48c093fbc19e20f277dbe676a351cd35e334ecc81b8ee9510650c38048e11a68365e2815fd0545ffd4d833afec2e3c3e31f73";
+ sha512 = "140997deaa24f6150ecabf82c2fda974dc294bb145781b98f448749b1d80a5caf29d7336b64ddf3bacda6d1036712dd89248e1c7781255d26876831a319d8c99";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/bn/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/bn/firefox-72.0b4.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha512 = "d4143ef97c5f9f20605dcf8b646b0acdde7b9475cf2696be7f3dd6ae5830511319a083f5dc6488a7d83764be7f39f6134fc67d28ac3e334f2a87235958ce3070";
+ sha512 = "469e4e1bc1b72b7ce8735c0940c778eb008905a0f5fdc2dc3a04a905ee7b151fb3cb34784eac2d88ce820565f795d9e44a82a95b9637c91255cf9178e1677ccc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/br/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/br/firefox-72.0b4.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "04a0d955fc4e74bee803f274e89dea46500bc0c89b3cbbc03b892d30b93c648ee2909a37078b38a4d106338e045cf5698bdfcc6125baacb8d839cda7f178c715";
+ sha512 = "bb57d3bfcebab646d10855dd1883806c6b477b0e3e4b84c370752be83accf121a55c90f1d7a1d4a2fa4f54f7d90f65d3362357963fa7b017971286134c69d13b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/bs/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/bs/firefox-72.0b4.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "f06e2d49206fa5569d3584b71f321c1ca9270cedc5bfb1c4ee8969f00cdd094bfcff400c1dbf67c9d4b45173f7aeabe9a44a393f8c49d30feacd4e4a0e24a47a";
+ sha512 = "5833a204b389a80518cb8c389f03ba2cc3be1d553c2deaeb4ec9eeb94f1cd45cbd96f8aaff0b2ae639b0993ff29f21b9a1d03f28e96a476c8867f670a05eb7c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ca-valencia/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ca-valencia/firefox-72.0b4.tar.bz2";
locale = "ca-valencia";
arch = "linux-x86_64";
- sha512 = "13aec7c68757c07e9b1016121ac474d894d580cdd88a05ec6e4a2f34018b483a37aca8bff8b46e7f00439059cb9cc44a9032363c8a157bdc3f06fee3be021309";
+ sha512 = "1c43377660b7be3de41f2c2c804d5cc638cf044979343f77b74f6e42190017d2c6eecd252a369dcc619b0e9bd97729261cb9cafc6964b3c7f0d2424f601aa44d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ca/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ca/firefox-72.0b4.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "e548c5a7b741c8affd6852a538f0842f3774048f9765c7f25177ebd71c8c7d41530e4236ef11fa03f4d2ae1d8704c19b29c95c7744715ff374dda20a7923f716";
+ sha512 = "169f024df0834bae9a8d5d2cc31a3af0bea865308b5642b3ed51ae4e65ef3f81dc6d1e00669dc1f0ef9e68cb22cdc6d1460567094bc66446f66804195d01afbc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/cak/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/cak/firefox-72.0b4.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "9e284c5bce5f2b232c4acb84e34d01418edb66cfc0290d5b48e67a412451f5520f845c9a0e70089cd89828ae9cdbf4fcb791fe5de17439372144e1b3133db149";
+ sha512 = "2689c6b338ff45d7c94e1530b3bc53cdbf4f3fe11424c770e03bf754ccb0699e75d0047b18be531f529c63da76a8170af85d76fcbb35a47f341efd8d485560dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/cs/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/cs/firefox-72.0b4.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "b4e23db7f7dfceec6fdb0a48d74a376e165ef3efd38f03990d19ab9cab67d51a2a0f3a0b3d18b57f9cc0f26d84454ee6b573c7f5444c2e4e20e9b18ca44dd480";
+ sha512 = "2bb94f4f324aa394e7aa4f98b3d22417b68449e2b15f12e3b6df576272506472984ed97bfd5949f1a1e7e2913e1afa57191361ea02b46c723e9590e916c9c81a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/cy/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/cy/firefox-72.0b4.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "506cbc0261c90b0b20382dd7f204e826e666915b6624c1490089ebb8e613fcdef368eac4b7de5b2167d406130c3435b0f0367d23667816a562ab0576a2be9458";
+ sha512 = "18778da2d0069c846c20323f8e8e786e13a8c08ea4152aa195b416f449b906bb73001ec0a9e6ce841b7b555b5c87643160827ff3a46f46a354fada07dcc9e0b7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/da/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/da/firefox-72.0b4.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "60e25765159560242af62d60a8c8a4f6f607a3f153277b013e70bd5f0abc9132801c122f5ef374e3de8710eaa49f059658fd325a66b076417b5ab34e9d156c2a";
+ sha512 = "33d190f5126ecbe033db03609dd38c9edf9020aefb3aedb9410434e3d0f630da7cf31769735e05622640720db1d251f83b744a061d3b08561147397b76ef13f8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/de/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/de/firefox-72.0b4.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "a99c8a9604e2a83e6bd085ce5a30f6fac79482ffb6360e23b1678c1531ca14f05394a91401ba57dc37a5006553944a8c96821c9cc58a4a3fd5aff685c51bdc4d";
+ sha512 = "2ccc6b0be2e17491b78df4a7bb4e46f1d96f4e2ac89a429f44b8e37db3d364477f998ec9032a15c8d9df8060e8b15133111bf163cfc781f015dbaf17827125eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/dsb/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/dsb/firefox-72.0b4.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "5dcfa216878aa733afe9fdb0d11c873c753a93cfe3aedbb3b4e5ff62f6578f86c6ac4e3a408012a00dcfad31d7de9dded903c6d5d0d351b108f718cb7c226310";
+ sha512 = "f040c247f36018c4aa4731b9f6ca0a1e3a21111d2ea99b8026270392a9f125f9e0ba060c5cd02cf60e6ded63f56d0a257eca001966b8ed96cb695b4a68e10c4a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/el/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/el/firefox-72.0b4.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "ac596fdd1bd4ca09bb127f5d964318e0496e4d9c2f060c982a62c8cdf71af5e35f7d96c37ad0543550af4b4741a08b7de10b2206d1ac90f8ff27ed733a346d86";
+ sha512 = "d7a2385b2ee59a7d39cd73f27b945b486f3df393e9807c74b3fa86130b25a8d4144861024c071b16ad9a1ae14f49eb66ce0c8e85ab56237e4461513adbc25106";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/en-CA/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/en-CA/firefox-72.0b4.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "8dd71d997a6676f6ef28d09a90f67b7858bc313beea4312124a498208b9b8e36ce7306901abe5bad4dcdaa5b1cd23010aa65eb8bb41f5f4ae2e400608dce2cfc";
+ sha512 = "8d276a97e68a437116755126f4ddd8168b825c9754422ee1fae03a1bccb447506f45693cb4df70d08a765a45c648255f63df363d7109befaf2dcc5808fb8d872";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/en-GB/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/en-GB/firefox-72.0b4.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "a442336f7a2dd1865052f06664b7b52ebac33be84c1cfc55b9b6ad3d2e9fd548a5cad65b9733f57ff432a7d0d8a4e034610a2f4ccbde836290d9a2ecc9ca8548";
+ sha512 = "eea97bfeb278b3c2c19bf48009971dd50631215c36ff00fae4d533c70e6a3056085562d8a399ec6c85b676bb320111ce2a3621e1dee022408ae9d40d5df5c085";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/en-US/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/en-US/firefox-72.0b4.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "fcf3bdffb8f2742101b8dc215e489ea54778d7e2f05aeec7229bebb532fa972aa56257264a0fdd3d37ec19d427d782f3d0cd45534f977d1b0b6e19399d004f75";
+ sha512 = "7ea54472c3be609e7fc1dd4702db2d1a961f1d18acfc60a63b54d53ea77c87447492f05509a72cff48475f96af673dc1822b99f4fcf87b1b56a9f3537d1810d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/eo/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/eo/firefox-72.0b4.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "228dcd7d4bfde4d99172f895502033271765898fb7221d359c55277de9b04d070e362a64c6327e774bf6ec7a23983765c21c77a1d210d4f238d0846d2f6ebc6b";
+ sha512 = "227fbd8fc7ea8a703ccac5c324e42258b96c5125faac201d5dbf70579215720e06a9726b197df3ccf85ace84e5df5bbf80ea09a0eaa1ed0b5c4f275d6f3d1939";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/es-AR/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/es-AR/firefox-72.0b4.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "bfc15c3bf2a8e8d980410d81ea94b99c92037779ed87fc4bc6a8035970067e98d181ec35d88e576dc08b86485a90a7fdca450a55deebfbeaf651247ea1dfafbd";
+ sha512 = "917bd89db5eb3d50a86c8b37589fb73c5bfca676af857cf0528dae236e4bb2f0d25ab0a1620eae832f8c3f55af57f4a983362828244c3cd5ebaee5b8c03c5f75";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/es-CL/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/es-CL/firefox-72.0b4.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "9638f8cb3fa6fd71dabdc88974e0498d7bedb09448e2544356d990ef641aceb3668214c0d54e7baf65ac196501697ddff216901d00d946962a43f0a09f3c8126";
+ sha512 = "b7d586c9c770a346324e26a2e2f9ace455827bd2e8c1bed4e12411ef419b8d5434e6acf99f15876d95343203242bc96b77fffc3f18f789c42e37a6c22ede3a46";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/es-ES/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/es-ES/firefox-72.0b4.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "1b17dce1c7b1d3965a71a7972777af91f8a88e2f5371db888e00d658390bd3aee7de034d0433f90bf93796425a80fba51a5a5e1d235095f9c43775895311952d";
+ sha512 = "d94e2b0442158d6f4ca4de81230f0b29b64714561fe6172cb14c35d5b742802c6ea5d84cd7a4e1cea14848892e451125bfff8c1feca663e1b57e503c96f7e928";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/es-MX/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/es-MX/firefox-72.0b4.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "4c4491775007dd5d2ef89d4245c8f84e79d4e27251a96b5f538c2e0c540b5097683a6072d94a85620e1f5b13143e1bf1062ce5f691000de3f9c168e44cd3b03a";
+ sha512 = "545901f49f6bd877780624be3ffa2c8a0b54e785d6e1b4509eb7b11f88bddabac84a14dbd0d463a74f7b487e8fb36077662d577cebfe56719b1715e7488f2598";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/et/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/et/firefox-72.0b4.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "24734e0ab55249a95117c39ea26f7bd173d8d90ff5e69833d6f3c335ef1ee895fa474458b2f6d1d545cca26c295cbacdf74098806a62e6742d03ece28a9fd426";
+ sha512 = "d36bc766733be0da86cfc65fad481a41bcb983ce665117113d8d34f536af96cc342d84db502ce4d262050b57d39b60e2e3b96f2681ba15df625b79e0dc6e21e6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/eu/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/eu/firefox-72.0b4.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "ddeb8b1dcbe414905fba9175ad4c09b981a9f2277d335d851320beace94d55ce2d1e10ae96972c6da28d8008db377fa4470f4fb8f7a1ead8a4c26bd01d2bd0e9";
+ sha512 = "57cb10ba3b24d617865f2aa500024889d93ef7c0ab79559cbaa15544424d0bf32fd7ac435b1953ee75ca241cf2164ecec56eddc874f57b103b2f1f9402509784";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/fa/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/fa/firefox-72.0b4.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "cc6daff1ce0cedde5a9a2c3189039fe59ba01ee20449610a340816dd316d104bc64f6496389aba5f4e843fb70fe9d9b18edc0dee59357d64e916969a3c38853e";
+ sha512 = "4aa25840114b704c92e8a1b190b8c809b5ef66ae0288d495835a2766a9c7fe91e3da28b272e55bf1f51fecfbb044333bfdc8290dff9ff6f0654195d31cfa846a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ff/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ff/firefox-72.0b4.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "ca11dd6f3862c42b1bb76050d347d97f27e6f415c9c5bf9565281c4bd11411b940f1f8ff69940e1201e008ba7ae5de653a64570b4f7175c2264bceeb696bb2e3";
+ sha512 = "5a0c4d1fc711d449b6188f021691f1b4c4c73c9d48d957176d1d6ff70e818a9cea194394ef4feee4e50823eeafca94366967bf9f11b2c128ab3987035db500d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/fi/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/fi/firefox-72.0b4.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "49110d54b09331a0d91b1e2fe2aa67a80e46b93bec3e449e55ce4b600334ce506344022ca7523b498b444e8bef25b358d18709ce83e6465254c0e27bcd9e8cd6";
+ sha512 = "e09fd700313ba64481eb460d6693b38904cf1a8fe9b9069015ed052ff38720b24a9ee99048e35063a3b632a81da190958eb6f2ef4dbbd100d1fc3ca1fe940296";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/fr/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/fr/firefox-72.0b4.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "14a3ff081668a5003e4d129256975e0c8eebab78ff96a7d63f6eeca45c9331ba1250df09a8d529cdbc199133a8ff61ed170f91f0f366f12e7f8f0486a563046d";
+ sha512 = "85c2ac0a335589ab1f188b1c04de7cf4659d7ea15587b04ee7c8d4e9633f73f8b43d7a9befb648ab565ef396917e1ae4e5482a1cd0d76bc183b065b219159a23";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/fy-NL/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/fy-NL/firefox-72.0b4.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "4b78417383fe474407f55353f148429047635988c7407a7dafa9aa894e3df9bed9363181b3201a66caf11f20c10ecaf5cf9cf630181bc043ac5f8ba9525bedad";
+ sha512 = "5016901adc6a1f53f9060522fbb1382c4c688a94936f1054cfccad5c6b0b2024900c1193eb8da3dc75ba88236ed1f6c6bf792365e3e140eef86ad5603ca22be0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ga-IE/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ga-IE/firefox-72.0b4.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "7bbd19ce0063746b66b5016b00cc3c0b62aad4424c26fcdf895c485217525e4d601c22d417c9faecfa8da6344f8edab28a3e0536b785f2215b8e5f67d4d860b0";
+ sha512 = "31ab37f8b09d09cdaaefa78f0d15e72d431c5a6b88b3dfbc40a0a9fe6468c6ef75a9bdd839eb54ed8e79aa022ed13adfa1db2d923d7c04f6ee1481defaee4a68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/gd/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/gd/firefox-72.0b4.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "a3444d8d13038203760ba3e04f6aee6097b5140a1f0faa247dec6916221c1c7cd5f9bca091f84f8a778cf3433a74671c4a9e9a4c114738309873a3bf14b860a6";
+ sha512 = "312c48338a80d4ab7fe06fb124fc19ffd70735adaacfea55095d756af473f605593bdf230c544120293e1a34b147cf10fc8df26a61a3446b5d6529497eb5681f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/gl/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/gl/firefox-72.0b4.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "9d0441b7391aa2a7adcd24946d36ce197b6aa107133f0e83120c8caacb02a5580e2e786a7c36bf03003698d473a39dd3e9d7d57553f601dbe1b45a23bcddf12d";
+ sha512 = "ece63c5b308ad4491bd379ff41808033e4daa472f96d52e5a629670eba33053a49b45bee4ec6d34fbfb4800079d4f62cbc3bb958bf63b7ae5039dc0ee7ea2b92";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/gn/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/gn/firefox-72.0b4.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "41fcece059ff48ad3d23ad3826dcbff2fd356ab5567abdd757ff66739f09ad962a2026cc5b5217ecfa1d035356f77fe8563ff2f78be925b88ea903d8ccc63641";
+ sha512 = "92d41dd688156750418f04c03b5290fae253129fd850ef87e8dcdab2e663beb130b67902bccd9bd429f3aac1d34ef01e3cfa3bc830a3950f9d8639a23faa8e79";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/gu-IN/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/gu-IN/firefox-72.0b4.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "d09dbcd2222245218902e2e7d921239a2e96481ba6312c3601e33c0a9f5c21c27a505ade880ff36560dc2634562a58dbfef574bc693941ecb9f6fef9461cb004";
+ sha512 = "e846b051288374077143e755d6d1e9d372305a6ed11fc775e9226302249370e597833f56cb31c56f85db54e23f8482e9b14f5f87d2f2958694a879e2d9b02b39";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/he/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/he/firefox-72.0b4.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "9d7cf14280fa265f1f8a06cd21e174098347199b389b66613713af722f500461dd394b2b56bc635168c3266bbc9e98676bbeac45a647ad9c7c0187e49e41218d";
+ sha512 = "8937f443a1a1ccd4ce26d230b895b538b8f81f5462895218fd92a3ada3037cf7a84fa3759efb2c5ec136de0f535ea4a2c94749b41fb55c6a71b4a5d8b232620c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/hi-IN/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/hi-IN/firefox-72.0b4.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "295cc80fcdfcbc523d676147f403e828f1f09642a5fcea0d371504f6ed2892556a058f7097e923a7d5bb13b812efa858f39161efba557d8a5d38562beb091646";
+ sha512 = "50a68e2d85708d2241710fdd78d9fc76357aa7a5df267cff989cb8011a20588c2b7d07a0cf29f9b323e4a376fc5241e2851eb3292f63dfc42f0c77ae07109777";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/hr/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/hr/firefox-72.0b4.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "e5dd6596a62da991d33589e7ed5f2834d10125e9ba3d05670cbab35f2a7addba065d36e881b3cf7aae3a31932a4e7e197cdcbae42e9ffbd352ca60513fe35931";
+ sha512 = "eb3a5c80a564f7d4d4a5bb5dafd21738e374c8305c6461fcd45fa905a990c17ff05ca59764f4a129986929f3c3143e4c8167a97a3294f6868fea9f500f7d679a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/hsb/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/hsb/firefox-72.0b4.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "a07459b299630d6db0b18b045547fa65533de02e6684e696ff4979575455ad8bfa42802ab93c4b3adb38046ca5856b7b2af470524cb54efbc7752fa42d9e77c1";
+ sha512 = "ac88de2b8766f665f6a21dcca48053abbc52c7f5e8b29b61c8c220c0aa7a1d5acb827ce0ad8fb15537200479c563165563e0dc54d1385b13ab0bb7a2fd2abb29";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/hu/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/hu/firefox-72.0b4.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "01ddb0a1333ed2b9dc3ee1f0b2ec069c1d606abdb918798f64ba420774dab33356ef7c97d0c403bc5052b0834a852b02ac17d187f53c509e13f4d2de5bcc66ed";
+ sha512 = "7adbeebef6577755db12ffa392fdcc47f1e2e73f988071337b509f4972daf34c5ba7b5585e02f2fc1c024c6f5cf7f6ec8a8559e08e185fc2ffdceb8808ac7287";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/hy-AM/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/hy-AM/firefox-72.0b4.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "648240e7ca906619d2e396069c0b2be29e962d9e2f96e5f5cee0efce7c85f4b6f17fb3589d236a7ae347ffe465d7c7188d68e04454e566b4619ffdcbb21bbcef";
+ sha512 = "09f3224e70a5cb166ae29e4d1e847646d8d296fa303a64b0dfffbd3aca10e70ccdeb3ba1ac4ddf0e8250ed05b2b8a48723f84a2478da834908e7c7f8a228a921";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ia/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ia/firefox-72.0b4.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "313b8de952330bfea1a0643821a17331e92bc5ab6a575c77cb14484ef8734662bce804259cbfc0ef2191f0e96aa10d61b6374149563cb4114008e26d9efc3ced";
+ sha512 = "4bf144e6b24b0fda96505ae468bc69e3d7274397cb3d1d8154db0312fd3e0a1a75326f932739408dce363510e90090be5ea2139d4dc00d3280537224d4807d60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/id/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/id/firefox-72.0b4.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "39e8a946274245702bac80455cdc84a5416cc25dfdf32b67d9bf97a0f263cda6417799b80a1eb34cf98492929016dc176ad09e140cdb7f57d09daef97aacdc69";
+ sha512 = "7720000f5a642129fe14854ddced162160d4f8eaaa752790cdda7728c35f6d1b00302c88027c43d2ba8e4f5b4f12ea5f9317640b650615d4a9fade83678b27f1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/is/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/is/firefox-72.0b4.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "2956d0309b81a9c428ebba4698a7b5431e885e55bc71ba3394abfe50fd81e0b7b3c9049aab020a8d9a8caefc04cdebdd4793e56754ba41c88e55aa8d8a3e05f8";
+ sha512 = "fbf8d788585f1cd8c019fe360b9b063f6a7686bc3b1692088966e01c4abf0303c52a82f5b385606381051b6cff3d6449db41b80c02f99aadb32d65642fc48819";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/it/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/it/firefox-72.0b4.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "73486caba6b0fa67bd6754ef6d712c244429b8de262c73fe2bcf35afb2d6e1a3061a3ca97fed148397b49230ff1dea0263e1bc404be74f28c88b6e0c540a4163";
+ sha512 = "0fd05ed4de599148372f164a3a28b5af8aa43e2c164e231ec10a0d74ade3a02f5e1085f7627acd27563ab231426a72d2e7c5f323b7b9b94e72c9271ecbcb5d74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ja/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ja/firefox-72.0b4.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "446fbf643d4fac6f43ef0b7547df542ecd8fd5d319456875a1660ae40a949872c74bd97ae8e49e7c685a1938eb312693ec35c0e107e9bad942584dfba2f934e1";
+ sha512 = "8eaf09d8f89589078433b03e62c8bc24de30dc40dff5072e59f8cdaf3ac2d1bac8759185cdfe5de1c4db10bb521e80153472ade065be459e20887da37677f0e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ka/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ka/firefox-72.0b4.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "1666ac3fe60104b0c3a942f28f4496927fd83baa403c85cd712f11cac1e3a35f794a3fc098e642ea7a20720d3138f021f77935d365ce2ed7606e89284b374476";
+ sha512 = "5bb9b88ce3cf82dc7df0114cd6588f900e31ae5dd2595bfe4b85f4d732d6a1bb9f2bf7e0925ca1c5c9f827fe86642c496bcd5697a26c06f9eb4444907560a1cf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/kab/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/kab/firefox-72.0b4.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "9335419c9b7b93075e12dc1b4f96c260b7e045b7598f60dd9c6ccd3ff4c3fab808666a7b13ef8a7906f31afd5a720499aa6abbdd5c4259d23aa8b1317146c805";
+ sha512 = "a3b86e59bb9bc4771399f07cd11f354a246b83244be8c7ae2e9dd3980eba992f0eae8f1fd7ba27c44b308fb79fa940a96aded4e917198056f008a9d59cf6c0bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/kk/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/kk/firefox-72.0b4.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "c5107685611e21b0d12357aabd3111a05cc635d69553510220f928485c3a78124aa86afc44c26147b282c158e94d448df14a4ce1e43763b78c5a9e3de6348942";
+ sha512 = "747e861143ebf9a2c3fca15077e128ee1a93c2a9d2debfec4424c3f587413e8be01cb1a8697c04651e06ea857ad435f116789139017c1954f92faee8eddc40ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/km/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/km/firefox-72.0b4.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "d26f924db4954eb1dd9c2cb2d333a954925c53ac4a48a0f82a5ec340a3bcc6934a00666e9398c407e5594e191d5789bee2ded4af57d5f76aa4d27a3f00b4ae89";
+ sha512 = "c763db70f2c74e8a51c16c881e766be1f54a3ebd34521305486d4a811fcfd026b7bebecfc36979f4143b040640ae0d2c4802fb2377ebfbdc25d034f39824e32d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/kn/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/kn/firefox-72.0b4.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "d8ac76dad99060c2900d063b9e037b8b4bbee96066521f41353f77c82536bad8a637e38302b9b5cf1f643284792be730a2441bca2d604d05ffc77600a162d3d2";
+ sha512 = "09a8f41146ca0efd0beb68f1291be5b12d8b0436c82ee58ed88da8c3caf8a0193cbc674390a1bf596c7e70250bbbf8a7c081180ad91cc2da5993c3e0b9b9067e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ko/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ko/firefox-72.0b4.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "ee289f66819bcb680ef74c90de2e025617eb12ef69c4134c17768f0f0644d215f6220db5cdcf0190b63284782ca7125aa0cb2016c9dcb25e7db91a4200608059";
+ sha512 = "ef7c8a77c375835ea8243612f8543084c21d3437b02701c05c68917bc6efd34cdb00c3559f256508fd43f980d7d5c78376e5af8c59a1552d0ce417fbeecce082";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/lij/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/lij/firefox-72.0b4.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "8fb5707baec621e20bddd33f7ef61669d3694f3687e797cae9851876ef1976413ff60f3c3409a9a3e1b63f9c6e1028e9cf1b5a82d97960f1c3d92fb81af1003d";
+ sha512 = "0b144239ec308c0aca679e939cd620adf90c89b2269e6a16bc34315f0e8b0f1ae7e6c698424d5e8f5ea19f0e8f26c4c189d69735fa3b3c69d08f27300fbcbd17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/lt/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/lt/firefox-72.0b4.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "53db71d1798f963b53fd3695319276ce3ccf42b9b29b9678cf5eb149d6b79390d0a2712967486f05fe3c6d8cf25b123f5f8d6ccffa4f138f03dec611bbe2bdaa";
+ sha512 = "bf285af55d5af190696990c007285663bcfc0d58538bd11a79f9325cc5ca7c578863936314f8d5bcc551aeab414977d12bf1936aa07bff4152122b8b94b5f49b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/lv/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/lv/firefox-72.0b4.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "7cece5926ddc73a817ca894167ceb264865e284dacf66c4cf98c89cec8287268af6088da9cd3451a358e26ed591d2b6ff146f567116f8ab8a80cdda36aa781c5";
+ sha512 = "50b380115bf11732a481c1b9fd029a7307ed62ce90c18f43b569575c736d362b3ea531937b7e4f2386e27e38edfc5b76cb9b9a2664fe75ae56b0f71eee892c8c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/mk/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/mk/firefox-72.0b4.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "492739c5c7b25696ba02f8f0c41127689de8b65cdcee43981dbb1d1243d6490ed7f034ca0e8d5e50763390e85bafb134c190fd86a6d2bf2a9c715ff1837e53f5";
+ sha512 = "3ef8d24d7fdf80a88884e6b6becd8e9673123d21b897c0087716d185bf5fa1d22076c97bc9b7d1a08b884cbfdf62011cab141d743fdbe554546eb9780f2b17a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/mr/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/mr/firefox-72.0b4.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "cdc685a2435afbdf33324d7d93c5af9f1fa1b7a817c70f34607280084345d3e69c7eb1c0189db8c16c288e31ad0c982ea7271bce6b0a9a71f0596a9ababc32ae";
+ sha512 = "ad662cbb98826105f48e457df8b426fde80974bc8777b4ee155a6a27af765e21835c01bce2144c352d6e61c869f7a082edd5e828b5b9241ce12c295cb28be100";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ms/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ms/firefox-72.0b4.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "37379786db0f326add87e8796b5bd2b9a7365e2a740095a5ae0affd1f15bd08642aa44ae5aeac4e2b0198f4fa590b5fdc05ea2ccf51049908540c39fea059f1e";
+ sha512 = "ac62b3659a6c412f6e7d29818890cb0058f7660e8a4c41788dad3b6ce7c688fbf93afffb9fb637a2dfcb57a9dfd4143ce5eb2610b11d83add961f420cbcbb2aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/my/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/my/firefox-72.0b4.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "c6ef471af337726207344d7eea3d03f412facc0fb26ba45a9134fec7f7a8857dec1484a40625fee9eee1a840dc1ba50f6d959cf58b79f77713d996fdaa5fb616";
+ sha512 = "33387b6147f584597a18ca8f50ef5278546d057e5015dc69d6b4d90279a01cd7f9befefcb1fd4a6cb8b5807cf6c054d80dfe0d1b7f28eaa6337542d128d8fdc9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/nb-NO/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/nb-NO/firefox-72.0b4.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "8cb1f23fa23ee164c172cac43bb7e26ec42bd20b811922fa09c0945d9727d5cc545edc1e47f040084165de4eb0fc217c5fa9b54eb915703add563df83cabf7fb";
+ sha512 = "405053e48ddd9a8573e20bd3e7b9f0cd36b3459e35159056d8325892f07b25732fb6c7bab5dbf4ded60a40492402c708c511272c58325adabdefb01d724a3de0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ne-NP/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ne-NP/firefox-72.0b4.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "b620f2dc18fec008aa668255a3a5b2de987f9c1b3dd27ae93f9cd9f2c02287e105516568cfdb631a9f60dd08e03ccc89fc9d7f6c7d682fc7f8cf8644965b9419";
+ sha512 = "a08f962fc8a40404e4cc0ca752230aa006fb59eea753650002aa66ae287abf4778fdb5deb2ff165a4da38b3bcbb7151ef0c9b6b3506d9e6ffb1b8620b1469d41";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/nl/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/nl/firefox-72.0b4.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "51298d8ef95f9d76cbf6d410a85d277ded0463db6b85a05007cb11fbd9490fa385d9700bdf0dd333ba61aafe3690bd31604b1dabdfeeb5d8351c678eafa7a558";
+ sha512 = "a485f80af7d0b041e8ae629e8992f0f1b5ea298125b3a8dd6dc391b0faa3e5de7dfef627400ab2a938e1e0d73d95b39a0a3c6ba5a416e3842bd35ab12ab0c9e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/nn-NO/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/nn-NO/firefox-72.0b4.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "61deac483f285167a9ed3f12548735b484bdf2e361ec7e9ed62abd44084bf2ecf037990b946255e1d086a746139f3d24f1ed428dba150161cd5fbf9db420ea9e";
+ sha512 = "594f85634e1b10b79144f4594ccd3af46aba3291eddced012a39d7dcec641d37b6c55eaee985aa7529313e188e7fd0457317f3d7724c2f667e867e0b29bee1fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/oc/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/oc/firefox-72.0b4.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "8421017b5aec9c5998aeb255a47b8e34b189667a9b9a576f087613c4721ba7feeed5b053d7c4fe24c32ce17589b5fed8603695242e6acb25d5236414012a9563";
+ sha512 = "364928646f14d0197f85017f93d854d069f65f54fb3b79e59c819cb7bb2c259a220f4c9f1c8a17543ef5a3760ff94e2469921443a6d64bc9b1527fd2a931c271";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/pa-IN/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/pa-IN/firefox-72.0b4.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "3b8de8911a3249727bf1642214c5affe0555a6f91fa60a7b7709b3d9324403c9c5203557e6c4c0f8fdeb770fe73cc577f4a053064f09549049a9bcebeb4a359b";
+ sha512 = "5abddf19f937a8022f61de702a877af2a3d8bae417746cadfad9c55419dea53665104b66a17800ee5648bd9630b2e7ee159a1d1720feb5dc82b72b63138103cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/pl/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/pl/firefox-72.0b4.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "7c7b9ff6387e9252bfc8c9cf9540cdf05e2d041c0a172cbb95de67cc91bfb4991d554e3a1616be8e8bfdcf0243095e91f06aca50d01b8ccf2316becea23de54b";
+ sha512 = "732089cd288b0a589a6708df4cadb9506874eb9c1755d4138d0b05f7a83c977873438f5ccb897b8e337bfd86b8bbc5400a1fcbff2fde309d50c4970d972ba610";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/pt-BR/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/pt-BR/firefox-72.0b4.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "d6918ebbd92548be667c2fdc1bd53a21d5de473fdb73f82c81da89e95d2fc3d9cac5b8938f74d1b32a5e3163a5010b2cb03f19dd6d858130118c592a573ff461";
+ sha512 = "5c7de2ff62d03d39754679af7e7a291574ba6dd4444e6326281fd9d01b01505f6dd6f8dac207599a0f6adafb17c4e5c853084d312e3a5dbceaef8e8613ac6248";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/pt-PT/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/pt-PT/firefox-72.0b4.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "46fccd1f9f521b37ae4810535da84ec26f1de3a454f1e76d7652ed735fb91df043109597b3ec2d155ab5e47a2bc48ee1b2f54289514fd81503910f6a97eda8cb";
+ sha512 = "9fa37ff418595ab4a058c7b6f4c67b89bed7b3685619d7a27b379e19816245053acd266e91a3d0e1803c93cbe4570ab1c9b095db848e2b69f5f58b1990e06ef8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/rm/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/rm/firefox-72.0b4.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "7c8e478956cbd25f249f8ae61bf1749d0b6f40a18d35d7a2e0427cb9f7575f32ea2ba69e8b1240eed0ee382914aea93b15184fd7d0a3aa0af2530e0b3da948cf";
+ sha512 = "c071f91eae6c6824ff9ac4441ba429cc78c165846936b2f7c91cc0f78ceab4f3eda083ffa4cce7f68b4b77dcfc5c00f535f02e911b50a7ebf6066acadadac4d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ro/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ro/firefox-72.0b4.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "b42acf347fc1606ed4fe53b054b6c662aa909a734d6b9ccbd7f6d0fe42588504ae2a36e292db6229638b71228032189735ec318e745d187ffa5ab7087458749b";
+ sha512 = "dc093fd6eccddbe2e7ba25f22a74a9edcd03f1b080c5effaf1ca11058a66e7d171a6f7f3caed1d52847323f1055751e1ad290eb0192d6b8e9ea719cc27d9a816";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ru/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ru/firefox-72.0b4.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "f3f9a1501ba4a3ed69c0bec569d5fd585bca4bbc34d5d7b92a9b6c7c299e05201b4fd5b45c9a3d8c09d16d6804ab2a76c22a973e2b730ff33c03e325dd4ee4b3";
+ sha512 = "fadcf3ae2c5bc81f524d2be1ff060e1286d697cd4b4a8a8af9a8d7b0d221175de0d93cc1850e2dd678aab6c865266ef6edd0915ca188920b51771be4ef7ffd03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/si/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/si/firefox-72.0b4.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "99afc39d22bf30818da8156648face1eecaa8413f923fe4fb14623226c50afb437e39d908caf43e7a7c78b4ab4c66860a03832f33b012a5c1fa6c26e936e99e6";
+ sha512 = "f080a3aeceb726cd62cf57bcb96a95f32d0cfcfc639bec7b8628c7cdf5fe42d327cac474de4ded04f3f4c27fda8513d5588ca2e9354887104459f30128ba20bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/sk/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/sk/firefox-72.0b4.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "3c574962db7e38169b01179bc67af5d57296918adf009512ab494b6672ce95bda10dc9a6ff88f5ab17d414335bdd97fca5b75bcf0f4408a26a9eba83c052f3c6";
+ sha512 = "d0e40f3aaf8ba495159d314773115861095e07f8ecf8d30a03ca4b05f87586ac4bf96cd20012a5325cd4b76bf1b6bafaee1c925327bc244f3cf0d7e266486cea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/sl/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/sl/firefox-72.0b4.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "c266949cec012d11e13659e60edf9af6fd24434b0bc71bc7c1b50fb3e18de984ca34d074113949d95e7ce1dd759c7b081e8a336c73e7a84b146eec747413b222";
+ sha512 = "3bfa3965c337ca889f1f04930c9b8dce372a34f7c332397b4f074a2ef7ebf6120baa54e94973d8fc6a5eb8041c0bc170681d9bb882edf91b081460bb33314751";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/son/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/son/firefox-72.0b4.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "7b9f060acf3b4aae96a79d7fc712803cbc51a6b38e5624371523f9e45169f838f26f1848f8c39f644cbb7409e76c835bafe02152e981034202c50222fa1fa87a";
+ sha512 = "1e51babc67e116a8f0d324a929fd6ee821d5852519a4870870035f1110a7434c6e0ea900f23cfb489142eaa8e914be0e5235784028e3c539b902ec0f16bb8c43";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/sq/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/sq/firefox-72.0b4.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "3e555168da6e7ce386c7a577bd773879d0cdc725ee2c79151554628212fb4b16a95a88169bbde512ca63f51920e035a27b863b2e2d2a5a636c6e8b1427cce20f";
+ sha512 = "d7f8d94d1a23b580f489e5be24d2e2a45210d82f7da25b36d9c16c91136fc7b9785e141b13e14c3c19d3a5a3434dad600d3699ea206177f01ac1b539bbd59da0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/sr/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/sr/firefox-72.0b4.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "b453c4ee3138061c1b5b955639672eaff4b5702aa067f1316f7b42922e4c9ab9a00b8fe60f3bd47c25d300ae048277ac5830fde6898e2cd4e3c7eb9d4ecd34db";
+ sha512 = "8816a768e79c84b2ba3573d00f3154d87fc995019b499f5d9d7e945fe29a18dbb8a2582ec8a3ffee520de2d91f239714b84ad6e5627b54da4644f25ee8d6f439";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/sv-SE/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/sv-SE/firefox-72.0b4.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "7f859fa052096bf5cbb63716cb0b57c2edcc13f0e79fbcd59cc179f7fa91fb70a99d94f44a5005e3e6d38e88dd58843acf6e5c9b097b5d592ada7d19aa8b7b94";
+ sha512 = "44f09518b34866de5aba13308d638eddbb79941020a72c42825c2ba619a44c6e239124179ba4b5b88a2c79a875ae0c9d6983b691a6e637c7da017d9ab772da0f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ta/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ta/firefox-72.0b4.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "4cd7b5be580a70aee1259a39ccd37e947c8da8be408aaaa9210e76f4744c2d2075525331e0441d14be4a6aa5f3eb8c7e0f78220bbde0db3e521baa3a9696e1a9";
+ sha512 = "216d999c6f3e7aa9aa0f95622aa62830103a6eeb7f56636a9577be6963090c106ef5e6b825fb0a39b7ab634a2b59351a376127bbe26989139041042a7bf092ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/te/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/te/firefox-72.0b4.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "685bc8f8ec7274dc402a6f27be13a254ca28b67ee28f151cd0e146db6857d8f54729fb76c3266ad08c47b108e84bccaf8dd561dafc7996f9678a83c4a01d4fa2";
+ sha512 = "fe20b19cbe0eaf688dbb834e57b77d1982007808221a978475f5dfa9ad98c5c488661c2471f3302d56cd04b84808b7c1b3d8d076888026fc7736ebfb9b3bd050";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/th/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/th/firefox-72.0b4.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "d5167cdf3d67638772d474634c690bda4c3ea136baa3ac28d5113c9eb7673dcf9f38abf6e2fd54b55e5e487ff60f7e33036b7939b6c1add860dd48d9cfccb0b3";
+ sha512 = "25743569ab5c90e88f046d71ed9ef0356b4c49541e42e35405045d5161b4bdb54836325eb71c118b4a8422335633463071cfb5792e5d9ddad2233d3e2f120f6b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/tl/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/tl/firefox-72.0b4.tar.bz2";
locale = "tl";
arch = "linux-x86_64";
- sha512 = "bf49bd41ca1bb1cf03f8b06ce80e518f487359fe5bb93b90cfbc17ecb05aab74f4b68a8ad76c10acffa934a5a9fd5e257a52b9705e3f09e81343d142afc773a1";
+ sha512 = "61797fea9bd40a323c2fcbd7959cfccd5597bf8ab323f0c2294afdf3cfc1bab1b58df3f4efc365c145b3943f68cef3eed0c455acc51597cb26b5a55302bc5850";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/tr/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/tr/firefox-72.0b4.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "f67ad1441541b02d77eed6ec0e205e36aa585d70a85d74c3704e9fc95126ca4ede76807c62df2eb0659ae24ad8a79bb6857299a52dba432d0cade8b3091b6db4";
+ sha512 = "21cb703efda21f1206778b6c018e4001ed95d45304740fb059ee618e96aa15f755569614d510890e5afea96685d6c8e564a23d1a83585c1963824c8c00ed97fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/trs/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/trs/firefox-72.0b4.tar.bz2";
locale = "trs";
arch = "linux-x86_64";
- sha512 = "151772f684075ca2b24c98e35405b8cc54d878062a3d5bfe5b49561a0328a2d9064780fbc8aa1368bcb53957c208a102859accd35ff3e09d23a0623886ed24d8";
+ sha512 = "e7392a0f1e9771140598bfb2a150c7bb24095af79a846cdd21f96eeca0e9f22d38bd780137a4dc62750dacf6521bc8de2de1fa5fb8f757b092b814c31879c842";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/uk/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/uk/firefox-72.0b4.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "f27019219dfa6b1af09971aabeeabfad7343a6e9e034433a366bf0b85dae2a070c4236115a645bcce433e8a1ddcc74aa33c06f3e1526a665d7339c730e2d8b6b";
+ sha512 = "f08cb0be78afc2a6573273168dafb86256f2afd5e6d36baec8308baa4e9c04c6defa23c200b50b621495ce214e2a401fd793ec20561dd31f5a1d17cdfb50bd18";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/ur/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/ur/firefox-72.0b4.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "4b6b3c96dabeeb3ce6b814ac28f8842fb8a991586f8d9e24d8f04c4771e1e930903fd486429b028177fda3194a40f2d68ae89fb55ba632f3d778635bdfb61f10";
+ sha512 = "6b363fba4ca9250a8e863e58a055d879ec7e817c5fde7c79903ee04af0c7471ba9563327f223109d77491ed78b2504abb3836951f02e9b1a73e365823513f26b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/uz/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/uz/firefox-72.0b4.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "c236ecb253b724715b66b60ed15870c7190bf53beb8c0aa3eab7b8f9770a35d07c4b07d7e947e548274ab636fa4acabc89f8ed9db81b347d6d01c3741547773e";
+ sha512 = "6521a885d0efc8b1c0929ceab087bccffa1236f518b920c0e3f8f450ca2920cf87f8ed72af4547fc4e3e38cea267462344289c52caaa035f59c688fe65073470";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/vi/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/vi/firefox-72.0b4.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "34716693e977408908c303e69a72fb9a3001ec4683e848bae2a22b050f446ed82509cd8bfbbc560bc4fc14d13da673cc56ac70b0dde8e719266697e043ae90b3";
+ sha512 = "c14ba7d59e46cc3dc3f507b1549eb38125f3f5c60156ea70bfdbb047721b91a7611ad25dddead6bf8d62f0e90324cf0b4fa50ee30a07efd07f48032cade22eba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/xh/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/xh/firefox-72.0b4.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "634514944739f748afb01379e9b0b7d902cd367ab3dd72eb08442b0700c145e3239f0fe8a4598bf123231b5430cb4cf17e33dfb56aa6aceff1d833efd836ce52";
+ sha512 = "26d47e833b8a4e376bde4db86a71eda8cfc3901afe89f76676065384f359de46e474fcd156f95d18f239e7420a064e67b9dddbc97139c49c059d0a59e5f8dc81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/zh-CN/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/zh-CN/firefox-72.0b4.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "5f57467a2b3bc1346c503d7ac7452a063daa5656c8193495046f80296140d648f50539c5f0c9af23155498593da54f66e16f4ae2ab72637f394859e74ce3c990";
+ sha512 = "a87129e3fed358669a2376abf1717c10b463d83a58fd8ad3069f35b54569beaafe6235610d0f148fe9f2759184699784e72b4afb65f09fee60411dc593bd65ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-x86_64/zh-TW/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-x86_64/zh-TW/firefox-72.0b4.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "fe5808270355da0a3f6bc8b1522f8c2afd79f6f68842f09ff7db9d67ab21c1c683ab65dff9be7a666da9b25add657f6ebf8b080e898e8b2822612ba7b1a53dca";
+ sha512 = "af28d2d450d7e76390902ea28dddacf356371e96d2a1711ee2842e551f10f5048488015b57ad2744546855c8134967294c3e5a0e939de657fb884f7885e8c039";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ach/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ach/firefox-72.0b4.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "f4ca9cbf830c34b0287f92ec7683872b93cfc29a559c56e29fac686a50833e31bbcd2e22eb5ae5fe345fe8110d50d6be2c8ce32968aa74a65543e701ec2af6b7";
+ sha512 = "a5e3dd292b9e611bc7218459ffce0521992d43d8884a451e611bb41f59c6d0a0729752af0a711897b653f5cd3efe586d100ea783b5b009f6115fd0d5ccda0dde";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/af/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/af/firefox-72.0b4.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "31de89d33fce172551a3a7cc1047b06d9fbd199d0e9a7ca94434ca1f050d0cebe0f3c06b1703b2e6ad7bab37fbaffefde5ec661bb23b1b470b82360f4f08d471";
+ sha512 = "528c94fb5984344576e5ed7ae6c9e0f42a7eb8b00715ee8cf0add14fbc65c29b85a888ecd34f0b729283b14dbc2771927ae9d7b3f471f4c7a81c11222350c870";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/an/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/an/firefox-72.0b4.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "a5f1346cd8e74bae67b3a7b0ff7350b4376b4fbb7305932c333767e5625fb1a451daf3004619fe737d7d479aed09cfabb9323e32ccf1d980f369f7763520c515";
+ sha512 = "447754e83d868fe8a531f7c44a037003f9e0ab6a10ed8ef1f0db7107804c75936e792a8a6df69dc4db1c544f9ef9f6edff248878f25ea3a81b72fe509494fdb3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ar/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ar/firefox-72.0b4.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "87eeaf4d620a643bbfbe8f710612aa12bbaf2162f5e762263714f9ecc4a6fc75896c4d8145089775c24018491a9604d9b67273d43e96ec206518c42b978d8037";
+ sha512 = "91a2016144ddc0184e954ccdebc3535c8cd36dae79869e95cfabc1e9d9a7f49345611d85ef5252db3dbc31c2421061bb87941fddf62ca38e2c8fffff4f410011";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ast/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ast/firefox-72.0b4.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "b3b169892ec8646abbb22ab31d24337f4203c8257a0827dbef0ff396fb5219af47e68e69f90fb874f4f09bb2144cdf5c8d5cf7d0f484b755e5ecb40c19c3a839";
+ sha512 = "46783dbb86c1b50bbd9ef03509402805eedb1ac82c017d0e6d6c1692f0888d1ba14a61ff99f3a88e758d96435326a1b0807a47bbc18ad73b0b1ecd36870ce4bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/az/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/az/firefox-72.0b4.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "569a81642a725f184cc0abbf573bc92ae21efec93dce73572f46fdbc0319caa3da6a9f7e5066c7abe74d7636f27628ec5a87d243ff41a483e8f2f9eab6fbbf0d";
+ sha512 = "2ef54123e01952612fbb3596736b5ebb948d986fd6ffd2eaf2285dcd269bc6ba4cc2489d052336b2cb4fab94baebe460a4313011444f21de55f0bb095553345e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/be/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/be/firefox-72.0b4.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "9bb66208dc81e314fffe537fa229abc401e5d55fc6070e773d6cd167cc719019886b96625796bb20590e4313ea422d814ce4e2c6ddda8064ecf2d42bfdc2ac71";
+ sha512 = "93948950bd416f0b48ac3449abf5d15ce0db59568e93625f5aa82af3e5377c01529d08b3a1aee0b7b6ed8bd7ca76d238adb083031f58bafaa7152bd44f6038f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/bg/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/bg/firefox-72.0b4.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "04f7a77b716d77e56d1f4997c6fff775a16e2bee5cb7a33e3aa87677b08dc5e62587be072d639bf383454a3e4d5cdb656589c8db1b42a79244e2103cd54be4f3";
+ sha512 = "4004520711d7052425c3c9951230961e584b816a9d35f5d97cafc1714d1d38e9743593b6707fea4550f63c770878b67f7ec0e3affdd9e57110bffbbcc492af32";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/bn/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/bn/firefox-72.0b4.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha512 = "c3a03115b7f7599d2e6d1bdcee8fba27a967c05809bb29826dbac670b092cb6e290f1f9bd955b880fa87b99884530802644b1d32107ddc1704cc31a42452a570";
+ sha512 = "62330230a74acd2fc5103a9c34b0b475e22c267d03304e32ee9add9440f829c2d17e8d967b62d7140bc6f9329238c64009a68c1c7dad494c49ec7f56cf97880b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/br/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/br/firefox-72.0b4.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "2a556badf0e1a64b1dd1e47ceac5e3e8be24998eb4373e0fc03b63518200d41ddc5ccad4ee679993c80a63b63c38e3c4cd28b2a3c96d344210bde628e0d6dc27";
+ sha512 = "964698949b7a1e200a743e6d1c59db2a654238b1aa4122e5b3c29d47b4e35f098a362c359a6fcfa938c5189353a7942fe24ca0ffdb59498e50a2b92eb75907e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/bs/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/bs/firefox-72.0b4.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "909a21a318738fddf063f70489ac47648a16f666ce7ff93b152305fd3f932db939b71ee75e27131451ef14e3e0d5deb0c33cf4e9f0a174e1b369192261e28624";
+ sha512 = "8655234c81fb9099a41335ec71c3e78c790a3bcb40ed6d91f78f18e705e73bfb4eb77661f80c608e2970adac75752c798f163270c1a66c7cf92ad92f76481ac6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ca-valencia/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ca-valencia/firefox-72.0b4.tar.bz2";
locale = "ca-valencia";
arch = "linux-i686";
- sha512 = "e7414535d0a0c0291de4076242dcf3e44405408d885adb551c951600f2565d524080064c8ad7d475d8e3e884667b99f99fd55df7266e9bd453c907216fb1af75";
+ sha512 = "a420b87ba65d4e99662788d3f5142cb96747334959bdba455a8a449cb984104cf2d2f2b0d21f216fd2194261b13acba2c7f28de901d95d402fc72b3ef85ee612";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ca/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ca/firefox-72.0b4.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "cbb1fc6cbe4a051afffb4c67d4bed4b97dd4511da4ee283bfc27400550a1a4cae2984f847892dd271472e6f09970fe5229f137220544785deca837dfe6f241e9";
+ sha512 = "53712c47a152259724ff339d1be1783cb8d0d38267c357c1e1b56396082c04f0204127301a865ad19b0072d02a7af42b904f1ac68e166875b59d50358a681fec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/cak/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/cak/firefox-72.0b4.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "79cb0c91bc2d6567bdf0ef38672f35f1c5a484b8decf9efff8d9f907b26b5cad5bfc71c171185da0561abcc92889cfd7a8fd974a532cd9acfd6cc8e6bdd68ad1";
+ sha512 = "cfb06d98597d582132c0bafbc39384217da03024cacc80d92d29e489469180793d796edb2f78ecd717d2f25409757cf68eed46fd9d6f7b87cad01161dfe75d68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/cs/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/cs/firefox-72.0b4.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "b1a5d5619eece10b1d7e70e14857a0965175294808253238e3ab432585662d3c16c56bb6bb989225efbf271f1d4eecb3d20fd4561b0e8994538516d54fc9386b";
+ sha512 = "85bc90f95d2cd57a1f5a1c779317df3e651ef1930ec0c003aee89b353577792890db7a7ee853c4d93db802c28fa355ff4a35a56381fdd7b7742c554dddafcb21";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/cy/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/cy/firefox-72.0b4.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "3e06fc68797f371f918ed10b93f6984780e81344dfb014e790e02351d8afe72974c8234533683ec87d9cecb6e0ab49f5f1b7f61c9058c4ac275a5f79627c5827";
+ sha512 = "53e920d8d4418296b01d21b5e3c9c7788db7d9554e5c2b3c38b11a47a3ee2cf083a80d3e3a28fdb4bea262b3056cba4ae2dbd3a388252df7dc8a1fa35dd2173d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/da/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/da/firefox-72.0b4.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "ee90213314fa0ad3267c97eb00cd81205cef1df09a8cfaf162d707d8d3dfcd95e2ada11cd1458c988a7ab95df7a1eac55f7e2b3107c26690c39dcd5d441417ee";
+ sha512 = "69f93fed3e51fef8fc47f581a9a4f1a7dd9bce949bf582dc27bd0f04356cc337d1f0c7156d1668a2d5c09a6afe53628503fea39a2ba79e564f4c2c4b13d49826";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/de/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/de/firefox-72.0b4.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "9f1aee93429060eb0fd60a19b7622a4bead16b8c3609a00afacf7e41f437f6e2e75cc2b4bf7785e77d6e1bf1e51899a176c5fda3b3b88ca549da903ebb3ddfea";
+ sha512 = "72506755ca28f1f59aee4f39fc51eaf952b607eba97b6a1b80a6dc79db545aa5e8d5df94792ec0c3b93fd70bbce0bfcc25ca7b9b611690782a265a1581c15393";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/dsb/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/dsb/firefox-72.0b4.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "80d3b7edac9accbf47cacf8cd3e31b0568423b7e133a347508ed1ec6862d1f4a6558f975fe0bbb762888a25c37dc10e9b20a60ae9c4d313918bfb7f85cd0328d";
+ sha512 = "17ae8a6c85ead04cac4fcb8c29a4842fe714cd2b3d143a3333595794ce51d8bdabe4a12038041d9da89932766a4b5508249a1d8ae0fc8efecfcea87672392d9e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/el/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/el/firefox-72.0b4.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "46f7b8931354ab171d60e5871091a0c214f0f9a7f4689ad8a59bebf48343cc390c4ab38840d21536a3c32c1cce59307402e542cac5ed056efc5f33009f6ead17";
+ sha512 = "f7b80595318b84be3c3d5e9e30f09527c1ea135a817f3570c9d430c7f7334195f362d421cd0d8970e2fb32d6c967147ed44b0ab373c1dcdd79e6fcdb86be2a35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/en-CA/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/en-CA/firefox-72.0b4.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "74ee6da165e6e35d511b9d0a715d4bbc85541014728b1bf8bd526a3ffcbd5794afd9f00d8298ed194713a9053ad514434cbed7d4e34a342149de9f2ee2e0f126";
+ sha512 = "cb301703072041e12b10e5f24414dd16cfae57492f11f0d0bc6b68323f905bd075165dec03f7f59a5b75b9fa1cd0972b8106027130525ed917d3ed9d58a3730a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/en-GB/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/en-GB/firefox-72.0b4.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "1c84689bd6861752b2bc4530b4eeed8809b37f02dcb57d01716cbc347e6e161615046e81680db751acadd4f8d46e83b0d5c00b0702c7ba522148e89313a47b31";
+ sha512 = "3d63756f7d6f9efcc7706f9d250385cd8b4e78edd60ad7e065c7ef513530ebcac143e21fc377eff1e434af536a1ce73235dfa7d5020aac2966986d9b8fcedd06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/en-US/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/en-US/firefox-72.0b4.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "1750ea484b386b845e299b4ae7f7d3e6942ba3c765d09c6b94dc0d1d7da011e17ae05f84f379a0fceeb6df54a3e81f61f5c334886feed094bb630d62371ccc1f";
+ sha512 = "7c7058529f1c7254b866c8c63e6b90b03ffd9212aeccfc1a6592e98fb730928b11c9b26c0a69615e87eece1db1054c10a3b9709f382c8d513c9d482b973b0b85";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/eo/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/eo/firefox-72.0b4.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "b67e3423ac2801dfd80423b5faad2b1a216148fd5149fd787827f03745061d808e77ed352e21081f033129de2fec94b0951a16435357ced8dab23a8594e766ee";
+ sha512 = "ee2beef6197f8f59603291e139beef9c33a8e3414bafa63faabc644fa05995e4f6e1670e58c1a8ecf6e2cf2026732f831dcdbe399640f1f6faaf180e260b979c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/es-AR/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/es-AR/firefox-72.0b4.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "222aa7f906ddb829d6d95ad0ff64f080c26766f4ce83ba971e0e2a8996e471398882de24cae3f3fb51206c67ee7e1022d8a7d3d86ba70fc3147a2b914e4186bd";
+ sha512 = "4366394614cc037d6fe2485baf5cd0147952a8ffe9b2e1a28b8db65b3f0a9fead0823baced3211eece5bc3eb60fccd647195dfd184fca9a048730bc1cf0d9a51";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/es-CL/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/es-CL/firefox-72.0b4.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "9cec91d7c17c7c2fdf2a2507e71cb25c10b997de98f2a4e33a4fdf8aadf39c2ad9a539b15413a76dd86f8a0c370e8fd7ec1822cb3eab9917fe4395b57a8123ff";
+ sha512 = "ff0966573ec2ac21e886c57ec234bd1ee2f8d5c3e381eaeeeff3f0c11653c1fb4fef5f4fb68c24107a8f00b7f269848142ede7dea9ea095764f77dfaf1fd4521";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/es-ES/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/es-ES/firefox-72.0b4.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "f609a5a48417746b5c64f9765c067648581566b8ef3aa6935a9de9f08df12034f4e2f0af839d76e2adc1646244ffa58b1d50e4b4f8970ef043985c3e60ba9e6c";
+ sha512 = "4fd607ae1da3920707135a7d68cf1f4fddc43eb92521cbfb178feba39b0d7d4b2dde85723e655cc32c247a012c35e9a9479390683550e39fa2e00be0b01c3ebb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/es-MX/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/es-MX/firefox-72.0b4.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "34743906e3f6f7add3727c876f44aa21af08c178614940363cdf788fe54dc20a582c7d36eaf242355cdf31664aed7d807c8acf361aaf535d97e4ee06e4f4b219";
+ sha512 = "54803af40f8bcd74bcbe667f07b6d818a76e2dd6980e32c43651df9c6e30e45edd45664b442e69e035ebd610bb7ad9a2a6f0247faa4918b2b3d8bc9f72665ef4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/et/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/et/firefox-72.0b4.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "ffab3566060d248bd7c113f9ab462d6226893269eda244dc1e4c609456a987cbd0f66bfcd5478f097d9748eb0499e9d666d147cb989a3084a74a97dab5193afe";
+ sha512 = "43034830cd0ca754c6047052e4df6105a77a6040fc5d5f592a7ca3ea94ad30e0c98952fdb8f30c15adbd8e6d0aef9fd374e5b32fbd5053a3cf6f1a6f267a73a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/eu/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/eu/firefox-72.0b4.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "3ebbf87b65150cd8450287341f2357c8e8c102a80b91b61defd7800153e3b53f44d93825504dd1f818b82548835faa1324643bb7e484506f0b193043994c957d";
+ sha512 = "06ace3e3d34500a0871165dbf795704c9058f180ab23e9a94e458e9615475567df1970ac5f7c8a91279a38811d99ad5ad813dead9632b1abc8fadf75f1466040";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/fa/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/fa/firefox-72.0b4.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "4ca347f377339c31f75c5dae713589a834f4f50d594a060cf3e2c07d1da8318013302f23f43973e0db8cb3f3cf42abfdba0357a085b8bb74fe9851c5c798933b";
+ sha512 = "b70c5e0bdc41e14bb93e9b0eca3089402a7b2de2c105dc544991b0811398748a84c119da435b92a300876396ea47f36d1e4032fbf4e7c341357484362468f03f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ff/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ff/firefox-72.0b4.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "595763867baa20475057a576171d6ef3c1399a29c7a80a1e61822ddc71670a3ffbc4aa8b99dd857d91fda1e00ad1aa129bc79bb0cfc9f53f1147bb6c0c9114f0";
+ sha512 = "ac9f9a2a4ae117e20659ab73949b8b7e8c6e9ec780e9b7abff38e242243919e262acd9b3945e0e4e9aba55256aa6304b2647204586d0400684c24f7633e18eba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/fi/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/fi/firefox-72.0b4.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "92dc11a2e77b7286932067f3ac45f4bad752fbbb2649dd6ad9b5e5dde2838e4881aa26143b77775964149e2ee877dc5f38da2d203e1c04db1b1e2f24cb879768";
+ sha512 = "04dce53d546f03499b8691c6b621c0ed3cfc61e0177d506ab5eab7cf492e6fe11a50390da87f929f37014d235955b6c0747993824c3f8ffa6d04575ef407d69c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/fr/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/fr/firefox-72.0b4.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "37e23c8386568b68603e499153e3e258a56af45eb334255023b48c32b8dae32145460b849701def48ddb812314bb0c881766d68219408cebfa2e518eab2900f4";
+ sha512 = "43e55696a7634ca8f4422c47253b2cc231c6a7b142c2e3f13ecbcba053837fc4cfca1ca3c8270991e68fab2ef40fbe9dd21b54e278591e66578858ed15a7ef4c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/fy-NL/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/fy-NL/firefox-72.0b4.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "dee303e4b71814940f8910c6ed2686cb388e4c63d18fb88cda4437161f9fe60f65cb5c6bdcefeac4f56c321dc60a38ad77c2b1e2f83edfc54d8a87ec1f85abec";
+ sha512 = "11b045a86b15552449ff2c75eea1bf4ab51cb5087934d03d9e994de041ef442bcc15c2f6858b8e895520f2c231f03c33f9d5ae51e306b90c25ee7bde3c410d21";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ga-IE/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ga-IE/firefox-72.0b4.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "408bbb2f7cb351505330132974267ceaa90a86aef27d6194338810c40770bbe54d72945b1cf54a2b59d87331480d5bcf5ed6c327c65e890126ae0003840e4f18";
+ sha512 = "bbe8f473f775419f6ff6ee6e156b315eddd743ab7d8561d1b2f17b6d2185fd00d9507ff51de4001b66a7a80d07e7204cd7861daf4754c089c5a295a4f272b9e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/gd/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/gd/firefox-72.0b4.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "0ab9ef7d43cde2ae8042ccc16b1f82552e5ec09d9ccf23291bc19b2d53524cca34bd61c090c317b0c5d53cd93d5a994b38a3abbe636338a7a508966f7404da2d";
+ sha512 = "5f996f1d58ae60a65142d4ea2c6a73698f8042c83cbd8d2073b0c9834b92c12d808c13ca91d792b9c8a3831bd5657171d103fd1d3a958903164a563e5c233639";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/gl/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/gl/firefox-72.0b4.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "71711dc42fc674efe4df9bc1eb3b3f51a6df9eeaa919d21b65585e62fc6fb33f357da9708f25b7ae2d111353302b06230fd5279749788d8c06d802fbbb6b38d6";
+ sha512 = "bb4f26c429437227b0d0d834d9bfdd0511f922606aa48f4cef2e6e98ff7cafc473c3f24add0bf223831b7710d92a109996317c001df5047dfad9e9c3cd7a31fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/gn/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/gn/firefox-72.0b4.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "dd810f573d203220c588f1daf82628a62e771a8a5186d467675839fe94774f9c7a5741a8066b273d62f79ddcd9ac628248e651ffa379f7c7b13ec52375315573";
+ sha512 = "c065b74fd89313a8b54f19c551fee9e31dab35159fb0796b0a441aa7cd4f0daec8cfb8e1b2498accf18c99973d5377a986832fba8d907cd32b24a31ec86d3ca4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/gu-IN/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/gu-IN/firefox-72.0b4.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "c63b5ace09a07075cd274bcc9487cc8c8f2ee738b42b5206354d997d1b29ec8c2c83f3dca89902e90c5bd7c5f96b2e4ae707bf6ef519d8f6d7a1d979523c5bb2";
+ sha512 = "aefacfc8db154d592121d8b9f7743653002705a00c1280f443b58e433defd40b6b296ccd82adbb402ef907bb97abd4f9bda043dd0a48400410332eaa44dec650";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/he/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/he/firefox-72.0b4.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "c46460435482c73884d62ef77c8f92d3b09a2bd4b4485b1ce4f48d80e9695615df42869f1b5cacebd7b9062022cd7868bf25ea0995457490057667144608a4d1";
+ sha512 = "94419be7fc1c5ba72a30fcbc9ce83962efd294f9a33caa2067077cb6a3aa493c2ef4ced1b14e1fe9e6e3510dbeffa131b3d7d1de8c27703856601a855f68a6a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/hi-IN/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/hi-IN/firefox-72.0b4.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "22e6d02c3934c6ebd7bee848672ab28d8363bc178646d33254e9fcbbd6790c92b121b36c429b6aae422e4cbdeec26158f0a1533dfa601ed465659c706f7b934f";
+ sha512 = "e11bbe3e9d1bb50f6462357444c1d0bd074e732f81217dbacc1936c7546f8f3913749c7ab2f2288e229a8bee4e5a43e5e86f0eebf8adf69b0cdedf31817109b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/hr/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/hr/firefox-72.0b4.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "f07d9a3e06a4957a0d614bc45578c497a9ef2f21e39132943840d6bd6d51aafb5a88925fb9b6348f1de55ef831f14a20939685fd79a7dacf0cec42e6281483ef";
+ sha512 = "040b33546e3309cb562b4fee834529b6acbff828b4239017d0221b33ca4078841e4bb5283bce79cd5545f8b83d72ef9a26fe4c1bb8e1ce3592e9801ad7665a09";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/hsb/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/hsb/firefox-72.0b4.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "5efb205a729e7ed3d16ec3459f544b138fddfd70cf7494b12e31c9879cde18ba0c2f1ebaf2b9085a9af5e17aa066b48a4e52c959627eeddac8d025bce7924934";
+ sha512 = "6cadef677c236dbf7140181644bf97bcf850ffd67e282ea69005400996f1ecc838971347c6e9bec6d4d1074e73e62af5ab91df146e7846892ab86bd802f47342";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/hu/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/hu/firefox-72.0b4.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "4cc9d7c92e285d9100df3ff3e9ce0f8dcf803b540dd8c87835179544dc9f252eab68135d0f67f0626829c918e8ade6826a4ad87da69efcb23e36a85390009217";
+ sha512 = "8a5cde0f6e8f42833bcc81a063225bb44366386c96428afce58425197eab833e3e2463e5ebdc7661675aab6566559004b9812f12f666ea1c329e049d106f7f6f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/hy-AM/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/hy-AM/firefox-72.0b4.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "11c6a61219789b23791461f6f4ebba4e726e5dfc53b7fb1ae2f23b602b75d770edc8399f55bf2dadb863fee5953cb118ee2ec931c3b9a5d4df3b307526a89619";
+ sha512 = "61f01c79780003d7c0d8edcced7a698b37bf4cac7663b692bf7c4459dae4ccea9a11ca49d8fe5c03584eedffde10c4ad3826dfe3d96531922c38127e173f49fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ia/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ia/firefox-72.0b4.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "feebcec542b539c41b592116c5dfba3b88179d87d0a83090641079a1705b7c275c1fa8c7bb8dc31ed0a06ec62acf42dd2e39700f6b71b408182870f8c2d971d7";
+ sha512 = "3c9d5a69a330e43efa981e79e9aa36dac937d434101c7088aee070e42e21f601b5f1e04d639c8e30c3db6b39f07f1dc00c261b5ec1f5794232a095e9ebd1549b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/id/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/id/firefox-72.0b4.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "dba5e3ee99597d7bb615473b9715b1862bde5e45a631320e6a4c50f1b497a0c42f585ecff67d6728075821f19c83d9497788f7e4cf34573b4139eb2a164de004";
+ sha512 = "4a40764f77e43ae21a242647ba70ee42fc86f6813c2cf77b28f446d13a73d2f64e9694bcacf28c17826a513b19f567f58ff1c52aa3c6be8f416f0a448c06b434";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/is/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/is/firefox-72.0b4.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "d2078a7faa0edd5f5210bc5e4c7ee53a303aa6420b8ca8dc1ab764e17e141acb8412bb732457946380c4cbb0199b672a0841cdba3097bfd6e69bff6947bbbb97";
+ sha512 = "0aba047ace0a41355637443a29a4a4be23b60bb6f327cbfe24377f9338b8ec65465e530da77b8815ea5f4268c69aa0e80e1a726090f440fc775dab3acd7e62fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/it/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/it/firefox-72.0b4.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "55787b6d2cd8013414897da4b279e0937d54488bcef35c63753633ec0f56c8dc0c10508f06e90146e3c4ebe1f381229801a994cb497f2fc1bcbf78f8abab1ac1";
+ sha512 = "6bcb740801a18d09a720f9c9e451005afaeddcad3df58c4e81d112805ff60f620412939a824484267af41f2b0cafdc55c2c72114662d3e3f8c38e82463e188f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ja/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ja/firefox-72.0b4.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "02a316992254fef959a1618dba98730270cd751074330e6719fa45ac1a8b2c32cda90ce11b453b950ba4e1c679035c582aa472119676c5ea1bf623fe70367bc6";
+ sha512 = "7b03ab90989de93cd765e56211d402d180a937513e114efe3afc35e4b654d14a3cb7cbec1a32b8ab864feba693d9a76e696e93746b27f66c8913853dc1367d5b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ka/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ka/firefox-72.0b4.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "f5d93a5c47ba9eb7b1deb7a590a9fdf3d3567cfadae779c44c6360245f371f1feb14d64eb70d1538426a9a6005885d115826c11f673006028eb1b484bf0568ff";
+ sha512 = "14e720c676b10587f4947b135e45c37e496bfbd6366385c57ba010c90b424b7413348dfd9d65323dcffb7a186f2e8cdd72236e23b2ecfddffca0b923b462058a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/kab/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/kab/firefox-72.0b4.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "718cce9a90139abd0027c7c730ac5e5db95922d0960744481e05a4557926b62683df71052b5162ac614648def658909880de1ba5fb71b5b30975b0f97fb7013d";
+ sha512 = "c4e7a7f07b2b9cd4ebbb51e3a45be2b3fbf952f8da0d756c9cd0cf63bade2815385b54bb0bcf9ec575397ade8d0b820ab2b565d4a60b8676824c0003ca3c5612";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/kk/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/kk/firefox-72.0b4.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "1ec72e2a607b302878c30d78135ec7339d2e4a88f1e1f638aad0d21818c638bc6980fcf9b2319d6c1b4a32814a51ace010fc4ec1795415275ea0c6f7782755fc";
+ sha512 = "cdb162428e73b2a3cf01c7bd8f97bbf90a097ea6ec3f83b1f648179d1cba85f4ccef167745e48e1327859857bd1389525f901b85934cf10a9005a14e0471cb6c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/km/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/km/firefox-72.0b4.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "bc378c99b85df9c63e03824f3462ebbd84ece0b10eb4676d4e4c7deecdcb73945c63087628605a3370df4bad9b978c39728a157cfb96eb038faf9a3c65c49dda";
+ sha512 = "c580b37169a3eb76c8fc692733b51ef0b78bacfd5351dd03ddb33ec055ca52b58edbc278d48e6984ed5b253c4572c7f802a3edfa362282a70f6dc28bef7380f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/kn/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/kn/firefox-72.0b4.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "d7c902977156686b23b29c02386a743974e9d903cdd8b15b6761397e0fcaa94b83052603d9c807fa6914aad2101cb26fea6e767dfa101ff7b610751403786c4d";
+ sha512 = "79800119334a7c86d7c9698b9cdef025c733eb0afdd12767eb3d6d6a8537709ed553200445a9c2c40b41dcc349ebca408ab2b1e0a412d1aa92f0fa9db6249da7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ko/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ko/firefox-72.0b4.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "a7424b79e8d1ab631dac6dea38bf999cc7c998fc8dc96ac4955c00205d0ca397a57c37cafd74fa431f29e88feb0fa5abc1b8e46dc11d36c932ad1a0c4637ade8";
+ sha512 = "5118069f0a73bdb0055954658e33ff82a8e017c9ecb414126c1c3604f6e9867f2932b0b45a5ea2e0ad08ee12adbd60c6319f711ccb54e8eda226c92999b0ff0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/lij/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/lij/firefox-72.0b4.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "d80efe8613a1f9d0ed95a71df8245b29e078a3d7eb1ef574953a35018a3198a2f30cacf17467857ec7a943b174538a528cb19b3f787ae5411fdc845a9ace085b";
+ sha512 = "d040d130da5e90d83f3b08b6977fea5ae4f4dc16e4a93db9402a8b61e68088a13ad83acbde39215175167dd157ceccd3a1324f89d938b9ff6646dec2582f01a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/lt/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/lt/firefox-72.0b4.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "b4b93a59ea67315a623136629d66baa46e389fe01d1a6eb2cceafbc8e25570dd91d830fb3a7120c7c59e42d7ce24c23109aeb6a289756797214d6ca80a1661ba";
+ sha512 = "1bc305d8e73184a1dc5968a9e8f05a804a79e0d447d09fb5d20991897f9b6cc913c29b2eac5032f62279184e81a55577f75a54b3d54340f31b0f66b681655ccc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/lv/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/lv/firefox-72.0b4.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "f4e2d4cb15586b96f66818f21b35ee368acbdb5dc546b1df5aa20fb59ca5d4a2dc6ec2b08427af1622756369d67997e9bf8130a6370696219dc6f44e3a2ac557";
+ sha512 = "33a9e821ba8c8756ac07b6df0b786354caedb627b031fe7ba6716518369fdbe8877f0165d60c71087fe20874c8a0e4cbbcfd5f8a60ec90760df451b59722bc5c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/mk/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/mk/firefox-72.0b4.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "ef1f17ccde55e097ac1eb8a522749d1b8c4f10a45920fd9771676758f59b396372e38b420c11614cbadcf26f1d109a9051ce8266d567c7064d9fdc771153446e";
+ sha512 = "dd99b0f7dbee332b3012f524ea3de6cdfba6fa8c906855bd09145cf5d271af189f27e4fb84bb5acddf92f6930c9f885b772d97b94f90a99da7be01a581ca9e25";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/mr/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/mr/firefox-72.0b4.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "c3a8924dc813d9b34f55e87f984cc735156dfc1b1f840f5867e0539297ab3ec09c008bf44978411d7fc821d5671a49a0a53acde10eea847d2855fff80d40ec29";
+ sha512 = "ee1dbc95b187ef9bd7d2f727e66b9b36d8ab67bb0f3e5dc2f987b903e08de7c4173d97cf7684b28d67250fca27acdbc9b843b084e0c2f29ddd77814efcd3452b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ms/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ms/firefox-72.0b4.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "1186bd1679a713d2e79d11422332fa9f3e600c1a9ce1e8e26338e06d5ca97e2ee1d2f0dc657a78fa9590dd0421545cab3b08f4cb000af37033cb06c1b75adeae";
+ sha512 = "a2dcfdede6ebebeb5c994e4d609cc0a48f1100087ead6d0a219c65d204796a9898c8dc2c4df09479448aeafdae2099787c3d838c41baee12c9285a4e96b6ff19";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/my/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/my/firefox-72.0b4.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "fd99f7e218ebf570ee1dd8473fe9896fce2855b591aa25cbe03f5f78b0e36bc4587efe5630efe95023a16fd87dc5c221916bcaf0a5423e2a7d3f1fbf015c3c07";
+ sha512 = "f8bdc2bb60f34d434b529f3231301f97dee662fe1e3ad856467568d4195cd879e34a08c1a687911a66cecb208993cb59f827ca8351ab6deb66e2bfeec905a765";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/nb-NO/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/nb-NO/firefox-72.0b4.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "fcf0e084f20ae15c820193180a541576968cacb0bba58821547811c761cbe4949f0e8e93bf0713e0d21fce885c5414ed3ff84925cca51e1ed4f5d8df520ae53c";
+ sha512 = "f1694d443574316768dd5af6a3d1aa25ee2e20d78d125b95f15ca72fb5dcf696737c9ec6ed3809aea0252edd082a26453c6a7c98423c9fac91ebacccfcbc2c97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ne-NP/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ne-NP/firefox-72.0b4.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "6037ec1a95694c099850629d0048612984e9248622bf7527ffe4fa143644dce7c009d849b46e1ec55d4d33b306fdf9fe3d3ccd78071f63fa2cd7f6038705c033";
+ sha512 = "eefc58ecefa9d48e6fe61ac16dddecb51549cf9f3ced1efb36843e48eae85d899dd3abc704d33147e6700492d6a4fb3cdf39d3730cece739bd3a795bca53f54c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/nl/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/nl/firefox-72.0b4.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "ad3ad9dd0df03c5e702f33e67810c32eff250f951970ece9517f1869fc95335d65e50547b45073051b0113b5bcd071052b4a3ebfe1cfa5167ebce4835a976c7e";
+ sha512 = "cfc4a918fb314e7838c69dbeb8fc5c9a4fdaa08e890bb79e886510ccf7cae672be608e3b47bfde9001afc05194d97939868e7e0d7a2f16821a4e458b62c57948";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/nn-NO/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/nn-NO/firefox-72.0b4.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "efdcbf3b646ab11d0671ae09f15060e3f88462d869aafafdd7b2833e841753e1abbd5c115a94a1c9214b277e2d12a85600a425be3b913d1a66b49278b4c762b1";
+ sha512 = "06fdc085b0dbbee22ff89a3f155796a98e9e5e8721d25c5abfaf123f7d315b86b4e00747990bbca949861398eb58a0c4c147b7e2452ed602efc39c4788bcf082";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/oc/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/oc/firefox-72.0b4.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "3806bd7ea0343a74fa4d66d6ed30090f9bf33ef3e2bb1c40a55a3ed38be0ad24bfe6d35a4c0bdadaa9100404d7d704e0dffb6f6887210523394fd18c09c6cb4b";
+ sha512 = "b6534944fe1efe4f844935fde48b4397dabe181a6facd65110dc5512abcdfc83fd389e387dbd619d63857b456542553b74963d1e970c5136d51c6203f49c942e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/pa-IN/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/pa-IN/firefox-72.0b4.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "09a4b17b01ad77898499b17a3e8c174d1f35097def6d807cd602a5539edcda49c10db27fe98e738a78bbc5932f4bc0d956e3ad296dba79ff4ccce6fa50ae2f4a";
+ sha512 = "f351f9dc860a096b260e23e8fbeefd7529608a6ebaa05510cb4b6f5b78872b6cf7920a0df3fc5d6c02c02e982d3967d626def031932892df1e3e1176297b9152";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/pl/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/pl/firefox-72.0b4.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "33996f6536932629f0d55c17f93f79d81e9bf2a83246fa5587ab8304ce4ce5b2c7e7151d447701abf3c359171cb45855b28ea3b5fd5c64f65dadcdca80ab060e";
+ sha512 = "eb1a8cf7549f377cfcde8cda89c8353d41ed729ceb591ae79fe45a4bb78a70f7705e834d3a4234089ebcc1220320bbaa473d77fd955232b7f354660b946fd263";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/pt-BR/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/pt-BR/firefox-72.0b4.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "6e579f3e70bd30174422aeadd39fb0be373cc5d0f1e34fa75209177466c75710f90a0a3165980f794f4d7a2f701a59b2ea4fdc3cd8e39ddc09630442e09b44d8";
+ sha512 = "4c106cebf217be7fb68d38e1058f145b8e62dbe719f53cf8d8d08138ac43ccf07d5506f53383900b1b7978e85c7e05bee1c29d83738ac5172e4034b38f4e507c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/pt-PT/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/pt-PT/firefox-72.0b4.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "0ca174389788cf9bbdff7b3193c13cb2f1aa83d1d7f967efbda3855d8606d2318b840f65f25d0b7abb5e1466b8b8f7bdf1f4d3a0b33379343510838f447de3ad";
+ sha512 = "dbb5634292b35b1a5fd8ca634b794ed5f7932882b8be60c18c97015c770bb36aedac93022eedfcf231867b28ba53ee4078820df3b2f6782f14d8c2f6fcf3187e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/rm/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/rm/firefox-72.0b4.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "9c2c762724c503fb81e9e55fc3e333caabb81e6d063a756385b51658866c58dc07190f5bebec27e317731145c763ac7aed7fb53692de15c68c78260e3f518193";
+ sha512 = "dde472ae454af6b12729db749c9675d73045bfb881811ba34647ead42f39b5fef23dd9c505af01e40538163363a4076f681cd16b738cfa7235933ca65fed8651";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ro/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ro/firefox-72.0b4.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "80b5f9e7d1a9ffaefcf28f7c5ff4dc2f5d8ebfc9274d674c396bd2569e5309ba7e224da176c84a943749a605ca6634f7441c8f81225f6f8ed4912ca48409bc5c";
+ sha512 = "7af78cc786a786ab230b801a41dfc493a40202758d3df3f8792db4db798d036a65aa50f1d764b22cbda82eb798e895247ba625cd79461b72c780a8f2f742f709";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ru/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ru/firefox-72.0b4.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "63910164184c3c81d22c1d6b4450502eca4dafcbe62b015b3bcd3f47772ab482d979f2e34f050e219b5a87466bf3ebeff896cf27055669a2ffcde313e1948701";
+ sha512 = "ed1dd6fc52b61e83ef31975d25c569c33aab2fed13a11b74fa4bac37e464bbeded80394bdb7793d45471a0608fcefa8b9c94778a77d7fc39c7e39762f96ee260";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/si/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/si/firefox-72.0b4.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "79dd2082a8de6ff7ae9f3f47d5372b0a234441dadd428cafec544dc527b43d01434c49f5cb47da2c689b4b9cf8a45aff7f73064aba470bee84bd2b13af8f1aa5";
+ sha512 = "6581646a8e2cb2a3fa168274d2df643df03771d4a2a99a874db3c6c32ccd27fe31e06d9d3c86a0c190b21854453bd330656fbb4a69868b3024b39b20c908822e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/sk/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/sk/firefox-72.0b4.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "bb2cf2e3546f5d2b5a1c163165ff37461d4aae87db6b7f2b9e340f56dc60c29d806e2b699ebca6b00c1cf1bc8d74db2f72fd3dff9c4a7aeec0a03d93a23af73d";
+ sha512 = "d18ae82fd81b0face79f98320b74f7ed49a0eddfb64e6012279da3cac230688d2ada3d7c5dcbdbd89819db0735eefdb4a50f8929c12b9dedc10a1e40c97ff133";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/sl/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/sl/firefox-72.0b4.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "25f0f66b27f03c5b2e69f40da350db53a78b756a1ad7dc47453c33a2f6c62d558572f47c8159701805513baaa5b598d31101b7fee98f87f37366f85703033927";
+ sha512 = "2c630dfd44c0574b2354cbc089191d6745dcd9f3e7d8e1891a11d7b11a70734c86787ca820cf7ba46b1124c244366cf09e3a7a21eeb729e7512cd508eaa11aab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/son/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/son/firefox-72.0b4.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "2dd69052b1ea296e9c49a72a4c2f6a00c35f168ad162a86f101a0c6201a19aacca3ec8f98f2fdb13571359a2d6380d9ea9e33be9ebf74271f117becc72b09152";
+ sha512 = "fc50ca49ef1f58b93b41d9fb3ff81be8a17b9e80a49e83578b9cc152417b643b246eb21965391b870b7b281f8d77c2d73c3beaba94548f1d638927272a45f10e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/sq/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/sq/firefox-72.0b4.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "bbb9241e921837d7393ac562078be01085ede14e73f1179c6e07f59360026f6d5c2220a0067fed096526bb39660dfcc66100c8ecedc42dfa89b93499536720cc";
+ sha512 = "2d48a8217cfc1fd4210529596df73ae695efceaa4aca41da5db51962a81758dd1be4a15f30313e49f2f5fb33095408e146a16a7bac72d267704a8709c52601f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/sr/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/sr/firefox-72.0b4.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "1cea129186274ba3491829882bf51eb4199446b3c894b4c1e5bd010252564d9e0724401e700692bf9c2939074b69751bc7fc988fc63da5f4726a0e4d62837c38";
+ sha512 = "c8213dc5c02f72efd7be29d08c127033920ad0471942131787c396b05c6a6443dd803fc46268eab556571040a4bcd16870dd3d94b9612b9391489728d21c43c5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/sv-SE/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/sv-SE/firefox-72.0b4.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "6e7adbfb820f093fae4c2f2ea9f74e5d1ed91cd5a0f84ef3d53a2efe966af82fa5eeca32c3045ac1e575504e4322ed2aeaa5175d7ded1241d59fd7cafe42231d";
+ sha512 = "e654d3cc2d7ab45323077389c14860d294c3cd355408197f5bd8562b49f6f214f7c2271155ac9971ff3ec76a1075ec528ecec2887db41cdef02ef88cec40c4fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ta/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ta/firefox-72.0b4.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "9fbe15bc81d2c7ea84c50f77e209b07df049d740ce0985fe3bd3457aee87bb59ec60bd61700909986253d022332e536139e6c637d4cf7ff67248397fd13ec76f";
+ sha512 = "d6ec73ad1cc93112dbcc7fa2b7a0d4da0ace0e16b7352a3e348e1ad8ae451351dba94b98fafb504c1066640787a7413080c536e99a93e2039cf4a7261971b53a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/te/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/te/firefox-72.0b4.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "5ec78316c5f940dad34b8a847bb7057196dedd28235dda8d25f9155b2e6a660eb3639a95699cb8d8dbf90ccb2cb8d840f96d6f6821317fbe5cd92773a745dee1";
+ sha512 = "edfdc524360181210cc1f8a09a9506299af5f693492237901b3460d6e8c5f5cbbbe3857c063b682d79a2222077dac5225124ce179eb16884b1374788560f0ae6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/th/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/th/firefox-72.0b4.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "98caad307d4e72c3c1225249055b9039582a90c0a68b95c6ab4781c3e676833111de3dd88f4bf6280569e32ad8a8413cc7943a0e4b1c22abd1e59fd8463225de";
+ sha512 = "9875113f966d2cef50df360f3a2c1d2e21100131cf334a7b293cc859ab3c4146d56fd9e63544e35a90aba8edcf321044d233b04fc38025c926cc1b125a165651";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/tl/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/tl/firefox-72.0b4.tar.bz2";
locale = "tl";
arch = "linux-i686";
- sha512 = "908a3bdce2d2b803ae50adf856671f2f1a2af2c4b7c603e6be166adc13028fccf2f8b6cee2dbafc20050d6cc1cad52ac76135200da32a859657a7f6ad175fdf3";
+ sha512 = "a69699faf3f7c67bba77e1ecc661f9e1986324ecb7c35ce8f5137363a9c6d9270d0f6bd7fdb6ecaf20e34588ac57493ff5c1b04cb26adcf06af43e989f565b69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/tr/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/tr/firefox-72.0b4.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "c5cd41468c8a41b711301b05716840df7b9f536f435bb5938f46a6d7affc722b8c12bb6d9840d6c47e07b4dbd52d94f8c189b728780086114f8e07037282773e";
+ sha512 = "6b922577000343bd72fbfe0e624e85cba5a03a93d2134e6ecb4990795b6f078eed7efacec1b3d2f890e68e14a4f372c45b67ba0a310fd160378da922c08e5154";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/trs/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/trs/firefox-72.0b4.tar.bz2";
locale = "trs";
arch = "linux-i686";
- sha512 = "f83946fa8d121f8dd3a51707cf1fe25e4731fa9ee43d6889ac36319d4df8c9339eabe95db2ea5c01064fdeed8331ceecb3e13678b012e25a215519b0bab91f6d";
+ sha512 = "502b72962788b471e0d85a4b36cec4b4cd5c9278858a646782e01881f9c84b26b32f9642a475fd6e6ebe5b7adf6375040f86d43cc50f47a873585dcc64d4a599";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/uk/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/uk/firefox-72.0b4.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "2692fe4c88ca6d23e8d4aacaeb939b753393543bb1da2265c58fea5c587232c2b63043dbd6f7eb853c3617d30e707b99782fa683fd7ec4de8ed18fa748760347";
+ sha512 = "2e09bc938ff3fa1d583288da6a9d17af40aaed184100b1de54c6532ea4cb5ad8904b724ce06f2a61ed9d71f1128beeb478218e213b5a6f868fbc9f355b83a1b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/ur/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/ur/firefox-72.0b4.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "a8865d0c69a3f72e1b9adc7cf63a6987c4e1e46cdfc4ac31f26c48d14c175c0c1784933458eba132be6e1f580764846107df905eec51b071492b823c5d312db4";
+ sha512 = "2dfd92b3d024034b8abcbe6aa2ad12adc75fe8ebdbeeb914ca1847eb8fcb5b7cd20fbe80a4c8ebd87991ee46931e49bf8d7fefc95eb5df9f6a84813ffa99de7f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/uz/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/uz/firefox-72.0b4.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "4cabb95e02a86579f95937b149dceab678b6bc117c8684d9204efc5d9d05fa4b04372d38da0a17e66b7e69c9d5165b1adfa43d45a2e7bb6189e135ddf95fe3b1";
+ sha512 = "2b3c0c758814806cbd9db8d1861a309b6b040bb12ba9981fe13d59d7edaa38a801a093da45db63ce8b3d1430e2cad11a2807d0d193423bd5df227b1db32803c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/vi/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/vi/firefox-72.0b4.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "0ddebe6d31fec59f2c18541082d0a0ab0dcd0ee3ccec2e895aa026781297676c31f0a58aa2bc395c6764a0b3b911a940e00cbee159d4c40f45554a6f07e12ea4";
+ sha512 = "09e0b0bd2ff7c917b770110b4922c4d0549b0610b50e453521e92776e36f08f161fb419807c6e04bfd64ad36433a82e19767e249c3796cc3ed1a3efa72db44d3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/xh/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/xh/firefox-72.0b4.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "178c1fe904c66c226c7e2ccbe1142d101ad9e8ae59aed276535d7dd9afdaea17e23460c27a656322bd23a72b9764c3359af63ac16d3d11fc495712f70179aafe";
+ sha512 = "6014a55dcfb521c18fc0988bdadfcb6e6af840278a53f61704f775e40b2f271411f8b382d1e3d128f63792f862c5f7971c3c62c45f611124017695c94aa90ec9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/zh-CN/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/zh-CN/firefox-72.0b4.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "a648144767874c9dd0a6c66deeb4397b48a047a7c72168bc4597b2a0e30c557d60f8729400715b1cb003027f727eacd8161b0b19d7d2ae5176442de0e220bbfd";
+ sha512 = "e04c44841d5e9390e7535b4824cacf587cd23aa7b2e5ce0ceef532b6a3e9ff0e7ae8cbfca381e5f2f1cd17d484f02258b85e37917f863fcf16d4141812b5ffc1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/71.0b6/linux-i686/zh-TW/firefox-71.0b6.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/72.0b4/linux-i686/zh-TW/firefox-72.0b4.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "c401b4fa658e8a0ae045bcc3488695cb619d8db7fb2ac74d7365e9f2c7b2fe7be1e2eaa63ce8c426f3c3e5d5a77f4ae019e6982879cca6d4aa6b54264d414078";
+ sha512 = "d265ef9a7883702fc6a834afe04eaf0c420fbee25824e41ed8293a275e98e2aaa2c34bddd32587af4b91ba7acf0e56f295091f21c034d304d081f2045267c839";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 537a30c01a2e..c9dbe6ba4b96 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -32,7 +32,7 @@
, libgnomeui
, libnotify
, gnome3
-, libGLU_combined
+, libGLU, libGL
, nspr
, nss
, pango
@@ -126,7 +126,7 @@ stdenv.mkDerivation {
libgnome
libgnomeui
libnotify
- libGLU_combined
+ libGLU libGL
nspr
nss
pango
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index a9ca0a5fe06b..a362045451a6 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,935 +1,965 @@
{
- version = "70.0b2";
+ version = "72.0b4";
sources = [
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ach/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ach/firefox-72.0b4.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "cf64b9cd170d5a1bf1765ed07df197a3d0c7411b5281c89a0d2adfb3d9c404ed9fd2c8c021fe93971b846d7ebfdcfdf08f3a5703e156d6dbab61619f53d6d415";
+ sha512 = "6cbeb3067c7213d3b675c0d932fd77ba068af1713d7d7f4367f470ccf4767427a9239f2cdcfc3d1e33e1b71e02578743e0bccbca2320a9271663d2ad76b4012f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/af/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/af/firefox-72.0b4.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "e2815831dc99e0373541a56a38fa936a97d93a07a2dd7f789f5e4cc45860ce3c1b70bbbe709d35534364586af5b0dc626a4ba36dc8881244f98665a80ba57764";
+ sha512 = "e15a5faee8be48117493171ff2d04abdf8011b4cf40d68d65ead419bd6619b8a1386ee9867a1229879ef75bf5b36379ed3bb04f6de289dfb2b5c07fa5874711f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/an/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/an/firefox-72.0b4.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "d7cc4b7a1d7fabe186ae10a9bbd5d746415178dc3d17255e2278c1b5a9a7170403cdd153668b94220ea68be387b0c7b3365c8d460bfe53f7b381e7f3da12948e";
+ sha512 = "c96a0c3f4b6a29347642e5583980f70affe1c84de4a2a6b5a304062c0ebe173e22af5fef1c775b76afa4ff8cadc02b7df7fd2cc8838af2c10fb94c34c8282521";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ar/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ar/firefox-72.0b4.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "8fb79f3636682c83dcf42b143892148fddb06eefca4c5eb72f5ed703b821dc2bfab7a167a58992d83202866dc07bfa09eee876cc567586791440afea676efbbe";
+ sha512 = "08b69e38444a7666b6aadf8b3533030c91c23d53771daa0f975cd09b6c9726845258aed8c06de80a38f1fa47fd57b36d0f21ad7eda6e28824a7574d371d6235a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ast/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ast/firefox-72.0b4.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "468bcff942edfc8ba843f6f5a4b42aeb2b606186701d6a371565c4803664591037fe44bd026fca790ff8b8bb036619862ec51f04af63acfbf393fe8ac677907f";
+ sha512 = "419c8ccb281b16ef69b55a13eaf891ca230ab43b28dda65048b617584b84bcc899ed47368da764413b89f5b004bf3f69393214d0e30611ee4545c8a581af35a3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/az/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/az/firefox-72.0b4.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "983f8d78364c1479a252806f912d015e791e8073bc7848c0bebb28c7a39d6ab08bac2bd9e4a7f1c1cb68b8d2894eaa927541a78836717066491b450c0b34671c";
+ sha512 = "0acd28ab7e03c31fa84c0783259241515c0e7283afd586ce81007700eb6de7deab5e6d9f6775a60b1d2238d5ede5f56d2765bcf08592d9cec4e3dbf04bf000f8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/be/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/be/firefox-72.0b4.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "dd31f1d7d3f6fe10f9dba54475512016be4b26bf59ca0ce55932b23cbc29954bd80e95fb1e29f2ec695e8f16d0b0145ed0d160f1964fe40ffe079a3833ee8090";
+ sha512 = "7b3af40c4046173d5f28d8ee7e1487c244ba7e979625105d2521b91df7f1ecad7a0ec597eae8c95103aa43ab977bf1f9236ca7ecac1903d436d5b21a275ba26b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bg/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/bg/firefox-72.0b4.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "d08edb6750464805ef379b18008d5f3a76a649ee4d6528b4ebd255ab89205756e2c9978bd9a27f56a607117186d434fa2df49ef4494bf5bd4f1f8e2eed10b30a";
+ sha512 = "e4a28f963e056e4217998dc2359582d8e2d0c08658db18e2add0023084632046f9853536b5b59af0eec9ac3b222a54f75433a9094dca4e61433da13a0d3cd45d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bn/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/bn/firefox-72.0b4.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha512 = "a3c200e13d6b20a7fcdba2524501d936a183213f590213727facd9271867ca3d5ac0c59831b88e92a424b3b154bb9cfc66dfd8908ee28fe6a4ed15146944eb7a";
+ sha512 = "5300264897397a070375bc07338fe75cde2496a25a44badbf59376eb2eae339f3e5280ff281310e3d6c3bfe9fd2f6005f2b3f35ec815c238bc10146756e43009";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/br/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/br/firefox-72.0b4.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "235ca44c123dc8034541637b8cf5b7d7d3e361300639033dcae361bfcedd41360a5761486c990e7328e479b3073b5f68f01bd38228170c352f993c0bee4757c0";
+ sha512 = "656041367d9b742a1b7b178ddb2c5567b94dbb69631884c50bbfd439d4e8ee08c7c83b85a81dcb24ac202c8d4b42cce9c7bb33c707bc274bcb01d100e173add8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bs/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/bs/firefox-72.0b4.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "2b2202f8397edd25f871d0e9b7e2535be98559bcd84080b8418460f7f1e558cb779f1588e94d87e8e713639cb3bde3efa8de7baf2e2f36bf387d965bffb9552d";
+ sha512 = "dfa09428514aebf5282da86b6088f9d789be478e90ed8322794b2a7e3ab7db63fdfd2f437fa32cf17847a720fb968684b3428139ec9fa7a74dbcbbd5c1221969";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ca/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ca-valencia/firefox-72.0b4.tar.bz2";
+ locale = "ca-valencia";
+ arch = "linux-x86_64";
+ sha512 = "282e55df900d832d2f22faa65e90d241a1edf471a19fd973c66f950796e3d82b4505bb35c13a8f502e19eb67d0f54dc4a9b7574f94ee448835706c6d7a66a608";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ca/firefox-72.0b4.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "23b7af96430ff5202529e5bbfc5d359d8cb9419b54a8e7dff6b1c828ccd1cd3ca686ed062a29f7e8ee8201ae1a2bbce7032a0f3f0cfc63168fbf0b49c52a9391";
+ sha512 = "44e71ee6ea38f7cac766eec9d344d74391eb850b80f0bd8b4b71eb2b95588910f2610af3b3e365e57e9c7211c272dea81899a9bb8e1fbecdacd3f2c3db76561c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cak/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/cak/firefox-72.0b4.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "beda7fd930fbcf0985711917ea4b78a94042072a8cdd325079f3568bfcf2456efa0666efa4f869430cbfde34091b9d7d101edb94fde0a0c6942f61ee9c8a4fc1";
+ sha512 = "92b0dc18e82e3e48ea48457a86d5f4fea673f6ce1f63b0d326fa1abc818d2794e67c10696fbda1b095efe3cf661f8426cc17839d5f72dfd4ce63a6ce683981ba";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cs/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/cs/firefox-72.0b4.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "1b47c85b7b5125ba416e18345c7247b85f29e4136d56333da14d8f2c3ebb7b9f81bd0332f6031b36e68e21d851f9390e171f75305bfbe0f46dd0b7c995e0b2aa";
+ sha512 = "c6ef644d3d78f2e53579c063934e596b70147556bb74de7c31fa2592a1f06e6c84343d5efc8ec14a9789ec340688d02cfefdacd4abc4183d0850ea79c48a6d59";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cy/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/cy/firefox-72.0b4.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "071d30f74d13311693dbf3b4c1a111d12e53aaeb8d6207f8628f7a45acfcf797a722a5196086fc7b6c12545a8a177868a5669542f0535a4223df155867ec6b30";
+ sha512 = "77971dca0c2457ff1d938e79bb74ad94d1c6b988408f62150a17a7c25fda6c84cf9226b4ae6a6903a4ae3ce20e16d27e68964e18650243c347e2b9b6c4022773";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/da/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/da/firefox-72.0b4.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "3640a0a07c512e60e4119a683ac44cc596dc2a187d7f04a4b087540ca5deaba1c220403e398edf4c36247e92eef73de252d597ec082a7bc6e6c77e7ea799fef4";
+ sha512 = "3245ed636bf8556fdad23ce1f01582b1c06ec71a0cd30fd5d343cd79de205427ab7c4e194fb85f20bdcb69a06b06c13b7aeb9fcd9c69131bc0a38a0f7cbddd66";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/de/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/de/firefox-72.0b4.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "58538f8a9a0d6e97d49c005f45dc1b1842c07a6923a556d98aa13b4c979502a329adaf7b1782522e02a770945ef3809dc68138e73736593fa5ed5d07a1c9e265";
+ sha512 = "fe3ea14f2a3f3ebcda6c34f5699302631fcc69843fa6d825ce75c28687d11c49202a455d5627e8bb65927d9e45f201cfd8f4a2409bac46a6cbb88d998b3d66e9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/dsb/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/dsb/firefox-72.0b4.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "8a0ca47fdc85672c18bf883929eef9fa56b2b3b79e584c415c76f3005a55cca944700d27ca23b2ac2051c7c130b42b3551dcd1c05ec7a347ce6463ceecbb0748";
+ sha512 = "34074627334449991fbc2f907dc1b93b03ad7163fd8773d0a44043810eeaece19af574ea52b42ececf35debea347ead75baeda0e323d13aa6c80764f5b83eaf6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/el/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/el/firefox-72.0b4.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "c29d7b350fcfc7b6b76b02ef8677a21800d786e709b5e1b886532f74c8c11696da0fbf2adf6b22fd8c5edb6ab312516a2535ce3185ca5334cff9d79974a4f5ce";
+ sha512 = "2d50aca82f7b6d97fbc3905b08efadaba7f0ba0dba72ef11012feee5ddc19001fe782241eecdf9445bb528ecb16f8ca2cf8df8de5641cfa8455df915948e410d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-CA/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/en-CA/firefox-72.0b4.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "d04571c4f4b4bfec7f8a0eb2ee2ed9e9f91c415609106a97ddde7122bddb8f8a25685e4bc6c2eed5ccbad2111bc3e9db6e3ee27c422cc1813a8bb1941cd04af1";
+ sha512 = "6467da4e9af4c1214f33701e4b8105c6e0c6660ad1d1bb527592772488a8fba9272026cc1dcb090e7869ac9ef17e45ed0e97347a6ddfce778030f2f77c6cdecd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-GB/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/en-GB/firefox-72.0b4.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "c1f39142888d46884a51b892f232f6cb78309d65a6ba342a45d4bc6f3448ae90bbfd77d44f0e1611948a66a63bcb6d0f0e76f2c6f5fc3083d58b12b6df7cd2ee";
+ sha512 = "94857e1cf4c9f041439c1258b4481aeda8a28584afcec8d1f279586b31e1941ac9a2c847c50e1722e1e83a9156586f582cd7a45a5377f8bf1ba8e24e6fca099b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-US/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/en-US/firefox-72.0b4.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "1b0eb7dd1995822cf30aa85749741c1bdea6cc98b4eaeb1d11fd94b56d2138a177428734169355257a165350cf21b72141386d6fcbca606e9d3bc11f292563de";
+ sha512 = "6b5b0d3af32275cca8f8ff8d308fc4982988bfa2ec74168d6b13b3d8e962b799ade9c4ca39acd412ff281ff9e9b5505b001d888c7121a602c40f914b79dfa7e3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/eo/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/eo/firefox-72.0b4.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "e03f025948a463007708099a6e19abbd5a3e272eb03e053c6dc7ef156b1e4e83d68ae02bcce8f19fca1409e96e07f88a36537e08dcd73f1f289cd64a57b3aafa";
+ sha512 = "027cb71a76bfb08e54a3a92e2129244b7aaeb40ec0a809ff57666326e0e3e037b7c2b1d35c796e0d9fe415fb95483a6d7836f7f71b5e24e872b35fe31b809ded";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-AR/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/es-AR/firefox-72.0b4.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "f48d98ebd744d4915ffb6f0cfaec981b8177b0f74297224555bfbfa7390dbec29eae93f4dd3ba51bd84dbeb71a4c60519414f2a4c3d75b7c96b59610e30e5f9e";
+ sha512 = "bceca49673a5744247678cf939f9c78b04f120c075c94158375d363fadefd8965a52db9f9129fc5e3463c5e8a35055477ccba652e8a32ac5be63b90b43a8ba6c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-CL/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/es-CL/firefox-72.0b4.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "f593020ba37d0ce81a194772d1acc2f528ed826b009e034e17d3119e482b0df9e8dd518dd597687e566d30e2a736d89850e3cd2487d7c723e242a12f69962b45";
+ sha512 = "54172883b1878dcdd5e035fe41cc097e3d336c53d3a0b3452e07e1066be3386fe942892695d73f41423c9fd2927bac8c3cd8c9f8317e1c62489510d2779f10a2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-ES/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/es-ES/firefox-72.0b4.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "081641bedfa1f4831641aa0029f8ec34db6f4965f9aff2c5344b779387dd887c2cb371908778d6cef6ccaa0448c98513b300244dab30f36f68776506f840b43c";
+ sha512 = "ad698bcf55a8c938ac57c9681bba92fe9b52b09a2fc23d3dbfe34348878c2f7dac8722d6d1621cb7f0c32b4d8fbbe438fab67c5bc085ef34efb8c3b3f91b24d2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-MX/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/es-MX/firefox-72.0b4.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "fe58f3745c1b0009e065979cb6ca451f377d837b0a41062e0ab04d435cc935d931d6e8200521850ce3161aed6f9583a67df14d0cab5853e491b1a433909947d6";
+ sha512 = "6b913ce655f43d70ba794ed722e39bd64baa242dcda5a8e9841e072164c441a6776c257145f697123d06c11d0c22fadac8bc6fe83e79b658ab3c05bb9260a66e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/et/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/et/firefox-72.0b4.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "2d1bfa94424af6f6ae08e11c99e83749408e9be1ac7face25d392c0475df978666706fd694b76558d824d226a50fa5f1eb8da52fd4ff3a1bb615bc83986ecba0";
+ sha512 = "e6e30e3fbda582034abd3a654a1bec8135245e1ef97b75917d23d52ff85d97ef8d3a9d16f34c887ffe497ac6ceae6460f07a28e440b489d461d391ae6fcb5edd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/eu/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/eu/firefox-72.0b4.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "7a192de6d021fdbca6764906284b4490653705147c56b9709e83c7fc087916197c954ac1cc19cff3da78220d572492800ea5773d3e03cfac6ee75d5e6d8ae85b";
+ sha512 = "75e75402f548f38672cf1ea490095861f95312aa85446eb01bdc519ae1e6cf8f716020d235885a572c472ee25281b351e4b6f9473da1a95cb21b53bcf364c903";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fa/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/fa/firefox-72.0b4.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "427af8a45ae42e31ced616daf2d5e418e745bf43f87dd4858c983746dda1d52e1b909db542e9822c39019b13d1b47196c7041040f8c56e9f0712d7fbfba8b935";
+ sha512 = "f7331d511797a1e500420b9f7749f57570fa2eea2f68c9c0afc59165c0f6a257fc5920483cdc7a1f591fadd93c04878ebe04698b7491881907d9dc61d598e926";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ff/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ff/firefox-72.0b4.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "8a0627bff20eec56a7fbf6be6131bc004c12fd3033ceebe365a1367dccaf773c7c4f8592ee9a313a01943ec962ec010932d3f0fea7a94576372bb8fb735c90bc";
+ sha512 = "361c9e1e1c59b876499409b8ff1de96b1db67a0b28acebe88e212e32d9a4bf8b12bf0a9713e7cc443eb9d1010a633b6f973e029f261d12eda6b31ac2abc98227";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fi/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/fi/firefox-72.0b4.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "b86da9c7cfb2edab970d91b098c5ae3da60f83a9b772033d8a8a0a4db27afe62f5db600a17a883561733f1939bb95342273b4c5c7e004870c4eabb08648b822c";
+ sha512 = "cdeb40d6762725d0489f2118e2e14e278794f57ec1fd4c5121b291b56a260e0c853b81824a611fd4dc2bacfe60a909f9ec9c2fd983767e91dcecd5f34309c16f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fr/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/fr/firefox-72.0b4.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "54ad1fe9eaff331246817e2033adf54d5267e991ee016f96edc21b5c322a46103f72a5662df06da313a840aedd04f677340573e57b55a9a1fa611af3ead97e0b";
+ sha512 = "c812114b2f3ca5306acd33d643edaa482d3c706851bd1a58dcb2487dd5a3ba7ee437415f2aaed99e47962d3b66b6c566c3d7489869d9c10cd5ce1eb30d35fcbb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fy-NL/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/fy-NL/firefox-72.0b4.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "c13363513a633def5c2fdfcdd0327b201f5d6d04d0dcd698f614799ac88424d19612eacfc6325b11808617a3cdc3f92e5903d84cdd56fa68212cb1b2babb9a03";
+ sha512 = "2d02c41fe7f3dcc195e08a52874380996a49e5767cfe78ee19269a8c3bca57f75bb256e4dc7a24b008d25ff698cbe522bb2db665b3ada33f89fc2738540b7650";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ga-IE/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ga-IE/firefox-72.0b4.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "23644670ee388362801cc4ca62fc6bf370d479821e0811ab493405ff3c8fce538ece89184c9d4f020c8a5089d3f7addd1d4fe298b55199dfe12f73408a988314";
+ sha512 = "cd234d2f8498fa191b68bd61348cbaae5e6785a2cdca4529f8eee10f19869ee6dd62d08dbb90512a6761c3b812d09581b43154d4a66037abd5460d989607e3ec";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gd/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/gd/firefox-72.0b4.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "967d24fee05d35aaf27be6ebbd3d31112126ee04bb750d3f17a2bd6a1abeab5ec7ee43235a26de5f19e5979c6d295e74ffec9f1bbf6fa32564f50986487b0455";
+ sha512 = "4999fea1af785cbccaecc63efc3e87e9b3a08afeb243d79175241a84da57c86f57c2a24b5ac097ba960f780fb90b65011c950a620d46100ca57b92f346570012";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gl/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/gl/firefox-72.0b4.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "9976dfcfbf3d93df9c06a4328bc73ed5e1a3b922a8a616cd3c298d5955964ffda4e4fb96e85a23cb9c950602959e11d86f3d58840d475e5c6f5232992da13184";
+ sha512 = "e5d1080fcac102f98148b6477192eed748318147ef2bdad81941872d81343ab04516d3c39db00fdf34950936389a4b02f4367ca33fbb23913a09c59a547f37da";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gn/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/gn/firefox-72.0b4.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "155eee867cf421717c5c6720c2926318dfd7e3900bd42bbadf6947d291c3afa7b6d81610d53052700f32338e9fd4dd66ffc240ceabd5e6c6b6a3d5a18462b923";
+ sha512 = "13a72b84a30ef450ac12a3a1b42b9f8702ad560b251541aa2d3515a4c8aa06a8e3c942d3380e692783e8c8f0b4e0f6a4a25e57c87321953f42bbdf451fa58757";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gu-IN/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/gu-IN/firefox-72.0b4.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "82c58161e908a2dcbd10f8192aa9c89e220a5ef250d5b5037f483a415105946fad0527b0bb6ef3ea78b6b6a785064f116e17bcac7b2f45a1f0676e689f030677";
+ sha512 = "1e930682bea71326a73c7523eea8e7dc3d50c15899232660d8df17aaaedeca09aae6ec780ededc36d5f4c15d271297d2c6b6095821b20b5ddafe41cede0d42a2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/he/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/he/firefox-72.0b4.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "c6f8f8c144d6acdbf65a733627a7b977ae0b1aea7020356ad8e8e3d1cecc568c015d5e3a523df00bc94262b1ba7460f22de6d06421119407914c3e3856b91736";
+ sha512 = "c6ad6aa8108dc7eeb85dbf5ebeef93db16306ae96a1f5d8c2ec1f6a895e20f9c1fa8b7ebaa0c12c0b95e4ccb5f00939c2495a4adcfac642b0071b3c81748acdd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hi-IN/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/hi-IN/firefox-72.0b4.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "3ab7baf8b0609aa76cc3e72daa5bb0aab1feb6e4957ab032cb0011b575ac4f5f41689466a6ea10717c14065c463c6469967848a22a76bf9e03e53e9b3aaef6b9";
+ sha512 = "ca8a2b3cca71cd56ba469dd9465e779566fac77537803b6273ffdeec7c5b968fbc14e79f2c75cc7dfe809bac57c1fa8d52bc6408bd070d8409c7b575ab2147ba";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hr/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/hr/firefox-72.0b4.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "50be7cb19abc57bb3d3810bed8786c1ba8f4aa3f4c2d4d6ec6347b1cd263c724c6f138d2f95e579010c3dd893b432dfac169f964e78585601211de2b4144c02d";
+ sha512 = "c7ef8b4d58d5cfbb0d3ed1d76371c8dfc2cdcca35f701cf8cc72d3452d09da9aa673f85d27c54c63d856d6ed1381b7e2ee8b7b493d2de954489d5aacd9976ab6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hsb/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/hsb/firefox-72.0b4.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "cdbf552caa9d85ca5cd2501a98c7270eefbc4ad31db3cfc8399dc5e2d7dd7344feb71b1fd7bc6023e74dd10963668f004c4c7a74f518cc849539d9f780081c52";
+ sha512 = "ff3c870f4f520ca28ed55cbe2b27fea748c6c72c44e949cf5c4130c783b4c63a4bcfacd66a03cb245bc999239e14332eac58b4f6693a20f975a1d3883b1a0590";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hu/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/hu/firefox-72.0b4.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "731cbc3fa44e815fb9e437f863eb218accd37a009e136a653947a5571440dd839f025b724c160ef3076f87285f51503a1a9020f470076a71dd246caed8f66237";
+ sha512 = "42c643c90d1dc81564bbd9cba8968085ab3672e442b9ed2c479aa2c1ce05c13abef81e2010acf95b9a9061dd0d7fae1cd2eea1be3fb5b71e6b219d04b508f95e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hy-AM/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/hy-AM/firefox-72.0b4.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "0be8245de7830aec18132d8a36d9eb48528070b09d87cfcd8dff78b0d26d79dbd2cecd94bf5088158253849c2690201e38766cf85719126d232932384c7dbff0";
+ sha512 = "821dcea6cadc785196d0575edc9d5959237eded2593d87be7228aa90acf1c606e186a7c3d2839d0fb637cd4a456e5b79e7d7276adb6fb85c0d436af5af6269b8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ia/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ia/firefox-72.0b4.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "09fea9073150d0b6464d0769317c94d397eefcbd1577b73bee9601fe3babe12b7533730383a56629c2470e39628f11f0d0fef36a41f3212865b2643ca2f00add";
+ sha512 = "5245ef106cc45f351dec5060d1e9a300917cf71dd128761b6e27da9e807bd309bdf271afb6ddf249677cc223557a98a4611ab3679c78c00e65eb212fbf77c04b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/id/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/id/firefox-72.0b4.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "94b0340e3cd930ba39520ad28198a108bff9ffe40e8e1de77bc783bcd211d7cb5017b2c894d212a7a024ceb69c681f76bf513a38a3cd40aa6f846afcff32b3a4";
+ sha512 = "a18d6d9122373d914beba1d3b15281e09989752ad123356bb74f8a93458873ec3516b476f9d46af2931e90f06202730c4cb38a4e042b19fcaee1a7af0a7bd3ad";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/is/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/is/firefox-72.0b4.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "68fb812f36082a9bcc41416a0ddc704c69ecd0e5d958d16c1171c7be27097342a57980692b1000fd13c1de893404fab0d150ce675e0bc4efa96e06748d392754";
+ sha512 = "bccbd4588ed806b3ec02b8c872f82925629139a0513d46a6dd06b6b9f3818c98084a3a3bd99cd1ce987e7abdb249aeebbabc54ea1531d33e80bf945aa8666558";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/it/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/it/firefox-72.0b4.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "e02f944ca83b869785b92a40a5e13f088275cffe26084f85f5d866ce5f9b0d0234e7a9fb5907e4f97663fb00091005ca73142d14f99465c3a8b1888aaa5784de";
+ sha512 = "e90424148507f0623b8830e45e1d6e532c3886b2e5f6b75a945265b922e8d7df94a84b691ebca2d5b533cef2eee3c627e762df3cc83750e3f5b1e5c6562fadd4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ja/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ja/firefox-72.0b4.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "83611da83e6cf95dbbb3dea3586ac3fc5ab9e770a75a55e3868543c9f43fe481f5e6775dd45eb1cbeda06bb60619fe7867af64c7c8c2efc862e7f23fdd0d0ac1";
+ sha512 = "8e4e99b2108826897ab62265d9979afa72ffd4db52cbd313376572f75bb4379b972aa4aadb26084f9f0ca0eff38f6e03d3b8caaa5c28c8dc602050c13eb57c3f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ka/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ka/firefox-72.0b4.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "94683999f9bf4ccb13dcce3f993291e5568a3a4f107bccae6f8b95a2d05c8e68a62e9d24ba9c60264c17a027f1848e82cce6fd143994e69e2000688bc61df543";
+ sha512 = "a07a19cfa9a854b65842e869600033000eccd9cc989bbd74c1eb816ed53b02df0b66b48b16ea9e912ff6714865855ae910f30913d331854db891c4fbb27cb91e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kab/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/kab/firefox-72.0b4.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "fd1bdb8ff2df2e8c18ab7d13b1e07b128291b410607571426dce5054e8e6b221eadedce560c5e16d65ca2917910df02f74d6573323f7a26375f1ffcba080f22e";
+ sha512 = "be1a256ac3d4731697dddae8fcdc81523ff098f4c2ad06745d64b0a010bb83a2a9e952796edbf96da8b853694c345835ae41c87de4277944d95cde05b0e57efa";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kk/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/kk/firefox-72.0b4.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "3c53e12ccf2698778d579c09a26a522a038c4510d7af8fc9accbdbcb2c9013e12e243b88c03e7075ea76258abf2d234fe0ff7a06538f6d8e0f363ca3887617ed";
+ sha512 = "4ea0605b2bd0669171639217347b8ae60c22166d21638be4a4a4e1db37b43c7c350607846e6d89b90f171d05248c8aaa75d417263165cb993ab0ce93252b99a7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/km/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/km/firefox-72.0b4.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "2d3bab56eed0ef36ee41b11071dc2ee0407c675421fb23fe095ac81ecc492813bac115d03b3e832c33b03fb2df89b37a6153a388b44e540d48af93234cd41888";
+ sha512 = "613c836baff82172a72aaaa194478fc5b116593d9fbe4fe63811bad5fb64710d96468a91d7c0d73d72a3af11e2254303fdb8db7ae1931a39841da7caf7e22229";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kn/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/kn/firefox-72.0b4.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "b4dbb60f0aeaa203483a8c7c79afa9a9e8214b032507c0754b4320eabc40a39fc0a242709779faa38affc2e570dbfd70e1843d712c361ed9a3c52dca17b72eb9";
+ sha512 = "dd19beb8ae0422d0a54cd1f5f627119bbd13abb1cb723e490a1306f609bd9ac7cc8a6bef1b72e7d299ad5270472bffff4dcfccc7ef8a33137c8ab17d67cbbed4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ko/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ko/firefox-72.0b4.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "9c3e9876dc6363282cb302a65c3cf82bb14fb022e3f125fdad2e554d70501ef2b275826c4dcf064119463ceb93e6f0b8dab8c273364d1331d6ba5244eb0119c0";
+ sha512 = "e9180e11b37d361f7dfa8e6bf8a907d58f2424373922b65f06638060578d3871076a69f326d96590850b1f4bdbcd260bf9bc3e3b5748895e86ae953c8f529818";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lij/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/lij/firefox-72.0b4.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "689c0b271e7efd6c45de879d573cd5fed31d1ee2445849ac3442559f11d33a500fe70e861b54b288cb84ed42434071f9da79db2c1c8f7460ebd53445079439ae";
+ sha512 = "c14c338e9ac17b0200c00b40e8c45743baa5c279107aab0d2ab5f45330d2b7a513444f126dab999421b704790be00e2cdb4783236c41091b2f8e1973e2ff4be8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lt/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/lt/firefox-72.0b4.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "92ba0cf69d128848f2fc4dd86171ed7e4eb56c6dcf868d3918c7fbf41bb76305839f410567bb1ee7bf4ff114b858127dfb0320f2672560cb38141c88b601070e";
+ sha512 = "aab19d2dd90576b91a154106674fee1e05d46d331810a33d28205048c0c67451dc3fc30ea70d2233e6139c7968ed0d535490538556a288d5c331ec88bfa0a90b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lv/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/lv/firefox-72.0b4.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "54587e5040c387431e94b4739a9e34020d7dce1777195122d513175b71ecdb44663c416fa648ed648cbf4f6279b7fcecbf819f6fc3a61155698f0dcff5f42212";
+ sha512 = "d2fca320d8aec84cc718cd40b24a7cd18ac23e98619b69666c330e84fe8078be522deb58b2575d2eda1d823aa413ccfdfb68a4ab83fc99f9b74054b887f81fe8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/mk/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/mk/firefox-72.0b4.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "b7943903f7bd3783e5c3776d35125b19ed88e87f6449f25a5b26dead87407d0180cb21b67c89971d3e975d454098d22706c74a33d21c2888a90a0af9ef7b601a";
+ sha512 = "4079ef459d6f1164023afc07b4736a186f45af41ea9e76783832f1d8431b9de7a4dd8a425b4c203669417fdaff1fc6bd88d65d3f6b9aba5d0d0394f707321746";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/mr/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/mr/firefox-72.0b4.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "07e742844231a1dc7a09a268501934c63caaa482ed7117d1a498c66b6f5c1d559e3b0d59cac06b9c3d358add59a13912af1dd11a6c2cf72d5cca97b68ecd1c32";
+ sha512 = "3c4929d49fbd0d20c6cc03e5c2d3935ba291c99bd955ff56e10fe75ed872082754bd27cd9a8d6c92a7ce3c180302465ab6e6d77f1b230b208ebfc53083e78064";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ms/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ms/firefox-72.0b4.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "c649789abaac00c55ed415bdbd9c28185c56795754324517f5044cd753aedc004482501537c67c42afa616ddb5890a4ec992379fa30a28b8a492a0e559a73f95";
+ sha512 = "fbe861070bd7ef6d2a00bd6ebe8bfce566d4d771a0882f932ec1705bdf06eddd571eec1681b4cd70b204aac5559cbecd89b3cca5e6dcbbbc0cd1d0ffba51d51a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/my/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/my/firefox-72.0b4.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "06049a7770f621a9a72b5e563b485b81caad533410db23558679100f7a422fa1cf2a85233cc1bfd5d5b9c1705f8299544b4cbb4f52de3c73cf33bbe64cf845bd";
+ sha512 = "6c7223ec1b5f02bbf47fbe2649d954f3603795b137ef23e7b89a6b43851bb6ea020c5760c3e78c15188e0a2a794c44936f208aa13a64133d0275fc45a19cbf5a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nb-NO/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/nb-NO/firefox-72.0b4.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "5f80bdb4a310d46cf5b3b36567964f444c75c92e19b5ae5cab81847b2b601f04ee3d43a2325b8bd6d7ed3422f146e90612785b25f982bbf95a86057344ae35dd";
+ sha512 = "bfab99dec528554cd87d1fe6c1be92697c1505c8e0925dcc4cbca3b010c55c0790e9aa4d189c99e2f92ca4e1dff446fc3be1e5409ed1ca91b315c798a9aa8f0a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ne-NP/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ne-NP/firefox-72.0b4.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "f35496c71aa7efbab365e80050ef218fd4bad1e8c015bb97df65aa0e4f16613b531d40bbcf4739aa462077026259ea6f1d7ac71b10e51e04e75d120dcbab3ca1";
+ sha512 = "9b8916623c93b78855c13d1d6b1fcd65935a23d43b5477bc385f2afefa2bac083b581b7eb8595359be907315083e1744f3f338b7f058a8a291a8925d83021cff";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nl/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/nl/firefox-72.0b4.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "21327076b9196d799a40d28f1fea66f59944bbb0757fde66aba2b0f8b929a0d45a01bb0901c4b6eff4e0e5f7f033a44d2dac83c94494b7f95003c3dd620f1ce4";
+ sha512 = "c4150d0649385264413f61825c29cc187eab2b91b6522f03108eaf73b0fbc197d1004e422e759dab34d3780630de531e265eafa5b3ffcdd6c601909c9a9dcf5c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nn-NO/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/nn-NO/firefox-72.0b4.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "dc444e5546d1985d0ee4bbe2394e9e51131b46b9e41dae54c1402a9b08aa7de4a7d73fb57bd677af151420e71073ac398d28f4ae324b4e6e3028f01fdb98bd76";
+ sha512 = "1eec2afb9d67c6d6ffff3d94585b05fe96ffd011b99912ab20b4dc4bc0a7a4336080a03f58ddb48cca8575c94f7e312a6da620cc25c75222941d8503c3a5934f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/oc/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/oc/firefox-72.0b4.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "0c0fbf38f078c0fc4ae38112611f164808c7b9fbc4e3ef7d57e622e918f5c581915095d5bf7c92cc0ef9beb67cb04ba9b1ae1e011b7c8f91f23a79a326481931";
+ sha512 = "c5cd7d444c3ed35a49cc66553eee0187c97e867d2917bba2b490fea3272374d48ac235b313a8e9e7583a6e20c1f4430562ab7b428aa8a9e1aa280b0a357ba470";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pa-IN/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/pa-IN/firefox-72.0b4.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "b9f07313118ddfd5147866045e047f9ae7cefa0116d86aaf7f5dbaa2a64bf14f7a56bb748e115945d04aeb1dc4572d54b3d122c1e775062ee1de366c710726d8";
+ sha512 = "fec801cf39e9d00a06e7147469f886cc6014498b13b6c010e3ba73c09ba95dd142f262dcc0aa84fff9ff462e2b0a7823957f41248545cdbff6e56e085cc21afd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pl/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/pl/firefox-72.0b4.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "bd1e920304e1bb7bf6cf198c5537f1b106b1484b7ecf683e1424d208b736d2a3ab40c7e885a385611ba6f033a2ae4fb00cf6113810a20dd8808a34ceb11c7b38";
+ sha512 = "abaeeda6ea0c61a7fb325362dec9fc1639a272b144e0f5a534aa41bb56add7a33c1baf2b339945f1fdcd469a1727e1fc4d0ff954d9920a460081b41519f43ac1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pt-BR/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/pt-BR/firefox-72.0b4.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "e1bb5ca89ea0b60cb2997b9dba3fdb25e90914899f38a51d4506cb9bbd3d61f33d32ec3a9d2d79857d339f107134a021e0253b6a54916b48b6aaa5ef4aa08638";
+ sha512 = "d07b9827b4f570307361df5e04662b8325047432e8016b810b0898b71535356c472e937e5d3fdfd58001b68b10eb1d9dcca42113c759522dda8925f468571f81";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pt-PT/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/pt-PT/firefox-72.0b4.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "622bab9fe052fcfcdeb4d12b6b8773ed08e14dcf51fdecad24a638811a2f25c1a1efa13d7aa45dcdf06726eb366ee78c4abc7d22016303a9048df9af314c14bf";
+ sha512 = "787565d44ae9a44c09e0a342d53b395466cd4bb82939cb6f0d1177659441c24402a7837b92e9a1036b18faf91714925274ebb3a5062bd4e7895099ff1ed65b26";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/rm/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/rm/firefox-72.0b4.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "b02769fd926eebc180eab8f3ab9aab7d2a8d78d81f51116ef156865c74b60ac76ec75656455557dcfda2323c3dbbb438f8979de64309851f5b77c01175fc4b24";
+ sha512 = "5bc7abf66de4bc4f98b020141dacf4bf1949549f3967211f2542a5148535994fba4df11d054a1439f4b80e04ac180fc6b88e5fad634838dc27447d6a9de7ba62";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ro/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ro/firefox-72.0b4.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "572204e2a2a6d7535ce36ba9479f1fd634069a1fd9799eac6a3e5dcf02133859f4574ab7dc36018be88e53ab5a8bafb561e5994d013c0b9da7c9ea467183bb81";
+ sha512 = "20ffba73c479aee7e2413ee1eb10aa37adae41ad26c0cb2747242366847c5771a707c008d7163f9ca11fc32626f67b468168ef746cfca8ac0c7ad801f9751a69";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ru/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ru/firefox-72.0b4.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "42a99586fa8d07827a597c83fdfc746beea7504e800037efe0e82b65868dcb0e1ba6dd2aa401dbe64a30879d521215d180bb39906ad332d9e362405036da48ef";
+ sha512 = "bdef494dd866170c693f13f715a7b931069bf8b025ad729ad898354ea168289ff7947707310eacbd8a4059b59faedac3bab845116b6e6af8bb1af22f36bee17d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/si/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/si/firefox-72.0b4.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "288b629c23e7bd61b64b3f5947a93753ca780906b537d1f97892424c7ea9f890008370f5ce44e74062196558e9a088856236c98031996f5d9b40b454827fb1cd";
+ sha512 = "51cb393536e620c83c725736d1f4cc6744a10453dd430163dd6826566694a728aa3ec7bc15b5ce92c01b1a09b451d8fd4750c4a838e0c0993476e0dc0b8c064d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sk/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/sk/firefox-72.0b4.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "47b295382b39a040171ad46268da5005173a1206a3ea26c7dd8138d287ded24740f031456dccd2fdd72266691aa2d893ffc93211ebff2759666a643e3e448915";
+ sha512 = "c39f1527d1238f78c24e1b1c2ade7808f70be6ffbceac3367bd252ef5f333273c8b35bb9ff5434cbf2191fe26c80f63c141900a9292ebabb6a51d9bd70b8acf3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sl/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/sl/firefox-72.0b4.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "fec91027bc619c7a6d0092db4493e40ab31311191117e1cbb39bac33450c9f8705356405b6ee38b52201ba39e4da8141505759f891c7e6ae3d8d22f9ae29a629";
+ sha512 = "67ec9894f56de39ca324325add1ac92423611d1d158353cc1c90050275e792706b0cdd3ed1a911870c431f96e73bac15d8a2a542af2271ad2d17a445b3f51ed9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/son/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/son/firefox-72.0b4.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "8a1eff23ddf4391e77947519a5178724ba9393370669bc05764b971bdd930ca8ef9ede4cb0ba60c50daa2214d4212c6159f7379e16ec9a5c538ad8d7d39f0ff4";
+ sha512 = "41af46b52cee6d283a1908987366950584720322401884c9b10cb24bf3a1f897ffdc8805a63e42aa084600c638b31f985cff3e9ebb504f66573b757690d00254";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sq/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/sq/firefox-72.0b4.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "3811b809979c87996b8db041cef14b7987331067dffcedcedebf36b9b9569c70088a38a624361b25ea5dde2af6005fbbe5add558cde41d5cfed7687a2bd96847";
+ sha512 = "8b8dfe1b1370c7d20981688d069df16d1e04cd215cf183955ee41b6428de75f58479db8aab0313f80a108b3591997dfa9120632a7e11edf6df2a970eea18d03f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sr/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/sr/firefox-72.0b4.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "fbbc294a2f387e6ac44e4edc1a9b9a384d3677abdb6717e550f774d731037d0a7ce8036f25229efbacff75423e9a185423d2a39ac951c77ae62653097bc9ce26";
+ sha512 = "a85fa87b55516c137433b5f9f196e2148a273f5dc1d6a76eb4f4d43fe9a868e13e0fb9c53b0b6ddc601552f7cc82450dd972b1da0be80ec196f9f0b9e1049329";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sv-SE/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/sv-SE/firefox-72.0b4.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "0fbe4d264e97ce88bda435f7c8da09e589407030945b51b68004b5df2c0994bbe294a87b7a18a2e03a8d1de05cccbe2f23ecc59dbd1945c28b80c75e0ba45c1c";
+ sha512 = "39c67d5532df355157fd6472a6a7be26fed7356afc02b1be41da402f7864d39966bdaa4cf2cab5e5970d40ae047a0d0ba1db2c3d683855808114a916a55b959e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ta/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ta/firefox-72.0b4.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "57b86a405d32d9ca991c995316d51fc6f9363dcdbba2d0d1d601f302afaf863911e035d30ad67751210b4e3c726b3734b62b63b7dab6cc2f69a172bd8c62493e";
+ sha512 = "2927aff859647cb79334b0d39d76e3a78aea8556ba976abe895412016cdb86119b65fc9ab63e4e89c9f69b0c50f5c3eb6cd700da38e1570e6cdab385c4eb0a52";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/te/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/te/firefox-72.0b4.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "54ac916b2352b545ac8f5a9ccea2cc1ea5b3e267dadec7bcb06c3db7406f4dc5f7479a0f2c3954e9e19d093fed849df50b45c51d69753626149757633039a4b5";
+ sha512 = "d0a33df588d51fa495234b7e2c443acfbbd2d21bb50616445b35cb7d7272774228cb1c7986ac1169527e691cb6b57009ee9ed06d9040546a57807bad3c06d229";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/th/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/th/firefox-72.0b4.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "95ea774a8266d51054e7af4db09503963641981c8db332c8119e61c3d6349234aae202cc3e9726449454440f10f8ead17e4d6c682f261410937f7355cb7668b6";
+ sha512 = "9aeb8046db34e354b4e52b56cbf3829aab909a8330012025b52e62fd4d73f2052057d4a0611a3aff96c5e8e67e547f1a266a1c35fb1b9384e8ac20ae32306cd2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/tr/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/tl/firefox-72.0b4.tar.bz2";
+ locale = "tl";
+ arch = "linux-x86_64";
+ sha512 = "07c9a44489ee171aa930d0cc5acb1ee6773af6226f57593ef62e85163c941dde3f10d2f3cb0debdeb6762ed91834f9fc3882b0ee971c7ea73f26e1d85a14444c";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/tr/firefox-72.0b4.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "44b70293b353fed9b8435de36178ef6ee3fea108ad4ee129a1631eb32714c06aa23d58064746cd62a0f407b1f0557da38bc749c3113f3ba1d1b5d049eaac126f";
+ sha512 = "3a77e7f1a51d2ba6c0d249f57c06332adbe50da384e46bbb88947ea5d6afd32b09758e47a9e658aff193bcbe73f5c4513e1cd15c0eedc2671bc9d49b4b910232";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/uk/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/trs/firefox-72.0b4.tar.bz2";
+ locale = "trs";
+ arch = "linux-x86_64";
+ sha512 = "0ee6aae966087407b48d74ad29a77d428cf3cbdaf17baf9972954a6a256d4ec029e3d8ce4bfae8908ac55bebbf99b4523e23d3b7fa40fcae25749eab6709db5c";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/uk/firefox-72.0b4.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "ec6beef8f0b068b7c301a4a1a0c769b66ed5af08414d5306549b9b077592b06a2eafc175ecb097b9ab5033dad15344e52588506685222c14f73411a5fb9faeba";
+ sha512 = "6f270bd929a336fcc519158fced67a62b6763bfc77a11ea53b60baac75bfa91c63127bcba6f2bef032a37d54fea4153d7121dce61adc0b1c183a4cd93e80da59";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ur/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/ur/firefox-72.0b4.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "d1efd485f869b6555672d80057dfecdf7775cd45bde0711ad90dcdac8ffab4b46bf04e9350a0aa7629d9939c953f434e75b6aa458cc835e6cd06efcc7fa1bccf";
+ sha512 = "02f2f5205aae0245833b48ff9241aa5130821633ee3f74be367b90536a85e33d41dafe9a585f531a550e0e795dafff74e3e0cae7050593de0d32489301559131";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/uz/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/uz/firefox-72.0b4.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "b7cae3888e2bc4a7b31a0b7313b7476799b16055f7af8e4016083da8a71f40f523f9963d79f53bd6a96c1bffe2fe2d34d62518bdbd9ad137fe17f4c175fd0f06";
+ sha512 = "642652955f0cd1882b213dcc62a3931c90043a98d711136743f73aef3f325e1c09683849267d774a070bc474dc3332c5d1fb1678c8616842085fcd895dfaeebd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/vi/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/vi/firefox-72.0b4.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "aa4aa778e35e72122fd857c736c226d62e5f6ec73f1075500728e90f9c2ddaf9c0e6033d1785b4102918a6db32a744617552769c29cedde655e9a3f0b173a4e3";
+ sha512 = "37d26761b42c676dda8f6007b95f2c598c9d340958b86474c9dd655415fbe41fd6d4dad9e7205aaf5039c7e5746a6c71bd5459e0660b1429977d99c881803d8b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/xh/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/xh/firefox-72.0b4.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "41619782aca727c09262de57a128fdc7936cd4b3ace84565cf687a006bd462a3218682c56693efbb233df221c66b2b545cd701b025d6b3a5308b132ff87b35a4";
+ sha512 = "35013aa94ca7b4bc02db1d6bd953d23f789576f29f3cc8ae10ab1ac11aa9db4c633e21d73d49221f2ada74569d3c732a02ef21b23eef3e977ee9f46e2b3fc90b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/zh-CN/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/zh-CN/firefox-72.0b4.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "befc922f6256bd8416758c4fcae972e939e645a752a97863ac0b432310605cbe46dea4c713d4ed86189a9f4094131fdbffec10b4d771b061335baeb180b75ea7";
+ sha512 = "150a697bd5a24edbabd999a1f4a538d1937caea035a9e50e55aec6b40a1c20bef94b5d8bfab368711af84b59f94604be0c8b74cb37d0248597a5f5c10092a81c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/zh-TW/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-x86_64/zh-TW/firefox-72.0b4.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "3bd89f88ca805e3b19edacb97efcbf50ffb2f4b3baf67c1d64d9c475922c6ca5ace13e07de292f95efc0f78bd1b0fe9e9e9198288c3d874263c7be6175291eb0";
+ sha512 = "003065b656337da643933c173d7bd8dbebd74cc203832206ca5d9bbb63d60a0b44b002d003951aa810458df19a74f45148cb81489e7f059a07c14082a9a61dca";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ach/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ach/firefox-72.0b4.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "800146462c9bdef3a5cc021995ec558ba02fa1b5310973286d1360327aaa9967430d1432775c44c21dfcde6b06d39f9b7b7568661734f70f1452e78071ee440b";
+ sha512 = "5b9ab917b51a25bb9b0f640c842f550e720f23a4afd1c6bcf089ad7d09453599df63e364d74f2caef63baffbd3ffcafdc9ec46dbf5da4f88100a8958eef0b763";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/af/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/af/firefox-72.0b4.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "61b65cbb84523e3cf98e59847d07ec5766b2db3d5fd27c4633add006d428aed40c77f100dd87ab222b29d95bfa4cd7e2f7fc8ebae2fb4712935f51546939dbac";
+ sha512 = "797dbaa4cb4dfb2f02b20215131efb4f24c4b6424e330c7f185f8f208e872ce8104325b6fc1e03bd86bc52b865072c75868c12e74cfe724f551ff3496eb1a1ba";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/an/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/an/firefox-72.0b4.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "f9808793e9657622de595b529fb6341c13ded793177413ff5f829712f7054f42c98de5a5e153deb3f8b8f3b3fc8e80fc3737e1dc5ec577731744bd0e992d7be0";
+ sha512 = "e1d9a378e0d7810483e9f9848ff6e765f5c10ea2c6305dbed31e4cca576c780dd3c51154352d2de047af820c9ddb6ab4b1209385ca25440415539a7ff1061bcc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ar/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ar/firefox-72.0b4.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "9ab1dbce20235787d945f3ea6ada45ba174dbb9169f206c2aabeaa2fae8bba6f4cf55577c1985f59f62d2a302d97ad2e3d7b7baa68682e4ecf3b8978410b45ec";
+ sha512 = "aab04ed5df3ab564b503f13b13021a32f4c93a80b3b3243b1402ed67ab1e5fbb7015895b57e25d07914e4b9394cab92aa6fc929f36c4b92d2c973d2b08a33f71";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ast/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ast/firefox-72.0b4.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "c5e4aedcdccddd1968564170d7f74deacec13e801bb19cb97ffeb7923924d66649b2bfcd0823d8e2b27b737bf5b0b558c57f931f1ff8b6928d2e2ad0c63d270c";
+ sha512 = "9eadf148b729adc3e3bd1f8d9624634a05d2f11207f16bef3023cc264720044ec08f6699e386e54692a95925a6a72749941ca7a3d5022e7b6341db7369ddb460";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/az/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/az/firefox-72.0b4.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "d67fba709c62bd06288bfe80bee2e08f370824420b52b07bd0e8c6dccc350770f0710e22ce55f9ac4bf989aea74cc3db1ee026baa7fde967fdf14f8dd9694702";
+ sha512 = "4b172bbf812bce8efc001bcd113fc2314225c4ed3661f907e40bc4dafc39b7c15b6909e3b1e406cebbb7d5b0b353d8398a9a177c6f1c39e893612d9e8512b918";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/be/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/be/firefox-72.0b4.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "9fcf25f380bad5cea7c8fcceecd0734239bcf10d3081a22a24899103c96a388596135676a0769a8c2cdcce0ae7abc67e8a0b65621725de4201919d250bc28f02";
+ sha512 = "ca921d8abdd24d7eb85e3cf32984db6009d74d402d0b0f48557afc42037700a47ec40855ba5b4aa85c3a79b4437b5235ceee3889411325276c8ade11adf788ea";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bg/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/bg/firefox-72.0b4.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "a7a5818af9299a4b63098c102019134dcd74001a92a2d672d2c3c9e8dad6a58c28fdfd14ab10b96262ce34fca4947905f100a5d89df0e106df3c8b9a0a1796b1";
+ sha512 = "acd98884f4299bb95ef3dc46331a0257a83e80094b4e6ccd9ed1f82fc7c2b11e3915cee83af7cd38d73d7dc3383d1b9b241f82a075a106b58d9beca7103fca12";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bn/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/bn/firefox-72.0b4.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha512 = "60de18a8524a67dfb90ee9d272ec06e70b4393b3ed76acc7c86a545af561b323710add4a4d8a896982dd8bb48bf3e32496fe800abf50fed509d91f0e54a8d04a";
+ sha512 = "598c5269ef854f0121cfc425df329fd7a97c1bceffd3ca8f68d9b1dabd653a74621a410b7ba6490efb5881b9074889fa11d55552933b3a58d467d920cc09067d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/br/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/br/firefox-72.0b4.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "61cca84ee862455860c3889480852df1ea62dfd9ef18209ca24fde83b3971ed7788811b4c6ad57a19d32525fa67ac82ece938700682385a4b99587959bc2af9b";
+ sha512 = "b2c2d3a51286daf2ce41e076c79c466aaf631cf3aa51a6d824260a228e4b160f7366ddfdca75c87e7f4502be8306a985fa23a5d7e923767514e127ccb76cf9ff";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bs/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/bs/firefox-72.0b4.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "45fa72a908bd24e6e8f35fbb1337b394850eeabc7d52252007a93f1f2993d4e43fadd3254a41664ecd76da29ed3b72dbebd95bf0735c71f07d9d19f3e3f723b9";
+ sha512 = "5b972334c648b9b90add5f92b96d3385a677b56722c0b7340299fb81a5ce16169de3339407d2327b4f440df2c137e486fa73307fbe8e595fae47a64ce4bce59e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ca/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ca-valencia/firefox-72.0b4.tar.bz2";
+ locale = "ca-valencia";
+ arch = "linux-i686";
+ sha512 = "7e038cef24ae848c304286a9c59cfaa70ac300720cc03decb8253b1986606419171217fcd117ba5f9e201a198ba0685e34f9edb88584559b1879badcc642534d";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ca/firefox-72.0b4.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "53f9de3f0720b489cb7ae59c2dd2b7c0cbc6bb7306e802253562fb508ce0ff1415cf5b76c0a3eb085e592562cc1d39817009ba1e668e4c68f4ee0c8b5947cfa0";
+ sha512 = "e2a880226f67636a0c60409e48e48c858d9fd4c539df91005009598b92da1310302f3d6f097f475385904a354754e5128d4049dd369eb0ebc49f4269860f0e05";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cak/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/cak/firefox-72.0b4.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "ccac21ab9baea681bb170309fa3c1e7762aa731e49b831a4a45bb5a1477bf2582e1ea9ec78c8c63838589fbfe74b3f8e31653caf7c13355cc92de959b0d6820d";
+ sha512 = "5cdd469ab037f891bc09b42bc53f62eb46183a4865d060388d73f386d4f57702123400ff1ec3a831b98e98b6d67cdfd3ad021e336c54fdc531f414bd23658f57";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cs/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/cs/firefox-72.0b4.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "ac08d633f909edb3663d7e7cf5a27c1226d91a244786f941fc4fe771a7d5104183fa43782b8d838bbb50ee9342be081e28467b4dfaaae1c4b2a39233d5a9e31d";
+ sha512 = "a36ad27e7288448dcb3b36080cd2b92652c8d579f551a903a92ecc55cd82b0a1d33d6549cf183c95a0e6f3aeb567c378d2900243839ff703341f81ea1abe51cd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cy/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/cy/firefox-72.0b4.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "176f3b9699e0b2b8c7f108add3a07b90664e7eb5170c9669cb5b67f2b0a6c0b2a6c47cfb2e34494467aa865f12c12c525fc967761878b92e067baff2d6e625ae";
+ sha512 = "eb869584c63ba72e24ac53b0c3bfa972ca80eada99b88454a2311ed9583cf90af9e2744f15486d68741a3912cc8cf4208b4b93b445362aedae58606f7e6725ba";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/da/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/da/firefox-72.0b4.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "29b8ccdfd4f202f418ce2005e5edff4f69d3c3c337ee78069ee9c13b9fd3e90d29b28ad2801d8133119ae3048b6a09ac8105dc4fbaf1dd8f267fd15bb9ed31a5";
+ sha512 = "7fb996c0ffd07e5a9e1f76754dea4c4f18e93299a036bea2293609d06da5b2902fe40513c386f41612c5b2878fd24ab41c7e73d568364dbd3ec9fb57f55f7a9d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/de/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/de/firefox-72.0b4.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "c041f802e2c5d57f013f018e192f2c62271ee15f53a7bdc9adbb447f5b3319e4da0c9743b0cf8ce4dfb03e94d0b81e0f8256b749c4eb3ea3a3b9833bbee28db2";
+ sha512 = "d80152df53b9f43cdd85639c3d7c2dbb2f35262e737d4893ead4d526f1259e2971011f75b58e415901734de41ae72244085f7cf57ba2f17b9dbf7b64db2c5be8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/dsb/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/dsb/firefox-72.0b4.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "a6ed5dba712d1c5512f5e0e1caad7f0b0f7e2ccacd891bad54aee79cb749bb79610a46ebc75bb662352bb8419d8e0f047c0b0f8214f11edf8153708040188b5b";
+ sha512 = "cfd2384c1b1ff24d9976efab37c2492bf70ab8ce86b873497e91378bcfcdc09e9a6ac1b8f3993adca57f86ce697a9a5869708114c7ad5b58531093eabe991255";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/el/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/el/firefox-72.0b4.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "987c29ca1d3b65bef9b5464b2d2c945cb66a6be671ce09b421218c3fbc6aeea0de6e5f7c2105943ca41b7f56d7aea25f8bdf4289eeff4618a92cf45c4234ed05";
+ sha512 = "fbfbf0acca8c0d27b11572b2744b70ef22143dcc1788fbfa864052ab66fc68c2d9bb3a7cd774b54cc0f41324e6335cea3f9c259f6bcfbe4b9bf2925b17b54320";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-CA/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/en-CA/firefox-72.0b4.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "7e85aee04f790b6efe29ca592c38cd2962636d7b8b5901e1779fe371b7a8546f700fab25ae5a53d170afe67c3ac64345954b358965010e65fe1a63ef803dcfd2";
+ sha512 = "1388f7b672da7ea79a01b15f3d356aa7120be45a9c473e996a7d4caee4f0879e9ca702c1da6cd55447076d7ef4e2aa46f1038170a2f9433fd533166fe80e14d6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-GB/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/en-GB/firefox-72.0b4.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "a16b6b40a0c52c53b28113e5bc681b56846664899e5876d47b873816a8ee7cd309a1e49057b0bffbd923e5faa354f1f8ae4e01172ffb24062d7451fe361e8941";
+ sha512 = "4e0ee5b0689771d715e4a381e72a79ef8a3457560500f06101c7d9f0563c81913778743877f63c37c4c74314248fb88585c503dc57b893f78c09277c39eb0c4c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-US/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/en-US/firefox-72.0b4.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "de2716443b6dc3757fe58d42ef4fc526c1218601650ba7ccb0b0a9f77b7acb04a4e4af2c79b7587ab8d8e3515ca6602b563fb54ac5e102ca30952c39843c7d31";
+ sha512 = "f054b7ea2361c3eb933405362fce21e311b77d121a80bb24ea09f41d47231582715f3cb160182161fa63b5028163bd5cd35bab5fc2cca8729c5aee15d2aab981";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/eo/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/eo/firefox-72.0b4.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "bb0b25735ec9bc607661fed392c0dc841185f84b06410dc0c2b7a05245d62cdc4978285246d2b281b08507ae2de2b4fe561dc115d838a10e581e484cc12dffd0";
+ sha512 = "6c84e22823ae465c5346f29b8729e36dee1d3846affa60be87ae2b479f114ca1e911a2bf2d6ffcecb2a8097d3e4689810c5afea27b419b0f0dd1ca830a83f79f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-AR/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/es-AR/firefox-72.0b4.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "6161b532fb8412151cb007fe0fa679ff0f195206d71b4a07f8b312a28c0fa0041f32e960fc6f88f3c88e54a850a24d00dc370e8a3a16fcc5b420c0a9cfe2e674";
+ sha512 = "65e37a5cc802e4677344f4b2ecd2451cf55656d3bcbf7d155ea7e404090c5c2375d68ef5c13e30817bbe56c2d4a9de6c1d82db2b1533ce4861295bcc39451585";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-CL/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/es-CL/firefox-72.0b4.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "490f550d9091a70a9a693acd80f24cd644188a3ed0199781c5c04583ae2a66b623df8a5d1a5d3b1c7617a214aef09f99d306577db5bca1034ed1afdea8d909d8";
+ sha512 = "cab5c05b8711973844b7deaff638abb9d52aa3fe1e533d318d0f48b2ca77434e6e7295531087f9def4bb25babd21c6fb2b94fcb4ca586f6cb5a37851c31559c7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-ES/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/es-ES/firefox-72.0b4.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "cb648224649c1f5a22c7b5eef4a4b4cb7381a76009cc1a4b0f2db7f1ca850f21ce3f5f4effe9e114f2ab55a0ca4a3f0180b5e7610cd895cbf1d8eff24a77ea82";
+ sha512 = "eb8b9e1a261a2bb89faa4225bfb2edc5d28b2268030adfc7d9ca67a8ddc27b850a99907e6cefb522a92ad399d3faf177a17ce10453f2d0a01aaf647d13c32641";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-MX/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/es-MX/firefox-72.0b4.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "bb5c9f06d2b17507f9036192558029a6068bc4b62c1403e228284722fd1011ca002b5b7669320c3613fb8362433a13a05960945c56721a220fd8e45e2908367c";
+ sha512 = "d2d3505d8860032e396bda2ae1039987d8567b90c2a79e2614a47e97fcbcf3715078f1de078e43231100dd567b85023f36f269ea97a0badebc1418f70812a437";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/et/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/et/firefox-72.0b4.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "642e8fb33bbffe1dbfec0caee8299051678c930b5b8382b7dbb27a139aa01edc737566b3b88444425296f29bedb30acf7e1e4bc39aabe37a4705271b0ddfa2e6";
+ sha512 = "288608642ba84b0247db4ea2772645975f1257a79df51c979fbafa07afc554d76432afbfaa77104dd9a25f0d418b4bc5a69c1660b76debe58b18fa68297e5490";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/eu/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/eu/firefox-72.0b4.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "b6856d8c07830809434528ade2e85da9577562e69e6753e0a3ba96e9e015642b77ee5cd913b017fe7ea96cd1eb985d8eed013c38e61078f37e155baf7d115711";
+ sha512 = "cef1f54aeb82de57be4c3cd96153d4535c64722d26084919237e67957bc140b66d1ae014129d8e4ebb28d37f0c322b59f71a64b0be4093e2a90c1f5d7fb65deb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fa/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/fa/firefox-72.0b4.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "46f320dd9b746cfbdf6d41e6ed4fee3c36027a21bf69eec769dc656d4c4620ee702e4f6bd82a3121f14218a68948bcdc032a215bb0effe93d35b5f5e044152d2";
+ sha512 = "2302fd2b64b841e7a952423a1d3efd34bc1b4234fc736983042fb06a602b57ff45b7f549cba0fbdc0442183df091ccb04e83276e08d89aa492fc4c1d49d952e0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ff/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ff/firefox-72.0b4.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "f32d17a087c4fa5ab1ac6b692709b067607b5a9efaf8d15fdc3d52f9bf02db3b3e460fb1350ee17f583a8b32e1823d91aa472451598dbc3eba2774b953b32195";
+ sha512 = "518c83964718c98893b16310caa044506713257f0321b5131fe4a8741409489a047566f4215d8df50824debbb53594d24072aa6a167285210b392ff1f8e081c6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fi/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/fi/firefox-72.0b4.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "ed4ce81ee0446841d989ea575654463ea8186e2e1b71e771380f2cb0ce6b2858ac8903330623be00c57a2a50f639ae320e794681647292fb6ed060fdc850d50c";
+ sha512 = "34c2ad202a616067e298a983bddc76087d387160bf67f9d2ca7c2aa54b3eb245e968055b15f57309217e1a5ea164b6af93d0c3467600a5d1d689e6f78a4bb067";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fr/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/fr/firefox-72.0b4.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "0b199767300180ed093b32685373d1b702a2d09587df3a4d99fc9f0d6b82c41b4002e83fd26be00b24dab4c1c3d38552d46676a5df52a69474f623ee94d72657";
+ sha512 = "3fa9dedd958b9f3cd70fee85d0034b8663e863b18b411122d3fb1f6beb1566efd92c63a38560972425afeefc4480b2c4dd86dabeb197ee7c30694b8e9c3ace51";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fy-NL/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/fy-NL/firefox-72.0b4.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "8e714668d8ad01ee6dc9cd5e5f607f393ec09434e62d1d08a55f4312a52b31591e64064bbf0da28e2e47d0c571e895e9061197ceb36d1ab5899f09de549b86c4";
+ sha512 = "1b8a346081dcf59d42140edce2e35dd4008c0aa6be326274aa2cda612bd9161bde5f5339a06af747b9f1f0eb5dd0e77113543d948c5b102ca4428cfd9c30970a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ga-IE/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ga-IE/firefox-72.0b4.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "4156af0bb459848815ec4bef7b91f69328cc44d9b23f56911849098d4b30422f013ac74597dbfe6610df093439170b5566e87a290e33dcb6b32d5e2e95525622";
+ sha512 = "7cb658cbf2d33d9ae42724de85e609e6afa2417666625e1baf26017a6e5225a1dc240c457c16f8c612699eb39a8243518061418729c9d5c18daa4bfe1561ae79";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gd/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/gd/firefox-72.0b4.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "c2d188a2f4a63f9cc106b2dcb64d3277aea07de0f4290fec560927d8ac577ae57c0f6f9dab998833a51924f1f4eb94cbce9312ac7bc69205a64fe766093c0847";
+ sha512 = "31928201e871c33c31521d8df74dd41e35860754389abcd130a5f8aaf63d8e24975217a09ba074405e092cb603a8b69b18ba89fbacd041a1aa553c4eb37401dc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gl/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/gl/firefox-72.0b4.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "c9427d99935fdfbf3b5ae3b0e9ab9f2b31b0a7b0d5b55b14effa1fd979d5f32b73016c939821f1db6eea286047334486b017b9000803e6ede4bcd4a564e89c10";
+ sha512 = "6a92b3b1ad9bf08c20ca5599812141d32372ac15841c9c4fa0758c4d566b60d2e583fb43c65029a6ab85325a7efc77e03fd42c407ae4857e39aa0f486419c52e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gn/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/gn/firefox-72.0b4.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "e039e1bf1f0250c1179b3bd185c1a612754f496d39e087059bc485af6a280c15cecab6e7869a63357c7b0dd713ef3efe5ceb6cc4c1f7334fc67560722e63b523";
+ sha512 = "38fd36c04d627574f2dbb4f42169687f5ac96f838137074aad44de247830acc9d750489956917d8c7c0736e49dd15a9fadebdee0775926812860800d6a6ac2f9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gu-IN/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/gu-IN/firefox-72.0b4.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "9a8d9a076e521a8b5a4f1cb3c06538d9cfcfbfe32862b48301c202a212beeea2d888964d317bfffbb4e4b5a56ef06ff2acda22f0b129a2521d23a5234817fcec";
+ sha512 = "5fefefff9fb2a99f5627dbf3be38ca6787bd46731f273499702698c1ae626b7a9d986883762557269b89d2385a70f83b73b3f40107b39ae9e761a80a79100363";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/he/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/he/firefox-72.0b4.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "763c4dc5241d3ec4337c17d4f7c7ef13667ad1a7ace2e71b65ead7fc4e771ffceb1eb1772c340ed8349cf401b1d9c4fa7f4e16031f5227e45a8e813e08437159";
+ sha512 = "4d9a0aa5108a3bb649a762be28946256021c76f83e450229a79ea00de01dea54f2571c3774cfea35cfd9c574c7b97676a8c6a97eef83ccdc8ed37cec9b0e8449";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hi-IN/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/hi-IN/firefox-72.0b4.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "a6092b8f611976117489fb9a860a801aac9fd598394be0b42e88091760a7f05c10d04d4e90b228a801ce784a981f4770c78e544614a68c2d9a0e8ab13fb89ff4";
+ sha512 = "ab556799360fb9e93921084d05401057a22e897d49c01b277369c66b7954657521cc1abf9bbfe2fa2b9eeb200c7e5a8dda37278d90a2bba4b33ce20adce32621";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hr/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/hr/firefox-72.0b4.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "ae2d26a2e98cc180699fa5f0a8fa1426525db4ccba99a57841fc8499e9595f0231de7802cfe347a81906d3abec3503b624ff224b1392ecaece17468ba12bad9c";
+ sha512 = "96c1ebccfdf96eb8961a4e40ff7e9ad8e810e58b6fc9315a0ef6c0cff0cb6e8f7b94e22738f81deaff17d0f61c86a121ed50002a0b2e5507d1084c6c1b3d1ad0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hsb/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/hsb/firefox-72.0b4.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "0524a4f4ba2ddd3143f9f95e07749aa5f8c37c8f31cc9030f220a99d1a8d270b61ebb63ee3118edc79712f3af3f1795ded34492144d0dcf1857f04cbb3cf3451";
+ sha512 = "03655bfc8c04229f525712ed9c23cdb481d41e7300d5c6bf983851968e9d7d249962cc73f54972f80c71a12fdceeea1209ad33180276c94948e0df9b996649d3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hu/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/hu/firefox-72.0b4.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "64f4bd68c9a62965162bea7ca4bcf15369f9d3c69c0f6080d0bd660202f2a546f39835b8987e26da3752adc366164b451f842f2694305bf60a2b085749b13827";
+ sha512 = "1fecc903e4e3cc90cdeac3629362b7399b5902dbb66e8e91157721c5ee1cb862d71b1456c1688dae6b43afe8990508a12fc3cf1ec8ca708cd53ef36f86ba9772";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hy-AM/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/hy-AM/firefox-72.0b4.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "6d33a2bf17038e24c323bd53372974062fe5a11278eb535518637ee68712f4c2da93a3dd3378161f1e67efc51a06c746578af10f02c81fd25b747820e963b5f6";
+ sha512 = "37d59c6006abb270cc3df2911ef460160f73a3013ee66412787340372b4d09d0ce30b91b2f733cd9e27a338e5dd79137109a7c3aad5f0e6119e4dd31f3d3e42b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ia/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ia/firefox-72.0b4.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "0e4a78c9c03e7d87a934023cd0608426794f3e9818c7929b1e12bb300cc11d576334396c1125ceda555907363288726e286f6a376d6e301f386854ad3b437d35";
+ sha512 = "64050b10a3a530e5eac3b5696eaa5896d061774d65de695bae4fee58043bedb57e63e707bd738433f719812909f754932e19488f53bcf4ba6f424dcf15b9a805";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/id/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/id/firefox-72.0b4.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "76b89937f37aedf1534b8e06601c9d59680426a55b3df3726318f438de1ec259c335876a1da31c6996e54c0d9efcc651e1504f764d4b426db2f0d97a1ca1e9ff";
+ sha512 = "7a24e788ebd46bd9ba8ff6ecd5821b59cf3c0ff0bfa4776ebf97f422f56c2fbc33d20314a7c44cfdc9ebe6ffd4ff4289c21bd5c363998a84dd40034caaffbfc0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/is/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/is/firefox-72.0b4.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "17c164cc5a95f3e89e2bbddf58442da84dcfe784812163b68740dd1caa9ab823333c3188abf579601437217e0e9e58871424d1227b4ade6a0fc77e5798ef9099";
+ sha512 = "1b4135eddf550da0b871f54093b3c1e888d2705a370220e14b07ef93215485878d6e38ca11559bb09e8acddc27fdaa3d105d5ddd121f2f9220c32d138eb74fc4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/it/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/it/firefox-72.0b4.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "ae37e92971d2f0c6ce322011e66c2857aa73518f1d4e8d26c3c2cf1d99bea8909ff2541146b6789096af5141cd927dc82f91ffb9f7eaa0fcf4276d4782e72a97";
+ sha512 = "cdeb4786246bdab4b585d8172f5c8b5446746a5e6283b8e5deb58a03742c03b46ec0a3220550bc6dd96d314b29d50495b2d00764de2f3aa9f9accbf397a22c63";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ja/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ja/firefox-72.0b4.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "32690138d8c3dc2be001579602269ab5e89b7509f6d289a4cd0fb50b90e7a9a61ea57af8b064f904833504f0d523f1bab0a03f456fb75c967cc87f3e8e331b9e";
+ sha512 = "78e336ccd4697a6e5a136b453c5fb26c560315426b7c3151fbf432ecb1eee5dc26dfefbb8924087d9cf197334cf1aa233b0f125019ecd864ff5b394b42903648";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ka/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ka/firefox-72.0b4.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "6611137ec50a1a35b7ee3fa15a2066fd3231717ed6f7a4884c36306653226ee4211e8364e4872029d9b1967f69d10b799a4d58131d082f882e1b39e758132ebf";
+ sha512 = "44a973994dc3141f6810471e928fc8e516afe3f6998322cf431783d2abfcf42bf8fbef783d92e436445e6827a259c4db42a0e08b35ae76827007ba1df40226f9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kab/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/kab/firefox-72.0b4.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "f06c8fb18639967870bd581d2757ea66631f35b167688f4693198f6d70d1f61985946216410c401f0aa881e566df5a0f13d085e1ee880a35fb9ed21b0fefddea";
+ sha512 = "758a861ae3bb91a79ca967787f41b24c84945e0cfea162633a6be2f105974c34a8f8270c32f76c4d754612641fdfa11261de74fd629c7877eec385789abfbcd2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kk/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/kk/firefox-72.0b4.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "b22bae385110057cd77440101e27234afd17dc74602bf05763975ebc68e0940b4501ff168613fb664b2087a2782fe44a52589ab9972cfa44f9097513460cada5";
+ sha512 = "28a18c3a9476a90d38795f52767f33b4ef95d62f427788ce4f163526d96be48dc1dab1c01a443250a2773903a4a443be58a629de53e229ad8ebdc3f4efcecec5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/km/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/km/firefox-72.0b4.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "7c49611ba0dfaed7717f385925ccc621f5313496235a90c3851d26f11ec183541553979e6efe67f36faf7997d1e27a15e3d5646f33ed884fd66e6553c93d7db6";
+ sha512 = "08320bc047430a28ce092f39b2836a3e1691394ba04310088857ac2db7478e2d44b2cec450171944e890a31a152483b0bd1900f2fec802cea7b9267ed6bd4941";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kn/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/kn/firefox-72.0b4.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "c1fa863fa066a7832975963afbcf63aff6caf702ee8c58e2d54705e61b1863d71b81d7d0b9b8da7cf41d7c950a66820d8e1137a32ef91bb283ffad9b36b84388";
+ sha512 = "578edc5e24e6e825a60f1e9164e1d6fd8af7880c2af5bede481447b247f62f3331040976e9a273e4d484ecce2c7506285db1fe98b6f20e395a1f3f1e251688a9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ko/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ko/firefox-72.0b4.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "8d179e7660331ba4c90f666ad3792064cce4fc551144ae3a8d550f620765e43274ad18ca9eeef988c2a7ea612dcf82dfb65cf225f875b154a4d4a4c11e5d7a64";
+ sha512 = "750f7060432b48ed206643e8212489a753d35ab184a6e40f2a6105c1ea4ebf07b93251c0f06770dde66c62eb7659e7778f784828dc8d7f6b994232c862f39330";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lij/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/lij/firefox-72.0b4.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "e36bd824232bb3d7d7fb4779e3207cdd504d84861bd0b5b2ced6a29ecb9d16b10e2fb267162ca96452f52e8089a085021869eb107ad8ba5cfdb49f8e42e56648";
+ sha512 = "3e7f88af83912c3fc62c9ded0b90f805c5b28852432ac99e1216a7443b2c1c659b4615d94a97a3b825abd17bd3236ee111428df697f091e3b1f0b04c3e70543e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lt/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/lt/firefox-72.0b4.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "4ec494f1fc2260d73aabd695a29441d12620a8118945974e8a0ca6f21a0e9e49bf8a6378d4409f26f05cef369c990e1432d0b11eec99b98399e994703ba286f6";
+ sha512 = "d7a41e5dbae8d742793c741c5c084581b3c5ea13238e00a39df8451f2639c48e22d42a490a212d151694bfab600aebc7fe40aed9b0ee06f953838b93bdb366e5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lv/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/lv/firefox-72.0b4.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "3ffa772cecb4cea1c775b20b3ce505c2d84a9918c1422d85c5a2bde80c4b1432f223d828343af04c7c9518ae54bd7771e8144b66165aae1bdd140e068d0bda1d";
+ sha512 = "53a2010eda06c84bc1b8e0b495823301fb48f3580ee6430684d9f9180f1af95ebe15988e6a224f9116e96881805b4d927a8e95920e149f10562e7d549a477808";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/mk/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/mk/firefox-72.0b4.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "e8cf48b2e4a841c6101ab0759db844dce8865bcaf056dc0d2a5c43653bf86602dcdb337422a8149a4d4527f33ff79509d4c4a3fc221ca50c0f78fac80d7e45a2";
+ sha512 = "83f89a83d8662161d6f997957c8facdf268157f089291833f18a201ea7a0d32e36183259dc943d86e5d934cd90c96cece0862700494385fc1a40d2bca962599a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/mr/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/mr/firefox-72.0b4.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "a6be024f8c41f106157845fec1d5d4a5f81456d76f174883e8bc3d2f1d8dae327b20de89539980fef316baabdaf2cdf058dc91c12bbad1fefa0f374d66ac3222";
+ sha512 = "bc1b20c159ec013df6d2aecab283ea23198527427e2410e25b36f68369f373951c69284f90bb9f04775216ab65cc6a972dc36992d18248170a2f277c83d54a58";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ms/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ms/firefox-72.0b4.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "4beb0656f90497f480a171d762d3b85260f4f7388847260faa15bf7835bffb88a2d44657401b5d0680992864b1a4ee8acf6a6f56d3e9f41b6704808f775076ee";
+ sha512 = "18e9e3d764377a00a534efd06d657655d99e8375ce307bb92fb4f0c60e00f759a658be8c04229ef523d3d329b5a816e5dec5c3fb70d561da4acc37dd0fcf24c0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/my/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/my/firefox-72.0b4.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "98c47dd55ce49f4933a1fd67626a6edaaa20b4945ffa21195f19c9676f284081d32de83047dcd6d0e7737be94deae34fd306484f0ea80527bf0e3117cb67fd04";
+ sha512 = "54f1765cd2944071ddb39b6446dd5908f0ff8ad856952830d1ceb3b552e6c79e22ac771e47a3fa87b2c1a225fefad0e4e039ef4fa2142d24a78c7c6784ffa4b7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nb-NO/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/nb-NO/firefox-72.0b4.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "5d51f3e4dcdb82995c456e164bd4875e735029238ad47e7361c2af29c2c22ad43398279dad33356a858e054e268e846bdc72d8a82e869f12d2871dea8f6a75a0";
+ sha512 = "8510fc6e7c7e343866eb6d9607b22c287e4bfb60690b8700da48e28c1045c4b02f4e9611f3b72bcbf7747cc24790406543fdc50078773d7d0e60731623844bcc";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ne-NP/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ne-NP/firefox-72.0b4.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "794aee0947e1a3b81534fee16e3d7efef9fe6d8eebd8ec18b8bb120b3a3cdfcb4929882d09e8ee15136f65d88c0d6c25cbf8570f86e8c0f337f86f12fb11580c";
+ sha512 = "ab1a43e207a9bf653d6aac56df361980926fb45c0643644915b5e5a582a77f06169910154788ca86e9520ba1a2f10d4d5736abdfa12dafccb71e0b7b6aecc87e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nl/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/nl/firefox-72.0b4.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "e63f00aa526cdc8cb4eba86f4b920dc38e0a5f9eaef0a4103bf380f72b9fe2421aa4ee1417bca18da719ee01d57964c2edf21c4697121d70820686ad2f7379df";
+ sha512 = "b1cde7378cee2bf1d9918fafe2254293fd3305bcca8817f94882c21448e6bdb5171d1534adc019a45538564f6286d4272a9955bd8b9ce48c1d2f778f7be6de42";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nn-NO/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/nn-NO/firefox-72.0b4.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "d9e30d8d820ef5b07f6814cb5e37e3918b321968229d33911afa815ea6e727f4d3b505a397b60f1c1e679dfb79f9e130de450c10f8946035153f535060b9d4cc";
+ sha512 = "bd08e3b542b6da35edcf7d91f18a7cc6a0ed6d2f12c747a36cffcfbd1856d1075dc0d0fc00e3724a2b43e09e08167110020a8618c66211f0b55934cdf3aac757";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/oc/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/oc/firefox-72.0b4.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "94004a03a0b07fb91a30677168d19ecfb29d5613483da62859cc68d9e392f94ecfd87f29b5f3c44cdfbb3fe067216fe4f6db997da2368aeb289fb7b1d83029a6";
+ sha512 = "74ad86151e8d493e4eb3c5cfa4199946f279c071c527b912a270562a73daff67219eb2f970efb8ec942f0ea53a89c868add213c8b98a51155420aafdb85970f8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pa-IN/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/pa-IN/firefox-72.0b4.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "5d4d9952600b81a93ed62314a536d91729ff6a423ae9359436e632c9d807b13ac19fd6b1d2034839450ed5ba5411b91afeb52d0cfd74ec84a1924b6036563b74";
+ sha512 = "fd5e002903e6a16d982e063a9644b1261f45b9bfdc75c615dc29fa9ffcb49c7f024d8d9a9879ffdd5fdb78718711e5b44de8173283496a68beac5efa1a8c3bf2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pl/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/pl/firefox-72.0b4.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "6f3f628b38e06494d528c96071c0ba0738582da37f16a4a28eacbd17aa7574f1ef795c662ad09b8a15637bc25fb6b791e1bc54b3d530031c66450f5f7ba3ca76";
+ sha512 = "1602cc2a17598747cf22b85e7fb0594c670bea4b1dec4dd5bc44f1c03cb25624d2e67479fd07fbe048565dcd79989fdf90236f677c56cef225944d7fbd5945f0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pt-BR/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/pt-BR/firefox-72.0b4.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "e97eb866f17277db6303c58411fb5f4ef561884c0e5437dc09d3da63145107a8ba5862a8d965d4c5ba38f40930e82c440ae1a26b023f6a212ce177c77df72f4f";
+ sha512 = "213665953981892fff05313811c450355545ba78629f123324f20e3f11d7fea88a09a90c063a1f923ec2e9015d4456c70ce0ba15764c1fc01fb04fb67fce8341";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pt-PT/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/pt-PT/firefox-72.0b4.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "81cd5a4c5b2a89079a45826f34ebd6564a929e1ba73dd07efa7d8a8b4958a36fa083377bd0e7b6b1e86a83a749f1117f3e7f2703961e668cced5cbdca8e95c10";
+ sha512 = "f4a08d2e1d07fda7abd2c23e0cba842faf09bbd21e86766435a623b52453ce4fd55fe616dffd12685bc65aa0a621d8ac3e2d568bbc6d3803fa76862e3647db70";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/rm/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/rm/firefox-72.0b4.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "2b78c41faea2f3f91be9c21de826e5e8a2533a76dc925458e2f75f085fbce71bda63dfbaedfe988f29ef9384a0ecbf4599174a210269c6adf3f875d227374385";
+ sha512 = "d1b8ae6ad4ec05b5ac5b6c8900e42d42d64b74a9ea98822d6f8725c52e4ffd7e259fc11e171cb9b51b4dd18d5aa3beb7f20d6ddd33bff7b3dd34f3eb066a6f5e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ro/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ro/firefox-72.0b4.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "d01b01df0d9e25635b85abec0e0ac081beee02a97bc50b1902b271aa4ae5cacb410d7b9644d76785d54622553eeb8f4ca4f85e40c7867c6f99840de570974a2c";
+ sha512 = "ed3d824640ea0ce7aac6ed383b654673d2534342ef0d1e605d8693e3cb55f0d8029518b7cfefd9509c6e9a2243af4803c32d19be15e2906fa31e4d33e18ba6fb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ru/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ru/firefox-72.0b4.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "36ac6ec95c9c1e3d5caf1315854324bd0cb41fd6e83dabd81d3af2189fcd111ea7ab8a384e5a07f4618c9046b8f59c3590c6bb8d1a12a2475d19d7d65940a26f";
+ sha512 = "90fc22cb96e466d2f556d070621c2de06bf792eaf1979d5ed29e1259d5702992d1f0635ec7fa2bab7ae7fdbfc360e60668352cac895b1756c7e9d528e6f8482d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/si/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/si/firefox-72.0b4.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "796878bd3a982443558d042c64520d6cd65c1eb247c6630e1c1073c75be3a2d3e3d4f164deb44336ff536c6a7a81650c0806de79cc3698d6215fb87ff2ca50e8";
+ sha512 = "fc35d29b1a7dc4d6c82a49cb23f194f0856feda444b434a77f6f1e2af346171a8a976218604e2fdf1f041b9edcec4f3eef20a22950f32273192acb9d9cce0041";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sk/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/sk/firefox-72.0b4.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "48f3179f9ac81ef1c69a44540adf994874a91770eb1b2af51804a791c10540485a61af2b1fd337f7cec86682c5a3df24e8e030add48773459b8ba7caba6e88ed";
+ sha512 = "8f5f5a33839c68c278c7f128c3c11d9466f6b40d73f169266b38268f7ac9dc909611bcfa7d02f63748e8d8ceb1d1d331f2bfe560900679658d0f5c7421b89938";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sl/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/sl/firefox-72.0b4.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "5ca3ddfef139448e411bb226cd2abb3a8fc4100986a294bedc5bcc4a1906a6b0ab82f6e3d536dfa66e404bd5b7eed671e98cb22f1d082764cc5d3080fa0363f2";
+ sha512 = "f62801fbb70ec7b5f2b10b2d846cfc1da28f69ab3b041042961844fbce0acaf75cb99f93e42d805dc1e18ffe25ac88831e8e3f08680022ae3e6b10a8923122f8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/son/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/son/firefox-72.0b4.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "a14b7a55043d2aeec02d1f28f30038e0ffbc3f76df1c5abad04413673d5e6d7290feab39e0ff40bfc35bf993fc49311b0cca38735c367da233808910c2a864f7";
+ sha512 = "8326c8cecb491ee51e46c69b392fb042bc13fd141e5f0aa96e2d6138527e96a3277863cb616b7b88c03e18b29f781f2798cf4884bbdd0d434e9f75f00549e670";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sq/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/sq/firefox-72.0b4.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "ea1575fefd6ffccb7a6ab428663de5e80b48062e13d3424d05b5aa3b86972236839f6a0df7546b5ead27be0a40293f2e9d74472d2756d9fa86bad18d478993de";
+ sha512 = "d3388c7cc6496315423a00bca80544fb7eec4d2fe8231b344075503a8813b1d25c1aec7c99f71e1bd1eadfb47edde93dd6b68e04f00dd56f414c77bf77b880fa";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sr/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/sr/firefox-72.0b4.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "8c5ecc59a41613ac259e1f1515e6475fada7cb7c33650722ad9d36005b8aa173afaab254eec004be082bd74406c88aa4754dc3f4dd131b9761fc82778a7dc573";
+ sha512 = "a646209ae9671ff23ee4c72eb40808802e23b7e87febdf2ef58623e2005889cfb38741b9345acf55fb103f327ed39f3847f21801a6493453d4d0392b7d5894f2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sv-SE/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/sv-SE/firefox-72.0b4.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "f6446ff3add515a7fe46af9752206c05632cb95b5e65e19c331556a6e4e304f765f8cfc9cd90fec2892fe7302230a5b3b85c462a557e7074e255ecd94befbcd8";
+ sha512 = "9440cad4da1aee56ff25b1d2b7f1f9597d475fc1fb4c91ea4c2df10356a16e2f48c147d93dcd387b35c5633fe0027a6879b0a730d97a07e40e1d5158f54a8006";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ta/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ta/firefox-72.0b4.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "03302b3da44fa586df13d2f20faee5da5e82151550498d7c0e0fc70efca8a98db47443bdd0289fe90d602ca53c1e82c9f610cc8432fefe5c99878faacd0c9153";
+ sha512 = "c3b1c100f22eec6de008028b6d7be3ccac5c856b1ae914962baf13e5ac1fd149598676ada5cac02efabc586c8c23742a33670292ebbb774e27c69bee5a943d11";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/te/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/te/firefox-72.0b4.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "49b3921154e909685e8e52a892a2af322e650109fa6b17bcebd62908e71b5b30c0346905c2422124629d93e1cded40b6f81222ad4871057ac482c1df7ca3b53f";
+ sha512 = "3d73e89551abb41f8aa94012edd7fe132b7e3b61bcd00622ee84647eeda32f612ec3ac57c439500e94cd46c5bd3615843ff55e0b9dc9fa13b92d0260fd483c8c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/th/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/th/firefox-72.0b4.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "497da9beff43403f2b09da713474dde509ea2a71145fc8006a852536e4ab71a83586d67d6b7238b3b0ed3d135db6bb2716716b959463b13d92935f2b1ee147ef";
+ sha512 = "0359d465e62c5efac6f8b23d12549450562bf4eaec6cf185c5d6d29c9ec2a48c41b5b0cac090b135faccdc8ecadf0198a7b4b9df1d9f7bf5ff1662ba5c0d8148";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/tr/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/tl/firefox-72.0b4.tar.bz2";
+ locale = "tl";
+ arch = "linux-i686";
+ sha512 = "1d80077c7ac5a4173b273a44d1a164b39a46dae384a977bc79d2f5d9669395843e20945fb5b799e7fee678568a8ffa3b821d4603515aeac6eca7e725a7ab716c";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/tr/firefox-72.0b4.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "43762b9401ad7337e0ff00003a07d374271ab032a4609bf9abb1fc3a69ab578e45721395d06aa4fdf41e15a71bf503156632b5e3d6f94b5d6e62592c78a267a9";
+ sha512 = "fb5f1e93b017d3f3f9a1008923686a6acea170618ebd3cc52e1e0ec5ba369c6cf5406126689d3bbc05bee63c52b086617925ebe33ade0363d138eb200b52d5f1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/uk/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/trs/firefox-72.0b4.tar.bz2";
+ locale = "trs";
+ arch = "linux-i686";
+ sha512 = "a5935de8cde85d6ec031e312bbe55c39d43db206b981b7513dbd78d9e344692226ee439c548b4e26cd73db49e0b5d57d77c4928995aea326fe1e94c3fb17af99";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/uk/firefox-72.0b4.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "e10bbbf8a8f899f2a7b57bed9a846d6b490303c456027b034a750dce6b21416415eb0d9420629d008d901ab903e7c643fe7ad5bdf5aab511da9977d536d71ffe";
+ sha512 = "8fb43aa7e90323fd51bd2e281b5fe80c213502fe092844606cc7a3e49edf05a5d4382fd84bfe0223406da453361f869663616f33c9e16f5667cd06aca6c82874";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ur/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/ur/firefox-72.0b4.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "9155b7efa37b299ce74ed6faacafb354947430265a34fea9e101a9f0947a57a4a3b001bc7b583002ea08d3b7f33074926c4f6184b563fa5a1811b2b7a9b05fd6";
+ sha512 = "f25d7482bc707e7b780f30ead9156a76ed89710e47a971ad66f456794158a7d003515c5c7a70146448cccfcec4f7d920781d334096a1b27dbcf68b91dda80374";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/uz/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/uz/firefox-72.0b4.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "a3a3aeaa6cfa114e619ba9685dbf9d796015f26b9fbb4529f69d17f8c40c0771d58ff044cd4f97123096244f29b964f1756868e35b5dec3fb79f7b32b7a31ab2";
+ sha512 = "e6b64ba6bd3d137272a0a4b5674080c35f6fb84c6c2988ce0827165112278d1c1213a15175e3c98ab032087abc721c7c95fbdf905d2e4585150a9cbdfec3e604";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/vi/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/vi/firefox-72.0b4.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "167a38acc587a4479fcd15d1e47f34e0412e846a0689a119c1f382ef119bfab3035450326d086f6c8efd67a93300df234d53165609c47e94327b4415f40d88c3";
+ sha512 = "60df754b0f8d5a7c1fbb30552f7528de11413aaa712386815fe1f575514e5ea36421f7cd4f264d60949ffc29409ab509b9425258f9eb1c6a014f1e5d2ab30bea";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/xh/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/xh/firefox-72.0b4.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "6a0ab1589a56d6563431d2e5f01e6c01a65be6865cb4b4d52a21b6438727d378ded049730374d3400603286104e4e05f246829b9a45513998db6c9c14597d6cc";
+ sha512 = "24ce3035237d6e62ad6e01746c969ddc75e95013b5033d343145fbe1aec0735e588e2a964dbb074f554611a04de112b029d50139ac1a8d7c34834ac78251ebe7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/zh-CN/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/zh-CN/firefox-72.0b4.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "f3e20c68a34ba6aca4bffd07d0bc1e5676ef7f2d9b56aa175431825e90221255bfaa76e40a6fdacf812172317deadd3e3a29756331ccb09aba5804ae58d2ca8d";
+ sha512 = "4bc556547c3d1b37c0073a255832527a8c4bd2c86c103051913c14fbeb25c9175a4b7809778a936cbcd6cad02540af914f42ebe28884474ce623f2e6f42b53db";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/zh-TW/firefox-70.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/72.0b4/linux-i686/zh-TW/firefox-72.0b4.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "dea1df5beec52f0d12e18907922bbd2f27b4a20c87874c199d04671f636fbfebfc1d64bf0c8935ae41c139d4beaf08e164aabe47da8be67d4855b1fb924aabfb";
+ sha512 = "d4dd040838eb37652e4e049a0ba2bd0f09f8ec239769b79009e290693abd12d2aedb621829033698b193324c17754950c0481caf3f68830e9f1e138a62d58f94";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 7b74a1094c7d..0a819fac91bd 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,935 +1,965 @@
{
- version = "70.0.1";
+ version = "71.0";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ach/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ach/firefox-71.0.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "8ffdef324586ec9afcfe254c42e938f54774e9c4ea5c695ba585439e71468145b6f0e39644aa731aa01427f09bc117a501ffeb36b5ee40fe39f675be81c86a33";
+ sha512 = "61b15c19839b16659129746561c8da055ac7e7761384511466937892bcfc34aa06aca613e6786b7415926192ea587d8d2d49efe156238fa63a30013f6feb4d41";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/af/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/af/firefox-71.0.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "df9dccc59c7a3563e7f3b9dad7eb3acf483d27c575ab2c5bf4934efe69d75033e675f399876d2925dfa9f651b558884abf37fd2bbf5f46e671fb9f6ebfb28f81";
+ sha512 = "e8d62ea2f03a330178f6cf6316b87343d76ca99acff5d67d9d45be813eb9ab7969466ea30c2759f4ed0e55e33b743cbc96c6524d4a856abdf54723ec7839d803";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/an/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/an/firefox-71.0.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "1c02c1eb8aa276a9e3c1c48926092d10e1dde51b3d576eab1165c97543d2d014c1dadbe9aef9076aa41398b3b6087384dd352b587761ba92952db3178b393ee7";
+ sha512 = "613f8424d32fb9c7946716e39e4ed6964d7e5c398f7885a86ba36318dc1276228026aa196dff4c04058630ed537818719c0d56e501c010c650d4a4c8a3da32bf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ar/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ar/firefox-71.0.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "aa768f5799fcd352287e663f69d37f82deddc10c1ff6e15d383f7fafb4d159f551b9aa6d4f8faa9f7bb789c056423bb03cc2c658d47584e422f02eb6cd1ebe4c";
+ sha512 = "fb240bfd506da1d2c5197c684419b8d8be15847e9516c915856816073de46f7694ebed8256799d06f57ed77a0417124cac277cc8cfa2ee9395affab2ba956f5d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ast/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ast/firefox-71.0.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "edece41399d6e5959823306295f7b40849425426e164ec8d4d6ae4ceebbb4f7f0a83d05caf1039795c5b9bab7fbb10f4b8c2f51c116b897ff5deb879064c2fe0";
+ sha512 = "e87a750ea3d27008c986ec58b104b32214d50dc0362e4a92d0359b990fb39f8ce3af63d7d96e84893804cf1e87c7c319aa3973f22eb32776c812ea2599b8a5b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/az/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/az/firefox-71.0.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "d509166e3b17b68688420adc9074839a60cf4e64039d3a3a0974746d11fdacacd2fee7059abe5cbc6fb7533d7c99a32518afa7eabcf3ce4b304a9843c66cc273";
+ sha512 = "5789390585336b88e0ff14c32da9136b8c40e1ee7e6290796fabb01060dd295a07ae76dd78223b2a73cf0f59ca6dec40ff1d31a7f73956ac852314266b4b47a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/be/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/be/firefox-71.0.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "308a04e69392fcd748bed4db4b46d83462e5aa93cac01d6be8b8a408cfae1347d779bc0db46892b7b4a53dba384c3273385911a365e1b21206e906e35d78e8e8";
+ sha512 = "5dc9e7e7c8ba973f477318103015e425c7de61bf803a41e06c9774b4ed5894deacd4abf389ff40395a0269a06ac2ffdddc737bcc2e26dc8760adee2c6e58bdf0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/bg/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/bg/firefox-71.0.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "130e8a9f8e9829b70aaf6b0fa0f0160f31cd37d1dd87ce1398976461625321e47f8683ba11c1023cddc661a6dc9a0f7752c41247bece4ce11568376495c526bd";
+ sha512 = "12d7e7c285ac69d35ad7726babab8b50f42846931545123fb61741bfa635a2eb7b3f1829bb92f5d5a9d07dfe3dc0c685f49eb5b7c1baa388788b697477b5ec65";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/bn/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/bn/firefox-71.0.tar.bz2";
locale = "bn";
arch = "linux-x86_64";
- sha512 = "ff688748b1c216aa384c1e28e4147c761a81fcd22a49150b5862bc0967b54566f2933c1a71a40ed3257ea592129b83150197c23e411ddbbcbea74731b70f886a";
+ sha512 = "45431252333b7ccad98bd79a708b5ca25f7cbb49330cd3287dad259d9db0ad4d19671e12cd9d71d82f8ab2b1d8cfca34e7cae14a8299300166fc33fd2946718e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/br/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/br/firefox-71.0.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "b366245b8933d2f76f1eeb6dbc16cec661643718d07e73df2e4890ccb1add383521ffac6df2f308379bf7e878df6fcdf0a258471a773f9cb635dd4ff11a721bb";
+ sha512 = "c4a3a7e197864f52525270a11ae7979772d0eaff9fa623edd5f3bca143c7fe2f9788ffcc8407934a2b7370edbd94fb0009f8b6188b0755903178fe18235a9247";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/bs/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/bs/firefox-71.0.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "2a2a663af9865b123d5eb6b185c1bd44a8dc5361dfcca118086f2162590cafaa36cd71ef59fe1ec0eb637d7e7c0cda2e943647d289c1c2c7afc206bda6dac1aa";
+ sha512 = "17e7e8a7c74d413a90e0b7e0da7a88455a1411f2d08f081285ececb162625912302560ddfddea7efb466c9cb4c679978d4ad90685db65faf6bf847f3ac1d2bc3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ca/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ca-valencia/firefox-71.0.tar.bz2";
+ locale = "ca-valencia";
+ arch = "linux-x86_64";
+ sha512 = "4ed7af69a5f4b5e82886b787cb7feab2df19ccabbb4e9e2fa9ddbc6677e0d11a4c94ffeb0517c35a14a51b257769c3157b21ee661d0b086fa0bc951407885af4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ca/firefox-71.0.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "0a77e2f99466557c0b5b540d86773d36ee5f0498cb5ee5e5d39814069efd8c3c48291675a7b607530859b86bb9886889ad35382936657738d1bc86d4da46ea01";
+ sha512 = "8a0688a40f263bc6775f6bd23edbe3fcf3f9b725e37e9b94b23bbef65aab273e503bc67c03fdcf820395acbf59a5578f5638a3277bdc14e961b18c6a68a443cd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/cak/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/cak/firefox-71.0.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "6eb549b34f3ec10974b223892e7d4003597660eb840e6931a7bc54afede2433915e27602dd8e83a53dc3cfb386fbd52fc1d04d7c5fe1bf1e40e8eb0ddf40a159";
+ sha512 = "4b25ad5ceec5d55fc2f3c1be875e75237c2c32d3ebab725018bc04c6b5d43ff182818d95d73d816479d87a6a2994330fce894d87573852f79e43b56e0b7fd6a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/cs/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/cs/firefox-71.0.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "b34adfc5aa3a405543af4d7077bf1202480832b6dcbccbcc3a1e8e3ee525a2442f9c127ec5da2bc7a1c1e2c3948c4e85ca746f03b701814bfa73614aa5bcd769";
+ sha512 = "ae2f6386819caa9917ba26e7b404cd8f4b6f4d390faea57a333ac555a6860dcc7b92993224ec54f5bbcb547b91cc99a5b9008bba33dc39b38ce5eaf9468c3f50";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/cy/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/cy/firefox-71.0.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "b723b1d73341112e606965428a5f3f793f78a7172e3ec9adce8e1feea212921d63616898050c47d15cbb6c2f80049678489d752524b8449a5afedcdf7b59b533";
+ sha512 = "fd6093384954f1a0deb7435229fe92196db1a3ba80ce651f1be20a420701a8b5ff417ee7f1d3c8f5f703d732e3b89ef87e49d164785bf32c326c66ecb9afe165";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/da/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/da/firefox-71.0.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "d4d0f30577a016a2a1d24d6d8bfc51c55f27b0cab2dce3d2f584c3bab4b54022409e9090ad0631a84d041cdee5e2c467b843d41df52504e0e86a9a550cd6c267";
+ sha512 = "52c63938d5f6fb85ec5fd24289eb2dad43a00ec38cdd59c0c44cc06d3884ec203195e4dd1a6b26f990b819fe58f6638f97d8d2dfb597d2cc01a27ba019d0cf03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/de/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/de/firefox-71.0.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "8d544ee0b04c84ff736fc84515fd3afd3c00a99b4f76df5aba1669ca970138bec7965b87210f7dcbed3c0bf48f81dee184b225f49900d6393698e20a9a8fc28d";
+ sha512 = "e10824056a96d5d7e5b671d6bb37f607d36b92412c01baee8e493b90fd3b9613be2bd7854d0aba3e97cd560345ecba19b880e9beac82bcc5c850217a397f7f20";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/dsb/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/dsb/firefox-71.0.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "2c23d351b72bf2a9b94da2cf786fe58192698aa9ab428b947103e6ddae714a004a461a29af2a1dcd865a316038dda6a2610536f330c42d3ac16e7e027fc1add3";
+ sha512 = "d1ebe6e9b14d1fbc63a45f6cecae206ec7479851aed80819f7cce78e7cb3a043efd0eb367c2a2561cd6d668497e5337aab3a0f5579dd5291587d36c22890849b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/el/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/el/firefox-71.0.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "4da4a9b6c412dcbe1b12109df45a26bd3cfb67205ae351d2c49c774b8138633a2854211ce8f14f6630badc9d38e3edd0fa8c41859554b76ebcad698476828692";
+ sha512 = "f1468f8d0d2838df928a209330ae6fc7c1a03b9b16168ed5777db7763c56227031414150a5b01c4ad35ac6e4cf7f1eb24ed644896cc6bf3745aa2de7029b0d1d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/en-CA/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/en-CA/firefox-71.0.tar.bz2";
locale = "en-CA";
arch = "linux-x86_64";
- sha512 = "477865fe5340b56db34b44bb82f9dca748a9e12832a698e1d17fcb31f93d02d01c221568d68778f21b10184393e3a07a08cb1314dfa6a67441baa7150c0bd98c";
+ sha512 = "a78d91bcf51fc963328d38e7681b573d7d2f751bd27f881d80e43cdf40452ccd71207bdc7d0fb7b8f209e9ea336236752aadeac33b51bf1e129df46840a4f72f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/en-GB/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/en-GB/firefox-71.0.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "145b02e3e27009839094bdfdeed1fa79ee3d6fdc068fa00496db0c129d26c6f52a239ffc9e14b49a82946ee8c5ea9c840b8d9b734bc62a9b3bc7b3aae9355b58";
+ sha512 = "5fdf613e662d3d3e709d6b0c13371e58542dd61a04c52abccca06dacd58c0327e49241603b12e940bb79fa4f80055f919136bbad597b1727ca067bfc54fdcb0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/en-US/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/en-US/firefox-71.0.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "fe347712d10282ecd16e11d5820c43bffb2264c373cfb0abfe2d5014b88b2db1d9c3f3b18e0cf7f4dcdbb6b710ebf8c46952239a260cc7336ba8a7abdcad6f7b";
+ sha512 = "f835ace8d5ea8bf920c1065a2dcf4cd0c4fefbe675311b9768e864446570bf8bea289703dc2cd5d1295f027cf93ce5aa34ca28a722f64549b388a50fe4c87e96";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/eo/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/eo/firefox-71.0.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "b33357cc9262c2128b33f7324457cf9ba3f245dc1690364b5b70e9f7041b17f2c4a7f1289486dd4cd5c57c4f92b91a48c176aff4df5770013637270670740174";
+ sha512 = "86d403a9193b35dec9e71e434e5e998d1f7f5ce14bc47218bc50454bc623652d704f5dab27cd4759e2c90fc85bdc8f016f799080dadebf0d31c0e5be2173a63a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/es-AR/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/es-AR/firefox-71.0.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "4e11b69eaae79235c445af1313669fff2b41b15504895b65927c184c12afc53dcd8c35a2df0b7dcb136582e9b850c999f4eefca146a79861c4f2c54936454ea1";
+ sha512 = "f4d9b5d87c334111897cd91b16433122a391f491efe420ffdf63e0638d07348c6a2017f1175f246d2f93b030781043ca7a1bf4d3248412363d6fef7048125c74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/es-CL/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/es-CL/firefox-71.0.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "d0297e178415684604211d9d8fe942fb4ea37c0fd67750c13df7918f70bd8caa73e92db0c75a712689702ce2dc039a721fe1c354124a2ca65e11ef552cb4967a";
+ sha512 = "b2c5ad1d7b51fc072bb451dd1a63af4d9c90f9d2091e02bf8d8b4d39d9918b9abf20beada85058d05aa57ac447ba2b480d12d7916666caed5be853427061589e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/es-ES/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/es-ES/firefox-71.0.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "37017e46caa2a97470988b521a4a957ce5943f2259fd722105528aeef6813d506da4ff4a0235ca90c6d6db6ecca3f037629872cf43134891c7aa604a21da2648";
+ sha512 = "e85e9dc61bb8f4319544fe0bc2430c03a813f4f4da1cabf7d7ae03738cf7b5f2f8d39656058c4a447c3890e1b98c6e558cee17ad528119aff516eb17be39c879";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/es-MX/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/es-MX/firefox-71.0.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "722cc4e25f5d67404a97fd90fdde4c7b2140e0cada2ce2e400d89d50f31c88be748e1a743dc73c499688ebe37051c4267dbd4e7b1ea64af7dbde34754fa1867e";
+ sha512 = "7d73e3687f822e8ab41f8b4e04ab04eb7d0a4c8f3584ddfc43dd154b760866d26e28f85c62ef6ab55777c842e3eab61ff9372232f2788b254133d3ad7a84775a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/et/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/et/firefox-71.0.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "bda3e3b7d073aa7fb8b0d9c4fca2a22972633775c66ea07a5f54ed262ce9232f10de3495dc94cf4d758a881f5b9304beab57d8ba2217aa651ab025af37949a7f";
+ sha512 = "d9f2d99d7195d64d3aec9faaa07469d99f9fb9ff1f83b38cf8ec7ebfa2cec91a0f8242548a794d1ae5858623730d0f616ecdca5c25288b7bbf378bf7677173ff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/eu/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/eu/firefox-71.0.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "6cba87ec645c1036da3f915ce3ecc65361fe036d778266d4f0396e723bc65e0dfce2fa723179a94aaae0bc87bdb896badbc728ba99fe0f5bd250c3fe639db64f";
+ sha512 = "a0a8c7af075f4fc4814c571e9aa4eb889326b92815b9fbe3c79c69ccc78012e278386b1f2b2e1d6957e8b97ae65c044322e3792df6d6f66f42552270883f2dfe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/fa/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/fa/firefox-71.0.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "d16d36b676eaf8f9a0809e3702398eb03affbd596e63da2f90a29d256ad1564b19be5346a463689895e7d8b42b9648c581495d8058b33a30ea80a53a19417f45";
+ sha512 = "f8274fef2412c541f1548afac3e3ce7d0ef758ce133669c18a4737e05464b94b2bbbea966325cfe89064b4acf3f79725613101e5428b9032d75c73acf6b8ba6e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ff/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ff/firefox-71.0.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "2205c85057e8d959e1556ec81523724d9e5e9064b22f30f7f194c184baea1c4c6a3e7eff133b4fc8c8574b8702ba075f7345b1703916a8dbbaeb8275fdbc0640";
+ sha512 = "cfe678f59a4a468710c1c9d17d8ecabcf491c2a9bde03ee7ffe4b73f426632587a546913538449606bcab4c945e5cded2fc3c81ebd9797a4791c097455dd6689";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/fi/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/fi/firefox-71.0.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "c65ad5804089f81f28a4820edd154df5fb7825988de650dd8550ab518326c809e21e50a033fe6b6433d89ae075a561ca91ac930728bed05758885263866df469";
+ sha512 = "9c9c0c1040f451068bc244c5dd194e799b64ac5f1e80f71ea4ea84cfdc1f3eee2916cd2dcf24d3eb8bc70bdf80957201472eb8346d2ca605e97e8f70eb3433fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/fr/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/fr/firefox-71.0.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "d65508b9a78fd8bf75a44b39346e8408a83a0e308cf0fcbd612f3b9d66d6c1e5fb93c8070574b8823b363470aa138468dcbbc3313f3b789508093bab86248524";
+ sha512 = "9b395558437f41b75f709ac046c482a0bfd5aa68336b2d0b53fb8896abe2f7e37965885c70bac24026cf5d3a9cd774da03dbea896c13b95bfaa70502164eb5b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/fy-NL/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/fy-NL/firefox-71.0.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "44d1d3d072fd350874aa1366c76146579fbd6015930c8e597abc472fa380155676b5016294688dd4cb43fc5c3b225c8c0ee93af2126874dbb4b5108f2c267b9b";
+ sha512 = "c15e43a16c3d3ead9eeaebf774caec691fb4307c49d3d96b587b217b46a9ad3de8ba6e474a4cd1fa493b3f873e3041bb11c0b807c022182e08dc4d841b2e0a72";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ga-IE/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ga-IE/firefox-71.0.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "2e8ba8cdcf2d96eb61d089d2f53139375a161a92b000f7723a62dca28000e77946f089b5f571b7cd9cf75b6910cb37c522fe95fddfa10e300351e679ed685300";
+ sha512 = "6092293fafe763688f810cfba2c34abca1a2d4b0c086febb048386a04bbcc6ffd62ef210b679c0d29dec3cb343be8264daa332fe710d2b681094fc7209b9c679";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/gd/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/gd/firefox-71.0.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "b08e58fa3845047d6dc82d55ccc4c9f0e09a10e48444c6e39a4826534503c59db737b1c7e9cba526b98f240f6f65010002ad56b054349df82e608e58ba2d34b9";
+ sha512 = "67218bb7dd860e92ae5b2c6ee4234b58c65cc3c458f8604751782f629f3fc23f523ae18093e141f19cabd93619db0f283db797c4c4f01a8e860aeec7976c0fd5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/gl/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/gl/firefox-71.0.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "d84b29970c4eb30f73f1f924744a529ae51b4d933cb0c6108ff9d12736596c34e3237566922540b0ae346e63dfde51f4252cf9e6a76e0c910878cbbc7dfffac2";
+ sha512 = "ddfffb5e6927a9edd8ea448148524dba075f1e9ffcfaaa5d56b04af06a3107095b910034022e2c9af298d2d2cc7a8612c8544af8ae0418c4d2ed0b1cd83d6e4a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/gn/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/gn/firefox-71.0.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "650e09d225a27194156fb2681591b8bd658f92ac33e8ff4e0ed601a75fa28315f5ce34a7c3ea89ad7ba065fa3e0c9942051c0c75d96a87baba623eed368c5a64";
+ sha512 = "54f2893fb78260240c6b9f0fb9989d1dff7f4f5d493fb1baac6711821fe61e38afacc52cd7608543f5d9d8999a716163c65604c442279f929f35eb0e8f892d7a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/gu-IN/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/gu-IN/firefox-71.0.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "546d8c2a3f63f5090ab6c1b82a515d816123f5d87185efab04f1c255a7717e28e0969866e440b695fb22a743dd000575dd150d82613b9c7a289a2ada8689a0ae";
+ sha512 = "91e04c877173c730ac0bafc3e51fc47ddfadf3bc6858c8e4ac52454d4ce1fbcd965da53e8adf9c6276c7f7fdc353e52463875976bff4e01b932d348ee0f961bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/he/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/he/firefox-71.0.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "5e27de14d61ba25005700ec2efd958698733b362aa4aec6bbcf630fcd34cececdd4eef0bb8c9ea31ec5372c816b5cc0d930c15e594f33f28b99476a19e0ef92f";
+ sha512 = "f9a142dfc33af2f28671c5cb62007ca307a5156c9e97e1ef48e2e709faa89e2ce8ef40f98886b1b7595e6cd3ddb86e19c9795296bbb1fc07afc1cce933e7ac62";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/hi-IN/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/hi-IN/firefox-71.0.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "b91d9977e3817332240c82e73dbee31ea1dde9bbd4004f7f19e27cf3693460746cd7b37a571fc0219e88f0f52af2e38a39eee17935a9a6400da5fbf8605aa8ea";
+ sha512 = "545bade79a71a9a7e6c62f74d027705a7c60ad1303f8e1795e7809355368dd5709121baeebee16c7ee36b7f9913edab8fdde4555278a08e58981df2dc3ca897d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/hr/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/hr/firefox-71.0.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "8f87ee0a9fdac42b554d3d69d114feb44b320e1db3202bb90c0f05f7b13eb1b22f1d341d9e4ca6eed2e7a3b560834ae328582c7db66d64c3dcb54031218398c2";
+ sha512 = "08a92ebb33b0658c4242ffbf46245839842a16355b5c61b7c4c41f84daf306645c4945b96cc954e8121f3e9c27227427e322b8a38a209a6d7945a047ebdefb1a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/hsb/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/hsb/firefox-71.0.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "84070fbc03c36b3ec04be8872546c9ad79de14a4b518bc76ef324bfeb06f859153bb717c7fa7e0619ec6df0392d2e0f139616503a86b3926dad3f1e1c9bcf0e3";
+ sha512 = "3cd0a9bd9ff3c3662a4dd64cac378dec948ab2d518b41adc0a5836ff42a502afcbef0307bfd04af728e7065e3bcd791d64470f2602e358c78f51b7f41912cffc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/hu/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/hu/firefox-71.0.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "3a0e8fba4050641edb8f273659f7ce3eaea974f22b7a1b3c9859f11834b94f470831d5d71ce491b5269bcef79db973b7500d04a01583189e3acb7b15ff6f2ffd";
+ sha512 = "96b625cd3fec5578a646ec1668cde58c59b381fd2b58d84cd904c67c89b19fbed05d9ee70ea7f114be5041a00bd074e00eebcc424cc7715734a88bd3a15fa32d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/hy-AM/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/hy-AM/firefox-71.0.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "f408b350c3210a024671561caf75bacbeeb43fc90061558886c1eaf948caf14a8526ac66230cb66e265ea4b5094908e89188c469da76b477337a689b7a4f7998";
+ sha512 = "d67115a96bc9e1f225de788570e28b96ad867435afd94ee849dfd7c27f40aadfcf6213e2c2a8f6a237752a1241464e48c9bee373d5563506577cf0bdf6f9d290";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ia/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ia/firefox-71.0.tar.bz2";
locale = "ia";
arch = "linux-x86_64";
- sha512 = "5ba03b1a90d681f963e54e4599178c4494f4f892bcf3e1ea698eaa237830f128d9e0e4a19550f683645fd4682efa7801492bdc3fe5ef4cdf51b2241eb6fad279";
+ sha512 = "09334b96781f1ca1343766d3a78a82b9fbd60d6c2d267bdc25a5e0c4b3fa4df785e6eb839291585adc08ba9a1f707d3ab066da326a34d72a750dcb9fe10b1f96";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/id/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/id/firefox-71.0.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "e8fe42ce9f6399d1291198d169f7da5be07f8317ffc47395968958587b559e576b6dfebb6a1176b89eb4ae6138aed9de987d6839f1e48c1a330a0274967f27b7";
+ sha512 = "5b01cd3f4395a7747d27c49038f82887ede4b5fd396d96f6ba085d26dbeb2bb7c722bbd53fc0872ad0070de0817e6e67f065e4e0054d52f0a76d4813e60b3b68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/is/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/is/firefox-71.0.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "2179886cb62bac2fbac100fe7617b074ea890b9efc16c0fcf8387096d82e4b84d351bd2eff431bf5ac1e30d144208411b57bde540d8a744fb9e91b793d6dd061";
+ sha512 = "bee1004c51fb2c6a45689b29d8ef1aedf91eaa22d153d4d85eda87c79c3d063bef8ba0cc985c5b9cd808aecfc22b1654fbe7baf0f9c96cfc188a1ab101405c5f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/it/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/it/firefox-71.0.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "738519602a2a7ee6b8c97a9df82b125d46e77d1804e7278d7416ff7a930fa38a2cd2888f7019f5a9d15b748725f8bb2d37eb7390141ae65c3056352c64b9ebe8";
+ sha512 = "7aa5568131a47d3bff820bfd3c7e8f5dff8d79d2f039510d73964b302f2b6f63e41cd2232e4d17e766ce52d89c9aad5118092152472ee7080b8505a4352b30a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ja/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ja/firefox-71.0.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "645ed65a2e9340c7836bc35badc6bab1d209fa59dcd3221deb892ae63025179610fe3a59c60dba3262c18b618ca7f625c9df6f247b8ddb0f7e72557d0572417b";
+ sha512 = "92e13e266b2da5b200cbb2d09b1bae3ba6963069357656a2dec89d2ca239bbfa799bb7356d5935bdd38a0d4ed5d503bcd69de67d3caf79f8118f0884b9b7fe6e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ka/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ka/firefox-71.0.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "f4d4d156b5d7c15886680b2d5b2b6db7bb978a620be38ad25eec6ce477f5bdda068030b51fb05b949d3faf2639b6f0f288619ff523b0e9e988515927f251fe08";
+ sha512 = "fdd066469146eea0e0dec12d5dd98f8801e7a8910b5662e71ad480be337d9481939e7d4d19eb0a34e19e929ccdea97681a9d0da2d9fb96a6caf36f842426f32b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/kab/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/kab/firefox-71.0.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "5f3d11bddb361a542f333c1045d9189e8ca104a8f5280eecc3b9392941f8468140fc686b7e6c36140ae4e9f9417f00467c9931334944b3949023015b23b5d0e8";
+ sha512 = "0a62bac221250b7ebe55beab4acbf58d90ef522a82f4f98ed1cfda19ff4bcb02e59587cace7251691aa5545d02b7b9ddb7a8fa99eabe65ae867a4405e24b851a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/kk/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/kk/firefox-71.0.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "e9cd29f905bf0cbb7a8ab90e7f73144fee15c5442d653c2492701356260b3c134eef33ee066bfb1dacd46e1cbdd19efd0901fa150472aa63f003ee9e82ce006e";
+ sha512 = "cd611b845802e59ac292cb6e487a68319544130d6a39f4ce3f37dd5fa73094ae89e9504d7bba846c55dbc16747caf988c1a45691e7fdffcd601b50546e15ea54";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/km/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/km/firefox-71.0.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "c9153fe68edf04008023928ad5fc810dfa0a8344beb2bd0c1810f15b0736fd1a0168d4b57e611f1192b5f7fada136d7bce209713e2873a2428218b555262c4de";
+ sha512 = "27b0d8750bfcf10813c35910eabe87f4294b033d1044b0fb35ba82a5870748de2f10b03b4f39c5857b6f42efee796ae9f8d3ccb9b920fb6b6544a0bbc86cae9f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/kn/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/kn/firefox-71.0.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "6ceaeb920d775403f1da31d172754c3cde34f8d3b68bb18d75e23887f253bb62610c960fca3e11599caef4a947e68f11b22b1c240b3381a6eba179c948c1cda4";
+ sha512 = "5b292220e41ad296d2230650810beea85f038dd7d16fe24f08d7424ad2927424c088d8fa1c5c670aa95f0457d9d8259d4ad228cde09d2195dcb94a452a56b6b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ko/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ko/firefox-71.0.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "f0161bd480a8a8a861c9e757e0c54334c060616bc544cc698a5e47b71de1784092c44b12cea973b74f80bec89cd14c13a9c6a493eb7a220a8121676f5151cbe3";
+ sha512 = "784a362e0a28233e7453948cf2e8a6d6752d5a702164f913dae01e58f7aa837fd976f5641f6786fc58799b2b3a66255317a52714ae09b3f346a9814eb5445c4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/lij/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/lij/firefox-71.0.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "d591cbb59e4db81ce872ad367e0d74b425c1b2b7528d8f468bbea15443efb98ae74a5b860fbef43718432be8f1d0929766a970e6751105bbd949c7ac6e515b65";
+ sha512 = "6ddc8ebfb7a469636054ce2b5606cb2601398dbec59221e81cdbb3fcde33be0d6e2c2f47a7bd80a84c3a1d0a1c8e68827d72d57041319aca59c89a1b03eb9510";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/lt/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/lt/firefox-71.0.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "073a23678762ee210554301940e220aa50dbb478aa345c47c64ced760a19e25e24d1748767d627b6b0d382245be71723e44189b7a4f8d74a16afa1fa8ff93747";
+ sha512 = "57f61620c306445154585623ee4b8d2e915371429f669c426d0b99916a6eef39888c32d304420146250ea4d2c4696f287b7dab1187e341ccdd728d5cfc181b11";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/lv/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/lv/firefox-71.0.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "6b5a2db5852f99fd725410042c59809ffc660ce66b15b8baab1b4b1d3cd4f534dbb93699b49204a73b37c2ec094ade0662661a580f7c498b8d17d7a1aed4ff1f";
+ sha512 = "6d7ef84ca7d5cf92fe671ef5372b602983b25a035e110bd92f25c461fc8a86fe0b14965aa3426c90febe1b311cbe67d901122cd54191162957ee0bc1e1d01a44";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/mk/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/mk/firefox-71.0.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "be4c365a2f9e39f5046b464308605d90d318142300fae63c5f12f3038bee064174f78639a5bf58950cf6849c5490f338247ca7982c2f400fa7c62672c11fb5a1";
+ sha512 = "680752f83f68c0a2c6f929016c610e671bef0ae44b84e976b0839a19f1947429a5a2e8e60149791fa2454a85772132dc87db1979adf327bf6d36da92b50a5924";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/mr/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/mr/firefox-71.0.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "a9f8d75efb79d3ba833edbe333308c1da1e1a5724e95d6f6065170150bd341de1189a61283f28e6570b35d24c1711d97b2fa6de9a32bf2b896a2376ed592b56b";
+ sha512 = "1950ebfb23bf825b2f8711ff85c53db29781e52a9684b515373c2591c458d897a7a4445cbe3ade9a891c52104a7651ced306885639495bed76690a305b22fea5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ms/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ms/firefox-71.0.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "82d9462433da674272c77cb89d65d9514a045ac7ba68270b7dec5f6f01e50e81d6b79b5c84830bac4abe311eedd3a2e851ac8afb7d03f0e5421995b78c039ff2";
+ sha512 = "1dacb30753cc4c65bda54af6dc886b1a8abd6c6320cbf208163aa83d874449aadac64c5f5559e5dcfb366d4b0ebece323ba46b2eb41f03e908b6aef08bb46a03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/my/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/my/firefox-71.0.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "9239499eaf3686cd9ccd1e686f06197be63e1fe9b95c1343bce032664d08387abb4798d725f64cb439ca61afea58f3802ea786b40653028a0b90686af8423398";
+ sha512 = "708813ef947b1bdc8f0459c3ac908ca1fe3862525c59d51ccdc1e7c2d91c1e45693b109faa3d0302e7a2a0acabc3c84543b8ebe98ba9d97215505074ce9169b2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/nb-NO/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/nb-NO/firefox-71.0.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "085fab55bc8ecd2021f1ea0887ca7b191390d8ba02af07c1fa16bf78bbb5561b9e47a7ded461bf68b1faad9be747db794c9a9d31d35d2d51888d54a513dd5f99";
+ sha512 = "6511ea81a9eb6f552c260821bfbaefa7153a59f5078d7ab5676aca313ee27cf75617cae1cb569df400ed491ed31e172f51fb4c4da4ad672ec76e3faaa31825d5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ne-NP/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ne-NP/firefox-71.0.tar.bz2";
locale = "ne-NP";
arch = "linux-x86_64";
- sha512 = "c5f1e0b5c3e84f11a3d78bce721ddaf5f93bca53236475bbae7b9bfb126917cffe779a89846c4b2ea8d47a55b61b4a0a9dccebc1e685f100f9ba36ace157cbda";
+ sha512 = "088adcab8954c67db9715047bda7c91034b7068593334ebd2b0dd5941ca7ca3d3c22c959baeb5222e041ca50e93f4032b2fd509e305a666af0f772f89a56faff";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/nl/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/nl/firefox-71.0.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "35bce76ba0505839b85f91881bc1fa8ee8e8d6b6dcc237619b80ae4c7fe0ae2c19bf6951ede595e94b5afb7b9c030813fbf4cfc796b1c3f82381b7c6a7ab593a";
+ sha512 = "a9d569d5032bd5e7aa5a54815b01d21f8aa55188144a0e19299cfd2e9f39f931bbd86bb9e05b9c2fc67e2749f82ef4d14c9bdc08044fceef8710b3eb67d3a4b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/nn-NO/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/nn-NO/firefox-71.0.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "16ca43ce95b52823ded1776584fcc5a5bbe03126496c029ff36475559ed73d3fb9aa60c205aa5e36565f19e1e144a0239421331f3e3660dd7cc38868d44ea7cd";
+ sha512 = "dadc75699db6c309262855754cd8f3849a5f51aa62ccb2071322cc54f8193ac5b6ddd642677ab277871c4ffb90000bd49a01bff23557d387e7d902b74150d4da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/oc/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/oc/firefox-71.0.tar.bz2";
locale = "oc";
arch = "linux-x86_64";
- sha512 = "46d6196315738ffd105a7a15e2f2bbdeba86b171c8b87d7a69e8a28f5c704f8d1312e19d118e2634505945adafedc37558b7d8fe24bdd5df7cc3d50837db3155";
+ sha512 = "52850cb096bf7c2539c048f935c434101f3e66e7c24d4fe05147de018aadb357c4fb7b582d4e43b3948575b3d0a8166a97cef58ebe159585e8a0065bbbf30727";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/pa-IN/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/pa-IN/firefox-71.0.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "73f8150047a7b0873fda0c7b8144fdac0e3e83dfdcf97b50398625cb228d5088dda611727ea5bdeaf0b018e0ebd9f6f63dba9abea398929761028623c513f35b";
+ sha512 = "ac1832d4c105b3b401cf029bf95dacff3afda8cc63de51b35d4b847177bf4ef48e415294c91c7a7c095725c52413ca17eab051d3a50c5f8c7346e480d85b2de7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/pl/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/pl/firefox-71.0.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "0f5134d8f8cc922331a4ffd26c9fc37e8ec54efc1e5d1b9da9fbe5fb05da80b078fd7698c88ef74009ca8769c919255aa120bfadf30354ce5b34f015a1caaefb";
+ sha512 = "6925686d241ab63e882b0679c93ea2ba73db84037593f098912fbd23a5bc0b93492bec3114e7e42a87f1ab72696f9c9d80caecee31b0d06c949a55238c0cb8a9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/pt-BR/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/pt-BR/firefox-71.0.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "f26f1cb749856c9e183984327f773baf9ccfb00f7b00abffc07fc98d9e646ca8d7b90ff784f8563e20ff5653cc57abfc193b9ce0862b5e86d50922d52a9c8e0e";
+ sha512 = "a3aa486f7d41f77e090d56047aa72dc9d40e8d8b27ec8203c85d77bd108443201940239fa16bbbbb007d8093429d810db0ce0ff6309c29763ee0b424b8df977e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/pt-PT/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/pt-PT/firefox-71.0.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "00921e3e87f12d653e762cefe75f3d064bfaa3fae7afe003cda2c98a381be4ad55a21989affa825c0e7726ad81baef41313ed98381ba598d991917d0f33b7cf9";
+ sha512 = "e8730652a48e737840f8bfef348d357d18d642e01aa91518fc88d0142fe45d5ec5f7902506e5e6a0c49c0fdcb74009a5fab96d9f6097b0cbe07c4df05599d79d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/rm/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/rm/firefox-71.0.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "1fb0246c91cc6beb01ae842a4ea9f2d749a5196380ee03eb689e03e1ad4d30f7d58ddd7ed3a6d3f340fc72b1c94732b67895cfcd0c2a3f1df87140d0ca7068df";
+ sha512 = "8555b604d00fa7f5efa6a2d3f6fed95e18c2256bc67dc311499b160dd634e9529e0e7f641d66c46ce3a269119a7e4af65461c8315d130eb46af3f43762f89d8d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ro/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ro/firefox-71.0.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "5a1d2659499dda8f7394b6646deab1cdb18f7b6ff71cdf3667a238ac1d4170a97624beabd28cef3dc0ec5969d5eb9d05b5560fff4bf14fd0a5e5e2744c670585";
+ sha512 = "65e2b57e2e9aa7226989181fd5cf7d76b54f3be66460fb587d35f27689551ec326ee77da5dd6e4a60b61f39c5c789c399c8164377f6fc03324e65653112d07be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ru/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ru/firefox-71.0.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "8c7d33d17fcfd3df95757818b95e6a799a5089a2311a2e07960e6700d024b8218ef9c03d0771d3c2559937a45556ab640aa5cd71c34c00dfa27936c62903bc57";
+ sha512 = "b2c52373652a8340e4425a101bb8a9c5bca8f2db6093e54f5983a1a62d4aec0b10252d678b91dcd8bbb23a844215545b1f9d627ed1dd1bbd1488fc07027aba47";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/si/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/si/firefox-71.0.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "1e20a444d0968162a84946ac8f78d42d0a01843a5521978b3719d954c2f49d4e834261b6e248d46e85a6312c60109cb2e2f75adbb209870132d828b73b0a50ec";
+ sha512 = "47fe8efd423579a99e480c906cd7af5a249c01103558c5a0dd41008ab701f60cec817bb691636985fb5ccd2c5c4d0628fe13e892db377d8400cf24b40b513aea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/sk/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/sk/firefox-71.0.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "badfe0541b0c7d5c9387b1a9da769b5a50ffb0ef5bbf063be99b4ce2fa44ebb7e957a1bcc5c7be4968e31028b215775f8b8d433af7c1c3ead2bede17c18b34f9";
+ sha512 = "3d8cd6aedd3ae96be8ddc7a8cf44a3185731803a1a413e3cc582aa17d3bd7280aa1001f7ec89360a95bdb8c01c0bb51b144921a72b9869e17fc83f6801aa3438";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/sl/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/sl/firefox-71.0.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "d6f133eff2b4fecc43603201a94b06d43a872de706bbce0c828c6f3ec4eaaeedbae677255bd85f8a22212f372192c3871d5871a402ec67855e30d2cef00f1b16";
+ sha512 = "79137e5e42391dda48e521b44cd7d6f951886b1473bd517689c04b74a0d4a9ceef5733e128a5180653a9ef9c3546d4d1a591e0343292e4eb7b9310ba77ebad5e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/son/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/son/firefox-71.0.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "234116cade8ff0fd68eafdeb09def2de5a4395eb500fc06e04f9c5367a2bc9859beb34fb64f9a80bdafa76200716d999bf17a35a23177974a4e7f1f1cc43f646";
+ sha512 = "d782f24ba3ebc4882e4e5cdb9668d35b9dbdd614d31102efe85aae6d39e2890dee2e667534c1ec82f7e010463c5628975d5a9f06df2b84a2c0322bc0ad22cdab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/sq/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/sq/firefox-71.0.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "5742ddc31600b89d600dece3afe1794799e147b6f66454de3b1d7f8948b06778b87bdca042e8082f61213fa4fedcfa8ea3a0ef3d9a88b7b83e0a9ab438a44796";
+ sha512 = "6423c1957d7d3f80f8a00e9e04b4dad3143f0404136e4d8c695030da3acc261827c7d3c001a97b8ec6e451cef753819a3846e576c4cd6812cd45cd78e7700a9e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/sr/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/sr/firefox-71.0.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "b3a2e8765c6d78bc35595f12086f4771ea5314e6aa0a1b36dd1d870680818c102d04e12633f30744c62416c378cee88c59e110eee11e44795d4dcc15c79c4273";
+ sha512 = "cf4de0253aca5994569925b5b5a2a80d560ad8d0bf6cfb9ec3b0f2944d542faa4065deb89375e8497f272349a10a4eb1db048631040e422dd7b37098fe912b4a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/sv-SE/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/sv-SE/firefox-71.0.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "65bc7b60249d6e29633bf6fb997a744522667af120dd00f61143f4c9ee7cf48a2764391c383821c9f6ac1c99fe40bee1734d8949194624ed123f92d0ffe7efa1";
+ sha512 = "83b0203af53d660dcfe801891a7409d8b3715ffd24ec1ea5ae526c712ed97b61470d23f656b196e8b8165eda8043eaba47475860ebc07f6fb28548d6a5a74e81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ta/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ta/firefox-71.0.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "5ed15cfb7e70ab43eef608a06713af28b44cd64a1e5d9e09bff2b5bc1c095f8022b82665a496ac25d3214c955c9662a8d783ba20a784a864739a04d387a4a81c";
+ sha512 = "c559e6f5fa0d7040f4b15567c24c9dc20d4f8fa1862985b3b4aec465e83734868fa9235d8e9718837d543b6ab8a74655f01dddec0be9d70740f728697043a612";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/te/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/te/firefox-71.0.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "6bbf8bf5a672b8fa16a9286dea173b5323a77f904dd3218a439489d2ec3ad092346be8d06f22cc8b12d39a44282861461883a16bea8b0067e1b0551cd38a053c";
+ sha512 = "6cc85a388d5c88a6ad74bfd1a411b9cc33d573e15ab04889753b8e9c006b94c6cb654ccdc72b90609e3a1eb79ffdecaafede306f80c7fe811fd8c583b7299311";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/th/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/th/firefox-71.0.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "ed04524b8d60e96a35967c69901d478596a98aec0a31f8f4fec72c67217a6397dfc2c0a142929d074d0eef6e0d32ab4183a72b467f0f19720c240f7d0ab9969a";
+ sha512 = "601e0c5ccf1b3725c399035ac2bc7d1440de7084c7a2ac1f12c883a7088154b3d83de7c0167a556599c3c896c57540b57a927f5c89cbef8d7cb74941aa76ced6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/tr/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/tl/firefox-71.0.tar.bz2";
+ locale = "tl";
+ arch = "linux-x86_64";
+ sha512 = "1023604de1e1fbce835511e50b0807c6e1dba76461b86c7e8506b640f26f9cbc854109b14a8872e6350899afbbc868f3b4427cfba32fffc6e6585f65fbb95dcf";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/tr/firefox-71.0.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "5660ab4de81d92002ae2dcb7b8eccb371ca57c4ac06d31b052b187985babb54eacaccde8f9b2cf815c15f9d093a06b5ace715de42a9c36793ecf7b847ec5f219";
+ sha512 = "56a4755be67d6d764c62b8e226a14aa0f18741ab71d3d6b7dfcaf45dde124d821dcae75c3e251024dfd44d99b904538eaf4dd4a56c728af651a8c4a2c9533a3b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/uk/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/trs/firefox-71.0.tar.bz2";
+ locale = "trs";
+ arch = "linux-x86_64";
+ sha512 = "bb4cffcba83698fc3dd8edfcce361d58503ba4c890f2d906690d7036a3b36a338e379019df9129e2b509394737b716bc70ec7afdd485b12adbf7bf804a13e8d4";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/uk/firefox-71.0.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "3cf5d6942fd15b42a17911aaf3069a610f3c65c3e5d4bff83ee922fdb21d6fc6afd81172a6871fd47245a045e5a644943d450fb8af400553b3091f78aaa71b5f";
+ sha512 = "d406c99bb37bfadae4a43195be37f52023835ec9d771bcb824b2714552929def1d3888236dd9aecd9624ff1cbc13d24ea1ad0ac99b2d7f05d738f81eb0817ea8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/ur/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/ur/firefox-71.0.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "174039e641ebcd3bc2204c7816566e8083a61082aca7c67c46bce316408a978b5832a250944f8282732590e442af4a9a21d4dff53dfa0147755d276bf3dea05f";
+ sha512 = "18c84f48270a12173fe93505d35f2a0abfd9400714b23ab28282efc38f9fef358dfdd3a182b57f8de9f8635624e85b735276db913ab102a5ba27d9cab94ce352";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/uz/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/uz/firefox-71.0.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "fa6924abed1205b9c99db2134f311996c493d6b81ccee473baa9287b60cb0918df0aefa67603f0daa5fe73ba3e29ac2534f08079c6a348fd8546fe1d920a3b1f";
+ sha512 = "8c918babd17af9b44a3fd3fd1473b4a55e29a8b8907269ec7e4ddad82fa60babeec557f206a6c8a1deedf1536927cc94d5d397992dc3f7353a131110a73f7d9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/vi/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/vi/firefox-71.0.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "79cf47c86f9ee36b906f13d78405c84793284affb7c1364cf7f71ca33f3938b0b434655db3a9051edb95574de6a7591697703a8bb5c7db3fa088da7d9aa97356";
+ sha512 = "bc00562535fb5555b5ec00b28f477d78fff09248bf6b3cc8fa6c54bc4d3ee304ed0787c17b18b699e693bfa1f40eec2875962b02df7a0beabb5a30f0a926bb54";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/xh/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/xh/firefox-71.0.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "ee34ae83ea0eb4c3fc6a95635cd1965bc0ac13f9881fb15cb3202f32360e15c959de84457e2f167fe4dabc1e411062b942526f3cd624b1c860b4df7711de4d60";
+ sha512 = "8fa553f431e350c85aef0b31f99c2c02d6acb2ee1c78d353304b6030740c959b6cd5d536c62a0611306a9e2a927568ce91a6e43294462e8166221511632a5452";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/zh-CN/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/zh-CN/firefox-71.0.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "f60a9f43eb196084dd86cf910597ae4833f6aa9d87a7dab934104ed6def9936420bafd1d8a321ff7d22d6d1b69452ac2b79865446b4b41789dd97858b0887810";
+ sha512 = "4a58da292a7453566e903612d2d8ec9af07e2c9f35346bdc4c1be4a9f586bd0d95236a300bd544a6f50bafe3ba582edbeabe3a18de925a85323e53999785e3fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-x86_64/zh-TW/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-x86_64/zh-TW/firefox-71.0.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "1c582dd3dde0c6a0a29145b9482b750f849d22162889436397f9186e82852b3a763784a7e53a18f728ac7e76dd4e9c02e080e679770ae2ce0638543c00d3e3db";
+ sha512 = "9cd943600d1464d3116b9d141d58f06177886ebb6a41f491af8004ea46713b56e93da56b1187f96e4f6ac6a304a5f1ef00bc0f7c74fc333cfe3a7a094cd907dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ach/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ach/firefox-71.0.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "5037ec716c3b9484f8dac120b9bd5d89d7fe4af8d5890566623b8cbe8cb9be7ad361848995b4b0862bbfff8ce752566e88a32643e6d631cb35f4bb48b136f0c1";
+ sha512 = "4b8e6c0a9617f35af6484a45781aea888693d89b87e73693cc4d39ac5dc8a4b5ade221efc2c8367f799f19b86d8cc23994c28adb519f472f0552487c6279e0b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/af/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/af/firefox-71.0.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "875f8c525297baff2876a6c5567b1a7c6b07a269d487c93a7591366c9e91f2359f3ab537f7c6ab59d20f1360638f742443aecc2082ebb5e6bfb545e7bf328f54";
+ sha512 = "cfb071be89b5c5d4943402f545a001717aeb46df6210a7c5efa58ec73f192799cb0b5e1d4cc61cd13b072a9a320560f6592700e9cb0df1fbea4cdc8d24c8a286";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/an/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/an/firefox-71.0.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "fa677ecac73408fdb394390f72bf49ccb3df16f93ad124ad91f60d1f29aa8a217af341ffd566291b86c18c81c92c8f9950dfbc8a339aad12105349f36cd79e2b";
+ sha512 = "ea87ac0ea1048dbb50ef76b93d1027d78fbd9fb18acd7e77121954ebdfc2bc8fbedd2e3b61461ea884e265be744ebe7d300b4416f7e3ba1ac6cdc86710e34b33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ar/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ar/firefox-71.0.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "e4474a7bf8e50d29d991587d354d2f1df0359513be6e6b8e978be6af59f18650c83d5acba61c0a972da8fad7b7db720c63105d8bbe6f903dc4392ba060fc8f88";
+ sha512 = "2301d1d7c3029829585442a8cb49a8fdb862044fb9329304d9fbf13e3359e60b452fab822d57743a7fb9b037ebe45607a251581b22dd682ef56c73a934c4cede";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ast/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ast/firefox-71.0.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "1a9d6336780e76e501e844c925953409c12953f27de8185407475a9ee54b9601d069f535570f16e70f6165c363a089b38cba472329749d18499defde6feb71e5";
+ sha512 = "4b1a6377f4cce9f16955b045eec886352dde9377b4ac4349ba544bf5554cc8d8b4406afedfdca53ffc2a3417eef6deed74def9e7d370c9800187d589a19a5c1c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/az/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/az/firefox-71.0.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "774e7d4c0dd2830a581db68ed77d0066fdd03b523b9cad0e722343faa797e2b813f391a9fec7cfe37c9343c1220a0dabbe0a39a2ff39b3ed4d735dad7495ee49";
+ sha512 = "dd1a23b3a2a6ff1359953c2e4208e3e2eca32194ae8b48cce9654ffab680749b0a9cf9d9f13ca589b61d91f947df33ab2dfbbe559cd90c470ac2ab7ecff46a63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/be/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/be/firefox-71.0.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "cc82764c3a70d7ff2d92a5ad42796aff97e6c30e13d2669a6e651ec21897be2bc13ae7dd7a061e359dbf88768306b85face5602e9e5a917b4dc803593be224fd";
+ sha512 = "052bb1c0411c0d1fe997a394ef4dadfeafc4b01d80b4f7b5c80cc9281d1cd7affe65560fd19c085ffa1305314a86e2963f5baa814ea4ca285fa2e151af92a257";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/bg/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/bg/firefox-71.0.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "f64cb5ab0896c0d87532eefce2bedadd8fa3d288c093aca9245f860e93c2b3345b4a3a5261f01cc91621d05d1d60476d546b063b4bc76d11149c62031d4cdd5a";
+ sha512 = "bd12158f7faee488c820853c6911f9c6e5ad92be9918669814761d2974e85be6242fc7b0e4f531a73692ec2d4724ac8f0a3371ff8b308012a4c899bfc1325444";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/bn/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/bn/firefox-71.0.tar.bz2";
locale = "bn";
arch = "linux-i686";
- sha512 = "46706117f3bff11a6fcfdc0a161eddf3e4d1167dad75f60eb0bbb9479bb45b65364a93a20bd1ed9b99da8965c1b86ec4138b1187f4974ca34cb6e71e1db9d182";
+ sha512 = "ea9081d4dee23cf6ffc1c2ad7e7d7228cf615336f83725f46d53db5924fa09cf948344f95f8ff6ef57b19799327648ac9d1d6a0bf104727e85c76ceabeef1596";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/br/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/br/firefox-71.0.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "9856d76eefc33a114558edd83be6abab5676ce059076580641781a602621a74458b5a87cc5a664a977a9537e5d5b5f3c534773dfa446b292eef9a9849fe7a5e1";
+ sha512 = "67accbfd323a94fdd8daeb3fccdd6ef294c501f0a796cff9274be0b71583841f15e918781aeb30c903a5d58554caad4d4ad2d1dba7dffd983c642661a22cfa79";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/bs/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/bs/firefox-71.0.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "7db4ce6bb1732f335da36e3f28ae695528a51b99797597a4154852f952a4dce99196f19da56807e653e3c83ce398872ebb2e0e1095d19ad45c68241f3b2d37d3";
+ sha512 = "72e33a58d27615dcf2ac407983f324cda4dcd127f4f6a7149552822578520abb9cf15c28aabc3a09a8873b392b0d7fe6976fceb2d89197c34a17fb4d4d1b5612";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ca/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ca-valencia/firefox-71.0.tar.bz2";
+ locale = "ca-valencia";
+ arch = "linux-i686";
+ sha512 = "3cecb8d3401838ad7c8668cbd424a6fc3f141aefdcacd28733301db651d31dd3ab996bd41a9dfd3249c4ebcb48c6d5eec464698bb6dc7fe9269dfd045e5eec08";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ca/firefox-71.0.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "565ff4b01016a47103832057ccb39aaa0af1860b90f820fdbce3a037be89741e077d9b10f41c7ecb20c1e5d724a672d394d3d42dcd5c82e48711104aa6660774";
+ sha512 = "545cf4e37c7946b0fc4b92cefdfc0e61e9fb77f01b886e82a4c2e9a348b720b45f6df84828fa8cd8e3a1827e47bd112d94d1513b68a96c1e1b2909729418535d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/cak/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/cak/firefox-71.0.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "7e5637b6e7560f68910adc22dcb02e0bb9a81a4b65a63c87634237943816da4c7d8bd3c02a809f15f4a1dd7a99903d6bf34151f4892cea4fefa5d8fac132c13e";
+ sha512 = "6fa83191685c96c860fd5b9ff8a27fa809c3595f2fe5ccadabc510e84e77da7210b192e589a7835bad8c6e5c46b7866124f66c419e58d0386a9bf8dd1d2d6583";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/cs/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/cs/firefox-71.0.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "407c9700c3c73fcff72042183549eb1c73a340b32bfcbdb350f4707b421c5c0614478aaacece123a41b4b2883eabc7e05568d90085e1ed560dcbe561f429a775";
+ sha512 = "50c22882418acac3f95a57691a5b1752ae51f209a50b60d7ad29b8e1b22b0aa372c1bc104dfa5563b6de14f6a09a03a85a595434f4bdc45a3ee932390249165e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/cy/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/cy/firefox-71.0.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "555f00ea08af899e080b52fc16ecf22b950a171be2beb339cefc7940a15a1b6ccd5c5dd61d3cb20d2e9f4a81faa9537279bd2b08195d8e3e527fd76990a462b1";
+ sha512 = "0475351728c3dc6afcf1e816edd5737f6aca15848da790616cc2fc3d7efe253ac2358a5b7226bf4ab9c3caaa07e91329e77622e6a022d81dee3cd7dc09532a5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/da/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/da/firefox-71.0.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "b2ecde8118c19ffd3bb5f75af9fbe3891fbe2feb85119a2d9ded71519e427d2a1fe9e41969945df984c516593cc61010daa61602fd6e5b01b84c7a6d0fb67a5a";
+ sha512 = "5a078e0be9d67fedca8951fb471838a54972d25a53d95c132b439028c20276a8a43183d249878fbb706f6b5d7d244bfcbc14cdad43ee2616eefefcbbc7876b5e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/de/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/de/firefox-71.0.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "3d90125d66977908e19c2c2d5f0e8d9242094a87ce29fcfe8174db21a882cbf71ca9fd76279ba4c03131cd945c24de1b74437a7364d5d7670021d7e901b06b02";
+ sha512 = "8348b5d882ecc1fe9c4632b6644d756578d29f1ea1938b3953c6c2f7ae70cd02e00299bb4b5384775ba5e45f43ebb0d79a5b976385da4ad6cfc192edef0bd1fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/dsb/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/dsb/firefox-71.0.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "65722a4473e466417b3ec0859422f6bb40dcb68565eaef789838e6e15a6acf30393b70a7d599106161684ecd1895a28d4876bb36c511a6b9a292ce6542a4c370";
+ sha512 = "63b9fb904d0040d9ff626eb970e00fa58288527a9068c234f02d41af6cb33ec9575595b5d3661c78abafe4b2472d3e8b8f5d3c8b92d8121f564fc9f71883195c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/el/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/el/firefox-71.0.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "8192bd5c963541153ce7264d227396fe6eb6ab54aec879e0bc511845fe1a311662a7e03db3ad193a01ef0da3c701718d1aeab72550cc3b8f01b14518c82eae2f";
+ sha512 = "1de78be4c89017cc39c19e6196bd2327bd24a4c7cbfdf1a77aa87b0b0395e9791443d034edc48afacf1fc20b785369e48e91c203edaca5c33cab10c9a5f098f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/en-CA/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/en-CA/firefox-71.0.tar.bz2";
locale = "en-CA";
arch = "linux-i686";
- sha512 = "4514ea0d1efee35b57482374202cf4b44e24389ed1ea536f35b908966d6dcbb1963f59f2d4c48c136baa1dcb222a0596f63dca21b1da175eb5b71dbac5dfac46";
+ sha512 = "1a78bdc245161bfbe2cb7d6488f750d53524feb1fd9e04b519136bd0797f8ac5e60b1d9b905e27f98512e4d898498823768de0b51a8fcc682a807f690df3458e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/en-GB/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/en-GB/firefox-71.0.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "62bfc1a2522a638af38a41b0054b4fce1fd04d383df81d12abf0cb132a0e4e8f138e741130feff4ddf0c3fab574a0e889b72862517dc4603e8d9e966894fb086";
+ sha512 = "c12442798aa2a5e3a1f31f934876b281abe0c956558cbb5042cb5c94bdc062bf7659d19f0ed67b7208243cb42244aa7685f76da08df6a4b8d2013cc6ffeae392";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/en-US/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/en-US/firefox-71.0.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "0bea6634aecdcf315ffcc56f8604a677f7bfa6976a8671a361f2f76a6ff9c34ac1e7ad07980ef9892196515fb922188a36439e8c7b5d8113632fe449ab138878";
+ sha512 = "558ae4312ef18493d69c7504f10baa3598fd6e47289f316346b6df16dac97ef25894d6d2c776ed2a8f1ce0546e9b4c6086fb58b0cfd5018424b81068a6fbb7a3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/eo/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/eo/firefox-71.0.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "a9bc92703d62576c988a5c50cd7cbdfe79665aed444e748f6c036b566005207883ae66bd9006af7ed6a35c26b520a250d746ed8b1964cc177abcf250231eb8a1";
+ sha512 = "ec05a1cb0573e27b5c848dc67ca6346ec43c7ea25d0854a84a8d61804946e970ef45995140b04271239d70c8d737c144d629384d221ab7167b581ea7f3982370";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/es-AR/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/es-AR/firefox-71.0.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "a3d9a790dafb4f8fa75dafb0fe6f6c938b09d67895e9f443bac35f1799a73652d3f2460e0481333b325fa3293954eea06f1843f5d7fbe6f1c6927287fe35dbf2";
+ sha512 = "aa2064be8753c26359cc14a2d6c4aeb342cc14876a9565ea214fec0378b17074f811ae948bbb970371b67ab95cec1b68a0393c758874d8af43863b485801ef4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/es-CL/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/es-CL/firefox-71.0.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "b81a8eaca07454b30a1dd902b6a3eaf6a81ded6d3a518067ce8483f20b6ff1c9f4f89e87e35bde08f7105970b033947fcdf03c1665522e1ecb557a7d2d536b83";
+ sha512 = "c4a3ff9543e50cfb200c21c80935133cbd8016da162bf8379817e86516ed23b6caa096228f1ff3a889f401f0ffbdec4d06015a81fcc0f5bf10c28e9097d61886";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/es-ES/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/es-ES/firefox-71.0.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "90fb3f648f6df4885521bc4d4c24e1e824ac3f700354ea26c3247a7791d2c588351e4d20f6dffd946ad3cd2a90744ce5fd0334744562df9a11b3015860da165f";
+ sha512 = "12f955890bc274d52d3a6ef81440c85d8b6b13332c2b3bfbad377cdba0fe8f64ed5dfc8f1ba576e9a8d0a5bd425b10e034a46b761ec86e7c2a5228bc2fbd98a8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/es-MX/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/es-MX/firefox-71.0.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "6520c5ca64ca286da0e5c5dbb239552040de4b5e5b1f4b348a671245071b8e1f4213da930fc6acc7a7134a9a139c57d0f0462318df167771763d2d83b54c6123";
+ sha512 = "e38bead8333f3f29319e045aee1612dcaf4091d8cd543c9345b0fc78a563ee0fccd936a24416cdc91ebd184b479a504f2ffb72648e9d6521a0f8a1cd68e1ba79";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/et/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/et/firefox-71.0.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "3e3d35b70b28d7a3b636e986d575db1e46ebd886cd3480202d9f79a13d2c60d0df0704d222cdf1e5b6c823dc80a68a610d7904b9915aadb0142fcdba83096280";
+ sha512 = "5437345a4ef6179898f7084c81fac8926f4d44dfa92c7875f7ffab5dd02538fd3e434db50abc486b460cf43a95162f5c38525c20d4872ff6300e182a6a3f2ae3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/eu/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/eu/firefox-71.0.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "53d4125d95a132ee7ba7d13b6dd3303dfb4799aa9419cc1600addbd7905af20914b0d9e05a50d96081000db4b7d69242fba9eeb51f5bb4fc755d29df2c800d6a";
+ sha512 = "9265ae811f7e78c7078ef2cacbaf82356a37ce4ccf1528c72303a7b70ff04c59a43173e3ce0930fdd5d0bacf75267703965e8e99ed06f58f7444a0ddc9988a84";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/fa/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/fa/firefox-71.0.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "0e6f6de18dfb2744f80591ba0b5761cd50c68e7957a7937a59699ba0ab40c995cf7f49fc9829f35379448dbabb86783962c06d9cc926e3ce0a00277ef509c307";
+ sha512 = "a1ef3b8d4547dd186bc66425da0b8e92a3d1bb30e05ef3ff0bb6ab303758f3a743ae6167024e290a409a4c1381aa8b20f126fe3c8b057a3b15c2a6393affdf84";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ff/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ff/firefox-71.0.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "9057e7c690474b8caec909f77fde40c40a0eeba7ae6a16d021809024f1e83235221637d4b3f0201e99ea381dbfc2d56b6207249e275feb83ec86bc0bc2a67ad7";
+ sha512 = "05e3660ec39408afdf19dfa57b0538d69a87de58885569538f9786c27d7177666c0d24b9e7c92f013b603aa5f7a873b3be84771016de50216b3d2093e9ab2d6f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/fi/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/fi/firefox-71.0.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "7b0e3601ff96c7e1574b073c8e14e6b1c2738064090b4bbb00c1b14fec901670fdecfb3b311d8beeb641b2bf762530db77e716dedd919096a549979b1cbec5b4";
+ sha512 = "a540afebb39f0a0fd0013635d54a4026007b2134293e669dafccec91f0c19045a1ac1c4983d1acf4c68daaaefef5d2b6e05a2c817759e32d738d71542145af9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/fr/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/fr/firefox-71.0.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "1cb393810f5268ebe869f116d9bb29f5d16e1fe074423f3e90a8a66ec1ae5efc525980157d9dd7b3635651e55e0619f64d5a8a356bfb1658e180a162135cec0d";
+ sha512 = "9f6007b920b23b345f78dcf372186c7b6f99fcf1b14f20405dc3b524cc057bc5d5acd9092f41d7f7729f5afdc8a973613ce0617c93e98ea2448154dd968ad344";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/fy-NL/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/fy-NL/firefox-71.0.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "13ec09f3e23b32996b9959ce90c5e1df9f2b4659cb5f5b848632930ae084125dfe27ff24e110740290480be655239470a05899993a41997c4c861d296a3d484c";
+ sha512 = "962fa9beac2152188f415f64418747d1fb8331f7abeb451f4fc10580fe3b35531f7be7d3a79428e1bca476e162701f879f7392e8c1fcf75f67b9af9ad09491af";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ga-IE/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ga-IE/firefox-71.0.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "fc8e89974aa1b21bc7c53bfd04f6bb307594a8547b77b1e253a9a0c9c47b9fb18e570a812bdfab72b65b88a2fbbb2ab62a3dd9190545323d896ee5df448e6f7b";
+ sha512 = "cef86c78031b5f5ed53e5c11cf9c2fc87b95ee7dfbd4fb4c60c4934c6dc2cace1576b657e947a185067c4faf1cf52c641f720d8859eef822d4d727ab4c51f9fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/gd/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/gd/firefox-71.0.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "19374bc3444d2b047f4bd9233acd87c2c629928ec4f527cd39974af72cb28f9b4ec5caf98c59906952b62fc0740d06c554ca0900a4bf8350a728797772cd12ca";
+ sha512 = "fe845325b5314e786653000fe99b9a2645036d7058e09e68dfc6a6b1d67e0686c03fe69fcdeb017e96b1ba3eebbfe49f66e1abb01f0da343218597616adf3a28";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/gl/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/gl/firefox-71.0.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "dc9e047c423e922aadfb7ad487191dc7c3b4c9ab4a92dea547ba7177883395ca492b494fd65d331a88c0b0d61a2064e96b07656943643533b6eaab0dceffe9aa";
+ sha512 = "75313fc9c8e0146668293f7689c1655835fa5bb13e87caafdb6bdbcbdfb356459ed7b181daa2de37d7a74740d2ced4edc34886bbd3d44ff39086a24ffdc2f81c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/gn/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/gn/firefox-71.0.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "7cad7e80ccfe46f146585307b4aaf2f53543c92c2fa399397615d481e0a5c2918896afdd0307fb91966f1153f00af1c35a5aaf0947849e0c17b67af3849e9f3b";
+ sha512 = "2b1f1b34bb99cc412a00c74a60dc8964700b8d99d76f96a095f19cfab9c55ced8c3f1fedbe54e62c74401d8fd777cb1c6ab0f4954a553ad4898d03a05653bfc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/gu-IN/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/gu-IN/firefox-71.0.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "253cce0007ee447d6a22211b266532b8808faebc50451b00e5024ebaffc1deb01366f01b11e1602caf6af3497b47fac6a7d235861a9b8f796e5b89feb27b0987";
+ sha512 = "fef942f3ef14a660a0bb1420fd3c7af454ed330e01b41834b7a919927880a3c8f266339a5d95eea9c9d4fc9eeafb7e38d243726fe8fc5a2d0d88871c99c37c8e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/he/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/he/firefox-71.0.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "0319355e75fcf89b695c90af897ff14de43a7f83b89fa6deb39a4e8070d2147ce1d2ffcbc46c2fc423d9198fafbd1830eb855d29c400761c29ebc11003813224";
+ sha512 = "509d12bfd4708b9836b9817573c06533a81c9704f8660a1cce12d28398c91cfe52a22e3f139ee34b3f5c762d122e68ba92e725f41dceaf0b0ae5bce40ccd05e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/hi-IN/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/hi-IN/firefox-71.0.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "49352a4f2a609fb5062fdb935ef5947cad9f8f51edf6f2c6866af8948301495986ebd5d2620efa919884d08eba88f66b4a4b0ba41b323fadcd960263a218909f";
+ sha512 = "6157cb4b53c2c190f9473b8086505fb0b12de5e9e902edcd259f5748cc462507fd5603fb08b0c19ac8e64a63ae3552244b61a08904a40860d9210debccdd3edf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/hr/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/hr/firefox-71.0.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "3ae70d6a0e01b2f24692c23bff8a02881793ad25ab62b3d2130117d1ce488ef84e855c95e42f45b623b09dd01cec9e7ea61f5bafefb33381f729db8b21a22447";
+ sha512 = "7e3fe339fa2d1a1d7258cc3b3e05397be74792ff7295d5a391b723ed491e5aa5768c66231935e9e69c864b2914e29c3bce8439346d23ec6e075645ae15dc4111";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/hsb/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/hsb/firefox-71.0.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "53d427b81c5e05e2d986420f13ba33704bc30f12fdab7ed60399d2c9e577731a64d7facef62eb07b9fbcb9589dd0c976aced60e41e573197fce230501a2c139a";
+ sha512 = "d7e3dfd311e12c6a84b4d9dc064c25b9a8ab32aef063306dbee9c8da6a057af358bf37cb2c6ae3c4c6f1a9f4512d6fc1cfab2e60bdbc0aeda530a2cce3085561";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/hu/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/hu/firefox-71.0.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "fcfc48428bb0764f5573d976fa671a4eeb7d08a5e5d7ed6472cbcb85a5c269aaf709550032845fd2993246a10aaf990bdf02045a9229af2cf6f34e693b250388";
+ sha512 = "807905640f123592a56d3343bff129ac35f44ddf60ab04ab719f17ceca5dcf8cb21b1f24dad35580a6ec50bc11bd4f0243a28aae62800154f4d98be0d290e402";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/hy-AM/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/hy-AM/firefox-71.0.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "91b09cacf023774a6b123804578508ac78d11b398267c679f0bc97a27921fad94378be338c2a6488ccce9944537f14df9df705c9c365c39f46773de50ab24fc5";
+ sha512 = "2839c3ef418a083e5ee8ce563a4f06b5f1edfcd9c86ae90ceb75a6decb1ef587b9b855055fd1fd7e0b1e25431c7e67999c69278339ed94d86744002f4d954a07";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ia/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ia/firefox-71.0.tar.bz2";
locale = "ia";
arch = "linux-i686";
- sha512 = "64ce9ce8b80db1af862bfdeb45fb5e4790ed910470c242eef2905220f5c763652783c6575753a6c950777b6dce20ed55150f298a03d24ff331f076c7c7904316";
+ sha512 = "900e8931df0bd992a22556f8796b59accab53593824ce5928cb69fcee5f28ada5a4640a25edce54aa2f81c59547b8072cb09fedf852202d4407d5e4983a3599c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/id/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/id/firefox-71.0.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "1e104130399a6379c174804a7e2f5a5ee855303565295c829f1f024ed3742379e6ff835416e123ef2ae4a210974619231eeed8bde58b784717ee9a49e6b6e66e";
+ sha512 = "dbfc727dd69a3799c2c2350f3f79b01b1b83e011cc5e0f38acb1c632324f8de90a7d70dd32a7c5c91dce5b0becfc530563ab290ab9176a632ec9da80a3ca6a66";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/is/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/is/firefox-71.0.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "0c4f0e787695c8615c8f5c65e776ffe30d7a4cdcaac4e996a5ab417a3f785658801df4ef0810c00e6a028a87843d4e01e7653a74defaaa1d427bf78a569d88f5";
+ sha512 = "209e319507b34b35820a28835aacd4f910a00d0edcab29c30a3a3e1278ee3a5934d5237f4b3ee8df90abddb278cf497790169ee52266f965e368746f9f8ee326";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/it/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/it/firefox-71.0.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "b133d1cc936b23d289cc14024b3fd6572ff9ab1b1becb5b5456ab933cec28b17d2a42f82a11404e59f954d7c8f1f583dacb21cad0aeddfc5f1cc663569d1727f";
+ sha512 = "419da43d9c9a3048fa8552f0e3080ee2bdcc2a95b8c88958dea0ca898cecb45d6fb634db31af827b2f8842275f88dabf0b940078b08f2d91aeed5640bafdb00a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ja/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ja/firefox-71.0.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "e5ac3d886d17a2a7e2b4ed51098501c32d812b49895b5861ab2d086475b5b2a12b76895ecc77e3b5b8d2c02ea22206cc6babcc629f97925d0824b519692b0e78";
+ sha512 = "492b7f8f53b905c8e5b9cd9e16553ecd96f6fa0c063939e5e1b655a89f78b1b16b4ed29d219710d4bb3ff8335904cec4b494b850a735697bdb68cc9ef9a1f202";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ka/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ka/firefox-71.0.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "a565ff60cf771a1b4f38793cd62f37f7d87255e546605cf6ff8eb9865a3595d9d6a65712e602f71dae5257d465b5b2cdfeab3fcf86b81f974d96ed4394fc30fe";
+ sha512 = "8c0d6457a97f9bafcf902e718d5ca85f8fcbc09d8be19ba702bf76a9eabbd607b41411db242302f1a6d100e541805bb4050e48510b562191e0ea2794dd2d5bcf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/kab/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/kab/firefox-71.0.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "01cdd838b55b490b631838d37d8b8facc59a88c83782af37c44e2a7fb9e029ffa74286a5e697c5fb18b3c6bfd299e505dcb7a74806ce2f402f9d7fc70d7490d4";
+ sha512 = "d5b85445c45dbd9ebc9d16bbdeca374aaabbb6adeb34f661d329995156ae2a71cff6ccc473380cfee1822c1f3f71d4fc2b00721d674499ec31d278f486f57031";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/kk/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/kk/firefox-71.0.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "ef57f2946a86477e37fe611a33f88c5d79f480432d96936ca5a1b8e4a0a4d84770a311c5d017d06215e65e99b42b36c32d8ea862c4359064bd008ad3e71143d1";
+ sha512 = "c1da7ff1e1102fa8c51f8e5e268aeaff7e735d90608ae8a07efca5e88b00534da1962f963a51fa8a03917b8ed7b598d7f4ef7500528227fff1da87b77571241a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/km/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/km/firefox-71.0.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "ad6c71ab38f778089dc741b8efd1093f500df24c5bbd78801f1b02ea2d13dc30cc56eb32585102f646135ff3f2d6ab8afa871f2ed6fb7528daf1e16ac3c3660a";
+ sha512 = "939b3072f867f6a6a4e8d2ae5dc7e49e351216ab0f767235ba82939ead1071c4d33eca4e4ced8f39715b12884765db17970a9bd88518c9e499e3b0abc0b8b9d1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/kn/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/kn/firefox-71.0.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "e341c369ef095cb356470e7861504aa4a670bf633fd91ecfd190561cdea5faee03206053cac60dc1c66db3a771bb201e169913916741aa1a398a1567dc56b209";
+ sha512 = "b86414a3698ec62ec5f92a818c6f00460d246a5baa3a24f33da5b64b122ff6393e9e14a45e3778a45982df73c276e19efddae95a5ef41171ce5b7a995bbe9413";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ko/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ko/firefox-71.0.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "38c8c9ee945cb381744b077f3c85b0d96355d866fa7771cb4c1fa1c542d8d11f8c63b497a6c052da20ff443adcd16aec868d79120b1ee27d0f17aa9d1c809112";
+ sha512 = "b1f8e57c9147d834dd610391a908599cef69d30f61c9075b6fc85c641a6bd4e74b54823cabd09d2d391d0734024ab2d699010b7fcc8755d687cf7b6ef1f250f0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/lij/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/lij/firefox-71.0.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "8cfe74ecb2ff43a83c2d4587ba3ef46a9856ce6065dd320df8cefbc75a6f34bc2c0dbd969e3a0894b0cff3faf40c67dfd5ef13c739beb5aeacfad2fd0da644f4";
+ sha512 = "256dda3e0cb8eb52dc7f778c0c9bbf38ebec313afe0f24e8d00a823d1eab4cbd30cc7fe9637eadae355e9494d0993f3060113b502a2daa4c2aa40154337c50a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/lt/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/lt/firefox-71.0.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "f00e7d3abea4f6ad161d1b9755a23c0cee97a897d14aa168c02b8ca934c116a046c98320a2cc92ed880aaac97961688338a7d16d9fd8d8140d5b89b6b755bb59";
+ sha512 = "7d57c55f2b3c3d19efba46424eaeaca350c70087100e8954bc85cb0c74fc65d3c47a3319d2aab5353d2298922da8fcb007f84469b61e2f9f6c69e5121212d9c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/lv/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/lv/firefox-71.0.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "48006127f33a07a1fa9873cd5700b7bf6195c53b45ae8917277ad936a9ea1e44125fd29a32c21f293c45513ed0d8ba159577acbfcfc1406f653c3411eb5f28cb";
+ sha512 = "abaf628da902218ab6394b547b1e4d318091b0fdbec2bfaecc75a8365df56a668fc7ddc21241497af7710317676a055c2850bf74960204f1160adf1d00c81461";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/mk/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/mk/firefox-71.0.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "41fee9f27eda062cb60deb190c155e48d370b42c2705a1be31b08593a688013547f7bdf872c385d77e69073b242538b55e058e84a2f3f8f2c50510b018a6bdfd";
+ sha512 = "0bc74823a7ce8654f366949144c2876e7a3a526b96dac37452be4ba387234a302ef786a38e3828514c5164d609014c15181472cc2d3e0f75e8871b8af859adcb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/mr/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/mr/firefox-71.0.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "7b34194089a72e26c7feef0a541c0ce92b770007492963ecc04427a155e0488846c5bab875cf3bd6f535fec9b10f18d4bd75a439e8cc70f635d718be94683539";
+ sha512 = "d1d6e6bd41ef63424eefdd4a8fca9b8b20d4d452117eaf6abff22f9b42f7a22a4182fb826cecc4c38975caf6fbecd43fca35f818053c2360ed723250c7e95fc8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ms/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ms/firefox-71.0.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "6a48e803f8c2ef2bf77802e7905a75124f2b5a0bf05be1e42cfffbca6337cee16e63e0b50eedcdb21f868ff0792cfc7adbf3d00b9b7498e122d5c6b9571b267d";
+ sha512 = "e3161b2ea8bab3d720b04d69e966cb1265cc0649241081127ab5ce31d4036699a63231b8342a07c215d53ceaf5af2567da1aa1e71a46439a797aaae979bd17cd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/my/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/my/firefox-71.0.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "843a0618ab2260462937a374b87e1bb24a781ed85aee3f03b9745c1374c186bc5c8013358c37ac674495e992e1ece3015f51bd50216733c498576936284fb9ae";
+ sha512 = "ae7830a149522f0ed9bfd3e53e1c692534cd7c2f43d6eece8d3789764fd8ff7ccaacd6ac2efc9fe0f45c7cd0ea8b612208f330ffd0daffe9243ee9e1b5169a31";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/nb-NO/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/nb-NO/firefox-71.0.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "95f23fe193ea4b71daaf2bf9e6016f30202fc2eff3b8de2f64e32451a23edf438441c10979673b73f4244eb7dcf34fa29af985487cf2d757394f02e399e1e2f4";
+ sha512 = "c25803b43b21a2ebbdf16a8a9825cbfb7442358a6791ec6f268d12874e35f24ef48e8dee55e6ed5cd46d193fe59b902890b6b718fa8a6e121ef6fdc359dc903a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ne-NP/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ne-NP/firefox-71.0.tar.bz2";
locale = "ne-NP";
arch = "linux-i686";
- sha512 = "aff8a40c53bb7279ecb3054716a2c8e655b0708d1f93eaabaa10181f634942fea384cffc0d6e624fbdb046fad5e9922bb74ee051b306e323f5f71bc0f05809b6";
+ sha512 = "b363fcfb531981dc423d0b134cbda0dd5c07f95631cc3b7644a7f3701d52ea20f5e62036d1e845ffa2a4f65e9b4a295bf9645ade31f59f3af864ec7d83f82240";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/nl/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/nl/firefox-71.0.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "5b9049bd2c025e988415373525ab7b4d98938fb8f3cd821e923d082df5e57b4338d2b1b769f5861e962bbcf4c4ec103ed916995b6621e5064a5bf08bdb42847e";
+ sha512 = "7ffa10349f0705a751f4e29775b43b81f2e23af764774c27a5bfaca90656650090076fdf3c11fd29dbbf4af9cf4d39b3389b885eaeb3e5abc0a5bb9cb9b85aef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/nn-NO/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/nn-NO/firefox-71.0.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "f3a54f9ad4b5d06646eb52c44407bb7fb6ec1ab7a88f703bde17c69e6f598a05eb5c86e1eb89cd41edc89721463b997b9c93172eeaa1ba5cadfb85136fd9d848";
+ sha512 = "4df5c67cb0fe6f0ab70bb885d601ca0beffe3bc8cf8d652e47d9d01a503bb2b33e47fd45b8c1cf47919607da4a6f144fccb15f8fd39dc9d1e395fbc607314a6e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/oc/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/oc/firefox-71.0.tar.bz2";
locale = "oc";
arch = "linux-i686";
- sha512 = "5eb8a9b68ab057cd67776edc1dd71f094e5373926230ab4275e498ca91e18d8bbe37f2d921507001097b1536085739fb8e167b47cc71d7350301fc9ea687c122";
+ sha512 = "386e9eeb00e63d9ed24befa757b8fce2dcdaf6c9cab69000ff23ef89e9f65ebba0128b69202db34852f2149fae91df05694f6957eca7ed1f82a25e14c0123ea7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/pa-IN/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/pa-IN/firefox-71.0.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "3bbe65e9486b1192c0ab6aee17805e31724fca6ce4faf986c9afd9ae5b4e48f81cd78c15bf7a4be74f4f26a49f9de69221f88ae4b3a119c7c5400ad9d73d2869";
+ sha512 = "213e984eb4e62d058198b71e72b8c814f203e2f0d2c2bbab2fbf22f7cece52186beb44b1f23ed19ac1638b027781c1e7b4f2e68770180bbb9b7b27d401eeeb21";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/pl/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/pl/firefox-71.0.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "3e4c7d5a36e11f2013209f6eb40d7c95ec597a049688d795f426215377ce99677393d198470c9549b7800b36926ea728629497572e1242bcdb150f17d1e23642";
+ sha512 = "f7828a1a31face974561441e4347fe17f6fd925e41430dfa9f5b39d4fe8a691aeae9691b6703a29f798b68caa53e1ab17cc5ec6d3948240fddd6a78854c74bb0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/pt-BR/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/pt-BR/firefox-71.0.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "45b3b8541c76e2b18f1ce6f31e7653b612529573fd7d795ab09da85fa786db8f85385e875996acf2c2b53335cded727cd00d59d51caa63a115d18877a14b6396";
+ sha512 = "bf780d5934d67009c38f980fe82fb299cf52e76652066e057b38b88ff113825e3f34d7ad7667c3617e8304464a66082e8dffa0a6e6d9fa607504558e89f5b13b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/pt-PT/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/pt-PT/firefox-71.0.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "a372f393f9b49bf3fa84858a5173272a226d740e8dda058c780d7733778be0d0e3eca7e959425b9b51ed62d1dcb91adcf04c8f7832bd4563649d29274c844c11";
+ sha512 = "4923899c4ad5dc1364d8aa15bc8089eed80b06595b96a85b219478ce92e86fd8d3ff2423150dab09a357f3e68b380d267dcf32f75368e6c49df521cd651f8d55";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/rm/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/rm/firefox-71.0.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "5fbbf7b308f40ff27ee364bc0a5ce9d8dde0685eccd319a1aba22192b1e713ab2ac34e66d9284cac8f9d8b2ca5a4f4c24b6befc76da937e97c1021b2247e0be6";
+ sha512 = "b4386b2b482c85663de59faa3a068713459dbf70cdc7d8cab8477b1e53c499e6e3438e4cd53233954d7170d12e9e598b5dead5def0669d01bce597c8a6b84725";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ro/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ro/firefox-71.0.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "a39b7e922aaf404b810e06b56bb23b012252606caa70e64680a024adf64e780db8a4850053166f35e0d47a98e009e5116143b273920531a3c1ce82ae81430c33";
+ sha512 = "9b033b547508da32ab23b477c4b4589d1b12515b3341dc39a13106748d8e93a48dceb8ed6d9a95da455ea1101eb6e9643cc5d676bb59922bdb64a0526b778221";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ru/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ru/firefox-71.0.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "e2b909fb157a514485ac90dd46598245df90b9d6ace9104a4fd638513d2e5bf430b59238a3180d2906e8be2a2e1cc68478f7a6a1b2017018a8bdf79c6acd777a";
+ sha512 = "595d7ce551c846511f691de9dac90d5b15f46b6b00590a41d4ba1d7471f55b7f32dcd1e392bcc54ab2d1cffdcaf2ccff8fbfc3c084d3f74cca869bf570c515e8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/si/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/si/firefox-71.0.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "e99a85f77b4269189f578f2f2ff52f952a1044c8e9894b7ae3826df709304aba7b56980078adc82a4c6242ab7dc102a55c7c3417a2bd3c4d4a50ae702381e400";
+ sha512 = "c10dd55008408cee98aaf4e6aacf03a4770a20220732e8d5318441bc163730753edcba8691017906b3cf2c28d5f9cdd0606ee812a1d01b40ef24d3d9d0239d08";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/sk/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/sk/firefox-71.0.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "16a1c7f32c6e9ef145e6c85a5d875afb87ab844ba1a97e0a878129dfa3e8d1418f3484c5cab653fdb6901a4af282c0b4eb6b7e44a4b124fa5638136cec7d151b";
+ sha512 = "a439c2edda86c81911a61334ba747eba8619eaaf09b9f089a462f54bc93f413207b4db20a96b85ce8b0df58472bac450be1d8ab8e3bcad482ce653837d981ce2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/sl/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/sl/firefox-71.0.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "0e844d8c13b365b206d903059d68edb54a49995616846d6ba73846d437fbd4a15ed4c179ef466f955598a08d37e546e63f72cb5cb351affe9b71a7b8172680c7";
+ sha512 = "1bcf899acd6e722ddecb6f776cf185e71d758e7974c2b9e693f1295b2a9007dbca7cbea9b1c2e540857f748c24daa8631ad1857798742b1496a8553412e7b0be";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/son/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/son/firefox-71.0.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "21e038a13b2de3b1793a05c6b58311ef025fd5e0e84ae73ce6a652563ff0e2ddea3d94b723175a4ed8782b72b32eef673f0bb30c8191894d3b5279c8f928a356";
+ sha512 = "0f43632a15edf48efb18089daab3f2f45c54ff1cdf288a8ab456bc36019aae9109bef1017b01481625b8d225fe78494be8323ced159bc4ecc9aebfaed1c46e75";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/sq/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/sq/firefox-71.0.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "17e54e8d2e47aa06b2889d2c742e8af7b0d506025c03eb240106c3ca6e2a6ed8a3c68e2999190a4a18b3ea52a7e0e689851d9839105f5ce973c7d92dc5162a94";
+ sha512 = "0ce0d354aee7c3e2bfdab5a3cc13c64d9967620fc710d52d0ce46cc54d15149d52e6d35749f5eaa3889c8ce1399a08477d5a1e7079c012d5280765c5688d3894";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/sr/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/sr/firefox-71.0.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "c635b30ff1c3681b37cc823c7184939f4edd0a5eb0b991e6efb329816e7f7a1433bcebd7a5a905a0d0352c214d9df7015e6e017d66b60450dbaf5c1ce8e91311";
+ sha512 = "218ad778d5f8421081f0a6c42232513dd7fb6f4b946cffc4a36278d37457d68e78674f5deac839c500ab7708f79bdaffebefbb14777103af2f01b105d7de54d6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/sv-SE/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/sv-SE/firefox-71.0.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "d4a7bb7cca2caae6c0fe59a7d95386b62b6d061604601d84779fbbfcae0f3e4f1688c0397b30fc39a52706b3188f7bdf87b9f04af2b2f3b9f4af791d090af62a";
+ sha512 = "8c3bea33cedd039db2af5c0203a36c375d65d83d4d914a43b9ed9f83e5f7783e7cb2072259bb14642ff9ef8463d6af521d242c1d9f6dab10f9621d499dc6d7f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ta/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ta/firefox-71.0.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "6849eb6714602c1fdb9925bedf155876544f483ed4661e90d3bdb819a43469030913b2f5dd08a25a1ecd88599f6210ba08fd840598fdb442eda701c6427e63d1";
+ sha512 = "0a0eb3e83e897bcc21a610b235e923344d8f3a09c0de83f78c5b240c84254e2684654608d004be82896c485f004b9fb9f93a6039f51a780610ea5f6a7eeb1d59";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/te/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/te/firefox-71.0.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "b969367ab5d96f7eb3d53ecb0e2bc6b5c76f1f3b409be2469e44eef7450d9b4e3df20b759ddff452319cfe117d037c8140086c06d99aa757ea1be9471a5d7ec2";
+ sha512 = "b39b47e236fa80771414f92b8d9898d0f316e4f4807abd9ca59ffba822166a11ff79f79b819600a1b3a24afccbc7ccbd740dbef89516b1ea031c1364ec6bc7ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/th/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/th/firefox-71.0.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "9bb9888a2106256fffdc289c711b75d008018080d49dc87ebbb40519ac39884a7e645504b3b9a458dc34268afe273684044d3993d94851bc7ef0dfad2491cd6d";
+ sha512 = "ff6c0a8d6ad2b1971af4fcd5d96ed2422e6fc6a820d43f2177d49740ee2a87a52a393ac323c65901907303741d7b228cb547093419dff474cde3837b3f9d4679";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/tr/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/tl/firefox-71.0.tar.bz2";
+ locale = "tl";
+ arch = "linux-i686";
+ sha512 = "ac603fc901fb513266bf3d9ee7c1e088fa09fd403ca264539b586879303f27987c4eb1432a8b9d3a3c4fa3abe874d1d1be76cb9993cf0bfb675df3815f9b6b81";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/tr/firefox-71.0.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "80a614d54be2ea66ffe8947e9389c795a83bddd1d1350f5f98953ebf02eb8d7102ee3e2e41e79143a19630a897ad9ad9b3d999fc264a271a7be426c18de4a179";
+ sha512 = "5a222bf901572528f058d2f6bf2d449fe93dfc9a7555c91ba6a19844674e3ef43a3d53258840cf37dcd3cb2100d68cf0a6407f2934ee07345faca2423f0c7a04";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/uk/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/trs/firefox-71.0.tar.bz2";
+ locale = "trs";
+ arch = "linux-i686";
+ sha512 = "d0530d17fd9aba0046ddc677326c17301603f1929d3c7fde6590278af43c9ec2b3ec8951efb184c9ff89085311cfb4b5738e732203d8ec6e7f8be61428fc4f87";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/uk/firefox-71.0.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "f08ad461916354ed37d489e2635cde7c42c34b9bf8eafbbf05901a489f9eb69ab55df2dbecbed22980f63d084b76a981d8608434366e35836c19a9e87367b9e5";
+ sha512 = "fcee0ec3a5821c7539aab0414a48b2647aa88b66b99b079259f811c91afdda4ccd4f073ca06f9f8b87173427d07f0390705fcca66fbd100a917205bc4703201c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/ur/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/ur/firefox-71.0.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "33483075d31c70b684e8152f241c0ec082fdb2a7567bdcc418d86a5135ce2afd6b40ec6616b8725dc3a0dc683120ef55717c5391a7a8bcc1c62b43c56620f70d";
+ sha512 = "8bf47e2b5eca734580ca0958d0f86a4807a1753996da13f57c2a3c6f6f3d1297de7fdc02e8db649ef7108313c415a8a82baa5772f35f7dc94fd5bd1927558e8d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/uz/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/uz/firefox-71.0.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "065c212d3fb01cee2c90be07c84bdce37bd285ec20938cf6799951e2ee2d598317b720af8757ce0d9355dbb4fc99365e02890cb57a43437ce60e9d28c7701cc0";
+ sha512 = "50bf9e63e73387c4740f5978e8eae93d7212775cffc62cd9f2d7da24dde2558180d59cec5c19d78475cfbc7451f82263ae3b9ed53c765f6621ec456b0eca03e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/vi/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/vi/firefox-71.0.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "fc906223f3a75ad7672bb54dfc2b653f26bed3ca958f8a030bb4987db641abf3ab84dd811b0919a7ea283703bada22ef5e3042bebf7ef6336b3d2494c4cc87e4";
+ sha512 = "887878ae122299374d1eccfade722837cdd7df0122e2790749909543d6ce9a5fa83919a7ceea1864ab3b9b71408c38b4e3e72d2abbe485dfb66b378e103d9719";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/xh/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xh/firefox-71.0.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "dc1896ef1a1eb0e0049724bf28f14bb2d039d558212aed3c619688f289d8b80f99b4e77acdb75d454b75ed39e610527840211dd2ffd7dec1a8e74d68d3eb468a";
+ sha512 = "4521638a80908805b13faddf28098b7186704b50b1da6ea9999aefba0202263e6e8650445b6b6b635d4290f96a95173c5aa0db9a4ac066b4e4baeab3c67bfd79";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/zh-CN/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/zh-CN/firefox-71.0.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "d3a1ab88c12115e70b4077d6ff05949d637527a376abaa5ae773ae3ee7caac9e9812ec16f1674d890aa0dab358491f344688e6f1e2fe57ea10f086d4c88c1cd2";
+ sha512 = "65830ec45c63074cd4494805af5fd40b7fe6b061025f00d16df53ea3a51892b1e7eabc2fae8000b08a7d4c6eb4a8648eec2f3c86e105d8cb383e6dc20a3a3114";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/70.0.1/linux-i686/zh-TW/firefox-70.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/zh-TW/firefox-71.0.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "0746b0f439aee108a0c2e4b582a9c308921ce52575322ee6129026ad35ad9cc5a4ee81b05a27fe2febfd98168c59b012381e0432e08dfc52cc2ffed8bd43cfc6";
+ sha512 = "ae776f0593c0ab0dfa360a76e1465fe64de9f751ffc906019168af18467731670fedb2449d159d4978351e39da01eb6553444eba0c5884111d14a8f280c92462";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 93dd5e527e38..d9dc0a4f7887 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -7,7 +7,7 @@
{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify
-, yasm, libGLU_combined, sqlite, unzip, makeWrapper
+, yasm, libGLU, libGL, sqlite, unzip, makeWrapper
, hunspell, libXdamage, libevent, libstartup_notification, libvpx
, icu, libpng, jemalloc, glib
, autoconf213, which, gnused, cargo, rustc, llvmPackages
@@ -95,7 +95,7 @@ let
browserPatches = [
./env_var_for_system_dir.patch
]
- ++ lib.optional (lib.versionAtLeast ffversion "63" && lib.versionOlder ffversion "69")
+ ++ lib.optional (lib.versionAtLeast ffversion "63" && lib.versionOlder ffversion "68.3.0")
(fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29
name = "write_error-parallel_make.diff";
url = "https://hg.mozilla.org/mozilla-central/raw-diff/562655fe/python/mozbuild/mozbuild/action/node.py";
@@ -110,7 +110,8 @@ let
url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/build-arm-libopus.patch";
sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp";
})
- ] ++ patches;
+ ] ++ lib.optional (lib.versionAtLeast ffversion "71") ./fix-ff71-lto.patch
+ ++ patches;
in
@@ -131,7 +132,7 @@ stdenv.mkDerivation rec {
gtk2 perl zip libIDL libjpeg zlib bzip2
dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
- libnotify xorg.pixman yasm libGLU_combined
+ libnotify xorg.pixman yasm libGLU libGL
xorg.libXScrnSaver xorg.xorgproto
xorg.libXext sqlite unzip makeWrapper
libevent libstartup_notification libvpx /* cairo */
diff --git a/pkgs/applications/networking/browsers/firefox/fix-ff71-lto.patch b/pkgs/applications/networking/browsers/firefox/fix-ff71-lto.patch
new file mode 100644
index 000000000000..f48cad9e67a2
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/fix-ff71-lto.patch
@@ -0,0 +1,100 @@
+Original Patch: https://bugzilla.mozilla.org/show_bug.cgi?id=1601707#c6
+
+Also fixes the issues with dom localstorage.
+
+--- a/dom/indexedDB/ActorsParent.cpp
++++ b/dom/indexedDB/ActorsParent.cpp
+@@ -24311,11 +24311,11 @@ nsresult ObjectStoreAddOrPutRequestOp::DoDatabaseWork(
+ // if we allow overwrite or not. By not allowing overwrite we raise
+ // detectable errors rather than corrupting data.
+ DatabaseConnection::CachedStatement stmt;
+- const auto& optReplaceDirective = (!mOverwrite || keyUnset)
+- ? NS_LITERAL_CSTRING("")
+- : NS_LITERAL_CSTRING("OR REPLACE ");
+ rv = aConnection->GetCachedStatement(
+- NS_LITERAL_CSTRING("INSERT ") + optReplaceDirective +
++ NS_LITERAL_CSTRING("INSERT ") +
++ ((!mOverwrite || keyUnset)
++ ? NS_LITERAL_CSTRING("")
++ : NS_LITERAL_CSTRING("OR REPLACE ")) +
+ NS_LITERAL_CSTRING("INTO object_data "
+ "(object_store_id, key, file_ids, data) "
+ "VALUES (:") +
+@@ -26076,9 +26076,6 @@ nsresult Cursor::OpenOp::DoIndexDatabaseWork(DatabaseConnection* aConnection) {
+
+ const bool usingKeyRange = mOptionalKeyRange.isSome();
+
+- const auto& indexTable = mCursor->mUniqueIndex
+- ? NS_LITERAL_CSTRING("unique_index_data")
+- : NS_LITERAL_CSTRING("index_data");
+
+ NS_NAMED_LITERAL_CSTRING(sortColumn, "sort_column");
+
+@@ -26099,7 +26096,9 @@ nsresult Cursor::OpenOp::DoIndexDatabaseWork(DatabaseConnection* aConnection) {
+ "object_data.file_ids, "
+ "object_data.data "
+ "FROM ") +
+- indexTable +
++ (mCursor->mUniqueIndex
++ ? NS_LITERAL_CSTRING("unique_index_data")
++ : NS_LITERAL_CSTRING("index_data")) +
+ NS_LITERAL_CSTRING(
+ " AS index_table "
+ "JOIN object_data "
+@@ -26198,9 +26197,6 @@ nsresult Cursor::OpenOp::DoIndexKeyDatabaseWork(
+
+ const bool usingKeyRange = mOptionalKeyRange.isSome();
+
+- const auto& table = mCursor->mUniqueIndex
+- ? NS_LITERAL_CSTRING("unique_index_data")
+- : NS_LITERAL_CSTRING("index_data");
+
+ NS_NAMED_LITERAL_CSTRING(sortColumn, "sort_column");
+
+@@ -26218,7 +26214,10 @@ nsresult Cursor::OpenOp::DoIndexKeyDatabaseWork(
+ NS_LITERAL_CSTRING(
+ "object_data_key "
+ " FROM ") +
+- table + NS_LITERAL_CSTRING(" WHERE index_id = :") +
++ (mCursor->mUniqueIndex
++ ? NS_LITERAL_CSTRING("unique_index_data")
++ : NS_LITERAL_CSTRING("index_data")) +
++ NS_LITERAL_CSTRING(" WHERE index_id = :") +
+ kStmtParamNameId;
+
+ const auto keyRangeClause =
+diff --git a/dom/localstorage/ActorsParent.cpp b/dom/localstorage/ActorsParent.cpp
+index 9c46c20670..642cef1701 100644
+--- a/dom/localstorage/ActorsParent.cpp
++++ b/dom/localstorage/ActorsParent.cpp
+@@ -6959,13 +6959,10 @@ nsresult PrepareDatastoreOp::Start() {
+ MOZ_ASSERT(!QuotaClient::IsShuttingDownOnBackgroundThread());
+ MOZ_ASSERT(MayProceed());
+
+- const LSRequestCommonParams& commonParams =
+- mForPreload
+- ? mParams.get_LSRequestPreloadDatastoreParams().commonParams()
+- : mParams.get_LSRequestPrepareDatastoreParams().commonParams();
+-
+ const PrincipalInfo& storagePrincipalInfo =
+- commonParams.storagePrincipalInfo();
++ mForPreload
++ ? mParams.get_LSRequestPreloadDatastoreParams().commonParams().storagePrincipalInfo()
++ : mParams.get_LSRequestPrepareDatastoreParams().commonParams().storagePrincipalInfo();
+
+ if (storagePrincipalInfo.type() == PrincipalInfo::TSystemPrincipalInfo) {
+ QuotaManager::GetInfoForChrome(&mSuffix, &mGroup, &mOrigin);
+@@ -6996,10 +6993,9 @@ nsresult PrepareDatastoreOp::CheckExistingOperations() {
+ return NS_ERROR_FAILURE;
+ }
+
+- const LSRequestCommonParams& commonParams =
+- mForPreload
+- ? mParams.get_LSRequestPreloadDatastoreParams().commonParams()
+- : mParams.get_LSRequestPrepareDatastoreParams().commonParams();
++ const LSRequestCommonParams& preloadCommonParams = mParams.get_LSRequestPreloadDatastoreParams().commonParams();
++ const LSRequestCommonParams& prepareCommonParams = mParams.get_LSRequestPrepareDatastoreParams().commonParams();
++ const LSRequestCommonParams& commonParams = mForPreload ? preloadCommonParams : prepareCommonParams;
+
+ const PrincipalInfo& storagePrincipalInfo =
+ commonParams.storagePrincipalInfo();
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index b60d1a8e8f32..105a0a18d6b9 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -14,13 +14,12 @@ let
in
rec {
-
firefox = common rec {
pname = "firefox";
- ffversion = "70.0.1";
+ ffversion = "71.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "0jzga89iyawswma2p2g1ygffivflc8a966v8s5pbz425xhgbcvif1li0y0rbhnc5dc08lh0mr3a9n5sry43rr5nhkqi1vsh1ri1i3kr";
+ sha512 = "0hfjlhwdhfdfzd27d6p3h8ff5m2jphlaipv4zym48bn6g95if1x98q2lb87617bxfm31di4rckjvqb70g9sm3smil6p6bnw2dsvnq1g";
};
patches = [
@@ -100,10 +99,10 @@ rec {
firefox-esr-68 = common rec {
pname = "firefox-esr";
- ffversion = "68.2.0esr";
+ ffversion = "68.3.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
- sha512 = "3p4gic3nlz1rxfc64xnv6vgfvf84w8752vpkdc1sfl3qx0w05q5d23rsvmkm8nb45bnsq3ch3jsrsh4p6fan4k9hvmzv8zgp6k2qlpn";
+ sha512 = "31zisy4l07hhm9yvxz7sx04kz1f5rl20z1w072jxaabi42sw07xr6lcflv88gwl21y902n7vwd1q1zfavpnipn65wap4i0vm8c4m6pr";
};
patches = [
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 3ed06717f6a2..4901d694f49f 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -18,8 +18,9 @@ browser:
let
wrapper =
- { browserName ? browser.browserName or (builtins.parseDrvName browser.name).name
- , name ? (browserName + "-" + (builtins.parseDrvName browser.name).version)
+ { browserName ? browser.browserName or (lib.getName browser)
+ , pname ? browserName
+ , version ? lib.getVersion browser
, desktopName ? # browserName with first letter capitalized
(lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
, nameSuffix ? ""
@@ -83,7 +84,7 @@ let
gtk_modules = [ libcanberra-gtk2 ];
in stdenv.mkDerivation {
- inherit name;
+ inherit pname version;
desktopItem = makeDesktopItem {
name = browserName;
diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix
index d679eb56f5bd..0605eda7fc76 100644
--- a/pkgs/applications/networking/browsers/luakit/default.nix
+++ b/pkgs/applications/networking/browsers/luakit/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Fast, small, webkit based browser framework extensible in Lua";
- homepage = http://luakit.org;
+ homepage = https://luakit.github.io/;
license = licenses.gpl3;
platforms = platforms.linux; # Only tested linux
};
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 29954e4129e0..7e3705a3b0bd 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation rec {
pname = "flashplayer";
- version = "32.0.0.270";
+ version = "32.0.0.303";
src = fetchurl {
url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
- "1c3dn4gkl40i5sjkvpbkn9fl82vjhy1v7dhrayk3ncfsxcyvbcm0"
+ "05hfc5ywmcvp6zf8aqmzjp3qy3byp0zdl0ssrv9gvzcskdqkhsj2"
else
- "1g7i9mihn5g9i71xyf805k19yk41vsr85gzk87gm426m0hcgg89i"
+ "12hl8lvxz648ha70gi3v85mwf0nnayjiaslr669vjan3ww94jymv"
else
if arch == "x86_64" then
- "16lxgkbr2hg49vhc7414zkh1kblhysf779854faay308ml3i5kdw"
+ "0x0mabgswly2v8z13832pkbjsv404aq61pback6sgmp2lyycdg6w"
else
- "0jrdzm8pw7aq32w7m4rvkhj7mmqyddh5yxpj7q3d9hxrwshkikvj";
+ "16kbpf1i3aqlrfbfh5ncg1n46ncl9hp6qdp36s5j3ivbc68pj81z";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 27ec18aa6c88..28b4c8a36c93 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -50,7 +50,7 @@
stdenv.mkDerivation {
pname = "flashplayer-standalone";
- version = "32.0.0.270";
+ version = "32.0.0.303";
src = fetchurl {
url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "0k5azrl92hkbn7adjz7s2lv8h59n7gsjrcprqdc485i4f7sjmkwj"
+ "0xkzlv90lpyy54j6pllknrp1l9vjyh6dsl63l4c8cgh4i830gi14"
else
- "1la5s4wxchfpl8in576xj675yrg84pify22pwf063h0jg3rdgi68";
+ "0mi3ggv6zhzmdd1h68cgl87n6izhp0pbkhnidd2gl2cp95f23c2d";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix b/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix
deleted file mode 100644
index 6ab533763109..000000000000
--- a/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, gcc7, pkg-config
-, next
-, webkitgtk, gsettings-desktop-schemas
-}:
-
-stdenv.mkDerivation rec {
- pname = "next-gtk-webkit";
- inherit (next) src version;
-
- makeFlags = [ "gtk-webkit" "PREFIX=$(out)" ];
- installTargets = "install-gtk-webkit";
-
- nativeBuildInputs = [ gcc7 pkg-config ];
- buildInputs = [
- webkitgtk
- gsettings-desktop-schemas
- ];
- meta = with stdenv.lib; {
- description = "Infinitely extensible web-browser (user interface only)";
- homepage = https://next.atlas.engineer;
- license = licenses.bsd3;
- maintainers = [ maintainers.lewo ];
- platforms = [ "x86_64-linux" ];
- };
-}
diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix
index 9b537c553376..97c65fc12ef5 100644
--- a/pkgs/applications/networking/browsers/next/default.nix
+++ b/pkgs/applications/networking/browsers/next/default.nix
@@ -1,86 +1,90 @@
-{ pkgs, stdenv, fetchFromGitHub
-, gcc7, pkg-config, makeWrapper
-, glib-networking
-, next-gtk-webkit
+{ stdenv
+, fetchFromGitHub
, lispPackages
, sbcl
+, callPackage
}:
+let
+
+ # This is the wrapped webkitgtk platform port that we hardcode into the Lisp Core.
+ # See https://github.com/atlas-engineer/next/tree/master/ports#next-platform-ports
+ next-gtk-webkit = callPackage ./next-gtk-webkit.nix {};
+
+in
+
stdenv.mkDerivation rec {
- pname = "next";
- version = "1.3.4";
+ pname = "next";
+ version = "1.3.4";
- src = fetchFromGitHub {
- owner = "atlas-engineer";
- repo = "next";
- rev = version;
- sha256 = "00iqv4xarabl98gdl1rzqkc5v0vfljx1nawsxqsx9x3a9mnxmgxi";
- };
+ src = fetchFromGitHub {
+ owner = "atlas-engineer";
+ repo = "next";
+ rev = version;
+ sha256 = "00iqv4xarabl98gdl1rzqkc5v0vfljx1nawsxqsx9x3a9mnxmgxi";
+ };
- # Stripping destroys the generated SBCL image
- dontStrip = true;
+ nativeBuildInputs = [
+ sbcl
+ ] ++ (with lispPackages; [
+ prove-asdf
+ trivial-features
+ ]);
- prePatch = ''
- substituteInPlace source/ports/gtk-webkit.lisp \
- --replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit"
- '';
+ buildInputs = with lispPackages; [
+ alexandria
+ bordeaux-threads
+ cl-annot
+ cl-ansi-text
+ cl-css
+ cl-hooks
+ cl-json
+ cl-markup
+ cl-ppcre
+ cl-ppcre-unicode
+ cl-prevalence
+ closer-mop
+ dbus
+ dexador
+ ironclad
+ local-time
+ log4cl
+ lparallel
+ mk-string-metrics
+ parenscript
+ quri
+ sqlite
+ str
+ swank
+ trivia
+ trivial-clipboard
+ unix-opts
+ ];
- nativeBuildInputs =
- [ sbcl makeWrapper ] ++ (with lispPackages;
- [ prove-asdf trivial-features ]);
+ prePatch = ''
+ substituteInPlace source/ports/gtk-webkit.lisp \
+ --replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit"
+ '';
- buildInputs = with lispPackages; [
- alexandria
- bordeaux-threads
- cl-annot
- cl-ansi-text
- cl-css
- cl-hooks
- cl-json
- cl-markup
- cl-ppcre
- cl-ppcre-unicode
- cl-prevalence
- closer-mop
- dbus
- dexador
- ironclad
- local-time
- log4cl
- lparallel
- mk-string-metrics
- parenscript
- quri
- sqlite
- str
- swank
- trivia
- trivial-clipboard
- unix-opts
- ];
- propagatedBuildInputs = [ next-gtk-webkit ];
+ buildPhase = ''
+ common-lisp.sh --eval "(require :asdf)" \
+ --eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \
+ --eval '(asdf:make :next)' \
+ --quit
+ '';
- buildPhase = ''
- common-lisp.sh --eval "(require :asdf)" \
- --eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \
- --eval '(asdf:make :next)' \
- --quit
- '';
+ installPhase = ''
+ install -D -m0755 next $out/bin/next
+ '';
- installPhase = ''
- install -D -m0755 next $out/bin/next
- '';
+ # Stripping destroys the generated SBCL image
+ dontStrip = true;
- preFixup = ''
- wrapProgram $out/bin/next \
- --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules"
- '';
-
- meta = with stdenv.lib; {
- description = "Infinitely extensible web-browser (with Lisp development files)";
- homepage = https://next.atlas.engineer;
- license = licenses.bsd3;
- maintainers = [ maintainers.lewo ];
- platforms = [ "x86_64-linux" ];
- };
- }
+ meta = with stdenv.lib; {
+ description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)";
+ homepage = https://next.atlas.engineer;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.lewo ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix
new file mode 100644
index 000000000000..a71583ffbec5
--- /dev/null
+++ b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix
@@ -0,0 +1,50 @@
+# https://github.com/atlas-engineer/next/tree/master/ports/gtk-webkit
+
+{ stdenv
+, pkg-config
+, next
+, webkitgtk
+, gtk3
+, glib
+, gsettings-desktop-schemas
+, glib-networking
+, gst_all_1
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "next-gtk-webkit";
+ inherit (next) src version;
+
+ nativeBuildInputs = [
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ glib
+ glib-networking
+ gsettings-desktop-schemas
+ gtk3
+ webkitgtk
+ gst_all_1.gst-plugins-base
+ gst_all_1.gstreamer
+ ];
+
+ makeFlags = [
+ "gtk-webkit"
+ "PREFIX=${placeholder "out"}"
+ ];
+
+ installTargets = [
+ "install-gtk-webkit"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Infinitely extensible web-browser (user interface only)";
+ homepage = https://next.atlas.engineer;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.lewo ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index b968c4f3d9d1..c1ede5044492 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -47,11 +47,11 @@ let
in stdenv.mkDerivation rec {
pname = "opera";
- version = "62.0.3331.43";
+ version = "65.0.3467.48";
src = fetchurl {
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
- sha256 = "0zylg32zn6blkgy4bwmjzc26i712lwakahvrd24ncpfa8805f7x7";
+ sha256 = "0vcpq2p8si6rlyvd8nzs0a7pjxks2qn8i8czna968wyfxlczckyr";
};
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 07234f59a8ed..ae3999e3cda6 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -3,7 +3,7 @@
, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype
, gnome2, gnum4, gtk2, hunspell, libevent, libjpeg
, libnotify, libstartup_notification, makeWrapper
-, libGLU_combined, perl, python, libpulseaudio
+, libGLU, libGL, perl, python, libpulseaudio
, unzip, xorg, wget, which, yasm, zip, zlib
}:
@@ -13,13 +13,13 @@ let
in stdenv.mkDerivation rec {
pname = "palemoon";
- version = "28.7.2";
+ version = "28.8.0";
src = fetchFromGitHub {
owner = "MoonchildProductions";
repo = "UXP";
rev = "PM${version}_Release";
- sha256 = "08w90269mwcqsdhx4vvp18c5iccvzqhaaw6aw7w0nppf2f2k8lri";
+ sha256 = "0swmwall8pyg905jnw6x1b6vcv92zb7ph3zqcymh4ay2liikh8c0";
};
desktopItem = makeDesktopItem {
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
alsaLib bzip2 cairo dbus dbus-glib ffmpeg file fontconfig freetype
gnome2.GConf gnum4 gtk2 hunspell libevent libjpeg libnotify
- libstartup_notification makeWrapper libGLU_combined perl
+ libstartup_notification makeWrapper libGLU libGL perl
pkgconfig python libpulseaudio unzip wget which yasm zip zlib
] ++ (with xorg; [
libX11 libXext libXft libXi libXrender libXScrnSaver
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 7b13d748fe05..b616e82a2098 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -10,23 +10,23 @@ assert withMediaPlayback -> gst_all_1 != null;
let
pdfjs = let
- version = "2.2.228";
+ version = "2.3.200";
in
fetchzip rec {
name = "pdfjs-${version}";
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
- sha256 = "0yik4vfnz46j844jfw1gq5cshgzry42kpy2d5rr7fbn9fjf98bw6";
+ sha256 = "1fpxsw0hzahccyng08acvc7g0gk29j2x701p6w6fg1718mvcrm1q";
stripRoot = false;
};
in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
- version = "1.8.1";
+ version = "1.8.3";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "0ckffbw2zlg0afz4rgyywzdprnqs74va5qj0xqlaqc14ziiypxnw";
+ sha256 = "055zmzk3q0m3hx1742nfy2mdawfllrkvijnbzp1hiv01dj1bxaf8";
};
# Needs tox
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 9851ff94d793..ff87e6b703da 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -93,19 +93,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "9.0";
+ version = "9.0.2";
lang = "en-US";
srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
- sha256 = "0aajbk65lpcazn8mdk7ngaqp0sykql8zjlkhznphxxw9v59mq3b7";
+ sha256 = "1xdnqphsj7wzwyv927jwd3fi36srx0minydwl5jg5yyd3m3if9hb";
};
i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
- sha256 = "08ahs9985ndcq1ywz06q4znai6a3ivibjk473kymzl6k40q1c9y2";
+ sha256 = "1qk9fg5dvyyvbngsqla00by8a974mpvq9pnm2djif54lr2nfivwf";
};
};
in
@@ -397,7 +397,7 @@ stdenv.mkDerivation rec {
longDescription = tor-browser-bundle.meta.longDescription;
homepage = "https://www.torproject.org/";
platforms = attrNames srcs;
- maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ];
+ maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm hax404 cap ];
hydraPlatforms = [];
# MPL2.0+, GPL+, &c. While it's not entirely clear whether
# the compound is "libre" in a strict sense (some components place certain
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
deleted file mode 100644
index f86c4a84e58c..000000000000
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, python3, makeWrapper
-, webkitgtk, glib-networking, gsettings-desktop-schemas, python2Packages
-}:
-# This package needs python3 during buildtime,
-# but Python 2 + packages during runtime.
-
-stdenv.mkDerivation rec {
- pname = "uzbl";
- version = "0.9.0";
-
- meta = with stdenv.lib; {
- description = "Tiny externally controllable webkit browser";
- homepage = "http://uzbl.org/";
- license = licenses.gpl3;
- platforms = platforms.linux;
- maintainers = with maintainers; [ raskin dgonyeo ];
- };
-
- src = fetchurl {
- name = "uzbl-v${version}.tar.gz";
- url = "https://github.com/uzbl/uzbl/archive/v${version}.tar.gz";
- sha256 = "0iskhv653fdm5raiidimh9fzlsw28zjqx7b5n3fl1wgbj6yz074k";
- };
-
- preConfigure = ''
- makeFlags="$makeFlags PREFIX=$out"
- makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out"
- mkdir -p $out/${python3.sitePackages}/
- export PYTHONPATH=$PYTHONPATH:$out/${python3.sitePackages}
- '';
-
- preFixup = ''
- for f in $out/bin/*; do
- wrapProgram $f \
- --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
- --prefix PYTHONPATH : "$PYTHONPATH" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
- done
- '';
-
- nativeBuildInputs = [ pkgconfig python3 makeWrapper ];
-
- buildInputs = [ gsettings-desktop-schemas webkitgtk ];
- propagatedBuildInputs = with python2Packages; [ pygtk six ];
-}
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
deleted file mode 100644
index 8a2e164b3639..000000000000
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, glib-networking, gtk2, libsoup, libX11, perl,
- pkgconfig, webkitgtk, gsettings-desktop-schemas }:
-
-stdenv.mkDerivation rec {
- version = "1.4.2";
- pname = "vimprobable2";
- src = fetchurl {
- url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2";
- sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkitgtk gsettings-desktop-schemas ];
-
- hardeningDisable = [ "format" ];
-
- installFlags = "PREFIX=/ DESTDIR=$(out)";
-
- preFixup = ''
- wrapProgram "$out/bin/vimprobable2" \
- --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = {
- description = ''
- Vimprobable is a web browser that behaves like the Vimperator plugin
- available for Mozilla Firefox
- '';
- longDescription = ''
- Vimprobable is a web browser that behaves like the Vimperator plugin
- available for Mozilla Firefox. It is based on the WebKit engine (using
- GTK bindings). The goal of Vimprobable is to build a completely
- keyboard-driven, efficient and pleasurable browsing-experience. Its
- featureset might be considered "minimalistic", but not as minimalistic as
- being completely featureless.
- '';
- homepage = https://sourceforge.net/apps/trac/vimprobable;
- license = stdenv.lib.licenses.mit;
- maintainers = [ stdenv.lib.maintainers.aforemny ];
- platforms = with stdenv.lib.platforms; linux;
- };
-}
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index f3228b11eb99..0b14a15f5daa 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
in stdenv.mkDerivation rec {
pname = "vivaldi";
- version = "2.9.1705.38-1";
+ version = "2.10.1745.23-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
- sha256 = "0jj2kfdl4788l132ncz3jf1pnjig7dc9gaxjmgv51n1ahmmx8shi";
+ sha256 = "1dkyanasycarka6zikrk0pn6n0xin7hrnysm67rs7pam4lzpq0vh";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix
index 0f36177278b9..b86ba3c39f06 100644
--- a/pkgs/applications/networking/browsers/webmacs/default.nix
+++ b/pkgs/applications/networking/browsers/webmacs/default.nix
@@ -27,18 +27,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
pygments
];
- dontWrapQtApps = true;
-
- makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
-
- # See https://github.com/parkouss/webmacs/blob/1a04fb7bd3f33d39cb4d71621b48c2458712ed39/setup.py#L32
- # Don't know why they're using CC for g++.
- preConfigure = ''
- export CC=$CXX
- '';
-
- doCheck = false; # test dependencies not packaged up yet
-
checkInputs = [
python3Packages.pytest
#python3Packages.pytest-xvfb
@@ -53,6 +41,20 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
# python3Packages.flake8
];
+ # See https://github.com/parkouss/webmacs/blob/1a04fb7bd3f33d39cb4d71621b48c2458712ed39/setup.py#L32
+ # Don't know why they're using CC for g++.
+ preConfigure = ''
+ export CC=$CXX
+ '';
+
+ doCheck = false; # test dependencies not packaged up yet
+
+ dontWrapQtApps = true;
+
+ preFixup = ''
+ makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+ '';
+
meta = with lib; {
description = "Keyboard-based web browser with Emacs/conkeror heritage";
longDescription = ''
diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix
index 3383d6838f7b..c000a37ff029 100644
--- a/pkgs/applications/networking/c14/default.nix
+++ b/pkgs/applications/networking/c14/default.nix
@@ -17,7 +17,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
description = "C14 is designed for data archiving & long-term backups.";
- homepage = https://www.online.net/en/c14;
+ homepage = https://www.online.net/en/storage/c14-cold-storage;
license = licenses.mit;
maintainers = with maintainers; [ apeyroux ];
};
diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
new file mode 100644
index 000000000000..065f264f1529
--- /dev/null
+++ b/pkgs/applications/networking/calls/default.nix
@@ -0,0 +1,83 @@
+{ stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, pkgconfig
+, libhandy
+, modemmanager
+, gtk3
+, gom
+, gsound
+, evolution-data-server
+, folks
+, desktop-file-utils
+, libpeas
+, dbus
+, vala
+, xorg
+, xvfb_run
+, libxml2
+}:
+
+stdenv.mkDerivation rec {
+ pname = "calls";
+ version = "unstable-2019-10-29";
+
+ src = fetchFromGitLab {
+ domain = "source.puri.sm";
+ owner = "Librem5";
+ repo = "calls";
+ rev = "9fe575053d8f01c3a76a6c20d39f0816166d5afd";
+ sha256 = "01inx4mvrzvklwrfryw5hw9p89v8cn78m3qmv97g7a3v0h5c0n35";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ desktop-file-utils
+ vala
+ ];
+
+ buildInputs = [
+ modemmanager
+ libhandy
+ evolution-data-server
+ folks
+ gom
+ gsound
+ gtk3
+ libhandy
+ libpeas
+ ];
+
+ checkInputs = [
+ dbus
+ xvfb_run
+ ];
+
+ mesonFlags = [
+ # docs fail to build
+ # https://source.puri.sm/Librem5/calls/issues/99
+ "-Dgtk_doc=false"
+ ];
+
+ doCheck = true;
+
+ checkPhase = ''
+ runHook preCheck
+ NO_AT_BRIDGE=1 \
+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+ meson test --print-errorlogs
+ runHook postCheck
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A phone dialer and call handler";
+ homepage = https://source.puri.sm/Librem5/calls;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ craigem lheckemann ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix
index 02368990a015..6462dd499493 100644
--- a/pkgs/applications/networking/cawbird/default.nix
+++ b/pkgs/applications/networking/cawbird/default.nix
@@ -1,6 +1,23 @@
-{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala
-, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection
-, glib-networking, python3 }:
+{ stdenv
+, fetchFromGitHub
+, glib
+, gtk3
+, json-glib
+, sqlite
+, libsoup
+, gettext
+, gspell
+, vala
+, meson
+, ninja
+, pkgconfig
+, dconf
+, gst_all_1
+, wrapGAppsHook
+, gobject-introspection
+, glib-networking
+, python3
+}:
stdenv.mkDerivation rec {
version = "1.0.3.1";
@@ -14,13 +31,34 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- meson ninja vala pkgconfig wrapGAppsHook python3
+ meson
+ ninja
+ vala
+ pkgconfig
+ wrapGAppsHook
+ python3
gobject-introspection # for setup hook
];
buildInputs = [
- glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking
- ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]);
+ glib
+ gtk3
+ json-glib
+ sqlite
+ libsoup
+ gettext
+ dconf
+ gspell
+ glib-networking
+ ] ++ (with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-bad
+ (gst-plugins-good.override {
+ gtkSupport = true;
+ })
+ gst-libav
+ ]);
postPatch = ''
chmod +x data/meson_post_install.py # patchShebangs requires executable file
@@ -30,7 +68,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Native GTK Twitter client for the Linux desktop";
longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird.";
- homepage = https://ibboard.co.uk/cawbird/;
+ homepage = "https://ibboard.co.uk/cawbird/";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ];
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index 2c0d039721fa..9295e90794d2 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "argo";
- version = "2.4.1";
+ version = "2.4.3";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
- sha256 = "1f9l9d4r0qfhpr2fn17faczcwmwmdz8f56f27cmmnhxz4r7qcm48";
+ sha256 = "15726n5rrbzszq5dpmrxbw9cn7ahihn28jqk274270140gz5aak1";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix
new file mode 100644
index 000000000000..67e91870f1a1
--- /dev/null
+++ b/pkgs/applications/networking/cluster/atlantis/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "atlantis";
+ version = "0.10.1";
+
+ src = fetchFromGitHub {
+ owner = "runatlantis";
+ repo = "atlantis";
+ rev = "v${version}";
+ sha256 = "08k2dgz6rph68647ah1rdp7hqa5h1ar4gdy7vdjy5kn7gz21gmri";
+ };
+
+ modSha256 = "1i4s3xcq2qc3zy00wk2l77935ilm6n5k1msilmdnj0061ia4860y";
+
+ subPackages = [ "." ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/runatlantis/atlantis;
+ description = "Terraform Pull Request Automation";
+ platforms = platforms.all;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jpotier ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index 8956828fa763..d0186fb9b4c0 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -1,13 +1,13 @@
{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo, buildGoPackage }:
buildGoPackage rec {
pname = "cni-plugins";
- version = "0.8.2";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "plugins";
rev = "v${version}";
- sha256 = "0gyxa6mhiyxqw4wpn6r7wgr2kyvflzbdcqsk5ch0b6zih98144ia";
+ sha256 = "0dc4fs08x4x518yhgvq3drjvansnc0cb8rm4h5wiw7k3whjii3cd";
};
goDeps = ./plugins-deps.nix;
@@ -35,6 +35,6 @@ buildGoPackage rec {
homepage = https://github.com/containernetworking/plugins;
license = licenses.asl20;
platforms = platforms.linux;
- maintainers = with maintainers; [ cstrahan ];
+ maintainers = with maintainers; [ cstrahan saschagrunert ];
};
}
diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix
index b0f679322659..904eabfcda82 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -2,23 +2,23 @@
buildGoModule rec {
pname = "fluxctl";
- version = "1.13.3";
+ version = "1.16.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = "flux";
rev = version;
- sha256 = "0l2gc9p2jz1zyl527rr0r3qklm4j86d4biviq8a30jl9rsx6z4cy";
+ sha256 = "1yk78w9cwssk5y69iapfzqf7mnrkam3w64x4zsx3zjpdmvp9dq7l";
};
- modSha256 = "1q5g9hd0ansdc2acpysf6wi74q50w0psrpyhk4y6mm6kjvhlcn87";
+ modSha256 = "17rh8yilxqv0dwljwm5ay43diwcy5pa1g2jff9wyhsh8q7sy9wln";
subPackages = [ "cmd/fluxctl" ];
meta = with stdenv.lib; {
description = "CLI client for Flux, the GitOps Kubernetes operator";
- homepage = https://github.com/weaveworks/flux;
+ homepage = "https://github.com/fluxcd/flux";
license = licenses.asl20;
- maintainers = with maintainers; [ Gonzih ];
+ maintainers = with maintainers; [ Gonzih filalex77 ];
};
}
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 655f5f9c0b2b..45b6e9dcf334 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -1,48 +1,32 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
-buildGoPackage rec {
- version = "2.15.1";
+buildGoModule rec {
pname = "helm";
+ version = "3.0.1";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
- sha256 = "1afbymgpax7kgjjv1c9xb4dm7gcrhn2g69piamdq1k0ng348k5w0";
+ sha256 = "0l5rmmrb6b57w1szwp6g7ad3xv0pgvc394mzjr4bi3bzcjsn7wny";
};
+ modSha256 = "0xjzzwmq3i77anb7w2qfnz7vc0gxq02lylj0xs6dzwl543winshm";
goPackagePath = "k8s.io/helm";
- subPackages = [ "cmd/helm" "cmd/tiller" "cmd/rudder" ];
-
- goDeps = ./deps.nix;
-
- # Thsese are the original flags from the helm makefile
- buildFlagsArray = ''
- -ldflags=-X k8s.io/helm/pkg/version.Version=v${version} -X k8s.io/helm/pkg/version.GitTreeState=clean -X k8s.io/helm/pkg/version.BuildMetadata=
- -w
- -s
- '';
-
- preBuild = ''
- # This is a hack(?) to flatten the dependency tree the same way glide or dep would
- # Otherwise you'll get errors like
- # have DeepCopyObject() "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime".Object
- # want DeepCopyObject() "k8s.io/apimachinery/pkg/runtime".Object
- rm -rf $NIX_BUILD_TOP/go/src/k8s.io/kubernetes/vendor
- rm -rf $NIX_BUILD_TOP/go/src/k8s.io/apiextensions-apiserver/vendor
- '';
+ subPackages = [ "cmd/helm" ];
+ buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.gitCommit=v${version}" ];
+ nativeBuildInputs = [ installShellFiles ];
postInstall = ''
- mkdir -p $bin/share/bash-completion/completions
- mkdir -p $bin/share/zsh/site-functions
- $bin/bin/helm completion bash > $bin/share/bash-completion/completions/helm
- $bin/bin/helm completion zsh > $bin/share/zsh/site-functions/_helm
+ $out/bin/helm completion bash > helm.bash
+ $out/bin/helm completion zsh > helm.zsh
+ installShellCompletion helm.{bash,zsh}
'';
meta = with stdenv.lib; {
homepage = https://github.com/kubernetes/helm;
description = "A package manager for kubernetes";
license = licenses.asl20;
- maintainers = [ maintainers.rlupton20 maintainers.edude03 ];
+ maintainers = with maintainers; [ rlupton20 edude03 saschagrunert ];
};
}
diff --git a/pkgs/applications/networking/cluster/helm/deps.nix b/pkgs/applications/networking/cluster/helm/deps.nix
deleted file mode 100644
index ffc6a5cb1b82..000000000000
--- a/pkgs/applications/networking/cluster/helm/deps.nix
+++ /dev/null
@@ -1,1191 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
- {
- goPackagePath = "cloud.google.com/go";
- fetch = {
- type = "git";
- url = "https://code.googlesource.com/gocloud";
- rev = "v0.26.0";
- sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1";
- };
- }
- {
- goPackagePath = "github.com/Azure/go-ansiterm";
- fetch = {
- type = "git";
- url = "https://github.com/Azure/go-ansiterm";
- rev = "d6e3b3328b78";
- sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q";
- };
- }
- {
- goPackagePath = "github.com/Azure/go-autorest";
- fetch = {
- type = "git";
- url = "https://github.com/Azure/go-autorest";
- rev = "v11.1.0";
- sha256 = "1jmr04qkl9fgmj56czn2979ng0f6ygfbk2khv2xyx368686xc1d6";
- };
- }
- {
- goPackagePath = "github.com/BurntSushi/toml";
- fetch = {
- type = "git";
- url = "https://github.com/BurntSushi/toml";
- rev = "v0.3.1";
- sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
- };
- }
- {
- goPackagePath = "github.com/MakeNowJust/heredoc";
- fetch = {
- type = "git";
- url = "https://github.com/MakeNowJust/heredoc";
- rev = "bb23615498cd";
- sha256 = "17m780i9afj3sbmcrgwgzarfly4x9376w56qblkqnzdkv6vps22i";
- };
- }
- {
- goPackagePath = "github.com/Masterminds/goutils";
- fetch = {
- type = "git";
- url = "https://github.com/Masterminds/goutils";
- rev = "v1.1.0";
- sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq";
- };
- }
- {
- goPackagePath = "github.com/Masterminds/semver";
- fetch = {
- type = "git";
- url = "https://github.com/Masterminds/semver";
- rev = "v1.4.2";
- sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj";
- };
- }
- {
- goPackagePath = "github.com/Masterminds/sprig";
- fetch = {
- type = "git";
- url = "https://github.com/Masterminds/sprig";
- rev = "9f8fceff796f";
- sha256 = "0m6h88xcs8zc2b1g6zaksfn9kyqhr8q9508h57jb6papx7w54yl2";
- };
- }
- {
- goPackagePath = "github.com/Masterminds/vcs";
- fetch = {
- type = "git";
- url = "https://github.com/Masterminds/vcs";
- rev = "v1.11.1";
- sha256 = "1062m73h0pp5d0574lf6px4jsjgywnsbkw50inxx3zal5r185ydm";
- };
- }
- {
- goPackagePath = "github.com/PuerkitoBio/purell";
- fetch = {
- type = "git";
- url = "https://github.com/PuerkitoBio/purell";
- rev = "v1.1.0";
- sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91";
- };
- }
- {
- goPackagePath = "github.com/PuerkitoBio/urlesc";
- fetch = {
- type = "git";
- url = "https://github.com/PuerkitoBio/urlesc";
- rev = "de5bf2ad4578";
- sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
- };
- }
- {
- goPackagePath = "github.com/adisbladis/vgo2nix";
- fetch = {
- type = "git";
- url = "https://github.com/adisbladis/vgo2nix";
- rev = "56ac56bb0d96";
- sha256 = "1jbxbgcqkal8cdhj2nfbw92fn1fs9ng1df9sf92vgf0m1xzq2mc3";
- };
- }
- {
- goPackagePath = "github.com/alecthomas/assert";
- fetch = {
- type = "git";
- url = "https://github.com/alecthomas/assert";
- rev = "405dbfeb8e38";
- sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l";
- };
- }
- {
- goPackagePath = "github.com/alecthomas/colour";
- fetch = {
- type = "git";
- url = "https://github.com/alecthomas/colour";
- rev = "60882d9e2721";
- sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs";
- };
- }
- {
- goPackagePath = "github.com/alecthomas/kingpin";
- fetch = {
- type = "git";
- url = "https://github.com/alecthomas/kingpin";
- rev = "v2.2.6";
- sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
- };
- }
- {
- goPackagePath = "github.com/alecthomas/repr";
- fetch = {
- type = "git";
- url = "https://github.com/alecthomas/repr";
- rev = "117648cd9897";
- sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp";
- };
- }
- {
- goPackagePath = "github.com/alecthomas/template";
- fetch = {
- type = "git";
- url = "https://github.com/alecthomas/template";
- rev = "a0175ee3bccc";
- sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
- };
- }
- {
- goPackagePath = "github.com/alecthomas/units";
- fetch = {
- type = "git";
- url = "https://github.com/alecthomas/units";
- rev = "2efee857e7cf";
- sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
- };
- }
- {
- goPackagePath = "github.com/asaskevich/govalidator";
- fetch = {
- type = "git";
- url = "https://github.com/asaskevich/govalidator";
- rev = "766470278477";
- sha256 = "1lmynw9vkgrxv7nh60wdywv0nx4gjlkiar433wydhpc2h3m5q968";
- };
- }
- {
- goPackagePath = "github.com/beorn7/perks";
- fetch = {
- type = "git";
- url = "https://github.com/beorn7/perks";
- rev = "3a771d992973";
- sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
- };
- }
- {
- goPackagePath = "github.com/chai2010/gettext-go";
- fetch = {
- type = "git";
- url = "https://github.com/chai2010/gettext-go";
- rev = "c6fed771bfd5";
- sha256 = "1p9gzj39x4gyhc552n3dmi3kc224gwilawa5kcg8rla31qkwlsky";
- };
- }
- {
- goPackagePath = "github.com/client9/misspell";
- fetch = {
- type = "git";
- url = "https://github.com/client9/misspell";
- rev = "v0.3.4";
- sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
- };
- }
- {
- goPackagePath = "github.com/cpuguy83/go-md2man";
- fetch = {
- type = "git";
- url = "https://github.com/cpuguy83/go-md2man";
- rev = "v1.0.4";
- sha256 = "0hmkrq4gdzb6mwllmh4p1y7vrz7hyr8xqagpk9nyr5dhygvnnq2v";
- };
- }
- {
- goPackagePath = "github.com/cyphar/filepath-securejoin";
- fetch = {
- type = "git";
- url = "https://github.com/cyphar/filepath-securejoin";
- rev = "v0.2.2";
- sha256 = "0id32zjb92wm569m29nfrzz5mw9z1glr3klayr6j134pp4h1sgq4";
- };
- }
- {
- goPackagePath = "github.com/davecgh/go-spew";
- fetch = {
- type = "git";
- url = "https://github.com/davecgh/go-spew";
- rev = "v1.1.1";
- sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
- };
- }
- {
- goPackagePath = "github.com/dgrijalva/jwt-go";
- fetch = {
- type = "git";
- url = "https://github.com/dgrijalva/jwt-go";
- rev = "01aeca54ebda";
- sha256 = "10dmb5xxn5wijn299h483z0klprprkq7n1azakm3ysp50sr11ywg";
- };
- }
- {
- goPackagePath = "github.com/docker/distribution";
- fetch = {
- type = "git";
- url = "https://github.com/docker/distribution";
- rev = "edc3ab29cdff";
- sha256 = "1nqjaq1q6fs3c0avpb02sib0a906xfbk3m74hk2mqjdbyx9y8b4m";
- };
- }
- {
- goPackagePath = "github.com/docker/docker";
- fetch = {
- type = "git";
- url = "https://github.com/docker/docker";
- rev = "a9fbbdc8dd87";
- sha256 = "0vkr9fs8qv3ydpm4f4b3jsx1f3cxpws78f2kwpyn00y1gb3lpnpc";
- };
- }
- {
- goPackagePath = "github.com/docker/spdystream";
- fetch = {
- type = "git";
- url = "https://github.com/docker/spdystream";
- rev = "449fdfce4d96";
- sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl";
- };
- }
- {
- goPackagePath = "github.com/emicklei/go-restful";
- fetch = {
- type = "git";
- url = "https://github.com/emicklei/go-restful";
- rev = "ff4f55a20633";
- sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c";
- };
- }
- {
- goPackagePath = "github.com/evanphx/json-patch";
- fetch = {
- type = "git";
- url = "https://github.com/evanphx/json-patch";
- rev = "v4.2.0";
- sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6";
- };
- }
- {
- goPackagePath = "github.com/exponent-io/jsonpath";
- fetch = {
- type = "git";
- url = "https://github.com/exponent-io/jsonpath";
- rev = "d6023ce2651d";
- sha256 = "1qkzaxsjs7yg1672sk67nr119j7jc4751yzgii0j3nbipjv321kc";
- };
- }
- {
- goPackagePath = "github.com/fatih/camelcase";
- fetch = {
- type = "git";
- url = "https://github.com/fatih/camelcase";
- rev = "f6a740d52f96";
- sha256 = "15vb86adns1izvbzjw0lmmzrwlarhbxw5qalhx10vzzdx73wh4ai";
- };
- }
- {
- goPackagePath = "github.com/gofrs/flock";
- fetch = {
- type = "git";
- url = "https://github.com/gofrs/flock";
- rev = "v0.7.1";
- sha256 = "1xn48643h991p383hlhzd6k5v9akx8c6dcy93fz37fwqrrhzpb03";
- };
- }
- {
- goPackagePath = "github.com/ghodss/yaml";
- fetch = {
- type = "git";
- url = "https://github.com/ghodss/yaml";
- rev = "c7ce16629ff4";
- sha256 = "10cyv1gy3zwwkr04kk8cvhifb7xddakyvnk5s13yfcqj9hcjz8d1";
- };
- }
- {
- goPackagePath = "github.com/go-kit/kit";
- fetch = {
- type = "git";
- url = "https://github.com/go-kit/kit";
- rev = "v0.8.0";
- sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0";
- };
- }
- {
- goPackagePath = "github.com/go-logfmt/logfmt";
- fetch = {
- type = "git";
- url = "https://github.com/go-logfmt/logfmt";
- rev = "v0.3.0";
- sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
- };
- }
- {
- goPackagePath = "github.com/go-openapi/jsonpointer";
- fetch = {
- type = "git";
- url = "https://github.com/go-openapi/jsonpointer";
- rev = "v0.19.0";
- sha256 = "0sv2k1fwj6rsigc9489c19ap0jib1d0widm040h0sjdw2nadh3i2";
- };
- }
- {
- goPackagePath = "github.com/go-openapi/jsonreference";
- fetch = {
- type = "git";
- url = "https://github.com/go-openapi/jsonreference";
- rev = "v0.19.0";
- sha256 = "1d0rk17wn755xsfi9pxifdpgs2p23bc0rkf95kjwxczyy6jbqdaj";
- };
- }
- {
- goPackagePath = "github.com/go-openapi/spec";
- fetch = {
- type = "git";
- url = "https://github.com/go-openapi/spec";
- rev = "v0.17.2";
- sha256 = "14n5x2nxlj2x62v3km96yw7rncxk2b9v94k3j0c22r43c60m38mx";
- };
- }
- {
- goPackagePath = "github.com/go-openapi/swag";
- fetch = {
- type = "git";
- url = "https://github.com/go-openapi/swag";
- rev = "v0.17.2";
- sha256 = "1hhgbx59f7lcsqiza2is8q9walhf8mxfkwj7xql1scrn6ms2jmlv";
- };
- }
- {
- goPackagePath = "github.com/go-sql-driver/mysql";
- fetch = {
- type = "git";
- url = "https://github.com/go-sql-driver/mysql";
- rev = "v1.4.0";
- sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n";
- };
- }
- {
- goPackagePath = "github.com/go-stack/stack";
- fetch = {
- type = "git";
- url = "https://github.com/go-stack/stack";
- rev = "v1.8.0";
- sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
- };
- }
- {
- goPackagePath = "github.com/gobwas/glob";
- fetch = {
- type = "git";
- url = "https://github.com/gobwas/glob";
- rev = "v0.2.3";
- sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z";
- };
- }
- {
- goPackagePath = "github.com/gogo/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/gogo/protobuf";
- rev = "v1.1.1";
- sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
- };
- }
- {
- goPackagePath = "github.com/golang/glog";
- fetch = {
- type = "git";
- url = "https://github.com/golang/glog";
- rev = "23def4e6c14b";
- sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
- };
- }
- {
- goPackagePath = "github.com/golang/groupcache";
- fetch = {
- type = "git";
- url = "https://github.com/golang/groupcache";
- rev = "02826c3e7903";
- sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x";
- };
- }
- {
- goPackagePath = "github.com/golang/mock";
- fetch = {
- type = "git";
- url = "https://github.com/golang/mock";
- rev = "v1.1.1";
- sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy";
- };
- }
- {
- goPackagePath = "github.com/golang/protobuf";
- fetch = {
- type = "git";
- url = "https://github.com/golang/protobuf";
- rev = "v1.2.0";
- sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab";
- };
- }
- {
- goPackagePath = "github.com/google/btree";
- fetch = {
- type = "git";
- url = "https://github.com/google/btree";
- rev = "7d79101e329e";
- sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0";
- };
- }
- {
- goPackagePath = "github.com/google/gofuzz";
- fetch = {
- type = "git";
- url = "https://github.com/google/gofuzz";
- rev = "24818f796faf";
- sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm";
- };
- }
- {
- goPackagePath = "github.com/google/uuid";
- fetch = {
- type = "git";
- url = "https://github.com/google/uuid";
- rev = "064e2069ce9c";
- sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb";
- };
- }
- {
- goPackagePath = "github.com/googleapis/gnostic";
- fetch = {
- type = "git";
- url = "https://github.com/googleapis/gnostic";
- rev = "0c5108395e2d";
- sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc";
- };
- }
- {
- goPackagePath = "github.com/gophercloud/gophercloud";
- fetch = {
- type = "git";
- url = "https://github.com/gophercloud/gophercloud";
- rev = "c818fa66e4c8";
- sha256 = "0igz47lpdxgpfb4ckrrs64vr4wkkiqaamk4wf5d3il4dc2g06azw";
- };
- }
- {
- goPackagePath = "github.com/gosuri/uitable";
- fetch = {
- type = "git";
- url = "https://github.com/gosuri/uitable";
- rev = "v0.0.1";
- sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil";
- };
- }
- {
- goPackagePath = "github.com/gregjones/httpcache";
- fetch = {
- type = "git";
- url = "https://github.com/gregjones/httpcache";
- rev = "787624de3eb7";
- sha256 = "1zqlg9pkj7r6fqw7wv3ywvbz3bh0hvzifs2scgcraj812q5189w5";
- };
- }
- {
- goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus";
- fetch = {
- type = "git";
- url = "https://github.com/grpc-ecosystem/go-grpc-prometheus";
- rev = "0c1b191dbfe5";
- sha256 = "0d7vybd4yy9a9clk03578xdpyhifxsy3qv6iiglrrnblbmpgksjc";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/golang-lru";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/golang-lru";
- rev = "v0.5.0";
- sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f";
- };
- }
- {
- goPackagePath = "github.com/huandu/xstrings";
- fetch = {
- type = "git";
- url = "https://github.com/huandu/xstrings";
- rev = "v1.2.0";
- sha256 = "0bn1kac5vcspxdpx4bygr4gngdbk67pnbqc04b0f7a4ny25n10iq";
- };
- }
- {
- goPackagePath = "github.com/imdario/mergo";
- fetch = {
- type = "git";
- url = "https://github.com/imdario/mergo";
- rev = "v0.3.5";
- sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/mousetrap";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/mousetrap";
- rev = "v1.0.0";
- sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
- };
- }
- {
- goPackagePath = "github.com/jmoiron/sqlx";
- fetch = {
- type = "git";
- url = "https://github.com/jmoiron/sqlx";
- rev = "v1.2.0";
- sha256 = "0pmi2asx157f5738g19fzyxb9g8yyfbpjyh2a2ykr9mafvp60rfd";
- };
- }
- {
- goPackagePath = "github.com/json-iterator/go";
- fetch = {
- type = "git";
- url = "https://github.com/json-iterator/go";
- rev = "ab8a2e0c74be";
- sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4";
- };
- }
- {
- goPackagePath = "github.com/julienschmidt/httprouter";
- fetch = {
- type = "git";
- url = "https://github.com/julienschmidt/httprouter";
- rev = "v1.2.0";
- sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
- };
- }
- {
- goPackagePath = "github.com/kisielk/gotool";
- fetch = {
- type = "git";
- url = "https://github.com/kisielk/gotool";
- rev = "v1.0.0";
- sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
- };
- }
- {
- goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
- fetch = {
- type = "git";
- url = "https://github.com/konsorten/go-windows-terminal-sequences";
- rev = "v1.0.1";
- sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
- };
- }
- {
- goPackagePath = "github.com/kr/logfmt";
- fetch = {
- type = "git";
- url = "https://github.com/kr/logfmt";
- rev = "b84e30acd515";
- sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
- };
- }
- {
- goPackagePath = "github.com/lib/pq";
- fetch = {
- type = "git";
- url = "https://github.com/lib/pq";
- rev = "v1.0.0";
- sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i";
- };
- }
- {
- goPackagePath = "github.com/liggitt/tabwriter";
- fetch = {
- type = "git";
- url = "https://github.com/liggitt/tabwriter";
- rev = "89fcab3d43de";
- sha256 = "04q8d0jk1ymvy7pv1dgfbqzk8gcjfa77psg1lk30ghlisf54pakg";
- };
- }
- {
- goPackagePath = "github.com/mailru/easyjson";
- fetch = {
- type = "git";
- url = "https://github.com/mailru/easyjson";
- rev = "60711f1a8329";
- sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-isatty";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-isatty";
- rev = "v0.0.3";
- sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-runewidth";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-runewidth";
- rev = "v0.0.1";
- sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-sqlite3";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-sqlite3";
- rev = "v1.9.0";
- sha256 = "14vw8bwyaz9lrd1rqhfri5cwpimiimhp75pkbqxxsjsr5jz89s7m";
- };
- }
- {
- goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
- fetch = {
- type = "git";
- url = "https://github.com/matttproud/golang_protobuf_extensions";
- rev = "v1.0.1";
- sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/go-wordwrap";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/go-wordwrap";
- rev = "ad45545899c7";
- sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9";
- };
- }
- {
- goPackagePath = "github.com/modern-go/concurrent";
- fetch = {
- type = "git";
- url = "https://github.com/modern-go/concurrent";
- rev = "bacd9c7ef1dd";
- sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
- };
- }
- {
- goPackagePath = "github.com/modern-go/reflect2";
- fetch = {
- type = "git";
- url = "https://github.com/modern-go/reflect2";
- rev = "v1.0.1";
- sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
- };
- }
- {
- goPackagePath = "github.com/mwitkow/go-conntrack";
- fetch = {
- type = "git";
- url = "https://github.com/mwitkow/go-conntrack";
- rev = "cc309e4a2223";
- sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
- };
- }
- {
- goPackagePath = "github.com/opencontainers/go-digest";
- fetch = {
- type = "git";
- url = "https://github.com/opencontainers/go-digest";
- rev = "a6d0ee40d420";
- sha256 = "1paz3na2xkhi10p5bk7f7gbh5yykfgr9f9i2gcc13rb461yq6fmg";
- };
- }
- {
- goPackagePath = "github.com/orivej/e";
- fetch = {
- type = "git";
- url = "https://github.com/orivej/e";
- rev = "ac3492690fda";
- sha256 = "11jizr28kfkr6zscjxg95pqi6cjp08aqnhs41sdhc98nww78ilkr";
- };
- }
- {
- goPackagePath = "github.com/orivej/go-nix";
- fetch = {
- type = "git";
- url = "https://github.com/orivej/go-nix";
- rev = "dae45d921a44";
- sha256 = "17hfmsz8hs3h2d5c06j1bvbw8ijrhzm3iz911z5zydsl4x7y0cgy";
- };
- }
- {
- goPackagePath = "github.com/peterbourgon/diskv";
- fetch = {
- type = "git";
- url = "https://github.com/peterbourgon/diskv";
- rev = "v2.0.1";
- sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "v0.8.0";
- sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
- };
- }
- {
- goPackagePath = "github.com/pkg/profile";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/profile";
- rev = "v1.2.1";
- sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr";
- };
- }
- {
- goPackagePath = "github.com/pmezard/go-difflib";
- fetch = {
- type = "git";
- url = "https://github.com/pmezard/go-difflib";
- rev = "v1.0.0";
- sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_golang";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_golang";
- rev = "v0.9.2";
- sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs";
- };
- }
- {
- goPackagePath = "github.com/prometheus/client_model";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/client_model";
- rev = "5c3871d89910";
- sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
- };
- }
- {
- goPackagePath = "github.com/prometheus/common";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/common";
- rev = "v0.2.0";
- sha256 = "02kym6lcfnlq23qbv277jr0q1n7jj0r14gqg93c7wn7gc44jv3vp";
- };
- }
- {
- goPackagePath = "github.com/prometheus/procfs";
- fetch = {
- type = "git";
- url = "https://github.com/prometheus/procfs";
- rev = "1dc9a6cbc91a";
- sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab";
- };
- }
- {
- goPackagePath = "github.com/rubenv/sql-migrate";
- fetch = {
- type = "git";
- url = "https://github.com/rubenv/sql-migrate";
- rev = "1007f53448d7";
- sha256 = "1cd7wpgym7yzzv4n7bsmg9gh1g7mqlljih3881arqlq11083d3mc";
- };
- }
- {
- goPackagePath = "github.com/russross/blackfriday";
- fetch = {
- type = "git";
- url = "https://github.com/russross/blackfriday";
- rev = "300106c228d5";
- sha256 = "1bcqwb9lk2sijn5q3kqp7sadhh0ysbxlj5bxjspk9yp5bp733cbh";
- };
- }
- {
- goPackagePath = "github.com/sergi/go-diff";
- fetch = {
- type = "git";
- url = "https://github.com/sergi/go-diff";
- rev = "v1.0.0";
- sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
- };
- }
- {
- goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
- fetch = {
- type = "git";
- url = "https://github.com/shurcooL/sanitized_anchor_name";
- rev = "10ef21a441db";
- sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01";
- };
- }
- {
- goPackagePath = "github.com/sirupsen/logrus";
- fetch = {
- type = "git";
- url = "https://github.com/sirupsen/logrus";
- rev = "v1.2.0";
- sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
- };
- }
- {
- goPackagePath = "github.com/spf13/cobra";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cobra";
- rev = "fe5e611709b0";
- sha256 = "1pn7g9jmhqc9yg6x02dgp4phiggnnxz8a11pv5y4vxhrvkjm6h71";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "v1.0.3";
- sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
- };
- }
- {
- goPackagePath = "github.com/stretchr/objx";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/objx";
- rev = "v0.1.1";
- sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
- };
- }
- {
- goPackagePath = "github.com/stretchr/testify";
- fetch = {
- type = "git";
- url = "https://github.com/stretchr/testify";
- rev = "v1.2.2";
- sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
- };
- }
- {
- goPackagePath = "github.com/technosophos/moniker";
- fetch = {
- type = "git";
- url = "https://github.com/technosophos/moniker";
- rev = "a5dbd03a2245";
- sha256 = "1z273gvbwr09lcxwd10wyvxmxjln93r952sr1w9hqxcgc1f8l3vl";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "0709b304e793";
- sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c";
- };
- }
- {
- goPackagePath = "golang.org/x/lint";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/lint";
- rev = "c67002cb31c3";
- sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "65e2d4e15006";
- sha256 = "0aqcmh0sp723d6hwgrv7pnrs4crns2ngr4x43jd4v985cbn455x7";
- };
- }
- {
- goPackagePath = "golang.org/x/oauth2";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/oauth2";
- rev = "d2e6202438be";
- sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
- };
- }
- {
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "42b317875d0f";
- sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "b90733256f2e";
- sha256 = "1dsqa48ai4rrqf0sxypnmjg5c6sbp63mj5ljr7qadam06r5m2q98";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "v0.3.0";
- sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
- };
- }
- {
- goPackagePath = "golang.org/x/time";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/time";
- rev = "f51c12702a4d";
- sha256 = "07wc6g2fvafkr6djsscm0jpbpl4135khhb6kpyx1953hi5d1jvyy";
- };
- }
- {
- goPackagePath = "golang.org/x/tools";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/tools";
- rev = "6cd1fcedba52";
- sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d";
- };
- }
- {
- goPackagePath = "google.golang.org/appengine";
- fetch = {
- type = "git";
- url = "https://github.com/golang/appengine";
- rev = "v1.1.0";
- sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
- };
- }
- {
- goPackagePath = "google.golang.org/genproto";
- fetch = {
- type = "git";
- url = "https://github.com/google/go-genproto";
- rev = "c66870c02cf8";
- sha256 = "0siq7sv68556ygqi2d2zmvx8l1xjqdc0fylqzci5h1mq2i14bayn";
- };
- }
- {
- goPackagePath = "google.golang.org/grpc";
- fetch = {
- type = "git";
- url = "https://github.com/grpc/grpc-go";
- rev = "v1.18.0";
- sha256 = "17drwyj3fi5sdz5ndlj7888b3gin6brs3jnh7gh6i15k97l6gf4n";
- };
- }
- {
- goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/alecthomas/kingpin.v2";
- rev = "v2.2.6";
- sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
- };
- }
- {
- goPackagePath = "gopkg.in/check.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/check.v1";
- rev = "20d25e280405";
- sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
- };
- }
- {
- goPackagePath = "gopkg.in/gorp.v1";
- fetch = {
- type = "git";
- url = "https://gopkg.in/gorp.v1";
- rev = "v1.7.2";
- sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb";
- };
- }
- {
- goPackagePath = "gopkg.in/inf.v0";
- fetch = {
- type = "git";
- url = "https://gopkg.in/inf.v0";
- rev = "v0.9.0";
- sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
- };
- }
- {
- goPackagePath = "gopkg.in/square/go-jose.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/square/go-jose.v2";
- rev = "89060dee6a84";
- sha256 = "04ak01zs9qibr6qvc6l0zdjj9pgccpbvxz6rdwrqv698i1q3qfpd";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "v2.2.1";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
- };
- }
- {
- goPackagePath = "honnef.co/go/tools";
- fetch = {
- type = "git";
- url = "https://github.com/dominikh/go-tools";
- rev = "88497007e858";
- sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc";
- };
- }
- {
- goPackagePath = "k8s.io/api";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/api";
- rev = "6e4e0e4f393b";
- sha256 = "0y7nxxywq2qx74a5vsg0h2jkfj879wbv6bjran12401fv0vsdlp1";
- };
- }
- {
- goPackagePath = "k8s.io/apiextensions-apiserver";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/apiextensions-apiserver";
- rev = "727a075fdec8";
- sha256 = "1p8bdl299hrmkq2hfh7sqhsv7c3ig1i0jy8mcgq0hqjix94a87cj";
- };
- }
- {
- goPackagePath = "k8s.io/apimachinery";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/apimachinery";
- rev = "6a84e37a896d";
- sha256 = "1ys06ixidvpcj9sgk0c2i5vsz11gg3h8xcpc9kqxfsik36cw1akk";
- };
- }
- {
- goPackagePath = "k8s.io/apiserver";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/apiserver";
- rev = "1ec86e4da56c";
- sha256 = "0my2r4ynbxgpbbrjgcrdrqazhhn2jwk8jkk8ymjks28gzs2i510s";
- };
- }
- {
- goPackagePath = "k8s.io/cli-runtime";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/cli-runtime";
- rev = "d644b00f3b79";
- sha256 = "1zcmfpyp6m9xl8dia56yb00ixra3ag5d43v2f5zlnrwphq967a8p";
- };
- }
- {
- goPackagePath = "k8s.io/client-go";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/client-go";
- rev = "1a26190bd76a";
- sha256 = "1b77zf0sip2cilkr40b2jm1kk71212s4clmbs2xl57b4n945yy1d";
- };
- }
- {
- goPackagePath = "k8s.io/cloud-provider";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/cloud-provider";
- rev = "9c9d72d1bf90";
- sha256 = "15iwal7nn1b7jwrvrhlzvdnf0381lccpw3jrlww8sfmxqsp860in";
- };
- }
- {
- goPackagePath = "k8s.io/klog";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/klog";
- rev = "8e90cee79f82";
- sha256 = "1hzy767dj0ya111al54k3g9xa40bsy7j81fi0sh7gyl1azw0h8dk";
- };
- }
- {
- goPackagePath = "k8s.io/kube-openapi";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/kube-openapi";
- rev = "b3a7cee44a30";
- sha256 = "1ald0jjliln5ipdniwfcrm4yal9aa4jr07d3ljrhhh2fj72c6dsp";
- };
- }
- {
- goPackagePath = "k8s.io/kubernetes";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/kubernetes";
- rev = "v1.14.1";
- sha256 = "0s06x9jk9b6r0i39nl0bmvwjgdp3qikgfbw5cnzi5mv03hc2li8s";
- };
- }
- {
- goPackagePath = "k8s.io/utils";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes/utils";
- rev = "c2654d5206da";
- sha256 = "1849p8xhiyk53mpg3mwpsmsm5ps5sa2p54bv7b38m415qxsn2d1x";
- };
- }
- {
- goPackagePath = "sigs.k8s.io/kustomize";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes-sigs/kustomize";
- rev = "v2.0.3";
- sha256 = "1dfkpx9rllj1bzm5f52bx404kdds3zx1h38yqri9ha3p3pcb1bbb";
- };
- }
- {
- goPackagePath = "sigs.k8s.io/yaml";
- fetch = {
- type = "git";
- url = "https://github.com/kubernetes-sigs/yaml";
- rev = "v1.1.0";
- sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb";
- };
- }
- {
- goPackagePath = "vbom.ml/util";
- fetch = {
- type = "git";
- url = "https://github.com/fvbommel/util";
- rev = "db5cfe13f5cc";
- sha256 = "1k9c3ihhkrcmhd26pwd62mp2ll7icr2q65i5pkymnfnhhv40p682";
- };
- }
-]
diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index 73d82207daf5..6fbad55f8070 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,16 +2,25 @@
buildGoModule rec {
pname = "k9s";
- version = "0.8.4";
+ version = "0.9.3";
+ # rev is the release commit, mainly for version command output
+ rev = "1a9a83b34cdd0c9b4e793ed6b4b5c16ea1a949a0";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = version;
- sha256 = "0wsj6wc2qi5708cg47l2qblq1cg8fcwxdygpkayib9hapx6lc6f8";
+ sha256 = "0k27mfccz563r18zlbaxll305vrmrx19ym6znsikvqxlmhy86g36";
};
- modSha256 = "1ia9wx6yd9mdr981lcw58xv39iqzz25r03bmn1c6byxmq2xpcjq8";
+ buildFlagsArray = ''
+ -ldflags=
+ -s -w
+ -X github.com/derailed/k9s/cmd.version=${version}
+ -X github.com/derailed/k9s/cmd.commit=${rev}
+ '';
+
+ modSha256 = "09rwbl8zd06ax5hidm5l1schwqvsr5ndlqh09w1rq9fqjijy649y";
meta = with stdenv.lib; {
description = "Kubernetes CLI To Manage Your Clusters In Style.";
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 0b4959d3b9b3..267f25f8bb58 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -62,7 +62,12 @@ in rec {
};
kops_1_14 = mkKops {
- version = "1.14.0";
- sha256 = "0zd2plsdn45wf73qspv9yaxa0crwfy5h6ws3lvw96vxvrkhl96l2";
+ version = "1.14.1";
+ sha256 = "0ikd8qwrjh8s1sc95g18sm0q6p33swz2m1rjd8zw34mb2w9jv76n";
+ };
+
+ kops_1_15 = mkKops {
+ version = "1.15.0";
+ sha256 = "0sjas8pn0njl767b1y15g7cci2q3kxkxwmgr0wvs7vi3n1s1sf9d";
};
}
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 1ad7ad3e393d..f852c3ac0a3a 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -15,13 +15,13 @@ with lib;
stdenv.mkDerivation rec {
pname = "kubernetes";
- version = "1.15.4";
+ version = "1.16.4";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "18wpqrgb1ils4g8ggg217xq4jq30i4m7par2mdjk59pmz7ssm25p";
+ sha256 = "05rpwmzkxhbvckcs7hspy6krdfskd8jnsn9g43fhidjvqhxyh6n3";
};
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
description = "Production-Grade Container Scheduling and Management";
license = licenses.asl20;
homepage = https://kubernetes.io;
- maintainers = with maintainers; [johanot offline];
+ maintainers = with maintainers; [johanot offline saschagrunert];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix
new file mode 100644
index 000000000000..3a2463447a2c
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubeseal/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "kubeseal";
+ version = "0.9.6";
+
+ src = fetchFromGitHub {
+ owner = "bitnami-labs";
+ repo = "sealed-secrets";
+ rev = "v${version}";
+ sha256 = "09ds5qn13l6l8kl2i01hgy6pqr30z1rm447ax32lf79zp8hca3r3";
+ };
+
+ modSha256 = "04dmjyz3vi2l0dfpyy42lkp2fv1vlfkvblrxh1dvb37phrkd5lbd";
+
+ subPackages = [ "cmd/kubeseal" ];
+
+ meta = with lib; {
+ description = "A Kubernetes controller and tool for one-way encrypted Secrets";
+ homepage = "https://github.com/bitnami-labs/sealed-secrets";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ groodt ];
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 89d06474509f..84e9b8899431 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoPackage, makeWrapper }:
+{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }:
let
@@ -7,10 +7,10 @@ let
schema = stdenv.mkDerivation {
name = "kubeval-schema";
src = fetchFromGitHub {
- owner = "garethr";
+ owner = "instrumenta";
repo = "kubernetes-json-schema";
- rev = "c7672fd48e1421f0060dd54b6620baa2ab7224ba";
- sha256 = "0picr3wvjx4qv158jy4f60pl225rm4mh0l97pf8nqi9h9x4x888p";
+ rev = "6a498a60dc68c5f6a1cc248f94b5cd1e7241d699";
+ sha256 = "1y9m2ma3n4h7sf2lg788vjw6pkfyi0fa7gzc870faqv326n6x2jr";
};
installPhase = ''
@@ -21,26 +21,26 @@ let
in
-buildGoPackage rec {
+buildGoModule rec {
pname = "kubeval";
- version = "0.7.3";
+ version = "0.14.0";
- goPackagePath = "github.com/garethr/kubeval";
src = fetchFromGitHub {
- owner = "garethr";
+ owner = "instrumenta";
repo = "kubeval";
- rev = version;
- sha256 = "042v4mc5p80vmk56wp6aw89yiibjnfqn79c0zcd6y179br4gpfnb";
+ rev = "${version}";
+ sha256 = "0kpwk7bv36m3i8vavm1pqc8l611c6l9qbagcc64v6r85qig4w5xv";
};
- goDeps = ./deps.nix;
buildInputs = [ makeWrapper ];
- postFixup = "wrapProgram $bin/bin/kubeval --set KUBEVAL_SCHEMA_LOCATION file:///${schema}";
+ modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y";
+
+ postFixup = "wrapProgram $out/bin/kubeval --set KUBEVAL_SCHEMA_LOCATION file:///${schema}/kubernetes-json-schema/master";
meta = with lib; {
description = "Validate your Kubernetes configuration files";
- homepage = https://github.com/garethr/kubeval;
+ homepage = https://github.com/instrumenta/kubeval;
license = licenses.asl20;
maintainers = with maintainers; [ nicknovitski ];
platforms = platforms.all;
diff --git a/pkgs/applications/networking/cluster/kubeval/deps.nix b/pkgs/applications/networking/cluster/kubeval/deps.nix
deleted file mode 100644
index b9565e927ded..000000000000
--- a/pkgs/applications/networking/cluster/kubeval/deps.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
- {
- goPackagePath = "github.com/fatih/color";
- fetch = {
- type = "git";
- url = "https://github.com/fatih/color";
- rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
- sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
- };
- }
- {
- goPackagePath = "github.com/fsnotify/fsnotify";
- fetch = {
- type = "git";
- url = "https://github.com/fsnotify/fsnotify";
- rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
- sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/go-multierror";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/go-multierror";
- rev = "b7773ae218740a7be65057fc60b366a49b538a44";
- sha256 = "09904bk7ac6qs9dgiv23rziq9h3makb9qg4jvxr71rlydsd7psfd";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/hcl";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/hcl";
- rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
- sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
- };
- }
- {
- goPackagePath = "github.com/magiconair/properties";
- fetch = {
- type = "git";
- url = "https://github.com/magiconair/properties";
- rev = "c2353362d570a7bfa228149c62842019201cfb71";
- sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
- };
- }
- {
- goPackagePath = "github.com/mitchellh/mapstructure";
- fetch = {
- type = "git";
- url = "https://github.com/mitchellh/mapstructure";
- rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b";
- sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7";
- };
- }
- {
- goPackagePath = "github.com/pelletier/go-toml";
- fetch = {
- type = "git";
- url = "https://github.com/pelletier/go-toml";
- rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
- sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
- };
- }
- {
- goPackagePath = "github.com/spf13/afero";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/afero";
- rev = "787d034dfe70e44075ccc060d346146ef53270ad";
- sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1";
- };
- }
- {
- goPackagePath = "github.com/spf13/cast";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cast";
- rev = "8965335b8c7107321228e3e3702cab9832751bac";
- sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
- };
- }
- {
- goPackagePath = "github.com/spf13/cobra";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cobra";
- rev = "1e58aa3361fd650121dceeedc399e7189c05674a";
- sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin";
- };
- }
- {
- goPackagePath = "github.com/spf13/jwalterweatherman";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/jwalterweatherman";
- rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
- sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
- sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
- };
- }
- {
- goPackagePath = "github.com/spf13/viper";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/viper";
- rev = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736";
- sha256 = "0y3r6ysi5vn0yq5c7pbl62yg2i64fkv54xgj2jf1hn3v6zzyimis";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonpointer";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonpointer";
- rev = "4e3ac2762d5f479393488629ee9370b50873b3a6";
- sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonreference";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonreference";
- rev = "bd5ef7bd5415a7ac448318e64f11a24cd21e594b";
- sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5";
- };
- }
- {
- goPackagePath = "github.com/xeipuuv/gojsonschema";
- fetch = {
- type = "git";
- url = "https://github.com/xeipuuv/gojsonschema";
- rev = "9ff6d6c47f3f5de55acc6f464d6e3719b02818ae";
- sha256 = "0rpkya4lnpv9g33bs0z3vd5dlnadkyq1lg7114nbd73vm878s6sw";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "2d6f6f883a06fc0d5f4b14a81e4c28705ea64c15";
- sha256 = "1a6x6n1fk5k013w5r4b0bxws1d2fh0s69mbzpi1vkyfpcxabwjhj";
- };
- }
- {
- goPackagePath = "golang.org/x/text";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/text";
- rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
- sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
- sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
- };
- }
-]
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index e60586437893..6afbbf215a3f 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "nomad";
- version = "0.10.0";
+ version = "0.10.2";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/nomad";
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = pname;
inherit rev;
- sha256 = "1hvnrbna4hsyp5byx5si2gn4h3m6shwmd8nk0vpbrs3ck3dl1p6l";
+ sha256 = "1kv67rkqnxiz2dkmc1v1df6qx9j5j4h7cis00v2i15sl824g22jw";
};
# ui:
diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix
index ce6c5424fba1..32dbced0a461 100644
--- a/pkgs/applications/networking/cluster/sonobuoy/default.nix
+++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix
@@ -1,11 +1,11 @@
{ lib, buildGoPackage, fetchFromGitHub }:
# SHA of ${version} for the tool's help output
-let rev = "7ad367535a6710802085d41e0dbb53df359b9882";
+let rev = "c9c2a461cd3397909fe6e45ff71836347ef89fd8";
in
buildGoPackage rec {
pname = "sonobuoy";
- version = "0.15.0";
+ version = "0.16.1";
goPackagePath = "github.com/heptio/sonobuoy";
@@ -19,10 +19,10 @@ buildGoPackage rec {
'';
src = fetchFromGitHub {
- sha256 = "0dkmhmr7calk8mkdxfpy3yjzk10ja4gz1jq8pgk3v8rh04f4h1x5";
+ sha256 = "14qc5a7jbr403wjpk6pgpb94i72yx647sg9srz07q6drq650kyfv";
rev = "v${version}";
repo = "sonobuoy";
- owner = "heptio";
+ owner = "vmware-tanzu";
};
meta = with lib; {
@@ -36,8 +36,8 @@ buildGoPackage rec {
accessible and non-destructive manner.
'';
- homepage = "https://github.com/heptio/sonobuoy";
+ homepage = "https://sonobuoy.io";
license = licenses.asl20;
- maintainers = with maintainers; [ carlosdagos ];
+ maintainers = with maintainers; [ carlosdagos saschagrunert ];
};
}
diff --git a/pkgs/applications/networking/cluster/spacegun/default.nix b/pkgs/applications/networking/cluster/spacegun/default.nix
new file mode 100644
index 000000000000..2180d8d30489
--- /dev/null
+++ b/pkgs/applications/networking/cluster/spacegun/default.nix
@@ -0,0 +1,27 @@
+{ pkgs, nodejs, stdenv, lib, ... }:
+
+let
+
+ packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json));
+
+ nodePackages = import ./node-composition.nix {
+ inherit pkgs nodejs;
+ inherit (stdenv.hostPlatform) system;
+ };
+in
+nodePackages."${packageName}".override {
+ nativeBuildInputs = [ pkgs.makeWrapper ];
+
+ postInstall = ''
+ # Patch shebangs in node_modules, otherwise the webpack build fails with interpreter problems
+ patchShebangs --build "$out/lib/node_modules/spacegun/node_modules/"
+ # compile Typescript sources
+ npm run build
+ '';
+
+ meta = with lib; {
+ description = "Version controlled multi-cluster deployment manager for kubernetes";
+ maintainers = with maintainers; [ kampka ];
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
new file mode 100644
index 000000000000..293a72a16237
--- /dev/null
+++ b/pkgs/applications/networking/cluster/spacegun/generate-dependencies.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nodePackages.node2nix
+
+node2nix \
+ --nodejs-10 \
+ --node-env ../../../../development/node-packages/node-env.nix \
+ --development \
+ --input package.json \
+ --output node-packages.nix \
+ --composition node-composition.nix
diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
new file mode 100644
index 000000000000..6a5283528fca
--- /dev/null
+++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
@@ -0,0 +1,17 @@
+# This file has been generated by node2nix 1.7.0. Do not edit!
+
+{pkgs ? import {
+ inherit system;
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+
+let
+ nodeEnv = import ../../../../development/node-packages/node-env.nix {
+ inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit nodejs;
+ libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+ };
+in
+import ./node-packages.nix {
+ inherit (pkgs) fetchurl fetchgit;
+ inherit nodeEnv;
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/spacegun/node-packages.nix b/pkgs/applications/networking/cluster/spacegun/node-packages.nix
new file mode 100644
index 000000000000..a69352a9c21c
--- /dev/null
+++ b/pkgs/applications/networking/cluster/spacegun/node-packages.nix
@@ -0,0 +1,11420 @@
+# This file has been generated by node2nix 1.7.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+
+let
+ sources = {
+ "@babel/code-frame-7.5.5" = {
+ name = "_at_babel_slash_code-frame";
+ packageName = "@babel/code-frame";
+ version = "7.5.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz";
+ sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==";
+ };
+ };
+ "@babel/core-7.6.2" = {
+ name = "_at_babel_slash_core";
+ packageName = "@babel/core";
+ version = "7.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/core/-/core-7.6.2.tgz";
+ sha512 = "l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==";
+ };
+ };
+ "@babel/generator-7.6.2" = {
+ name = "_at_babel_slash_generator";
+ packageName = "@babel/generator";
+ version = "7.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz";
+ sha512 = "j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==";
+ };
+ };
+ "@babel/helper-function-name-7.1.0" = {
+ name = "_at_babel_slash_helper-function-name";
+ packageName = "@babel/helper-function-name";
+ version = "7.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz";
+ sha512 = "A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==";
+ };
+ };
+ "@babel/helper-get-function-arity-7.0.0" = {
+ name = "_at_babel_slash_helper-get-function-arity";
+ packageName = "@babel/helper-get-function-arity";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz";
+ sha512 = "r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==";
+ };
+ };
+ "@babel/helper-plugin-utils-7.0.0" = {
+ name = "_at_babel_slash_helper-plugin-utils";
+ packageName = "@babel/helper-plugin-utils";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz";
+ sha512 = "CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==";
+ };
+ };
+ "@babel/helper-split-export-declaration-7.4.4" = {
+ name = "_at_babel_slash_helper-split-export-declaration";
+ packageName = "@babel/helper-split-export-declaration";
+ version = "7.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz";
+ sha512 = "Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==";
+ };
+ };
+ "@babel/helpers-7.6.2" = {
+ name = "_at_babel_slash_helpers";
+ packageName = "@babel/helpers";
+ version = "7.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz";
+ sha512 = "3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==";
+ };
+ };
+ "@babel/highlight-7.5.0" = {
+ name = "_at_babel_slash_highlight";
+ packageName = "@babel/highlight";
+ version = "7.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz";
+ sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==";
+ };
+ };
+ "@babel/parser-7.6.2" = {
+ name = "_at_babel_slash_parser";
+ packageName = "@babel/parser";
+ version = "7.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz";
+ sha512 = "mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==";
+ };
+ };
+ "@babel/plugin-syntax-object-rest-spread-7.2.0" = {
+ name = "_at_babel_slash_plugin-syntax-object-rest-spread";
+ packageName = "@babel/plugin-syntax-object-rest-spread";
+ version = "7.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz";
+ sha512 = "t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==";
+ };
+ };
+ "@babel/template-7.6.0" = {
+ name = "_at_babel_slash_template";
+ packageName = "@babel/template";
+ version = "7.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz";
+ sha512 = "5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==";
+ };
+ };
+ "@babel/traverse-7.6.2" = {
+ name = "_at_babel_slash_traverse";
+ packageName = "@babel/traverse";
+ version = "7.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz";
+ sha512 = "8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==";
+ };
+ };
+ "@babel/types-7.6.1" = {
+ name = "_at_babel_slash_types";
+ packageName = "@babel/types";
+ version = "7.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz";
+ sha512 = "X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==";
+ };
+ };
+ "@cnakazawa/watch-1.0.3" = {
+ name = "_at_cnakazawa_slash_watch";
+ packageName = "@cnakazawa/watch";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz";
+ sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==";
+ };
+ };
+ "@jest/console-24.9.0" = {
+ name = "_at_jest_slash_console";
+ packageName = "@jest/console";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz";
+ sha512 = "Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==";
+ };
+ };
+ "@jest/core-24.9.0" = {
+ name = "_at_jest_slash_core";
+ packageName = "@jest/core";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz";
+ sha512 = "Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==";
+ };
+ };
+ "@jest/environment-24.9.0" = {
+ name = "_at_jest_slash_environment";
+ packageName = "@jest/environment";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz";
+ sha512 = "5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==";
+ };
+ };
+ "@jest/fake-timers-24.9.0" = {
+ name = "_at_jest_slash_fake-timers";
+ packageName = "@jest/fake-timers";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz";
+ sha512 = "eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==";
+ };
+ };
+ "@jest/reporters-24.9.0" = {
+ name = "_at_jest_slash_reporters";
+ packageName = "@jest/reporters";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz";
+ sha512 = "mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==";
+ };
+ };
+ "@jest/source-map-24.9.0" = {
+ name = "_at_jest_slash_source-map";
+ packageName = "@jest/source-map";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz";
+ sha512 = "/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==";
+ };
+ };
+ "@jest/test-result-24.9.0" = {
+ name = "_at_jest_slash_test-result";
+ packageName = "@jest/test-result";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz";
+ sha512 = "XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==";
+ };
+ };
+ "@jest/test-sequencer-24.9.0" = {
+ name = "_at_jest_slash_test-sequencer";
+ packageName = "@jest/test-sequencer";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz";
+ sha512 = "6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==";
+ };
+ };
+ "@jest/transform-24.9.0" = {
+ name = "_at_jest_slash_transform";
+ packageName = "@jest/transform";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz";
+ sha512 = "TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==";
+ };
+ };
+ "@jest/types-24.9.0" = {
+ name = "_at_jest_slash_types";
+ packageName = "@jest/types";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz";
+ sha512 = "XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==";
+ };
+ };
+ "@kubernetes/client-node-0.10.3" = {
+ name = "_at_kubernetes_slash_client-node";
+ packageName = "@kubernetes/client-node";
+ version = "0.10.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.10.3.tgz";
+ sha512 = "mw+1zdKfMW4QN2ns82SKFhAvqC4SVUAiItto4oFg3Me+a510h3h9N5O7ad6m4efAmlQBlMc6Y5FHz70dAwuiMg==";
+ };
+ };
+ "@sindresorhus/is-0.7.0" = {
+ name = "_at_sindresorhus_slash_is";
+ packageName = "@sindresorhus/is";
+ version = "0.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz";
+ sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==";
+ };
+ };
+ "@types/accepts-1.3.5" = {
+ name = "_at_types_slash_accepts";
+ packageName = "@types/accepts";
+ version = "1.3.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz";
+ sha512 = "jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==";
+ };
+ };
+ "@types/axios-0.14.0" = {
+ name = "_at_types_slash_axios";
+ packageName = "@types/axios";
+ version = "0.14.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/axios/-/axios-0.14.0.tgz";
+ sha1 = "ec2300fbe7d7dddd7eb9d3abf87999964cafce46";
+ };
+ };
+ "@types/babel-types-7.0.7" = {
+ name = "_at_types_slash_babel-types";
+ packageName = "@types/babel-types";
+ version = "7.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.7.tgz";
+ sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ==";
+ };
+ };
+ "@types/babel__core-7.1.3" = {
+ name = "_at_types_slash_babel__core";
+ packageName = "@types/babel__core";
+ version = "7.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz";
+ sha512 = "8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==";
+ };
+ };
+ "@types/babel__generator-7.6.0" = {
+ name = "_at_types_slash_babel__generator";
+ packageName = "@types/babel__generator";
+ version = "7.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.0.tgz";
+ sha512 = "c1mZUu4up5cp9KROs/QAw0gTeHrw/x7m52LcnvMxxOZ03DmLwPV0MlGmlgzV3cnSdjhJOZsj7E7FHeioai+egw==";
+ };
+ };
+ "@types/babel__template-7.0.2" = {
+ name = "_at_types_slash_babel__template";
+ packageName = "@types/babel__template";
+ version = "7.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz";
+ sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==";
+ };
+ };
+ "@types/babel__traverse-7.0.7" = {
+ name = "_at_types_slash_babel__traverse";
+ packageName = "@types/babel__traverse";
+ version = "7.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz";
+ sha512 = "CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==";
+ };
+ };
+ "@types/babylon-6.16.5" = {
+ name = "_at_types_slash_babylon";
+ packageName = "@types/babylon";
+ version = "6.16.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.5.tgz";
+ sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w==";
+ };
+ };
+ "@types/body-parser-1.17.1" = {
+ name = "_at_types_slash_body-parser";
+ packageName = "@types/body-parser";
+ version = "1.17.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz";
+ sha512 = "RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==";
+ };
+ };
+ "@types/caseless-0.12.2" = {
+ name = "_at_types_slash_caseless";
+ packageName = "@types/caseless";
+ version = "0.12.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz";
+ sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==";
+ };
+ };
+ "@types/command-line-args-5.0.0" = {
+ name = "_at_types_slash_command-line-args";
+ packageName = "@types/command-line-args";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/command-line-args/-/command-line-args-5.0.0.tgz";
+ sha512 = "4eOPXyn5DmP64MCMF8ePDvdlvlzt2a+F8ZaVjqmh2yFCpGjc1kI3kGnCFYX9SCsGTjQcWIyVZ86IHCEyjy/MNg==";
+ };
+ };
+ "@types/connect-3.4.32" = {
+ name = "_at_types_slash_connect";
+ packageName = "@types/connect";
+ version = "3.4.32";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz";
+ sha512 = "4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==";
+ };
+ };
+ "@types/cookies-0.7.4" = {
+ name = "_at_types_slash_cookies";
+ packageName = "@types/cookies";
+ version = "0.7.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.4.tgz";
+ sha512 = "oTGtMzZZAVuEjTwCjIh8T8FrC8n/uwy+PG0yTvQcdZ7etoel7C7/3MSd7qrukENTgQtotG7gvBlBojuVs7X5rw==";
+ };
+ };
+ "@types/cron-1.7.1" = {
+ name = "_at_types_slash_cron";
+ packageName = "@types/cron";
+ version = "1.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/cron/-/cron-1.7.1.tgz";
+ sha512 = "48brwgU18DqA0mQX1As5OcJEo1yNjaXMM6Mk4r8K1dOzLJRQ37FE/kCivKx7ClKEHfhX2FdcxKzJ1B744a+V3A==";
+ };
+ };
+ "@types/events-3.0.0" = {
+ name = "_at_types_slash_events";
+ packageName = "@types/events";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz";
+ sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
+ };
+ };
+ "@types/express-4.17.1" = {
+ name = "_at_types_slash_express";
+ packageName = "@types/express";
+ version = "4.17.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz";
+ sha512 = "VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==";
+ };
+ };
+ "@types/express-serve-static-core-4.16.9" = {
+ name = "_at_types_slash_express-serve-static-core";
+ packageName = "@types/express-serve-static-core";
+ version = "4.16.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz";
+ sha512 = "GqpaVWR0DM8FnRUJYKlWgyARoBUAVfRIeVDZQKOttLFp5SmhhF9YFIYeTPwMd/AXfxlP7xVO2dj1fGu0Q+krKQ==";
+ };
+ };
+ "@types/formidable-1.0.31" = {
+ name = "_at_types_slash_formidable";
+ packageName = "@types/formidable";
+ version = "1.0.31";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/formidable/-/formidable-1.0.31.tgz";
+ sha512 = "dIhM5t8lRP0oWe2HF8MuPvdd1TpPTjhDMAqemcq6oIZQCBQTovhBAdTQ5L5veJB4pdQChadmHuxtB0YzqvfU3Q==";
+ };
+ };
+ "@types/glob-7.1.1" = {
+ name = "_at_types_slash_glob";
+ packageName = "@types/glob";
+ version = "7.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz";
+ sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==";
+ };
+ };
+ "@types/http-assert-1.5.1" = {
+ name = "_at_types_slash_http-assert";
+ packageName = "@types/http-assert";
+ version = "1.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/http-assert/-/http-assert-1.5.1.tgz";
+ sha512 = "PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ==";
+ };
+ };
+ "@types/istanbul-lib-coverage-2.0.1" = {
+ name = "_at_types_slash_istanbul-lib-coverage";
+ packageName = "@types/istanbul-lib-coverage";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz";
+ sha512 = "hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==";
+ };
+ };
+ "@types/istanbul-lib-report-1.1.1" = {
+ name = "_at_types_slash_istanbul-lib-report";
+ packageName = "@types/istanbul-lib-report";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz";
+ sha512 = "3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==";
+ };
+ };
+ "@types/istanbul-reports-1.1.1" = {
+ name = "_at_types_slash_istanbul-reports";
+ packageName = "@types/istanbul-reports";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz";
+ sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==";
+ };
+ };
+ "@types/jest-24.0.18" = {
+ name = "_at_types_slash_jest";
+ packageName = "@types/jest";
+ version = "24.0.18";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/jest/-/jest-24.0.18.tgz";
+ sha512 = "jcDDXdjTcrQzdN06+TSVsPPqxvsZA/5QkYfIZlq1JMw7FdP5AZylbOc+6B/cuDurctRe+MziUMtQ3xQdrbjqyQ==";
+ };
+ };
+ "@types/jest-diff-20.0.1" = {
+ name = "_at_types_slash_jest-diff";
+ packageName = "@types/jest-diff";
+ version = "20.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/jest-diff/-/jest-diff-20.0.1.tgz";
+ sha512 = "yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==";
+ };
+ };
+ "@types/js-yaml-3.12.1" = {
+ name = "_at_types_slash_js-yaml";
+ packageName = "@types/js-yaml";
+ version = "3.12.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.1.tgz";
+ sha512 = "SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==";
+ };
+ };
+ "@types/keygrip-1.0.1" = {
+ name = "_at_types_slash_keygrip";
+ packageName = "@types/keygrip";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.1.tgz";
+ sha1 = "ff540462d2fb4d0a88441ceaf27d287b01c3d878";
+ };
+ };
+ "@types/koa-2.0.50" = {
+ name = "_at_types_slash_koa";
+ packageName = "@types/koa";
+ version = "2.0.50";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/koa/-/koa-2.0.50.tgz";
+ sha512 = "TcgOD2lh0EISSadAk1DOBYw7kNoY9XdeB3vEMOKiDDaTMYm+V54nyPsU7Ulb/htb5OBIR79RgTeCWntCcophLw==";
+ };
+ };
+ "@types/koa-compose-3.2.4" = {
+ name = "_at_types_slash_koa-compose";
+ packageName = "@types/koa-compose";
+ version = "3.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.4.tgz";
+ sha512 = "ioou0rxkuWL+yBQYsHUQAzRTfVxAg8Y2VfMftU+Y3RA03/MzuFL0x/M2sXXj3PkfnENbHsjeHR1aMdezLYpTeA==";
+ };
+ };
+ "@types/koa-router-7.0.42" = {
+ name = "_at_types_slash_koa-router";
+ packageName = "@types/koa-router";
+ version = "7.0.42";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.0.42.tgz";
+ sha512 = "mggrNY7Ywwjt7QjaMAlbb1ixE+v7AFskOeyKdmZT/NvPVEAo48gYUxIcF8ILlMc3eg1bo6SxNoUcbxhTv7edrA==";
+ };
+ };
+ "@types/koa-send-4.1.2" = {
+ name = "_at_types_slash_koa-send";
+ packageName = "@types/koa-send";
+ version = "4.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/koa-send/-/koa-send-4.1.2.tgz";
+ sha512 = "rfqKIv9bFds39Jxvsp8o3YJLnEQVPVriYA14AuO2OY65IHh/4UX4U/iMs5L0wATpcRmm1bbe0BNk23TRwx3VQQ==";
+ };
+ };
+ "@types/koa-static-4.0.1" = {
+ name = "_at_types_slash_koa-static";
+ packageName = "@types/koa-static";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/koa-static/-/koa-static-4.0.1.tgz";
+ sha512 = "SSpct5fEcAeRkBHa3RiwCIRfDHcD1cZRhwRF///ZfvRt8KhoqRrhK6wpDlYPk/vWHVFE9hPGqh68bhzsHkir4w==";
+ };
+ };
+ "@types/koa-views-2.0.3" = {
+ name = "_at_types_slash_koa-views";
+ packageName = "@types/koa-views";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/koa-views/-/koa-views-2.0.3.tgz";
+ sha512 = "XLn//7qUUz2U9ZKXyHPwVIcQbZcW3phYTFXHGa1eW5BN88bi8n2fegvwJ+TokL2jRmRqBWwMB5p7Aab9iq1sZw==";
+ };
+ };
+ "@types/lodash-4.14.141" = {
+ name = "_at_types_slash_lodash";
+ packageName = "@types/lodash";
+ version = "4.14.141";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.141.tgz";
+ sha512 = "v5NYIi9qEbFEUpCyikmnOYe4YlP8BMUdTcNCAquAKzu+FA7rZ1onj9x80mbnDdOW/K5bFf3Tv5kJplP33+gAbQ==";
+ };
+ };
+ "@types/lodash.clonedeep-4.5.6" = {
+ name = "_at_types_slash_lodash.clonedeep";
+ packageName = "@types/lodash.clonedeep";
+ version = "4.5.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/lodash.clonedeep/-/lodash.clonedeep-4.5.6.tgz";
+ sha512 = "cE1jYr2dEg1wBImvXlNtp0xDoS79rfEdGozQVgliDZj1uERH4k+rmEMTudP9b4VQ8O6nRb5gPqft0QzEQGMQgA==";
+ };
+ };
+ "@types/mime-2.0.1" = {
+ name = "_at_types_slash_mime";
+ packageName = "@types/mime";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz";
+ sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==";
+ };
+ };
+ "@types/minimatch-3.0.3" = {
+ name = "_at_types_slash_minimatch";
+ packageName = "@types/minimatch";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz";
+ sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
+ };
+ };
+ "@types/mkdirp-0.5.2" = {
+ name = "_at_types_slash_mkdirp";
+ packageName = "@types/mkdirp";
+ version = "0.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz";
+ sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==";
+ };
+ };
+ "@types/node-10.14.20" = {
+ name = "_at_types_slash_node";
+ packageName = "@types/node";
+ version = "10.14.20";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/node/-/node-10.14.20.tgz";
+ sha512 = "An+MXSV8CGXz/BO9C1KKsoJ/8WDrvlNUaRMsm2h+IHZuSyQkM8U5bJJkb8ItLKA73VePG/nUK+t+EuW2IWuhsQ==";
+ };
+ };
+ "@types/node-12.7.11" = {
+ name = "_at_types_slash_node";
+ packageName = "@types/node";
+ version = "12.7.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/node/-/node-12.7.11.tgz";
+ sha512 = "Otxmr2rrZLKRYIybtdG/sgeO+tHY20GxeDjcGmUnmmlCWyEnv2a2x1ZXBo3BTec4OiTXMQCiazB8NMBf0iRlFw==";
+ };
+ };
+ "@types/ora-3.2.0" = {
+ name = "_at_types_slash_ora";
+ packageName = "@types/ora";
+ version = "3.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/ora/-/ora-3.2.0.tgz";
+ sha512 = "jll99xUKpiFbIFZSQcxm4numfsLaOWBzWNaRk3PvTSE7BPqTzzOCFmS0mQ7m8qkTfmYhuYbehTGsxkvRLPC++w==";
+ };
+ };
+ "@types/range-parser-1.2.3" = {
+ name = "_at_types_slash_range-parser";
+ packageName = "@types/range-parser";
+ version = "1.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz";
+ sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==";
+ };
+ };
+ "@types/request-2.48.3" = {
+ name = "_at_types_slash_request";
+ packageName = "@types/request";
+ version = "2.48.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/request/-/request-2.48.3.tgz";
+ sha512 = "3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w==";
+ };
+ };
+ "@types/serve-static-1.13.3" = {
+ name = "_at_types_slash_serve-static";
+ packageName = "@types/serve-static";
+ version = "1.13.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz";
+ sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==";
+ };
+ };
+ "@types/stack-utils-1.0.1" = {
+ name = "_at_types_slash_stack-utils";
+ packageName = "@types/stack-utils";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz";
+ sha512 = "l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==";
+ };
+ };
+ "@types/tough-cookie-2.3.5" = {
+ name = "_at_types_slash_tough-cookie";
+ packageName = "@types/tough-cookie";
+ version = "2.3.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz";
+ sha512 = "SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==";
+ };
+ };
+ "@types/underscore-1.9.3" = {
+ name = "_at_types_slash_underscore";
+ packageName = "@types/underscore";
+ version = "1.9.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.3.tgz";
+ sha512 = "SwbHKB2DPIDlvYqtK5O+0LFtZAyrUSw4c0q+HWwmH1Ve3KMQ0/5PlV3RX97+3dP7yMrnNQ8/bCWWvQpPl03Mug==";
+ };
+ };
+ "@types/websocket-0.0.40" = {
+ name = "_at_types_slash_websocket";
+ packageName = "@types/websocket";
+ version = "0.0.40";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/websocket/-/websocket-0.0.40.tgz";
+ sha512 = "ldteZwWIgl9cOy7FyvYn+39Ah4+PfpVE72eYKw75iy2L0zTbhbcwvzeJ5IOu6DQP93bjfXq0NGHY6FYtmYoqFQ==";
+ };
+ };
+ "@types/ws-6.0.3" = {
+ name = "_at_types_slash_ws";
+ packageName = "@types/ws";
+ version = "6.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.3.tgz";
+ sha512 = "yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w==";
+ };
+ };
+ "@types/yargs-13.0.3" = {
+ name = "_at_types_slash_yargs";
+ packageName = "@types/yargs";
+ version = "13.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.3.tgz";
+ sha512 = "K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==";
+ };
+ };
+ "@types/yargs-parser-13.1.0" = {
+ name = "_at_types_slash_yargs-parser";
+ packageName = "@types/yargs-parser";
+ version = "13.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz";
+ sha512 = "gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==";
+ };
+ };
+ "@webassemblyjs/ast-1.8.5" = {
+ name = "_at_webassemblyjs_slash_ast";
+ packageName = "@webassemblyjs/ast";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz";
+ sha512 = "aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==";
+ };
+ };
+ "@webassemblyjs/floating-point-hex-parser-1.8.5" = {
+ name = "_at_webassemblyjs_slash_floating-point-hex-parser";
+ packageName = "@webassemblyjs/floating-point-hex-parser";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz";
+ sha512 = "9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==";
+ };
+ };
+ "@webassemblyjs/helper-api-error-1.8.5" = {
+ name = "_at_webassemblyjs_slash_helper-api-error";
+ packageName = "@webassemblyjs/helper-api-error";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz";
+ sha512 = "Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==";
+ };
+ };
+ "@webassemblyjs/helper-buffer-1.8.5" = {
+ name = "_at_webassemblyjs_slash_helper-buffer";
+ packageName = "@webassemblyjs/helper-buffer";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz";
+ sha512 = "Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==";
+ };
+ };
+ "@webassemblyjs/helper-code-frame-1.8.5" = {
+ name = "_at_webassemblyjs_slash_helper-code-frame";
+ packageName = "@webassemblyjs/helper-code-frame";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz";
+ sha512 = "VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==";
+ };
+ };
+ "@webassemblyjs/helper-fsm-1.8.5" = {
+ name = "_at_webassemblyjs_slash_helper-fsm";
+ packageName = "@webassemblyjs/helper-fsm";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz";
+ sha512 = "kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==";
+ };
+ };
+ "@webassemblyjs/helper-module-context-1.8.5" = {
+ name = "_at_webassemblyjs_slash_helper-module-context";
+ packageName = "@webassemblyjs/helper-module-context";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz";
+ sha512 = "/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==";
+ };
+ };
+ "@webassemblyjs/helper-wasm-bytecode-1.8.5" = {
+ name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
+ packageName = "@webassemblyjs/helper-wasm-bytecode";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz";
+ sha512 = "Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==";
+ };
+ };
+ "@webassemblyjs/helper-wasm-section-1.8.5" = {
+ name = "_at_webassemblyjs_slash_helper-wasm-section";
+ packageName = "@webassemblyjs/helper-wasm-section";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz";
+ sha512 = "VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==";
+ };
+ };
+ "@webassemblyjs/ieee754-1.8.5" = {
+ name = "_at_webassemblyjs_slash_ieee754";
+ packageName = "@webassemblyjs/ieee754";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz";
+ sha512 = "aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==";
+ };
+ };
+ "@webassemblyjs/leb128-1.8.5" = {
+ name = "_at_webassemblyjs_slash_leb128";
+ packageName = "@webassemblyjs/leb128";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz";
+ sha512 = "plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==";
+ };
+ };
+ "@webassemblyjs/utf8-1.8.5" = {
+ name = "_at_webassemblyjs_slash_utf8";
+ packageName = "@webassemblyjs/utf8";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz";
+ sha512 = "U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==";
+ };
+ };
+ "@webassemblyjs/wasm-edit-1.8.5" = {
+ name = "_at_webassemblyjs_slash_wasm-edit";
+ packageName = "@webassemblyjs/wasm-edit";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz";
+ sha512 = "A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==";
+ };
+ };
+ "@webassemblyjs/wasm-gen-1.8.5" = {
+ name = "_at_webassemblyjs_slash_wasm-gen";
+ packageName = "@webassemblyjs/wasm-gen";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz";
+ sha512 = "BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==";
+ };
+ };
+ "@webassemblyjs/wasm-opt-1.8.5" = {
+ name = "_at_webassemblyjs_slash_wasm-opt";
+ packageName = "@webassemblyjs/wasm-opt";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz";
+ sha512 = "HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==";
+ };
+ };
+ "@webassemblyjs/wasm-parser-1.8.5" = {
+ name = "_at_webassemblyjs_slash_wasm-parser";
+ packageName = "@webassemblyjs/wasm-parser";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz";
+ sha512 = "pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==";
+ };
+ };
+ "@webassemblyjs/wast-parser-1.8.5" = {
+ name = "_at_webassemblyjs_slash_wast-parser";
+ packageName = "@webassemblyjs/wast-parser";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz";
+ sha512 = "daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==";
+ };
+ };
+ "@webassemblyjs/wast-printer-1.8.5" = {
+ name = "_at_webassemblyjs_slash_wast-printer";
+ packageName = "@webassemblyjs/wast-printer";
+ version = "1.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz";
+ sha512 = "w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==";
+ };
+ };
+ "@xtuc/ieee754-1.2.0" = {
+ name = "_at_xtuc_slash_ieee754";
+ packageName = "@xtuc/ieee754";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz";
+ sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==";
+ };
+ };
+ "@xtuc/long-4.2.2" = {
+ name = "_at_xtuc_slash_long";
+ packageName = "@xtuc/long";
+ version = "4.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz";
+ sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==";
+ };
+ };
+ "abab-2.0.2" = {
+ name = "abab";
+ packageName = "abab";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz";
+ sha512 = "2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg==";
+ };
+ };
+ "abbrev-1.1.1" = {
+ name = "abbrev";
+ packageName = "abbrev";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+ sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+ };
+ };
+ "accepts-1.3.7" = {
+ name = "accepts";
+ packageName = "accepts";
+ version = "1.3.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz";
+ sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
+ };
+ };
+ "acorn-3.3.0" = {
+ name = "acorn";
+ packageName = "acorn";
+ version = "3.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
+ sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a";
+ };
+ };
+ "acorn-4.0.13" = {
+ name = "acorn";
+ packageName = "acorn";
+ version = "4.0.13";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz";
+ sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
+ };
+ };
+ "acorn-5.7.3" = {
+ name = "acorn";
+ packageName = "acorn";
+ version = "5.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz";
+ sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==";
+ };
+ };
+ "acorn-6.3.0" = {
+ name = "acorn";
+ packageName = "acorn";
+ version = "6.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz";
+ sha512 = "/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==";
+ };
+ };
+ "acorn-globals-3.1.0" = {
+ name = "acorn-globals";
+ packageName = "acorn-globals";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz";
+ sha1 = "fd8270f71fbb4996b004fa880ee5d46573a731bf";
+ };
+ };
+ "acorn-globals-4.3.4" = {
+ name = "acorn-globals";
+ packageName = "acorn-globals";
+ version = "4.3.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz";
+ sha512 = "clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==";
+ };
+ };
+ "acorn-walk-6.2.0" = {
+ name = "acorn-walk";
+ packageName = "acorn-walk";
+ version = "6.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz";
+ sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==";
+ };
+ };
+ "aggregate-error-1.0.0" = {
+ name = "aggregate-error";
+ packageName = "aggregate-error";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz";
+ sha1 = "888344dad0220a72e3af50906117f48771925fac";
+ };
+ };
+ "ajv-6.10.2" = {
+ name = "ajv";
+ packageName = "ajv";
+ version = "6.10.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz";
+ sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==";
+ };
+ };
+ "ajv-errors-1.0.1" = {
+ name = "ajv-errors";
+ packageName = "ajv-errors";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz";
+ sha512 = "DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==";
+ };
+ };
+ "ajv-keywords-3.4.1" = {
+ name = "ajv-keywords";
+ packageName = "ajv-keywords";
+ version = "3.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz";
+ sha512 = "RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==";
+ };
+ };
+ "align-text-0.1.4" = {
+ name = "align-text";
+ packageName = "align-text";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+ sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+ };
+ };
+ "ansi-colors-3.2.4" = {
+ name = "ansi-colors";
+ packageName = "ansi-colors";
+ version = "3.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz";
+ sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==";
+ };
+ };
+ "ansi-escapes-3.2.0" = {
+ name = "ansi-escapes";
+ packageName = "ansi-escapes";
+ version = "3.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz";
+ sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==";
+ };
+ };
+ "ansi-html-0.0.7" = {
+ name = "ansi-html";
+ packageName = "ansi-html";
+ version = "0.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz";
+ sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e";
+ };
+ };
+ "ansi-regex-2.1.1" = {
+ name = "ansi-regex";
+ packageName = "ansi-regex";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+ sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+ };
+ };
+ "ansi-regex-3.0.0" = {
+ name = "ansi-regex";
+ packageName = "ansi-regex";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
+ sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
+ };
+ };
+ "ansi-regex-4.1.0" = {
+ name = "ansi-regex";
+ packageName = "ansi-regex";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz";
+ sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
+ };
+ };
+ "ansi-styles-2.2.1" = {
+ name = "ansi-styles";
+ packageName = "ansi-styles";
+ version = "2.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+ sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+ };
+ };
+ "ansi-styles-3.2.1" = {
+ name = "ansi-styles";
+ packageName = "ansi-styles";
+ version = "3.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz";
+ sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
+ };
+ };
+ "any-promise-1.3.0" = {
+ name = "any-promise";
+ packageName = "any-promise";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz";
+ sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f";
+ };
+ };
+ "anymatch-2.0.0" = {
+ name = "anymatch";
+ packageName = "anymatch";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz";
+ sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==";
+ };
+ };
+ "aproba-1.2.0" = {
+ name = "aproba";
+ packageName = "aproba";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
+ sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
+ };
+ };
+ "argparse-1.0.10" = {
+ name = "argparse";
+ packageName = "argparse";
+ version = "1.0.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz";
+ sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
+ };
+ };
+ "arr-diff-4.0.0" = {
+ name = "arr-diff";
+ packageName = "arr-diff";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz";
+ sha1 = "d6461074febfec71e7e15235761a329a5dc7c520";
+ };
+ };
+ "arr-flatten-1.1.0" = {
+ name = "arr-flatten";
+ packageName = "arr-flatten";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz";
+ sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==";
+ };
+ };
+ "arr-union-3.1.0" = {
+ name = "arr-union";
+ packageName = "arr-union";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz";
+ sha1 = "e39b09aea9def866a8f206e288af63919bae39c4";
+ };
+ };
+ "array-back-3.1.0" = {
+ name = "array-back";
+ packageName = "array-back";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz";
+ sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==";
+ };
+ };
+ "array-equal-1.0.0" = {
+ name = "array-equal";
+ packageName = "array-equal";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz";
+ sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93";
+ };
+ };
+ "array-flatten-1.1.1" = {
+ name = "array-flatten";
+ packageName = "array-flatten";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz";
+ sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
+ };
+ };
+ "array-flatten-2.1.2" = {
+ name = "array-flatten";
+ packageName = "array-flatten";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz";
+ sha512 = "hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==";
+ };
+ };
+ "array-union-1.0.2" = {
+ name = "array-union";
+ packageName = "array-union";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz";
+ sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39";
+ };
+ };
+ "array-uniq-1.0.3" = {
+ name = "array-uniq";
+ packageName = "array-uniq";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz";
+ sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6";
+ };
+ };
+ "array-unique-0.3.2" = {
+ name = "array-unique";
+ packageName = "array-unique";
+ version = "0.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz";
+ sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
+ };
+ };
+ "asap-2.0.6" = {
+ name = "asap";
+ packageName = "asap";
+ version = "2.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz";
+ sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46";
+ };
+ };
+ "asn1-0.2.4" = {
+ name = "asn1";
+ packageName = "asn1";
+ version = "0.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
+ sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
+ };
+ };
+ "asn1.js-4.10.1" = {
+ name = "asn1.js";
+ packageName = "asn1.js";
+ version = "4.10.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz";
+ sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==";
+ };
+ };
+ "assert-1.5.0" = {
+ name = "assert";
+ packageName = "assert";
+ version = "1.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz";
+ sha512 = "EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==";
+ };
+ };
+ "assert-plus-1.0.0" = {
+ name = "assert-plus";
+ packageName = "assert-plus";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+ sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+ };
+ };
+ "assign-symbols-1.0.0" = {
+ name = "assign-symbols";
+ packageName = "assign-symbols";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz";
+ sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
+ };
+ };
+ "astral-regex-1.0.0" = {
+ name = "astral-regex";
+ packageName = "astral-regex";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz";
+ sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
+ };
+ };
+ "async-1.5.2" = {
+ name = "async";
+ packageName = "async";
+ version = "1.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
+ sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
+ };
+ };
+ "async-each-1.0.3" = {
+ name = "async-each";
+ packageName = "async-each";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz";
+ sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==";
+ };
+ };
+ "async-limiter-1.0.1" = {
+ name = "async-limiter";
+ packageName = "async-limiter";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz";
+ sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==";
+ };
+ };
+ "asynckit-0.4.0" = {
+ name = "asynckit";
+ packageName = "asynckit";
+ version = "0.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
+ sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+ };
+ };
+ "atob-2.1.2" = {
+ name = "atob";
+ packageName = "atob";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz";
+ sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==";
+ };
+ };
+ "awesome-typescript-loader-5.2.1" = {
+ name = "awesome-typescript-loader";
+ packageName = "awesome-typescript-loader";
+ version = "5.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/awesome-typescript-loader/-/awesome-typescript-loader-5.2.1.tgz";
+ sha512 = "slv66OAJB8orL+UUaTI3pKlLorwIvS4ARZzYR9iJJyGsEgOqueMfOMdKySWzZ73vIkEe3fcwFgsKMg4d8zyb1g==";
+ };
+ };
+ "aws-sign2-0.7.0" = {
+ name = "aws-sign2";
+ packageName = "aws-sign2";
+ version = "0.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
+ sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
+ };
+ };
+ "aws4-1.8.0" = {
+ name = "aws4";
+ packageName = "aws4";
+ version = "1.8.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
+ sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
+ };
+ };
+ "axios-0.19.0" = {
+ name = "axios";
+ packageName = "axios";
+ version = "0.19.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz";
+ sha512 = "1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==";
+ };
+ };
+ "babel-6.23.0" = {
+ name = "babel";
+ packageName = "babel";
+ version = "6.23.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel/-/babel-6.23.0.tgz";
+ sha1 = "d0d1e7d803e974765beea3232d4e153c0efb90f4";
+ };
+ };
+ "babel-code-frame-6.26.0" = {
+ name = "babel-code-frame";
+ packageName = "babel-code-frame";
+ version = "6.26.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz";
+ sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b";
+ };
+ };
+ "babel-core-6.26.3" = {
+ name = "babel-core";
+ packageName = "babel-core";
+ version = "6.26.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz";
+ sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==";
+ };
+ };
+ "babel-generator-6.26.1" = {
+ name = "babel-generator";
+ packageName = "babel-generator";
+ version = "6.26.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz";
+ sha512 = "HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==";
+ };
+ };
+ "babel-helper-builder-binary-assignment-operator-visitor-6.24.1" = {
+ name = "babel-helper-builder-binary-assignment-operator-visitor";
+ packageName = "babel-helper-builder-binary-assignment-operator-visitor";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz";
+ sha1 = "cce4517ada356f4220bcae8a02c2b346f9a56664";
+ };
+ };
+ "babel-helper-call-delegate-6.24.1" = {
+ name = "babel-helper-call-delegate";
+ packageName = "babel-helper-call-delegate";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz";
+ sha1 = "ece6aacddc76e41c3461f88bfc575bd0daa2df8d";
+ };
+ };
+ "babel-helper-define-map-6.26.0" = {
+ name = "babel-helper-define-map";
+ packageName = "babel-helper-define-map";
+ version = "6.26.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz";
+ sha1 = "a5f56dab41a25f97ecb498c7ebaca9819f95be5f";
+ };
+ };
+ "babel-helper-explode-assignable-expression-6.24.1" = {
+ name = "babel-helper-explode-assignable-expression";
+ packageName = "babel-helper-explode-assignable-expression";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz";
+ sha1 = "f25b82cf7dc10433c55f70592d5746400ac22caa";
+ };
+ };
+ "babel-helper-function-name-6.24.1" = {
+ name = "babel-helper-function-name";
+ packageName = "babel-helper-function-name";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz";
+ sha1 = "d3475b8c03ed98242a25b48351ab18399d3580a9";
+ };
+ };
+ "babel-helper-get-function-arity-6.24.1" = {
+ name = "babel-helper-get-function-arity";
+ packageName = "babel-helper-get-function-arity";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz";
+ sha1 = "8f7782aa93407c41d3aa50908f89b031b1b6853d";
+ };
+ };
+ "babel-helper-hoist-variables-6.24.1" = {
+ name = "babel-helper-hoist-variables";
+ packageName = "babel-helper-hoist-variables";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz";
+ sha1 = "1ecb27689c9d25513eadbc9914a73f5408be7a76";
+ };
+ };
+ "babel-helper-optimise-call-expression-6.24.1" = {
+ name = "babel-helper-optimise-call-expression";
+ packageName = "babel-helper-optimise-call-expression";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz";
+ sha1 = "f7a13427ba9f73f8f4fa993c54a97882d1244257";
+ };
+ };
+ "babel-helper-regex-6.26.0" = {
+ name = "babel-helper-regex";
+ packageName = "babel-helper-regex";
+ version = "6.26.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz";
+ sha1 = "325c59f902f82f24b74faceed0363954f6495e72";
+ };
+ };
+ "babel-helper-remap-async-to-generator-6.24.1" = {
+ name = "babel-helper-remap-async-to-generator";
+ packageName = "babel-helper-remap-async-to-generator";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz";
+ sha1 = "5ec581827ad723fecdd381f1c928390676e4551b";
+ };
+ };
+ "babel-helper-replace-supers-6.24.1" = {
+ name = "babel-helper-replace-supers";
+ packageName = "babel-helper-replace-supers";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz";
+ sha1 = "bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a";
+ };
+ };
+ "babel-helpers-6.24.1" = {
+ name = "babel-helpers";
+ packageName = "babel-helpers";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz";
+ sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2";
+ };
+ };
+ "babel-jest-24.9.0" = {
+ name = "babel-jest";
+ packageName = "babel-jest";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz";
+ sha512 = "ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==";
+ };
+ };
+ "babel-messages-6.23.0" = {
+ name = "babel-messages";
+ packageName = "babel-messages";
+ version = "6.23.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz";
+ sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e";
+ };
+ };
+ "babel-plugin-check-es2015-constants-6.22.0" = {
+ name = "babel-plugin-check-es2015-constants";
+ packageName = "babel-plugin-check-es2015-constants";
+ version = "6.22.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz";
+ sha1 = "35157b101426fd2ffd3da3f75c7d1e91835bbf8a";
+ };
+ };
+ "babel-plugin-istanbul-5.2.0" = {
+ name = "babel-plugin-istanbul";
+ packageName = "babel-plugin-istanbul";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz";
+ sha512 = "5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==";
+ };
+ };
+ "babel-plugin-jest-hoist-24.9.0" = {
+ name = "babel-plugin-jest-hoist";
+ packageName = "babel-plugin-jest-hoist";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz";
+ sha512 = "2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==";
+ };
+ };
+ "babel-plugin-syntax-async-functions-6.13.0" = {
+ name = "babel-plugin-syntax-async-functions";
+ packageName = "babel-plugin-syntax-async-functions";
+ version = "6.13.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz";
+ sha1 = "cad9cad1191b5ad634bf30ae0872391e0647be95";
+ };
+ };
+ "babel-plugin-syntax-exponentiation-operator-6.13.0" = {
+ name = "babel-plugin-syntax-exponentiation-operator";
+ packageName = "babel-plugin-syntax-exponentiation-operator";
+ version = "6.13.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz";
+ sha1 = "9ee7e8337290da95288201a6a57f4170317830de";
+ };
+ };
+ "babel-plugin-syntax-trailing-function-commas-6.22.0" = {
+ name = "babel-plugin-syntax-trailing-function-commas";
+ packageName = "babel-plugin-syntax-trailing-function-commas";
+ version = "6.22.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz";
+ sha1 = "ba0360937f8d06e40180a43fe0d5616fff532cf3";
+ };
+ };
+ "babel-plugin-transform-async-to-generator-6.24.1" = {
+ name = "babel-plugin-transform-async-to-generator";
+ packageName = "babel-plugin-transform-async-to-generator";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz";
+ sha1 = "6536e378aff6cb1d5517ac0e40eb3e9fc8d08761";
+ };
+ };
+ "babel-plugin-transform-es2015-arrow-functions-6.22.0" = {
+ name = "babel-plugin-transform-es2015-arrow-functions";
+ packageName = "babel-plugin-transform-es2015-arrow-functions";
+ version = "6.22.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz";
+ sha1 = "452692cb711d5f79dc7f85e440ce41b9f244d221";
+ };
+ };
+ "babel-plugin-transform-es2015-block-scoped-functions-6.22.0" = {
+ name = "babel-plugin-transform-es2015-block-scoped-functions";
+ packageName = "babel-plugin-transform-es2015-block-scoped-functions";
+ version = "6.22.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz";
+ sha1 = "bbc51b49f964d70cb8d8e0b94e820246ce3a6141";
+ };
+ };
+ "babel-plugin-transform-es2015-block-scoping-6.26.0" = {
+ name = "babel-plugin-transform-es2015-block-scoping";
+ packageName = "babel-plugin-transform-es2015-block-scoping";
+ version = "6.26.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz";
+ sha1 = "d70f5299c1308d05c12f463813b0a09e73b1895f";
+ };
+ };
+ "babel-plugin-transform-es2015-classes-6.24.1" = {
+ name = "babel-plugin-transform-es2015-classes";
+ packageName = "babel-plugin-transform-es2015-classes";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz";
+ sha1 = "5a4c58a50c9c9461e564b4b2a3bfabc97a2584db";
+ };
+ };
+ "babel-plugin-transform-es2015-computed-properties-6.24.1" = {
+ name = "babel-plugin-transform-es2015-computed-properties";
+ packageName = "babel-plugin-transform-es2015-computed-properties";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz";
+ sha1 = "6fe2a8d16895d5634f4cd999b6d3480a308159b3";
+ };
+ };
+ "babel-plugin-transform-es2015-destructuring-6.23.0" = {
+ name = "babel-plugin-transform-es2015-destructuring";
+ packageName = "babel-plugin-transform-es2015-destructuring";
+ version = "6.23.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz";
+ sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d";
+ };
+ };
+ "babel-plugin-transform-es2015-duplicate-keys-6.24.1" = {
+ name = "babel-plugin-transform-es2015-duplicate-keys";
+ packageName = "babel-plugin-transform-es2015-duplicate-keys";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz";
+ sha1 = "73eb3d310ca969e3ef9ec91c53741a6f1576423e";
+ };
+ };
+ "babel-plugin-transform-es2015-for-of-6.23.0" = {
+ name = "babel-plugin-transform-es2015-for-of";
+ packageName = "babel-plugin-transform-es2015-for-of";
+ version = "6.23.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz";
+ sha1 = "f47c95b2b613df1d3ecc2fdb7573623c75248691";
+ };
+ };
+ "babel-plugin-transform-es2015-function-name-6.24.1" = {
+ name = "babel-plugin-transform-es2015-function-name";
+ packageName = "babel-plugin-transform-es2015-function-name";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz";
+ sha1 = "834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b";
+ };
+ };
+ "babel-plugin-transform-es2015-literals-6.22.0" = {
+ name = "babel-plugin-transform-es2015-literals";
+ packageName = "babel-plugin-transform-es2015-literals";
+ version = "6.22.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz";
+ sha1 = "4f54a02d6cd66cf915280019a31d31925377ca2e";
+ };
+ };
+ "babel-plugin-transform-es2015-modules-amd-6.24.1" = {
+ name = "babel-plugin-transform-es2015-modules-amd";
+ packageName = "babel-plugin-transform-es2015-modules-amd";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz";
+ sha1 = "3b3e54017239842d6d19c3011c4bd2f00a00d154";
+ };
+ };
+ "babel-plugin-transform-es2015-modules-commonjs-6.26.2" = {
+ name = "babel-plugin-transform-es2015-modules-commonjs";
+ packageName = "babel-plugin-transform-es2015-modules-commonjs";
+ version = "6.26.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz";
+ sha512 = "CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==";
+ };
+ };
+ "babel-plugin-transform-es2015-modules-systemjs-6.24.1" = {
+ name = "babel-plugin-transform-es2015-modules-systemjs";
+ packageName = "babel-plugin-transform-es2015-modules-systemjs";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz";
+ sha1 = "ff89a142b9119a906195f5f106ecf305d9407d23";
+ };
+ };
+ "babel-plugin-transform-es2015-modules-umd-6.24.1" = {
+ name = "babel-plugin-transform-es2015-modules-umd";
+ packageName = "babel-plugin-transform-es2015-modules-umd";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz";
+ sha1 = "ac997e6285cd18ed6176adb607d602344ad38468";
+ };
+ };
+ "babel-plugin-transform-es2015-object-super-6.24.1" = {
+ name = "babel-plugin-transform-es2015-object-super";
+ packageName = "babel-plugin-transform-es2015-object-super";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz";
+ sha1 = "24cef69ae21cb83a7f8603dad021f572eb278f8d";
+ };
+ };
+ "babel-plugin-transform-es2015-parameters-6.24.1" = {
+ name = "babel-plugin-transform-es2015-parameters";
+ packageName = "babel-plugin-transform-es2015-parameters";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz";
+ sha1 = "57ac351ab49caf14a97cd13b09f66fdf0a625f2b";
+ };
+ };
+ "babel-plugin-transform-es2015-shorthand-properties-6.24.1" = {
+ name = "babel-plugin-transform-es2015-shorthand-properties";
+ packageName = "babel-plugin-transform-es2015-shorthand-properties";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz";
+ sha1 = "24f875d6721c87661bbd99a4622e51f14de38aa0";
+ };
+ };
+ "babel-plugin-transform-es2015-spread-6.22.0" = {
+ name = "babel-plugin-transform-es2015-spread";
+ packageName = "babel-plugin-transform-es2015-spread";
+ version = "6.22.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz";
+ sha1 = "d6d68a99f89aedc4536c81a542e8dd9f1746f8d1";
+ };
+ };
+ "babel-plugin-transform-es2015-sticky-regex-6.24.1" = {
+ name = "babel-plugin-transform-es2015-sticky-regex";
+ packageName = "babel-plugin-transform-es2015-sticky-regex";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz";
+ sha1 = "00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc";
+ };
+ };
+ "babel-plugin-transform-es2015-template-literals-6.22.0" = {
+ name = "babel-plugin-transform-es2015-template-literals";
+ packageName = "babel-plugin-transform-es2015-template-literals";
+ version = "6.22.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz";
+ sha1 = "a84b3450f7e9f8f1f6839d6d687da84bb1236d8d";
+ };
+ };
+ "babel-plugin-transform-es2015-typeof-symbol-6.23.0" = {
+ name = "babel-plugin-transform-es2015-typeof-symbol";
+ packageName = "babel-plugin-transform-es2015-typeof-symbol";
+ version = "6.23.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz";
+ sha1 = "dec09f1cddff94b52ac73d505c84df59dcceb372";
+ };
+ };
+ "babel-plugin-transform-es2015-unicode-regex-6.24.1" = {
+ name = "babel-plugin-transform-es2015-unicode-regex";
+ packageName = "babel-plugin-transform-es2015-unicode-regex";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz";
+ sha1 = "d38b12f42ea7323f729387f18a7c5ae1faeb35e9";
+ };
+ };
+ "babel-plugin-transform-exponentiation-operator-6.24.1" = {
+ name = "babel-plugin-transform-exponentiation-operator";
+ packageName = "babel-plugin-transform-exponentiation-operator";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz";
+ sha1 = "2ab0c9c7f3098fa48907772bb813fe41e8de3a0e";
+ };
+ };
+ "babel-plugin-transform-regenerator-6.26.0" = {
+ name = "babel-plugin-transform-regenerator";
+ packageName = "babel-plugin-transform-regenerator";
+ version = "6.26.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz";
+ sha1 = "e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f";
+ };
+ };
+ "babel-plugin-transform-strict-mode-6.24.1" = {
+ name = "babel-plugin-transform-strict-mode";
+ packageName = "babel-plugin-transform-strict-mode";
+ version = "6.24.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz";
+ sha1 = "d5faf7aa578a65bbe591cf5edae04a0c67020758";
+ };
+ };
+ "babel-preset-env-1.7.0" = {
+ name = "babel-preset-env";
+ packageName = "babel-preset-env";
+ version = "1.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz";
+ sha512 = "9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==";
+ };
+ };
+ "babel-preset-jest-24.9.0" = {
+ name = "babel-preset-jest";
+ packageName = "babel-preset-jest";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz";
+ sha512 = "izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==";
+ };
+ };
+ "babel-register-6.26.0" = {
+ name = "babel-register";
+ packageName = "babel-register";
+ version = "6.26.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz";
+ sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071";
+ };
+ };
+ "babel-runtime-6.26.0" = {
+ name = "babel-runtime";
+ packageName = "babel-runtime";
+ version = "6.26.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
+ sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
+ };
+ };
+ "babel-template-6.26.0" = {
+ name = "babel-template";
+ packageName = "babel-template";
+ version = "6.26.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz";
+ sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02";
+ };
+ };
+ "babel-traverse-6.26.0" = {
+ name = "babel-traverse";
+ packageName = "babel-traverse";
+ version = "6.26.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz";
+ sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee";
+ };
+ };
+ "babel-types-6.26.0" = {
+ name = "babel-types";
+ packageName = "babel-types";
+ version = "6.26.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz";
+ sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497";
+ };
+ };
+ "babylon-6.18.0" = {
+ name = "babylon";
+ packageName = "babylon";
+ version = "6.18.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz";
+ sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==";
+ };
+ };
+ "balanced-match-1.0.0" = {
+ name = "balanced-match";
+ packageName = "balanced-match";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+ sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+ };
+ };
+ "base-0.11.2" = {
+ name = "base";
+ packageName = "base";
+ version = "0.11.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz";
+ sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==";
+ };
+ };
+ "base64-js-1.3.1" = {
+ name = "base64-js";
+ packageName = "base64-js";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
+ sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
+ };
+ };
+ "base64url-3.0.1" = {
+ name = "base64url";
+ packageName = "base64url";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz";
+ sha512 = "ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==";
+ };
+ };
+ "batch-0.6.1" = {
+ name = "batch";
+ packageName = "batch";
+ version = "0.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz";
+ sha1 = "dc34314f4e679318093fc760272525f94bf25c16";
+ };
+ };
+ "bcrypt-pbkdf-1.0.2" = {
+ name = "bcrypt-pbkdf";
+ packageName = "bcrypt-pbkdf";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
+ sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
+ };
+ };
+ "bfj-6.1.2" = {
+ name = "bfj";
+ packageName = "bfj";
+ version = "6.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz";
+ sha512 = "BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==";
+ };
+ };
+ "big.js-5.2.2" = {
+ name = "big.js";
+ packageName = "big.js";
+ version = "5.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz";
+ sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==";
+ };
+ };
+ "binary-extensions-1.13.1" = {
+ name = "binary-extensions";
+ packageName = "binary-extensions";
+ version = "1.13.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz";
+ sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
+ };
+ };
+ "bluebird-3.7.0" = {
+ name = "bluebird";
+ packageName = "bluebird";
+ version = "3.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz";
+ sha512 = "aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg==";
+ };
+ };
+ "bn.js-4.11.8" = {
+ name = "bn.js";
+ packageName = "bn.js";
+ version = "4.11.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz";
+ sha512 = "ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==";
+ };
+ };
+ "body-parser-1.19.0" = {
+ name = "body-parser";
+ packageName = "body-parser";
+ version = "1.19.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz";
+ sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==";
+ };
+ };
+ "bonjour-3.5.0" = {
+ name = "bonjour";
+ packageName = "bonjour";
+ version = "3.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz";
+ sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5";
+ };
+ };
+ "brace-expansion-1.1.11" = {
+ name = "brace-expansion";
+ packageName = "brace-expansion";
+ version = "1.1.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+ sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+ };
+ };
+ "braces-2.3.2" = {
+ name = "braces";
+ packageName = "braces";
+ version = "2.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz";
+ sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==";
+ };
+ };
+ "brorand-1.1.0" = {
+ name = "brorand";
+ packageName = "brorand";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz";
+ sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
+ };
+ };
+ "browser-process-hrtime-0.1.3" = {
+ name = "browser-process-hrtime";
+ packageName = "browser-process-hrtime";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz";
+ sha512 = "bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==";
+ };
+ };
+ "browser-resolve-1.11.3" = {
+ name = "browser-resolve";
+ packageName = "browser-resolve";
+ version = "1.11.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz";
+ sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==";
+ };
+ };
+ "browserify-aes-1.2.0" = {
+ name = "browserify-aes";
+ packageName = "browserify-aes";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz";
+ sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==";
+ };
+ };
+ "browserify-cipher-1.0.1" = {
+ name = "browserify-cipher";
+ packageName = "browserify-cipher";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz";
+ sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==";
+ };
+ };
+ "browserify-des-1.0.2" = {
+ name = "browserify-des";
+ packageName = "browserify-des";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz";
+ sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==";
+ };
+ };
+ "browserify-rsa-4.0.1" = {
+ name = "browserify-rsa";
+ packageName = "browserify-rsa";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
+ sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
+ };
+ };
+ "browserify-sign-4.0.4" = {
+ name = "browserify-sign";
+ packageName = "browserify-sign";
+ version = "4.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz";
+ sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
+ };
+ };
+ "browserify-zlib-0.2.0" = {
+ name = "browserify-zlib";
+ packageName = "browserify-zlib";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz";
+ sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
+ };
+ };
+ "browserslist-3.2.8" = {
+ name = "browserslist";
+ packageName = "browserslist";
+ version = "3.2.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz";
+ sha512 = "WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==";
+ };
+ };
+ "bs-logger-0.2.6" = {
+ name = "bs-logger";
+ packageName = "bs-logger";
+ version = "0.2.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz";
+ sha512 = "pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==";
+ };
+ };
+ "bser-2.1.0" = {
+ name = "bser";
+ packageName = "bser";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz";
+ sha512 = "8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==";
+ };
+ };
+ "buffer-4.9.1" = {
+ name = "buffer";
+ packageName = "buffer";
+ version = "4.9.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
+ sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
+ };
+ };
+ "buffer-from-1.1.1" = {
+ name = "buffer-from";
+ packageName = "buffer-from";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz";
+ sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==";
+ };
+ };
+ "buffer-indexof-1.1.1" = {
+ name = "buffer-indexof";
+ packageName = "buffer-indexof";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz";
+ sha512 = "4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==";
+ };
+ };
+ "buffer-xor-1.0.3" = {
+ name = "buffer-xor";
+ packageName = "buffer-xor";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz";
+ sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9";
+ };
+ };
+ "builtin-status-codes-3.0.0" = {
+ name = "builtin-status-codes";
+ packageName = "builtin-status-codes";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz";
+ sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
+ };
+ };
+ "byline-5.0.0" = {
+ name = "byline";
+ packageName = "byline";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/byline/-/byline-5.0.0.tgz";
+ sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1";
+ };
+ };
+ "bytes-3.0.0" = {
+ name = "bytes";
+ packageName = "bytes";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz";
+ sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
+ };
+ };
+ "bytes-3.1.0" = {
+ name = "bytes";
+ packageName = "bytes";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz";
+ sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==";
+ };
+ };
+ "cacache-10.0.4" = {
+ name = "cacache";
+ packageName = "cacache";
+ version = "10.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz";
+ sha512 = "Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==";
+ };
+ };
+ "cacache-12.0.3" = {
+ name = "cacache";
+ packageName = "cacache";
+ version = "12.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz";
+ sha512 = "kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==";
+ };
+ };
+ "cache-base-1.0.1" = {
+ name = "cache-base";
+ packageName = "cache-base";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz";
+ sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
+ };
+ };
+ "cache-content-type-1.0.1" = {
+ name = "cache-content-type";
+ packageName = "cache-content-type";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz";
+ sha512 = "IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==";
+ };
+ };
+ "cacheable-request-2.1.4" = {
+ name = "cacheable-request";
+ packageName = "cacheable-request";
+ version = "2.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz";
+ sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d";
+ };
+ };
+ "callsites-3.1.0" = {
+ name = "callsites";
+ packageName = "callsites";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz";
+ sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
+ };
+ };
+ "camelcase-1.2.1" = {
+ name = "camelcase";
+ packageName = "camelcase";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+ sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+ };
+ };
+ "camelcase-4.1.0" = {
+ name = "camelcase";
+ packageName = "camelcase";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
+ sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
+ };
+ };
+ "camelcase-5.3.1" = {
+ name = "camelcase";
+ packageName = "camelcase";
+ version = "5.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
+ sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
+ };
+ };
+ "caniuse-lite-1.0.30000999" = {
+ name = "caniuse-lite";
+ packageName = "caniuse-lite";
+ version = "1.0.30000999";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz";
+ sha512 = "1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg==";
+ };
+ };
+ "capture-exit-2.0.0" = {
+ name = "capture-exit";
+ packageName = "capture-exit";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz";
+ sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==";
+ };
+ };
+ "caseless-0.12.0" = {
+ name = "caseless";
+ packageName = "caseless";
+ version = "0.12.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
+ sha1 = "1b681c21ff84033c826543090689420d187151dc";
+ };
+ };
+ "center-align-0.1.3" = {
+ name = "center-align";
+ packageName = "center-align";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+ sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+ };
+ };
+ "chalk-1.1.3" = {
+ name = "chalk";
+ packageName = "chalk";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+ sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+ };
+ };
+ "chalk-2.4.2" = {
+ name = "chalk";
+ packageName = "chalk";
+ version = "2.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz";
+ sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
+ };
+ };
+ "character-parser-2.2.0" = {
+ name = "character-parser";
+ packageName = "character-parser";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz";
+ sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0";
+ };
+ };
+ "check-types-8.0.3" = {
+ name = "check-types";
+ packageName = "check-types";
+ version = "8.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz";
+ sha512 = "YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==";
+ };
+ };
+ "chokidar-2.1.8" = {
+ name = "chokidar";
+ packageName = "chokidar";
+ version = "2.1.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz";
+ sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==";
+ };
+ };
+ "chownr-1.1.3" = {
+ name = "chownr";
+ packageName = "chownr";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz";
+ sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==";
+ };
+ };
+ "chrome-trace-event-1.0.2" = {
+ name = "chrome-trace-event";
+ packageName = "chrome-trace-event";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz";
+ sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==";
+ };
+ };
+ "ci-info-2.0.0" = {
+ name = "ci-info";
+ packageName = "ci-info";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz";
+ sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==";
+ };
+ };
+ "cipher-base-1.0.4" = {
+ name = "cipher-base";
+ packageName = "cipher-base";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz";
+ sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==";
+ };
+ };
+ "class-utils-0.3.6" = {
+ name = "class-utils";
+ packageName = "class-utils";
+ version = "0.3.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz";
+ sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
+ };
+ };
+ "clean-css-4.2.1" = {
+ name = "clean-css";
+ packageName = "clean-css";
+ version = "4.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz";
+ sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==";
+ };
+ };
+ "clean-stack-1.3.0" = {
+ name = "clean-stack";
+ packageName = "clean-stack";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz";
+ sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31";
+ };
+ };
+ "cli-cursor-2.1.0" = {
+ name = "cli-cursor";
+ packageName = "cli-cursor";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
+ sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
+ };
+ };
+ "cli-spinners-2.2.0" = {
+ name = "cli-spinners";
+ packageName = "cli-spinners";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz";
+ sha512 = "tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==";
+ };
+ };
+ "cliui-2.1.0" = {
+ name = "cliui";
+ packageName = "cliui";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+ sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+ };
+ };
+ "cliui-4.1.0" = {
+ name = "cliui";
+ packageName = "cliui";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz";
+ sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==";
+ };
+ };
+ "cliui-5.0.0" = {
+ name = "cliui";
+ packageName = "cliui";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz";
+ sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
+ };
+ };
+ "clone-1.0.4" = {
+ name = "clone";
+ packageName = "clone";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz";
+ sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e";
+ };
+ };
+ "clone-response-1.0.2" = {
+ name = "clone-response";
+ packageName = "clone-response";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz";
+ sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b";
+ };
+ };
+ "co-4.6.0" = {
+ name = "co";
+ packageName = "co";
+ version = "4.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
+ sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
+ };
+ };
+ "co-body-5.2.0" = {
+ name = "co-body";
+ packageName = "co-body";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/co-body/-/co-body-5.2.0.tgz";
+ sha512 = "sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ==";
+ };
+ };
+ "code-point-at-1.1.0" = {
+ name = "code-point-at";
+ packageName = "code-point-at";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+ sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+ };
+ };
+ "collection-visit-1.0.0" = {
+ name = "collection-visit";
+ packageName = "collection-visit";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz";
+ sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0";
+ };
+ };
+ "color-convert-1.9.3" = {
+ name = "color-convert";
+ packageName = "color-convert";
+ version = "1.9.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz";
+ sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==";
+ };
+ };
+ "color-name-1.1.3" = {
+ name = "color-name";
+ packageName = "color-name";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz";
+ sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
+ };
+ };
+ "combined-stream-1.0.8" = {
+ name = "combined-stream";
+ packageName = "combined-stream";
+ version = "1.0.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz";
+ sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
+ };
+ };
+ "command-line-args-5.1.1" = {
+ name = "command-line-args";
+ packageName = "command-line-args";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz";
+ sha512 = "hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==";
+ };
+ };
+ "commander-2.20.1" = {
+ name = "commander";
+ packageName = "commander";
+ version = "2.20.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-2.20.1.tgz";
+ sha512 = "cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg==";
+ };
+ };
+ "commondir-1.0.1" = {
+ name = "commondir";
+ packageName = "commondir";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz";
+ sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b";
+ };
+ };
+ "component-emitter-1.3.0" = {
+ name = "component-emitter";
+ packageName = "component-emitter";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz";
+ sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
+ };
+ };
+ "compressible-2.0.17" = {
+ name = "compressible";
+ packageName = "compressible";
+ version = "2.0.17";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz";
+ sha512 = "BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==";
+ };
+ };
+ "compression-1.7.4" = {
+ name = "compression";
+ packageName = "compression";
+ version = "1.7.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz";
+ sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==";
+ };
+ };
+ "concat-map-0.0.1" = {
+ name = "concat-map";
+ packageName = "concat-map";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+ sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+ };
+ };
+ "concat-stream-1.6.2" = {
+ name = "concat-stream";
+ packageName = "concat-stream";
+ version = "1.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz";
+ sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==";
+ };
+ };
+ "condense-newlines-0.2.1" = {
+ name = "condense-newlines";
+ packageName = "condense-newlines";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/condense-newlines/-/condense-newlines-0.2.1.tgz";
+ sha1 = "3de985553139475d32502c83b02f60684d24c55f";
+ };
+ };
+ "config-chain-1.1.12" = {
+ name = "config-chain";
+ packageName = "config-chain";
+ version = "1.1.12";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz";
+ sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==";
+ };
+ };
+ "connect-history-api-fallback-1.6.0" = {
+ name = "connect-history-api-fallback";
+ packageName = "connect-history-api-fallback";
+ version = "1.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz";
+ sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==";
+ };
+ };
+ "console-browserify-1.1.0" = {
+ name = "console-browserify";
+ packageName = "console-browserify";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
+ sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+ };
+ };
+ "consolidate-0.15.1" = {
+ name = "consolidate";
+ packageName = "consolidate";
+ version = "0.15.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz";
+ sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==";
+ };
+ };
+ "constantinople-3.1.2" = {
+ name = "constantinople";
+ packageName = "constantinople";
+ version = "3.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz";
+ sha512 = "yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw==";
+ };
+ };
+ "constants-browserify-1.0.0" = {
+ name = "constants-browserify";
+ packageName = "constants-browserify";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz";
+ sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
+ };
+ };
+ "content-disposition-0.5.3" = {
+ name = "content-disposition";
+ packageName = "content-disposition";
+ version = "0.5.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz";
+ sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==";
+ };
+ };
+ "content-type-1.0.4" = {
+ name = "content-type";
+ packageName = "content-type";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz";
+ sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
+ };
+ };
+ "convert-source-map-1.6.0" = {
+ name = "convert-source-map";
+ packageName = "convert-source-map";
+ version = "1.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz";
+ sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==";
+ };
+ };
+ "cookie-0.4.0" = {
+ name = "cookie";
+ packageName = "cookie";
+ version = "0.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz";
+ sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==";
+ };
+ };
+ "cookie-signature-1.0.6" = {
+ name = "cookie-signature";
+ packageName = "cookie-signature";
+ version = "1.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
+ sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
+ };
+ };
+ "cookies-0.7.3" = {
+ name = "cookies";
+ packageName = "cookies";
+ version = "0.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cookies/-/cookies-0.7.3.tgz";
+ sha512 = "+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A==";
+ };
+ };
+ "copy-concurrently-1.0.5" = {
+ name = "copy-concurrently";
+ packageName = "copy-concurrently";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz";
+ sha512 = "f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==";
+ };
+ };
+ "copy-descriptor-0.1.1" = {
+ name = "copy-descriptor";
+ packageName = "copy-descriptor";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz";
+ sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d";
+ };
+ };
+ "copy-webpack-plugin-4.6.0" = {
+ name = "copy-webpack-plugin";
+ packageName = "copy-webpack-plugin";
+ version = "4.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz";
+ sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==";
+ };
+ };
+ "core-js-2.6.9" = {
+ name = "core-js";
+ packageName = "core-js";
+ version = "2.6.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz";
+ sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==";
+ };
+ };
+ "core-util-is-1.0.2" = {
+ name = "core-util-is";
+ packageName = "core-util-is";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+ };
+ };
+ "create-ecdh-4.0.3" = {
+ name = "create-ecdh";
+ packageName = "create-ecdh";
+ version = "4.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz";
+ sha512 = "GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==";
+ };
+ };
+ "create-hash-1.2.0" = {
+ name = "create-hash";
+ packageName = "create-hash";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz";
+ sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==";
+ };
+ };
+ "create-hmac-1.1.7" = {
+ name = "create-hmac";
+ packageName = "create-hmac";
+ version = "1.1.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz";
+ sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
+ };
+ };
+ "cron-1.7.2" = {
+ name = "cron";
+ packageName = "cron";
+ version = "1.7.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz";
+ sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ==";
+ };
+ };
+ "cross-spawn-6.0.5" = {
+ name = "cross-spawn";
+ packageName = "cross-spawn";
+ version = "6.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz";
+ sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
+ };
+ };
+ "crypto-browserify-3.12.0" = {
+ name = "crypto-browserify";
+ packageName = "crypto-browserify";
+ version = "3.12.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz";
+ sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==";
+ };
+ };
+ "cssom-0.3.8" = {
+ name = "cssom";
+ packageName = "cssom";
+ version = "0.3.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz";
+ sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==";
+ };
+ };
+ "cssstyle-1.4.0" = {
+ name = "cssstyle";
+ packageName = "cssstyle";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz";
+ sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==";
+ };
+ };
+ "cyclist-1.0.1" = {
+ name = "cyclist";
+ packageName = "cyclist";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz";
+ sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9";
+ };
+ };
+ "d-1.0.1" = {
+ name = "d";
+ packageName = "d";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz";
+ sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==";
+ };
+ };
+ "dashdash-1.14.1" = {
+ name = "dashdash";
+ packageName = "dashdash";
+ version = "1.14.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz";
+ sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
+ };
+ };
+ "data-urls-1.1.0" = {
+ name = "data-urls";
+ packageName = "data-urls";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz";
+ sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==";
+ };
+ };
+ "date-now-0.1.4" = {
+ name = "date-now";
+ packageName = "date-now";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
+ sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
+ };
+ };
+ "debug-2.6.9" = {
+ name = "debug";
+ packageName = "debug";
+ version = "2.6.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
+ sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
+ };
+ };
+ "debug-3.1.0" = {
+ name = "debug";
+ packageName = "debug";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
+ sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
+ };
+ };
+ "debug-3.2.6" = {
+ name = "debug";
+ packageName = "debug";
+ version = "3.2.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
+ sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
+ };
+ };
+ "debug-4.1.1" = {
+ name = "debug";
+ packageName = "debug";
+ version = "4.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
+ sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
+ };
+ };
+ "decamelize-1.2.0" = {
+ name = "decamelize";
+ packageName = "decamelize";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+ sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+ };
+ };
+ "decode-uri-component-0.2.0" = {
+ name = "decode-uri-component";
+ packageName = "decode-uri-component";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz";
+ sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
+ };
+ };
+ "decompress-response-3.3.0" = {
+ name = "decompress-response";
+ packageName = "decompress-response";
+ version = "3.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz";
+ sha1 = "80a4dd323748384bfa248083622aedec982adff3";
+ };
+ };
+ "deep-equal-1.0.1" = {
+ name = "deep-equal";
+ packageName = "deep-equal";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz";
+ sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
+ };
+ };
+ "deep-is-0.1.3" = {
+ name = "deep-is";
+ packageName = "deep-is";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
+ sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
+ };
+ };
+ "default-gateway-4.2.0" = {
+ name = "default-gateway";
+ packageName = "default-gateway";
+ version = "4.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz";
+ sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==";
+ };
+ };
+ "defaults-1.0.3" = {
+ name = "defaults";
+ packageName = "defaults";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz";
+ sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d";
+ };
+ };
+ "define-properties-1.1.3" = {
+ name = "define-properties";
+ packageName = "define-properties";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz";
+ sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
+ };
+ };
+ "define-property-0.2.5" = {
+ name = "define-property";
+ packageName = "define-property";
+ version = "0.2.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz";
+ sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116";
+ };
+ };
+ "define-property-1.0.0" = {
+ name = "define-property";
+ packageName = "define-property";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz";
+ sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6";
+ };
+ };
+ "define-property-2.0.2" = {
+ name = "define-property";
+ packageName = "define-property";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz";
+ sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==";
+ };
+ };
+ "del-4.1.1" = {
+ name = "del";
+ packageName = "del";
+ version = "4.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz";
+ sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==";
+ };
+ };
+ "delayed-stream-1.0.0" = {
+ name = "delayed-stream";
+ packageName = "delayed-stream";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+ sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+ };
+ };
+ "delegates-1.0.0" = {
+ name = "delegates";
+ packageName = "delegates";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
+ sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
+ };
+ };
+ "depd-1.1.2" = {
+ name = "depd";
+ packageName = "depd";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz";
+ sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
+ };
+ };
+ "des.js-1.0.0" = {
+ name = "des.js";
+ packageName = "des.js";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz";
+ sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
+ };
+ };
+ "destroy-1.0.4" = {
+ name = "destroy";
+ packageName = "destroy";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz";
+ sha1 = "978857442c44749e4206613e37946205826abd80";
+ };
+ };
+ "detect-file-1.0.0" = {
+ name = "detect-file";
+ packageName = "detect-file";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz";
+ sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7";
+ };
+ };
+ "detect-indent-4.0.0" = {
+ name = "detect-indent";
+ packageName = "detect-indent";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
+ sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
+ };
+ };
+ "detect-newline-2.1.0" = {
+ name = "detect-newline";
+ packageName = "detect-newline";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz";
+ sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2";
+ };
+ };
+ "detect-node-2.0.4" = {
+ name = "detect-node";
+ packageName = "detect-node";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz";
+ sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==";
+ };
+ };
+ "diff-sequences-24.9.0" = {
+ name = "diff-sequences";
+ packageName = "diff-sequences";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz";
+ sha512 = "Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==";
+ };
+ };
+ "diffie-hellman-5.0.3" = {
+ name = "diffie-hellman";
+ packageName = "diffie-hellman";
+ version = "5.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
+ sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
+ };
+ };
+ "dir-glob-2.2.2" = {
+ name = "dir-glob";
+ packageName = "dir-glob";
+ version = "2.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz";
+ sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==";
+ };
+ };
+ "dns-equal-1.0.0" = {
+ name = "dns-equal";
+ packageName = "dns-equal";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz";
+ sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d";
+ };
+ };
+ "dns-packet-1.3.1" = {
+ name = "dns-packet";
+ packageName = "dns-packet";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz";
+ sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==";
+ };
+ };
+ "dns-txt-2.0.2" = {
+ name = "dns-txt";
+ packageName = "dns-txt";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz";
+ sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6";
+ };
+ };
+ "doctypes-1.1.0" = {
+ name = "doctypes";
+ packageName = "doctypes";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz";
+ sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9";
+ };
+ };
+ "domain-browser-1.2.0" = {
+ name = "domain-browser";
+ packageName = "domain-browser";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz";
+ sha512 = "jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==";
+ };
+ };
+ "domexception-1.0.1" = {
+ name = "domexception";
+ packageName = "domexception";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz";
+ sha512 = "raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==";
+ };
+ };
+ "duplexer-0.1.1" = {
+ name = "duplexer";
+ packageName = "duplexer";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+ sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+ };
+ };
+ "duplexer3-0.1.4" = {
+ name = "duplexer3";
+ packageName = "duplexer3";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz";
+ sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
+ };
+ };
+ "duplexify-3.7.1" = {
+ name = "duplexify";
+ packageName = "duplexify";
+ version = "3.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz";
+ sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==";
+ };
+ };
+ "ecc-jsbn-0.1.2" = {
+ name = "ecc-jsbn";
+ packageName = "ecc-jsbn";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
+ sha1 = "3a83a904e54353287874c564b7549386849a98c9";
+ };
+ };
+ "editorconfig-0.15.3" = {
+ name = "editorconfig";
+ packageName = "editorconfig";
+ version = "0.15.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz";
+ sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==";
+ };
+ };
+ "ee-first-1.1.1" = {
+ name = "ee-first";
+ packageName = "ee-first";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
+ sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
+ };
+ };
+ "ejs-2.7.1" = {
+ name = "ejs";
+ packageName = "ejs";
+ version = "2.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz";
+ sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==";
+ };
+ };
+ "electron-to-chromium-1.3.275" = {
+ name = "electron-to-chromium";
+ packageName = "electron-to-chromium";
+ version = "1.3.275";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.275.tgz";
+ sha512 = "/YWtW/VapMnuYA1lNOaa1F4GhR1LBf+CUTp60lzDPEEh0XOzyOAyULyYZVF9vziZ3qSbTqCwmKwsyRXp66STbw==";
+ };
+ };
+ "elliptic-6.5.1" = {
+ name = "elliptic";
+ packageName = "elliptic";
+ version = "6.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz";
+ sha512 = "xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==";
+ };
+ };
+ "emoji-regex-7.0.3" = {
+ name = "emoji-regex";
+ packageName = "emoji-regex";
+ version = "7.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
+ sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
+ };
+ };
+ "emojis-list-2.1.0" = {
+ name = "emojis-list";
+ packageName = "emojis-list";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz";
+ sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
+ };
+ };
+ "encodeurl-1.0.2" = {
+ name = "encodeurl";
+ packageName = "encodeurl";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz";
+ sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
+ };
+ };
+ "end-of-stream-1.4.4" = {
+ name = "end-of-stream";
+ packageName = "end-of-stream";
+ version = "1.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz";
+ sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
+ };
+ };
+ "enhanced-resolve-4.1.0" = {
+ name = "enhanced-resolve";
+ packageName = "enhanced-resolve";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz";
+ sha512 = "F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==";
+ };
+ };
+ "errno-0.1.7" = {
+ name = "errno";
+ packageName = "errno";
+ version = "0.1.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz";
+ sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
+ };
+ };
+ "error-ex-1.3.2" = {
+ name = "error-ex";
+ packageName = "error-ex";
+ version = "1.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz";
+ sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
+ };
+ };
+ "error-inject-1.0.0" = {
+ name = "error-inject";
+ packageName = "error-inject";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz";
+ sha1 = "e2b3d91b54aed672f309d950d154850fa11d4f37";
+ };
+ };
+ "es-abstract-1.15.0" = {
+ name = "es-abstract";
+ packageName = "es-abstract";
+ version = "1.15.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz";
+ sha512 = "bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ==";
+ };
+ };
+ "es-to-primitive-1.2.0" = {
+ name = "es-to-primitive";
+ packageName = "es-to-primitive";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
+ sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
+ };
+ };
+ "es5-ext-0.10.51" = {
+ name = "es5-ext";
+ packageName = "es5-ext";
+ version = "0.10.51";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz";
+ sha512 = "oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==";
+ };
+ };
+ "es6-iterator-2.0.3" = {
+ name = "es6-iterator";
+ packageName = "es6-iterator";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz";
+ sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7";
+ };
+ };
+ "es6-promise-4.2.8" = {
+ name = "es6-promise";
+ packageName = "es6-promise";
+ version = "4.2.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz";
+ sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==";
+ };
+ };
+ "es6-symbol-3.1.2" = {
+ name = "es6-symbol";
+ packageName = "es6-symbol";
+ version = "3.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz";
+ sha512 = "/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==";
+ };
+ };
+ "escape-html-1.0.3" = {
+ name = "escape-html";
+ packageName = "escape-html";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz";
+ sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
+ };
+ };
+ "escape-string-regexp-1.0.5" = {
+ name = "escape-string-regexp";
+ packageName = "escape-string-regexp";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
+ };
+ };
+ "escodegen-1.12.0" = {
+ name = "escodegen";
+ packageName = "escodegen";
+ version = "1.12.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz";
+ sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==";
+ };
+ };
+ "eslint-scope-4.0.3" = {
+ name = "eslint-scope";
+ packageName = "eslint-scope";
+ version = "4.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz";
+ sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==";
+ };
+ };
+ "esprima-3.1.3" = {
+ name = "esprima";
+ packageName = "esprima";
+ version = "3.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+ sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+ };
+ };
+ "esprima-4.0.1" = {
+ name = "esprima";
+ packageName = "esprima";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
+ sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
+ };
+ };
+ "esrecurse-4.2.1" = {
+ name = "esrecurse";
+ packageName = "esrecurse";
+ version = "4.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz";
+ sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==";
+ };
+ };
+ "estraverse-4.3.0" = {
+ name = "estraverse";
+ packageName = "estraverse";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz";
+ sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
+ };
+ };
+ "esutils-2.0.3" = {
+ name = "esutils";
+ packageName = "esutils";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz";
+ sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==";
+ };
+ };
+ "etag-1.8.1" = {
+ name = "etag";
+ packageName = "etag";
+ version = "1.8.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz";
+ sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
+ };
+ };
+ "eventemitter3-4.0.0" = {
+ name = "eventemitter3";
+ packageName = "eventemitter3";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz";
+ sha512 = "qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==";
+ };
+ };
+ "events-3.0.0" = {
+ name = "events";
+ packageName = "events";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/events/-/events-3.0.0.tgz";
+ sha512 = "Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==";
+ };
+ };
+ "eventsource-1.0.7" = {
+ name = "eventsource";
+ packageName = "eventsource";
+ version = "1.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz";
+ sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==";
+ };
+ };
+ "evp_bytestokey-1.0.3" = {
+ name = "evp_bytestokey";
+ packageName = "evp_bytestokey";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz";
+ sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==";
+ };
+ };
+ "exec-sh-0.3.2" = {
+ name = "exec-sh";
+ packageName = "exec-sh";
+ version = "0.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz";
+ sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==";
+ };
+ };
+ "execa-1.0.0" = {
+ name = "execa";
+ packageName = "execa";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz";
+ sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
+ };
+ };
+ "exit-0.1.2" = {
+ name = "exit";
+ packageName = "exit";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
+ sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
+ };
+ };
+ "expand-brackets-2.1.4" = {
+ name = "expand-brackets";
+ packageName = "expand-brackets";
+ version = "2.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz";
+ sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622";
+ };
+ };
+ "expand-tilde-2.0.2" = {
+ name = "expand-tilde";
+ packageName = "expand-tilde";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz";
+ sha1 = "97e801aa052df02454de46b02bf621642cdc8502";
+ };
+ };
+ "expect-24.9.0" = {
+ name = "expect";
+ packageName = "expect";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz";
+ sha512 = "wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==";
+ };
+ };
+ "express-4.17.1" = {
+ name = "express";
+ packageName = "express";
+ version = "4.17.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz";
+ sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==";
+ };
+ };
+ "extend-3.0.2" = {
+ name = "extend";
+ packageName = "extend";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
+ sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
+ };
+ };
+ "extend-shallow-2.0.1" = {
+ name = "extend-shallow";
+ packageName = "extend-shallow";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz";
+ sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
+ };
+ };
+ "extend-shallow-3.0.2" = {
+ name = "extend-shallow";
+ packageName = "extend-shallow";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz";
+ sha1 = "26a71aaf073b39fb2127172746131c2704028db8";
+ };
+ };
+ "extglob-2.0.4" = {
+ name = "extglob";
+ packageName = "extglob";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz";
+ sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==";
+ };
+ };
+ "extsprintf-1.3.0" = {
+ name = "extsprintf";
+ packageName = "extsprintf";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+ sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+ };
+ };
+ "fast-deep-equal-2.0.1" = {
+ name = "fast-deep-equal";
+ packageName = "fast-deep-equal";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
+ sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+ };
+ };
+ "fast-json-stable-stringify-2.0.0" = {
+ name = "fast-json-stable-stringify";
+ packageName = "fast-json-stable-stringify";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
+ sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+ };
+ };
+ "fast-levenshtein-2.0.6" = {
+ name = "fast-levenshtein";
+ packageName = "fast-levenshtein";
+ version = "2.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz";
+ sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
+ };
+ };
+ "faye-websocket-0.10.0" = {
+ name = "faye-websocket";
+ packageName = "faye-websocket";
+ version = "0.10.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz";
+ sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
+ };
+ };
+ "faye-websocket-0.11.3" = {
+ name = "faye-websocket";
+ packageName = "faye-websocket";
+ version = "0.11.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz";
+ sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==";
+ };
+ };
+ "fb-watchman-2.0.0" = {
+ name = "fb-watchman";
+ packageName = "fb-watchman";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz";
+ sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58";
+ };
+ };
+ "figgy-pudding-3.5.1" = {
+ name = "figgy-pudding";
+ packageName = "figgy-pudding";
+ version = "3.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz";
+ sha512 = "vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==";
+ };
+ };
+ "filesize-3.6.1" = {
+ name = "filesize";
+ packageName = "filesize";
+ version = "3.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz";
+ sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==";
+ };
+ };
+ "fill-range-4.0.0" = {
+ name = "fill-range";
+ packageName = "fill-range";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz";
+ sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7";
+ };
+ };
+ "finalhandler-1.1.2" = {
+ name = "finalhandler";
+ packageName = "finalhandler";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz";
+ sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==";
+ };
+ };
+ "find-cache-dir-1.0.0" = {
+ name = "find-cache-dir";
+ packageName = "find-cache-dir";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz";
+ sha1 = "9288e3e9e3cc3748717d39eade17cf71fc30ee6f";
+ };
+ };
+ "find-cache-dir-2.1.0" = {
+ name = "find-cache-dir";
+ packageName = "find-cache-dir";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz";
+ sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==";
+ };
+ };
+ "find-replace-3.0.0" = {
+ name = "find-replace";
+ packageName = "find-replace";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz";
+ sha512 = "6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==";
+ };
+ };
+ "find-up-2.1.0" = {
+ name = "find-up";
+ packageName = "find-up";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
+ sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7";
+ };
+ };
+ "find-up-3.0.0" = {
+ name = "find-up";
+ packageName = "find-up";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
+ sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
+ };
+ };
+ "findup-sync-3.0.0" = {
+ name = "findup-sync";
+ packageName = "findup-sync";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz";
+ sha512 = "YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==";
+ };
+ };
+ "flush-write-stream-1.1.1" = {
+ name = "flush-write-stream";
+ packageName = "flush-write-stream";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz";
+ sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==";
+ };
+ };
+ "follow-redirects-1.5.10" = {
+ name = "follow-redirects";
+ packageName = "follow-redirects";
+ version = "1.5.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz";
+ sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==";
+ };
+ };
+ "for-in-1.0.2" = {
+ name = "for-in";
+ packageName = "for-in";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz";
+ sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80";
+ };
+ };
+ "forever-agent-0.6.1" = {
+ name = "forever-agent";
+ packageName = "forever-agent";
+ version = "0.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+ sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+ };
+ };
+ "form-data-2.3.3" = {
+ name = "form-data";
+ packageName = "form-data";
+ version = "2.3.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz";
+ sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
+ };
+ };
+ "form-data-2.5.1" = {
+ name = "form-data";
+ packageName = "form-data";
+ version = "2.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz";
+ sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==";
+ };
+ };
+ "formidable-1.2.1" = {
+ name = "formidable";
+ packageName = "formidable";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz";
+ sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==";
+ };
+ };
+ "forwarded-0.1.2" = {
+ name = "forwarded";
+ packageName = "forwarded";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz";
+ sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
+ };
+ };
+ "fragment-cache-0.2.1" = {
+ name = "fragment-cache";
+ packageName = "fragment-cache";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz";
+ sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19";
+ };
+ };
+ "fresh-0.5.2" = {
+ name = "fresh";
+ packageName = "fresh";
+ version = "0.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz";
+ sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
+ };
+ };
+ "from2-2.3.0" = {
+ name = "from2";
+ packageName = "from2";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
+ sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
+ };
+ };
+ "fs-write-stream-atomic-1.0.10" = {
+ name = "fs-write-stream-atomic";
+ packageName = "fs-write-stream-atomic";
+ version = "1.0.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz";
+ sha1 = "b47df53493ef911df75731e70a9ded0189db40c9";
+ };
+ };
+ "fs.realpath-1.0.0" = {
+ name = "fs.realpath";
+ packageName = "fs.realpath";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+ };
+ };
+ "fsevents-1.2.9" = {
+ name = "fsevents";
+ packageName = "fsevents";
+ version = "1.2.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz";
+ sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==";
+ };
+ };
+ "function-bind-1.1.1" = {
+ name = "function-bind";
+ packageName = "function-bind";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz";
+ sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
+ };
+ };
+ "get-caller-file-1.0.3" = {
+ name = "get-caller-file";
+ packageName = "get-caller-file";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz";
+ sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
+ };
+ };
+ "get-caller-file-2.0.5" = {
+ name = "get-caller-file";
+ packageName = "get-caller-file";
+ version = "2.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz";
+ sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
+ };
+ };
+ "get-paths-0.0.7" = {
+ name = "get-paths";
+ packageName = "get-paths";
+ version = "0.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-paths/-/get-paths-0.0.7.tgz";
+ sha512 = "0wdJt7C1XKQxuCgouqd+ZvLJ56FQixKoki9MrFaO4EriqzXOiH9gbukaDE1ou08S8Ns3/yDzoBAISNPqj6e6tA==";
+ };
+ };
+ "get-stream-3.0.0" = {
+ name = "get-stream";
+ packageName = "get-stream";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz";
+ sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
+ };
+ };
+ "get-stream-4.1.0" = {
+ name = "get-stream";
+ packageName = "get-stream";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz";
+ sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
+ };
+ };
+ "get-value-2.0.6" = {
+ name = "get-value";
+ packageName = "get-value";
+ version = "2.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz";
+ sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28";
+ };
+ };
+ "getpass-0.1.7" = {
+ name = "getpass";
+ packageName = "getpass";
+ version = "0.1.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz";
+ sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
+ };
+ };
+ "glob-7.1.4" = {
+ name = "glob";
+ packageName = "glob";
+ version = "7.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
+ sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
+ };
+ };
+ "glob-parent-3.1.0" = {
+ name = "glob-parent";
+ packageName = "glob-parent";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz";
+ sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
+ };
+ };
+ "global-modules-1.0.0" = {
+ name = "global-modules";
+ packageName = "global-modules";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz";
+ sha512 = "sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==";
+ };
+ };
+ "global-modules-2.0.0" = {
+ name = "global-modules";
+ packageName = "global-modules";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz";
+ sha512 = "NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==";
+ };
+ };
+ "global-prefix-1.0.2" = {
+ name = "global-prefix";
+ packageName = "global-prefix";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz";
+ sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
+ };
+ };
+ "global-prefix-3.0.0" = {
+ name = "global-prefix";
+ packageName = "global-prefix";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz";
+ sha512 = "awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==";
+ };
+ };
+ "globals-11.12.0" = {
+ name = "globals";
+ packageName = "globals";
+ version = "11.12.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz";
+ sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
+ };
+ };
+ "globals-9.18.0" = {
+ name = "globals";
+ packageName = "globals";
+ version = "9.18.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
+ sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
+ };
+ };
+ "globby-6.1.0" = {
+ name = "globby";
+ packageName = "globby";
+ version = "6.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz";
+ sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c";
+ };
+ };
+ "globby-7.1.1" = {
+ name = "globby";
+ packageName = "globby";
+ version = "7.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz";
+ sha1 = "fb2ccff9401f8600945dfada97440cca972b8680";
+ };
+ };
+ "got-8.3.2" = {
+ name = "got";
+ packageName = "got";
+ version = "8.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz";
+ sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==";
+ };
+ };
+ "graceful-fs-4.2.2" = {
+ name = "graceful-fs";
+ packageName = "graceful-fs";
+ version = "4.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz";
+ sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
+ };
+ };
+ "growly-1.3.0" = {
+ name = "growly";
+ packageName = "growly";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz";
+ sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081";
+ };
+ };
+ "gzip-size-5.1.1" = {
+ name = "gzip-size";
+ packageName = "gzip-size";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz";
+ sha512 = "FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==";
+ };
+ };
+ "handle-thing-2.0.0" = {
+ name = "handle-thing";
+ packageName = "handle-thing";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz";
+ sha512 = "d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==";
+ };
+ };
+ "handlebars-4.4.2" = {
+ name = "handlebars";
+ packageName = "handlebars";
+ version = "4.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/handlebars/-/handlebars-4.4.2.tgz";
+ sha512 = "cIv17+GhL8pHHnRJzGu2wwcthL5sb8uDKBHvZ2Dtu5s1YNt0ljbzKbamnc+gr69y7bzwQiBdr5+hOpRd5pnOdg==";
+ };
+ };
+ "har-schema-2.0.0" = {
+ name = "har-schema";
+ packageName = "har-schema";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz";
+ sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
+ };
+ };
+ "har-validator-5.1.3" = {
+ name = "har-validator";
+ packageName = "har-validator";
+ version = "5.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
+ sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==";
+ };
+ };
+ "has-1.0.3" = {
+ name = "has";
+ packageName = "has";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz";
+ sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==";
+ };
+ };
+ "has-ansi-2.0.0" = {
+ name = "has-ansi";
+ packageName = "has-ansi";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+ sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+ };
+ };
+ "has-flag-3.0.0" = {
+ name = "has-flag";
+ packageName = "has-flag";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz";
+ sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
+ };
+ };
+ "has-symbol-support-x-1.4.2" = {
+ name = "has-symbol-support-x";
+ packageName = "has-symbol-support-x";
+ version = "1.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz";
+ sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==";
+ };
+ };
+ "has-symbols-1.0.0" = {
+ name = "has-symbols";
+ packageName = "has-symbols";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz";
+ sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
+ };
+ };
+ "has-to-string-tag-x-1.4.1" = {
+ name = "has-to-string-tag-x";
+ packageName = "has-to-string-tag-x";
+ version = "1.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz";
+ sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==";
+ };
+ };
+ "has-value-0.3.1" = {
+ name = "has-value";
+ packageName = "has-value";
+ version = "0.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz";
+ sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f";
+ };
+ };
+ "has-value-1.0.0" = {
+ name = "has-value";
+ packageName = "has-value";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz";
+ sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177";
+ };
+ };
+ "has-values-0.1.4" = {
+ name = "has-values";
+ packageName = "has-values";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz";
+ sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771";
+ };
+ };
+ "has-values-1.0.0" = {
+ name = "has-values";
+ packageName = "has-values";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz";
+ sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f";
+ };
+ };
+ "hash-base-3.0.4" = {
+ name = "hash-base";
+ packageName = "hash-base";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz";
+ sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918";
+ };
+ };
+ "hash.js-1.1.7" = {
+ name = "hash.js";
+ packageName = "hash.js";
+ version = "1.1.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz";
+ sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==";
+ };
+ };
+ "hmac-drbg-1.0.1" = {
+ name = "hmac-drbg";
+ packageName = "hmac-drbg";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz";
+ sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1";
+ };
+ };
+ "home-or-tmp-2.0.0" = {
+ name = "home-or-tmp";
+ packageName = "home-or-tmp";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz";
+ sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8";
+ };
+ };
+ "homedir-polyfill-1.0.3" = {
+ name = "homedir-polyfill";
+ packageName = "homedir-polyfill";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz";
+ sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==";
+ };
+ };
+ "hoopy-0.1.4" = {
+ name = "hoopy";
+ packageName = "hoopy";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz";
+ sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==";
+ };
+ };
+ "hosted-git-info-2.8.4" = {
+ name = "hosted-git-info";
+ packageName = "hosted-git-info";
+ version = "2.8.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz";
+ sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==";
+ };
+ };
+ "hpack.js-2.1.6" = {
+ name = "hpack.js";
+ packageName = "hpack.js";
+ version = "2.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz";
+ sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2";
+ };
+ };
+ "html-encoding-sniffer-1.0.2" = {
+ name = "html-encoding-sniffer";
+ packageName = "html-encoding-sniffer";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz";
+ sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==";
+ };
+ };
+ "html-entities-1.2.1" = {
+ name = "html-entities";
+ packageName = "html-entities";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz";
+ sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f";
+ };
+ };
+ "http-assert-1.4.1" = {
+ name = "http-assert";
+ packageName = "http-assert";
+ version = "1.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-assert/-/http-assert-1.4.1.tgz";
+ sha512 = "rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw==";
+ };
+ };
+ "http-cache-semantics-3.8.1" = {
+ name = "http-cache-semantics";
+ packageName = "http-cache-semantics";
+ version = "3.8.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz";
+ sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==";
+ };
+ };
+ "http-deceiver-1.2.7" = {
+ name = "http-deceiver";
+ packageName = "http-deceiver";
+ version = "1.2.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz";
+ sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87";
+ };
+ };
+ "http-errors-1.6.3" = {
+ name = "http-errors";
+ packageName = "http-errors";
+ version = "1.6.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz";
+ sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d";
+ };
+ };
+ "http-errors-1.7.2" = {
+ name = "http-errors";
+ packageName = "http-errors";
+ version = "1.7.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz";
+ sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==";
+ };
+ };
+ "http-errors-1.7.3" = {
+ name = "http-errors";
+ packageName = "http-errors";
+ version = "1.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz";
+ sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==";
+ };
+ };
+ "http-parser-js-0.4.10" = {
+ name = "http-parser-js";
+ packageName = "http-parser-js";
+ version = "0.4.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz";
+ sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4";
+ };
+ };
+ "http-proxy-1.18.0" = {
+ name = "http-proxy";
+ packageName = "http-proxy";
+ version = "1.18.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz";
+ sha512 = "84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==";
+ };
+ };
+ "http-proxy-middleware-0.19.1" = {
+ name = "http-proxy-middleware";
+ packageName = "http-proxy-middleware";
+ version = "0.19.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz";
+ sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==";
+ };
+ };
+ "http-signature-1.2.0" = {
+ name = "http-signature";
+ packageName = "http-signature";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz";
+ sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
+ };
+ };
+ "https-browserify-1.0.0" = {
+ name = "https-browserify";
+ packageName = "https-browserify";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz";
+ sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
+ };
+ };
+ "iconv-lite-0.4.24" = {
+ name = "iconv-lite";
+ packageName = "iconv-lite";
+ version = "0.4.24";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
+ sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
+ };
+ };
+ "ieee754-1.1.13" = {
+ name = "ieee754";
+ packageName = "ieee754";
+ version = "1.1.13";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz";
+ sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
+ };
+ };
+ "iferr-0.1.5" = {
+ name = "iferr";
+ packageName = "iferr";
+ version = "0.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz";
+ sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501";
+ };
+ };
+ "ignore-3.3.10" = {
+ name = "ignore";
+ packageName = "ignore";
+ version = "3.3.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz";
+ sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==";
+ };
+ };
+ "import-local-2.0.0" = {
+ name = "import-local";
+ packageName = "import-local";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz";
+ sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==";
+ };
+ };
+ "imurmurhash-0.1.4" = {
+ name = "imurmurhash";
+ packageName = "imurmurhash";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
+ sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
+ };
+ };
+ "indent-string-3.2.0" = {
+ name = "indent-string";
+ packageName = "indent-string";
+ version = "3.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz";
+ sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289";
+ };
+ };
+ "infer-owner-1.0.4" = {
+ name = "infer-owner";
+ packageName = "infer-owner";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz";
+ sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==";
+ };
+ };
+ "inflation-2.0.0" = {
+ name = "inflation";
+ packageName = "inflation";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz";
+ sha1 = "8b417e47c28f925a45133d914ca1fd389107f30f";
+ };
+ };
+ "inflight-1.0.6" = {
+ name = "inflight";
+ packageName = "inflight";
+ version = "1.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+ sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+ };
+ };
+ "inherits-2.0.1" = {
+ name = "inherits";
+ packageName = "inherits";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+ sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+ };
+ };
+ "inherits-2.0.3" = {
+ name = "inherits";
+ packageName = "inherits";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+ sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+ };
+ };
+ "inherits-2.0.4" = {
+ name = "inherits";
+ packageName = "inherits";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
+ sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
+ };
+ };
+ "ini-1.3.5" = {
+ name = "ini";
+ packageName = "ini";
+ version = "1.3.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+ sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
+ };
+ };
+ "internal-ip-4.3.0" = {
+ name = "internal-ip";
+ packageName = "internal-ip";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz";
+ sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==";
+ };
+ };
+ "interpret-1.2.0" = {
+ name = "interpret";
+ packageName = "interpret";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz";
+ sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==";
+ };
+ };
+ "into-stream-3.1.0" = {
+ name = "into-stream";
+ packageName = "into-stream";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz";
+ sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6";
+ };
+ };
+ "invariant-2.2.4" = {
+ name = "invariant";
+ packageName = "invariant";
+ version = "2.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz";
+ sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==";
+ };
+ };
+ "invert-kv-2.0.0" = {
+ name = "invert-kv";
+ packageName = "invert-kv";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz";
+ sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==";
+ };
+ };
+ "ip-1.1.5" = {
+ name = "ip";
+ packageName = "ip";
+ version = "1.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz";
+ sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a";
+ };
+ };
+ "ip-regex-2.1.0" = {
+ name = "ip-regex";
+ packageName = "ip-regex";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz";
+ sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
+ };
+ };
+ "ipaddr.js-1.9.0" = {
+ name = "ipaddr.js";
+ packageName = "ipaddr.js";
+ version = "1.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz";
+ sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==";
+ };
+ };
+ "is-absolute-url-3.0.3" = {
+ name = "is-absolute-url";
+ packageName = "is-absolute-url";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz";
+ sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==";
+ };
+ };
+ "is-accessor-descriptor-0.1.6" = {
+ name = "is-accessor-descriptor";
+ packageName = "is-accessor-descriptor";
+ version = "0.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz";
+ sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6";
+ };
+ };
+ "is-accessor-descriptor-1.0.0" = {
+ name = "is-accessor-descriptor";
+ packageName = "is-accessor-descriptor";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz";
+ sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==";
+ };
+ };
+ "is-arrayish-0.2.1" = {
+ name = "is-arrayish";
+ packageName = "is-arrayish";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
+ sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
+ };
+ };
+ "is-binary-path-1.0.1" = {
+ name = "is-binary-path";
+ packageName = "is-binary-path";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz";
+ sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
+ };
+ };
+ "is-buffer-1.1.6" = {
+ name = "is-buffer";
+ packageName = "is-buffer";
+ version = "1.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz";
+ sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
+ };
+ };
+ "is-buffer-2.0.4" = {
+ name = "is-buffer";
+ packageName = "is-buffer";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz";
+ sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==";
+ };
+ };
+ "is-callable-1.1.4" = {
+ name = "is-callable";
+ packageName = "is-callable";
+ version = "1.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz";
+ sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==";
+ };
+ };
+ "is-ci-2.0.0" = {
+ name = "is-ci";
+ packageName = "is-ci";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz";
+ sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==";
+ };
+ };
+ "is-data-descriptor-0.1.4" = {
+ name = "is-data-descriptor";
+ packageName = "is-data-descriptor";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz";
+ sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56";
+ };
+ };
+ "is-data-descriptor-1.0.0" = {
+ name = "is-data-descriptor";
+ packageName = "is-data-descriptor";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz";
+ sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
+ };
+ };
+ "is-date-object-1.0.1" = {
+ name = "is-date-object";
+ packageName = "is-date-object";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
+ sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+ };
+ };
+ "is-descriptor-0.1.6" = {
+ name = "is-descriptor";
+ packageName = "is-descriptor";
+ version = "0.1.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz";
+ sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==";
+ };
+ };
+ "is-descriptor-1.0.2" = {
+ name = "is-descriptor";
+ packageName = "is-descriptor";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz";
+ sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==";
+ };
+ };
+ "is-expression-3.0.0" = {
+ name = "is-expression";
+ packageName = "is-expression";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz";
+ sha1 = "39acaa6be7fd1f3471dc42c7416e61c24317ac9f";
+ };
+ };
+ "is-extendable-0.1.1" = {
+ name = "is-extendable";
+ packageName = "is-extendable";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz";
+ sha1 = "62b110e289a471418e3ec36a617d472e301dfc89";
+ };
+ };
+ "is-extendable-1.0.1" = {
+ name = "is-extendable";
+ packageName = "is-extendable";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz";
+ sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==";
+ };
+ };
+ "is-extglob-2.1.1" = {
+ name = "is-extglob";
+ packageName = "is-extglob";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+ sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
+ };
+ };
+ "is-finite-1.0.2" = {
+ name = "is-finite";
+ packageName = "is-finite";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
+ sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+ };
+ };
+ "is-fullwidth-code-point-1.0.0" = {
+ name = "is-fullwidth-code-point";
+ packageName = "is-fullwidth-code-point";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+ sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+ };
+ };
+ "is-fullwidth-code-point-2.0.0" = {
+ name = "is-fullwidth-code-point";
+ packageName = "is-fullwidth-code-point";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+ sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
+ };
+ };
+ "is-generator-fn-2.1.0" = {
+ name = "is-generator-fn";
+ packageName = "is-generator-fn";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz";
+ sha512 = "cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==";
+ };
+ };
+ "is-generator-function-1.0.7" = {
+ name = "is-generator-function";
+ packageName = "is-generator-function";
+ version = "1.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.7.tgz";
+ sha512 = "YZc5EwyO4f2kWCax7oegfuSr9mFz1ZvieNYBEjmukLxgXfBUbxAWGVF7GZf0zidYtoBl3WvC07YK0wT76a+Rtw==";
+ };
+ };
+ "is-glob-3.1.0" = {
+ name = "is-glob";
+ packageName = "is-glob";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz";
+ sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a";
+ };
+ };
+ "is-glob-4.0.1" = {
+ name = "is-glob";
+ packageName = "is-glob";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
+ sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
+ };
+ };
+ "is-number-3.0.0" = {
+ name = "is-number";
+ packageName = "is-number";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz";
+ sha1 = "24fd6201a4782cf50561c810276afc7d12d71195";
+ };
+ };
+ "is-object-1.0.1" = {
+ name = "is-object";
+ packageName = "is-object";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz";
+ sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470";
+ };
+ };
+ "is-path-cwd-2.2.0" = {
+ name = "is-path-cwd";
+ packageName = "is-path-cwd";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz";
+ sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==";
+ };
+ };
+ "is-path-in-cwd-2.1.0" = {
+ name = "is-path-in-cwd";
+ packageName = "is-path-in-cwd";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz";
+ sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==";
+ };
+ };
+ "is-path-inside-2.1.0" = {
+ name = "is-path-inside";
+ packageName = "is-path-inside";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz";
+ sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==";
+ };
+ };
+ "is-plain-obj-1.1.0" = {
+ name = "is-plain-obj";
+ packageName = "is-plain-obj";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz";
+ sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e";
+ };
+ };
+ "is-plain-object-2.0.4" = {
+ name = "is-plain-object";
+ packageName = "is-plain-object";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz";
+ sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==";
+ };
+ };
+ "is-promise-2.1.0" = {
+ name = "is-promise";
+ packageName = "is-promise";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
+ sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+ };
+ };
+ "is-regex-1.0.4" = {
+ name = "is-regex";
+ packageName = "is-regex";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
+ sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+ };
+ };
+ "is-retry-allowed-1.2.0" = {
+ name = "is-retry-allowed";
+ packageName = "is-retry-allowed";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz";
+ sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==";
+ };
+ };
+ "is-stream-1.1.0" = {
+ name = "is-stream";
+ packageName = "is-stream";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
+ sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
+ };
+ };
+ "is-symbol-1.0.2" = {
+ name = "is-symbol";
+ packageName = "is-symbol";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz";
+ sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==";
+ };
+ };
+ "is-typedarray-1.0.0" = {
+ name = "is-typedarray";
+ packageName = "is-typedarray";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+ sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+ };
+ };
+ "is-whitespace-0.3.0" = {
+ name = "is-whitespace";
+ packageName = "is-whitespace";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz";
+ sha1 = "1639ecb1be036aec69a54cbb401cfbed7114ab7f";
+ };
+ };
+ "is-windows-1.0.2" = {
+ name = "is-windows";
+ packageName = "is-windows";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz";
+ sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==";
+ };
+ };
+ "is-wsl-1.1.0" = {
+ name = "is-wsl";
+ packageName = "is-wsl";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz";
+ sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
+ };
+ };
+ "isarray-0.0.1" = {
+ name = "isarray";
+ packageName = "isarray";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+ sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+ };
+ };
+ "isarray-1.0.0" = {
+ name = "isarray";
+ packageName = "isarray";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+ sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+ };
+ };
+ "isexe-2.0.0" = {
+ name = "isexe";
+ packageName = "isexe";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz";
+ sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10";
+ };
+ };
+ "isobject-2.1.0" = {
+ name = "isobject";
+ packageName = "isobject";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz";
+ sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89";
+ };
+ };
+ "isobject-3.0.1" = {
+ name = "isobject";
+ packageName = "isobject";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz";
+ sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df";
+ };
+ };
+ "isomorphic-ws-4.0.1" = {
+ name = "isomorphic-ws";
+ packageName = "isomorphic-ws";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz";
+ sha512 = "BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==";
+ };
+ };
+ "isstream-0.1.2" = {
+ name = "isstream";
+ packageName = "isstream";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+ sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+ };
+ };
+ "istanbul-lib-coverage-2.0.5" = {
+ name = "istanbul-lib-coverage";
+ packageName = "istanbul-lib-coverage";
+ version = "2.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz";
+ sha512 = "8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==";
+ };
+ };
+ "istanbul-lib-instrument-3.3.0" = {
+ name = "istanbul-lib-instrument";
+ packageName = "istanbul-lib-instrument";
+ version = "3.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz";
+ sha512 = "5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==";
+ };
+ };
+ "istanbul-lib-report-2.0.8" = {
+ name = "istanbul-lib-report";
+ packageName = "istanbul-lib-report";
+ version = "2.0.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz";
+ sha512 = "fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==";
+ };
+ };
+ "istanbul-lib-source-maps-3.0.6" = {
+ name = "istanbul-lib-source-maps";
+ packageName = "istanbul-lib-source-maps";
+ version = "3.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz";
+ sha512 = "R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==";
+ };
+ };
+ "istanbul-reports-2.2.6" = {
+ name = "istanbul-reports";
+ packageName = "istanbul-reports";
+ version = "2.2.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz";
+ sha512 = "SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==";
+ };
+ };
+ "isurl-1.0.0" = {
+ name = "isurl";
+ packageName = "isurl";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/isurl/-/isurl-1.0.0.tgz";
+ sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==";
+ };
+ };
+ "jest-24.9.0" = {
+ name = "jest";
+ packageName = "jest";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz";
+ sha512 = "YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==";
+ };
+ };
+ "jest-changed-files-24.9.0" = {
+ name = "jest-changed-files";
+ packageName = "jest-changed-files";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz";
+ sha512 = "6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==";
+ };
+ };
+ "jest-cli-24.9.0" = {
+ name = "jest-cli";
+ packageName = "jest-cli";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz";
+ sha512 = "+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==";
+ };
+ };
+ "jest-config-24.9.0" = {
+ name = "jest-config";
+ packageName = "jest-config";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz";
+ sha512 = "RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==";
+ };
+ };
+ "jest-diff-24.9.0" = {
+ name = "jest-diff";
+ packageName = "jest-diff";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz";
+ sha512 = "qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==";
+ };
+ };
+ "jest-docblock-24.9.0" = {
+ name = "jest-docblock";
+ packageName = "jest-docblock";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz";
+ sha512 = "F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==";
+ };
+ };
+ "jest-each-24.9.0" = {
+ name = "jest-each";
+ packageName = "jest-each";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz";
+ sha512 = "ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==";
+ };
+ };
+ "jest-environment-jsdom-24.9.0" = {
+ name = "jest-environment-jsdom";
+ packageName = "jest-environment-jsdom";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz";
+ sha512 = "Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==";
+ };
+ };
+ "jest-environment-node-24.9.0" = {
+ name = "jest-environment-node";
+ packageName = "jest-environment-node";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz";
+ sha512 = "6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==";
+ };
+ };
+ "jest-get-type-24.9.0" = {
+ name = "jest-get-type";
+ packageName = "jest-get-type";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz";
+ sha512 = "lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==";
+ };
+ };
+ "jest-haste-map-24.9.0" = {
+ name = "jest-haste-map";
+ packageName = "jest-haste-map";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz";
+ sha512 = "kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==";
+ };
+ };
+ "jest-jasmine2-24.9.0" = {
+ name = "jest-jasmine2";
+ packageName = "jest-jasmine2";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz";
+ sha512 = "Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==";
+ };
+ };
+ "jest-leak-detector-24.9.0" = {
+ name = "jest-leak-detector";
+ packageName = "jest-leak-detector";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz";
+ sha512 = "tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==";
+ };
+ };
+ "jest-matcher-utils-24.9.0" = {
+ name = "jest-matcher-utils";
+ packageName = "jest-matcher-utils";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz";
+ sha512 = "OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==";
+ };
+ };
+ "jest-message-util-24.9.0" = {
+ name = "jest-message-util";
+ packageName = "jest-message-util";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz";
+ sha512 = "oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==";
+ };
+ };
+ "jest-mock-24.9.0" = {
+ name = "jest-mock";
+ packageName = "jest-mock";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz";
+ sha512 = "3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==";
+ };
+ };
+ "jest-pnp-resolver-1.2.1" = {
+ name = "jest-pnp-resolver";
+ packageName = "jest-pnp-resolver";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz";
+ sha512 = "pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==";
+ };
+ };
+ "jest-regex-util-24.9.0" = {
+ name = "jest-regex-util";
+ packageName = "jest-regex-util";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz";
+ sha512 = "05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==";
+ };
+ };
+ "jest-resolve-24.9.0" = {
+ name = "jest-resolve";
+ packageName = "jest-resolve";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz";
+ sha512 = "TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==";
+ };
+ };
+ "jest-resolve-dependencies-24.9.0" = {
+ name = "jest-resolve-dependencies";
+ packageName = "jest-resolve-dependencies";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz";
+ sha512 = "Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==";
+ };
+ };
+ "jest-runner-24.9.0" = {
+ name = "jest-runner";
+ packageName = "jest-runner";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz";
+ sha512 = "KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==";
+ };
+ };
+ "jest-runtime-24.9.0" = {
+ name = "jest-runtime";
+ packageName = "jest-runtime";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz";
+ sha512 = "8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==";
+ };
+ };
+ "jest-serializer-24.9.0" = {
+ name = "jest-serializer";
+ packageName = "jest-serializer";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz";
+ sha512 = "DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==";
+ };
+ };
+ "jest-snapshot-24.9.0" = {
+ name = "jest-snapshot";
+ packageName = "jest-snapshot";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz";
+ sha512 = "uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==";
+ };
+ };
+ "jest-util-24.9.0" = {
+ name = "jest-util";
+ packageName = "jest-util";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz";
+ sha512 = "x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==";
+ };
+ };
+ "jest-validate-24.9.0" = {
+ name = "jest-validate";
+ packageName = "jest-validate";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz";
+ sha512 = "HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==";
+ };
+ };
+ "jest-watcher-24.9.0" = {
+ name = "jest-watcher";
+ packageName = "jest-watcher";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz";
+ sha512 = "+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==";
+ };
+ };
+ "jest-worker-24.9.0" = {
+ name = "jest-worker";
+ packageName = "jest-worker";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz";
+ sha512 = "51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==";
+ };
+ };
+ "js-beautify-1.10.2" = {
+ name = "js-beautify";
+ packageName = "js-beautify";
+ version = "1.10.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz";
+ sha512 = "ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ==";
+ };
+ };
+ "js-stringify-1.0.2" = {
+ name = "js-stringify";
+ packageName = "js-stringify";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz";
+ sha1 = "1736fddfd9724f28a3682adc6230ae7e4e9679db";
+ };
+ };
+ "js-tokens-3.0.2" = {
+ name = "js-tokens";
+ packageName = "js-tokens";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz";
+ sha1 = "9866df395102130e38f7f996bceb65443209c25b";
+ };
+ };
+ "js-tokens-4.0.0" = {
+ name = "js-tokens";
+ packageName = "js-tokens";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz";
+ sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==";
+ };
+ };
+ "js-yaml-3.13.1" = {
+ name = "js-yaml";
+ packageName = "js-yaml";
+ version = "3.13.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz";
+ sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==";
+ };
+ };
+ "jsbn-0.1.1" = {
+ name = "jsbn";
+ packageName = "jsbn";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+ sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
+ };
+ };
+ "jsdom-11.12.0" = {
+ name = "jsdom";
+ packageName = "jsdom";
+ version = "11.12.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz";
+ sha512 = "y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==";
+ };
+ };
+ "jsesc-0.5.0" = {
+ name = "jsesc";
+ packageName = "jsesc";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz";
+ sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d";
+ };
+ };
+ "jsesc-1.3.0" = {
+ name = "jsesc";
+ packageName = "jsesc";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz";
+ sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b";
+ };
+ };
+ "jsesc-2.5.2" = {
+ name = "jsesc";
+ packageName = "jsesc";
+ version = "2.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz";
+ sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
+ };
+ };
+ "json-buffer-3.0.0" = {
+ name = "json-buffer";
+ packageName = "json-buffer";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz";
+ sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898";
+ };
+ };
+ "json-parse-better-errors-1.0.2" = {
+ name = "json-parse-better-errors";
+ packageName = "json-parse-better-errors";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz";
+ sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==";
+ };
+ };
+ "json-schema-0.2.3" = {
+ name = "json-schema";
+ packageName = "json-schema";
+ version = "0.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz";
+ sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
+ };
+ };
+ "json-schema-traverse-0.4.1" = {
+ name = "json-schema-traverse";
+ packageName = "json-schema-traverse";
+ version = "0.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
+ sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
+ };
+ };
+ "json-stringify-safe-5.0.1" = {
+ name = "json-stringify-safe";
+ packageName = "json-stringify-safe";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+ sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+ };
+ };
+ "json3-3.3.3" = {
+ name = "json3";
+ packageName = "json3";
+ version = "3.3.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz";
+ sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==";
+ };
+ };
+ "json5-0.5.1" = {
+ name = "json5";
+ packageName = "json5";
+ version = "0.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
+ sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
+ };
+ };
+ "json5-1.0.1" = {
+ name = "json5";
+ packageName = "json5";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz";
+ sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==";
+ };
+ };
+ "json5-2.1.1" = {
+ name = "json5";
+ packageName = "json5";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz";
+ sha512 = "l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==";
+ };
+ };
+ "jsonpath-plus-0.19.0" = {
+ name = "jsonpath-plus";
+ packageName = "jsonpath-plus";
+ version = "0.19.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-0.19.0.tgz";
+ sha512 = "GSVwsrzW9LsA5lzsqe4CkuZ9wp+kxBb2GwNniaWzI2YFn5Ig42rSW8ZxVpWXaAfakXNrx5pgY5AbQq7kzX29kg==";
+ };
+ };
+ "jsprim-1.4.1" = {
+ name = "jsprim";
+ packageName = "jsprim";
+ version = "1.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz";
+ sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
+ };
+ };
+ "jstransformer-1.0.0" = {
+ name = "jstransformer";
+ packageName = "jstransformer";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz";
+ sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3";
+ };
+ };
+ "keygrip-1.0.3" = {
+ name = "keygrip";
+ packageName = "keygrip";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.3.tgz";
+ sha512 = "/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g==";
+ };
+ };
+ "keyv-3.0.0" = {
+ name = "keyv";
+ packageName = "keyv";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz";
+ sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==";
+ };
+ };
+ "killable-1.0.1" = {
+ name = "killable";
+ packageName = "killable";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz";
+ sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==";
+ };
+ };
+ "kind-of-3.2.2" = {
+ name = "kind-of";
+ packageName = "kind-of";
+ version = "3.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz";
+ sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64";
+ };
+ };
+ "kind-of-4.0.0" = {
+ name = "kind-of";
+ packageName = "kind-of";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz";
+ sha1 = "20813df3d712928b207378691a45066fae72dd57";
+ };
+ };
+ "kind-of-5.1.0" = {
+ name = "kind-of";
+ packageName = "kind-of";
+ version = "5.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz";
+ sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==";
+ };
+ };
+ "kind-of-6.0.2" = {
+ name = "kind-of";
+ packageName = "kind-of";
+ version = "6.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz";
+ sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==";
+ };
+ };
+ "kleur-3.0.3" = {
+ name = "kleur";
+ packageName = "kleur";
+ version = "3.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz";
+ sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==";
+ };
+ };
+ "koa-2.8.2" = {
+ name = "koa";
+ packageName = "koa";
+ version = "2.8.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/koa/-/koa-2.8.2.tgz";
+ sha512 = "q1uZOgpl3wjr5FS/tjbABJ8lA5+NeKa9eq7QyBP5xxgOBwJN4iBrMEgO3LroE51lrIw3BsO0WZZ0Yi6giSiMDw==";
+ };
+ };
+ "koa-body-4.1.1" = {
+ name = "koa-body";
+ packageName = "koa-body";
+ version = "4.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/koa-body/-/koa-body-4.1.1.tgz";
+ sha512 = "rLb/KVD8qplEcK8Qsu6F4Xw+uHkmx3MWogDVmMX07DpjXizhw3pOEp1ja1MqqAcl0ei75AsrbGVDlySmsUrreA==";
+ };
+ };
+ "koa-compose-3.2.1" = {
+ name = "koa-compose";
+ packageName = "koa-compose";
+ version = "3.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/koa-compose/-/koa-compose-3.2.1.tgz";
+ sha1 = "a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7";
+ };
+ };
+ "koa-compose-4.1.0" = {
+ name = "koa-compose";
+ packageName = "koa-compose";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz";
+ sha512 = "8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==";
+ };
+ };
+ "koa-convert-1.2.0" = {
+ name = "koa-convert";
+ packageName = "koa-convert";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/koa-convert/-/koa-convert-1.2.0.tgz";
+ sha1 = "da40875df49de0539098d1700b50820cebcd21d0";
+ };
+ };
+ "koa-is-json-1.0.0" = {
+ name = "koa-is-json";
+ packageName = "koa-is-json";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz";
+ sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14";
+ };
+ };
+ "koa-router-7.4.0" = {
+ name = "koa-router";
+ packageName = "koa-router";
+ version = "7.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/koa-router/-/koa-router-7.4.0.tgz";
+ sha512 = "IWhaDXeAnfDBEpWS6hkGdZ1ablgr6Q6pGdXCyK38RbzuH4LkUOpPqPw+3f8l8aTDrQmBQ7xJc0bs2yV4dzcO+g==";
+ };
+ };
+ "koa-send-5.0.0" = {
+ name = "koa-send";
+ packageName = "koa-send";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/koa-send/-/koa-send-5.0.0.tgz";
+ sha512 = "90ZotV7t0p3uN9sRwW2D484rAaKIsD8tAVtypw/aBU+ryfV+fR2xrcAwhI8Wl6WRkojLUs/cB9SBSCuIb+IanQ==";
+ };
+ };
+ "koa-static-5.0.0" = {
+ name = "koa-static";
+ packageName = "koa-static";
+ version = "5.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/koa-static/-/koa-static-5.0.0.tgz";
+ sha512 = "UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==";
+ };
+ };
+ "koa-views-6.2.1" = {
+ name = "koa-views";
+ packageName = "koa-views";
+ version = "6.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/koa-views/-/koa-views-6.2.1.tgz";
+ sha512 = "wU3tw48KuskaJg0x1JZmC73UWGgVmh6B54HuHDzTrkavig+dBI0NbFeGiWsaOCZREQkaTfIVXSPSByDant71ew==";
+ };
+ };
+ "lazy-cache-1.0.4" = {
+ name = "lazy-cache";
+ packageName = "lazy-cache";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+ sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+ };
+ };
+ "lcid-2.0.0" = {
+ name = "lcid";
+ packageName = "lcid";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz";
+ sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==";
+ };
+ };
+ "left-pad-1.3.0" = {
+ name = "left-pad";
+ packageName = "left-pad";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz";
+ sha512 = "XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==";
+ };
+ };
+ "leven-3.1.0" = {
+ name = "leven";
+ packageName = "leven";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz";
+ sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==";
+ };
+ };
+ "levn-0.3.0" = {
+ name = "levn";
+ packageName = "levn";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
+ sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
+ };
+ };
+ "load-json-file-4.0.0" = {
+ name = "load-json-file";
+ packageName = "load-json-file";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz";
+ sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b";
+ };
+ };
+ "loader-runner-2.4.0" = {
+ name = "loader-runner";
+ packageName = "loader-runner";
+ version = "2.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz";
+ sha512 = "Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==";
+ };
+ };
+ "loader-utils-1.2.3" = {
+ name = "loader-utils";
+ packageName = "loader-utils";
+ version = "1.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz";
+ sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==";
+ };
+ };
+ "locate-path-2.0.0" = {
+ name = "locate-path";
+ packageName = "locate-path";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
+ sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
+ };
+ };
+ "locate-path-3.0.0" = {
+ name = "locate-path";
+ packageName = "locate-path";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
+ sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
+ };
+ };
+ "lodash-4.17.15" = {
+ name = "lodash";
+ packageName = "lodash";
+ version = "4.17.15";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
+ sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
+ };
+ };
+ "lodash.camelcase-4.3.0" = {
+ name = "lodash.camelcase";
+ packageName = "lodash.camelcase";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz";
+ sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6";
+ };
+ };
+ "lodash.clonedeep-4.5.0" = {
+ name = "lodash.clonedeep";
+ packageName = "lodash.clonedeep";
+ version = "4.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz";
+ sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef";
+ };
+ };
+ "lodash.memoize-4.1.2" = {
+ name = "lodash.memoize";
+ packageName = "lodash.memoize";
+ version = "4.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz";
+ sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe";
+ };
+ };
+ "lodash.sortby-4.7.0" = {
+ name = "lodash.sortby";
+ packageName = "lodash.sortby";
+ version = "4.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz";
+ sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438";
+ };
+ };
+ "log-symbols-2.2.0" = {
+ name = "log-symbols";
+ packageName = "log-symbols";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz";
+ sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==";
+ };
+ };
+ "loglevel-1.6.4" = {
+ name = "loglevel";
+ packageName = "loglevel";
+ version = "1.6.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz";
+ sha512 = "p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==";
+ };
+ };
+ "loglevelnext-1.0.5" = {
+ name = "loglevelnext";
+ packageName = "loglevelnext";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz";
+ sha512 = "V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==";
+ };
+ };
+ "long-4.0.0" = {
+ name = "long";
+ packageName = "long";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz";
+ sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==";
+ };
+ };
+ "longest-1.0.1" = {
+ name = "longest";
+ packageName = "longest";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+ sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+ };
+ };
+ "loose-envify-1.4.0" = {
+ name = "loose-envify";
+ packageName = "loose-envify";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz";
+ sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==";
+ };
+ };
+ "lowercase-keys-1.0.0" = {
+ name = "lowercase-keys";
+ packageName = "lowercase-keys";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
+ sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306";
+ };
+ };
+ "lowercase-keys-1.0.1" = {
+ name = "lowercase-keys";
+ packageName = "lowercase-keys";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz";
+ sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==";
+ };
+ };
+ "lru-cache-4.1.5" = {
+ name = "lru-cache";
+ packageName = "lru-cache";
+ version = "4.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
+ sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
+ };
+ };
+ "lru-cache-5.1.1" = {
+ name = "lru-cache";
+ packageName = "lru-cache";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz";
+ sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
+ };
+ };
+ "make-dir-1.3.0" = {
+ name = "make-dir";
+ packageName = "make-dir";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz";
+ sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==";
+ };
+ };
+ "make-dir-2.1.0" = {
+ name = "make-dir";
+ packageName = "make-dir";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz";
+ sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
+ };
+ };
+ "make-error-1.3.5" = {
+ name = "make-error";
+ packageName = "make-error";
+ version = "1.3.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz";
+ sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==";
+ };
+ };
+ "makeerror-1.0.11" = {
+ name = "makeerror";
+ packageName = "makeerror";
+ version = "1.0.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz";
+ sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c";
+ };
+ };
+ "mamacro-0.0.3" = {
+ name = "mamacro";
+ packageName = "mamacro";
+ version = "0.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz";
+ sha512 = "qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==";
+ };
+ };
+ "map-age-cleaner-0.1.3" = {
+ name = "map-age-cleaner";
+ packageName = "map-age-cleaner";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
+ sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==";
+ };
+ };
+ "map-cache-0.2.2" = {
+ name = "map-cache";
+ packageName = "map-cache";
+ version = "0.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz";
+ sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf";
+ };
+ };
+ "map-visit-1.0.0" = {
+ name = "map-visit";
+ packageName = "map-visit";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz";
+ sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
+ };
+ };
+ "md5.js-1.3.5" = {
+ name = "md5.js";
+ packageName = "md5.js";
+ version = "1.3.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz";
+ sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
+ };
+ };
+ "media-typer-0.3.0" = {
+ name = "media-typer";
+ packageName = "media-typer";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
+ sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+ };
+ };
+ "mem-4.3.0" = {
+ name = "mem";
+ packageName = "mem";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz";
+ sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
+ };
+ };
+ "memory-fs-0.4.1" = {
+ name = "memory-fs";
+ packageName = "memory-fs";
+ version = "0.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz";
+ sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
+ };
+ };
+ "merge-descriptors-1.0.1" = {
+ name = "merge-descriptors";
+ packageName = "merge-descriptors";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz";
+ sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
+ };
+ };
+ "merge-stream-2.0.0" = {
+ name = "merge-stream";
+ packageName = "merge-stream";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz";
+ sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==";
+ };
+ };
+ "methods-1.1.2" = {
+ name = "methods";
+ packageName = "methods";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
+ sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
+ };
+ };
+ "micromatch-3.1.10" = {
+ name = "micromatch";
+ packageName = "micromatch";
+ version = "3.1.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz";
+ sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
+ };
+ };
+ "miller-rabin-4.0.1" = {
+ name = "miller-rabin";
+ packageName = "miller-rabin";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz";
+ sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==";
+ };
+ };
+ "mime-1.6.0" = {
+ name = "mime";
+ packageName = "mime";
+ version = "1.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
+ sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
+ };
+ };
+ "mime-2.4.4" = {
+ name = "mime";
+ packageName = "mime";
+ version = "2.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz";
+ sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==";
+ };
+ };
+ "mime-db-1.40.0" = {
+ name = "mime-db";
+ packageName = "mime-db";
+ version = "1.40.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
+ sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
+ };
+ };
+ "mime-types-2.1.24" = {
+ name = "mime-types";
+ packageName = "mime-types";
+ version = "2.1.24";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
+ sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
+ };
+ };
+ "mimic-fn-1.2.0" = {
+ name = "mimic-fn";
+ packageName = "mimic-fn";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
+ sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
+ };
+ };
+ "mimic-fn-2.1.0" = {
+ name = "mimic-fn";
+ packageName = "mimic-fn";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
+ sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
+ };
+ };
+ "mimic-response-1.0.1" = {
+ name = "mimic-response";
+ packageName = "mimic-response";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz";
+ sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
+ };
+ };
+ "minimalistic-assert-1.0.1" = {
+ name = "minimalistic-assert";
+ packageName = "minimalistic-assert";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
+ sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==";
+ };
+ };
+ "minimalistic-crypto-utils-1.0.1" = {
+ name = "minimalistic-crypto-utils";
+ packageName = "minimalistic-crypto-utils";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz";
+ sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a";
+ };
+ };
+ "minimatch-3.0.4" = {
+ name = "minimatch";
+ packageName = "minimatch";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+ sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+ };
+ };
+ "minimist-0.0.8" = {
+ name = "minimist";
+ packageName = "minimist";
+ version = "0.0.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+ sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+ };
+ };
+ "minimist-1.2.0" = {
+ name = "minimist";
+ packageName = "minimist";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+ sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+ };
+ };
+ "mississippi-2.0.0" = {
+ name = "mississippi";
+ packageName = "mississippi";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz";
+ sha512 = "zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==";
+ };
+ };
+ "mississippi-3.0.0" = {
+ name = "mississippi";
+ packageName = "mississippi";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz";
+ sha512 = "x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==";
+ };
+ };
+ "mixin-deep-1.3.2" = {
+ name = "mixin-deep";
+ packageName = "mixin-deep";
+ version = "1.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz";
+ sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==";
+ };
+ };
+ "mkdirp-0.5.1" = {
+ name = "mkdirp";
+ packageName = "mkdirp";
+ version = "0.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+ sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+ };
+ };
+ "moment-2.24.0" = {
+ name = "moment";
+ packageName = "moment";
+ version = "2.24.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz";
+ sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==";
+ };
+ };
+ "moment-timezone-0.5.26" = {
+ name = "moment-timezone";
+ packageName = "moment-timezone";
+ version = "0.5.26";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz";
+ sha512 = "sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==";
+ };
+ };
+ "move-concurrently-1.0.1" = {
+ name = "move-concurrently";
+ packageName = "move-concurrently";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz";
+ sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
+ };
+ };
+ "ms-2.0.0" = {
+ name = "ms";
+ packageName = "ms";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+ sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+ };
+ };
+ "ms-2.1.1" = {
+ name = "ms";
+ packageName = "ms";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";
+ sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
+ };
+ };
+ "ms-2.1.2" = {
+ name = "ms";
+ packageName = "ms";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+ sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+ };
+ };
+ "multicast-dns-6.2.3" = {
+ name = "multicast-dns";
+ packageName = "multicast-dns";
+ version = "6.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz";
+ sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==";
+ };
+ };
+ "multicast-dns-service-types-1.1.0" = {
+ name = "multicast-dns-service-types";
+ packageName = "multicast-dns-service-types";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz";
+ sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901";
+ };
+ };
+ "mz-2.7.0" = {
+ name = "mz";
+ packageName = "mz";
+ version = "2.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz";
+ sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
+ };
+ };
+ "nan-2.14.0" = {
+ name = "nan";
+ packageName = "nan";
+ version = "2.14.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz";
+ sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==";
+ };
+ };
+ "nanomatch-1.2.13" = {
+ name = "nanomatch";
+ packageName = "nanomatch";
+ version = "1.2.13";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz";
+ sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
+ };
+ };
+ "natural-compare-1.4.0" = {
+ name = "natural-compare";
+ packageName = "natural-compare";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz";
+ sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7";
+ };
+ };
+ "negotiator-0.6.2" = {
+ name = "negotiator";
+ packageName = "negotiator";
+ version = "0.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz";
+ sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
+ };
+ };
+ "neo-async-2.6.1" = {
+ name = "neo-async";
+ packageName = "neo-async";
+ version = "2.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz";
+ sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==";
+ };
+ };
+ "next-tick-1.0.0" = {
+ name = "next-tick";
+ packageName = "next-tick";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz";
+ sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
+ };
+ };
+ "nice-try-1.0.5" = {
+ name = "nice-try";
+ packageName = "nice-try";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz";
+ sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
+ };
+ };
+ "node-forge-0.8.5" = {
+ name = "node-forge";
+ packageName = "node-forge";
+ version = "0.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz";
+ sha512 = "vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q==";
+ };
+ };
+ "node-forge-0.9.0" = {
+ name = "node-forge";
+ packageName = "node-forge";
+ version = "0.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz";
+ sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==";
+ };
+ };
+ "node-int64-0.4.0" = {
+ name = "node-int64";
+ packageName = "node-int64";
+ version = "0.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz";
+ sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b";
+ };
+ };
+ "node-jose-1.1.3" = {
+ name = "node-jose";
+ packageName = "node-jose";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-jose/-/node-jose-1.1.3.tgz";
+ sha512 = "kupfi4uGWhRjnOmtie2T64cLge5a1TZyalEa8uWWWBgtKBcu41A4IGKpI9twZAxRnmviamEUQRK7LSyfFb2w8A==";
+ };
+ };
+ "node-libs-browser-2.2.1" = {
+ name = "node-libs-browser";
+ packageName = "node-libs-browser";
+ version = "2.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz";
+ sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==";
+ };
+ };
+ "node-modules-regexp-1.0.0" = {
+ name = "node-modules-regexp";
+ packageName = "node-modules-regexp";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz";
+ sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40";
+ };
+ };
+ "node-notifier-5.4.3" = {
+ name = "node-notifier";
+ packageName = "node-notifier";
+ version = "5.4.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz";
+ sha512 = "M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==";
+ };
+ };
+ "nopt-4.0.1" = {
+ name = "nopt";
+ packageName = "nopt";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
+ sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+ };
+ };
+ "normalize-package-data-2.5.0" = {
+ name = "normalize-package-data";
+ packageName = "normalize-package-data";
+ version = "2.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
+ sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
+ };
+ };
+ "normalize-path-2.1.1" = {
+ name = "normalize-path";
+ packageName = "normalize-path";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz";
+ sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9";
+ };
+ };
+ "normalize-path-3.0.0" = {
+ name = "normalize-path";
+ packageName = "normalize-path";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz";
+ sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
+ };
+ };
+ "normalize-url-2.0.1" = {
+ name = "normalize-url";
+ packageName = "normalize-url";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz";
+ sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==";
+ };
+ };
+ "npm-run-path-2.0.2" = {
+ name = "npm-run-path";
+ packageName = "npm-run-path";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
+ sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+ };
+ };
+ "number-is-nan-1.0.1" = {
+ name = "number-is-nan";
+ packageName = "number-is-nan";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+ sha1 = "097b602b53422a522c1afb8790318336941a011d";
+ };
+ };
+ "nwsapi-2.1.4" = {
+ name = "nwsapi";
+ packageName = "nwsapi";
+ version = "2.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz";
+ sha512 = "iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==";
+ };
+ };
+ "oauth-sign-0.9.0" = {
+ name = "oauth-sign";
+ packageName = "oauth-sign";
+ version = "0.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
+ sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
+ };
+ };
+ "object-assign-4.1.1" = {
+ name = "object-assign";
+ packageName = "object-assign";
+ version = "4.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+ sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+ };
+ };
+ "object-copy-0.1.0" = {
+ name = "object-copy";
+ packageName = "object-copy";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz";
+ sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
+ };
+ };
+ "object-hash-1.3.1" = {
+ name = "object-hash";
+ packageName = "object-hash";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz";
+ sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==";
+ };
+ };
+ "object-inspect-1.6.0" = {
+ name = "object-inspect";
+ packageName = "object-inspect";
+ version = "1.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz";
+ sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==";
+ };
+ };
+ "object-keys-1.1.1" = {
+ name = "object-keys";
+ packageName = "object-keys";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz";
+ sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
+ };
+ };
+ "object-visit-1.0.1" = {
+ name = "object-visit";
+ packageName = "object-visit";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz";
+ sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb";
+ };
+ };
+ "object.assign-4.1.0" = {
+ name = "object.assign";
+ packageName = "object.assign";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
+ sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
+ };
+ };
+ "object.getownpropertydescriptors-2.0.3" = {
+ name = "object.getownpropertydescriptors";
+ packageName = "object.getownpropertydescriptors";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
+ sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
+ };
+ };
+ "object.pick-1.3.0" = {
+ name = "object.pick";
+ packageName = "object.pick";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz";
+ sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747";
+ };
+ };
+ "obuf-1.1.2" = {
+ name = "obuf";
+ packageName = "obuf";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz";
+ sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==";
+ };
+ };
+ "oidc-token-hash-3.0.2" = {
+ name = "oidc-token-hash";
+ packageName = "oidc-token-hash";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-3.0.2.tgz";
+ sha512 = "dTzp80/y/da+um+i+sOucNqiPpwRL7M/xPwj7pH1TFA2/bqQ+OK2sJahSXbemEoLtPkHcFLyhLhLWZa9yW5+RA==";
+ };
+ };
+ "on-finished-2.3.0" = {
+ name = "on-finished";
+ packageName = "on-finished";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
+ sha1 = "20f1336481b083cd75337992a16971aa2d906947";
+ };
+ };
+ "on-headers-1.0.2" = {
+ name = "on-headers";
+ packageName = "on-headers";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz";
+ sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==";
+ };
+ };
+ "once-1.4.0" = {
+ name = "once";
+ packageName = "once";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+ sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+ };
+ };
+ "onetime-2.0.1" = {
+ name = "onetime";
+ packageName = "onetime";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
+ sha1 = "067428230fd67443b2794b22bba528b6867962d4";
+ };
+ };
+ "only-0.0.2" = {
+ name = "only";
+ packageName = "only";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/only/-/only-0.0.2.tgz";
+ sha1 = "2afde84d03e50b9a8edc444e30610a70295edfb4";
+ };
+ };
+ "opener-1.5.1" = {
+ name = "opener";
+ packageName = "opener";
+ version = "1.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz";
+ sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==";
+ };
+ };
+ "openid-client-2.5.0" = {
+ name = "openid-client";
+ packageName = "openid-client";
+ version = "2.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/openid-client/-/openid-client-2.5.0.tgz";
+ sha512 = "t3hFD7xEoW1U25RyBcRFaL19fGGs6hNVTysq9pgmiltH0IVUPzH/bQV9w24pM5Q7MunnGv2/5XjIru6BQcWdxg==";
+ };
+ };
+ "opn-5.5.0" = {
+ name = "opn";
+ packageName = "opn";
+ version = "5.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz";
+ sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==";
+ };
+ };
+ "optimist-0.6.1" = {
+ name = "optimist";
+ packageName = "optimist";
+ version = "0.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
+ sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
+ };
+ };
+ "optionator-0.8.2" = {
+ name = "optionator";
+ packageName = "optionator";
+ version = "0.8.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz";
+ sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
+ };
+ };
+ "ora-3.4.0" = {
+ name = "ora";
+ packageName = "ora";
+ version = "3.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz";
+ sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==";
+ };
+ };
+ "original-1.0.2" = {
+ name = "original";
+ packageName = "original";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz";
+ sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==";
+ };
+ };
+ "os-browserify-0.3.0" = {
+ name = "os-browserify";
+ packageName = "os-browserify";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz";
+ sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27";
+ };
+ };
+ "os-homedir-1.0.2" = {
+ name = "os-homedir";
+ packageName = "os-homedir";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+ sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+ };
+ };
+ "os-locale-3.1.0" = {
+ name = "os-locale";
+ packageName = "os-locale";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz";
+ sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==";
+ };
+ };
+ "os-tmpdir-1.0.2" = {
+ name = "os-tmpdir";
+ packageName = "os-tmpdir";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+ sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+ };
+ };
+ "osenv-0.1.5" = {
+ name = "osenv";
+ packageName = "osenv";
+ version = "0.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
+ sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
+ };
+ };
+ "p-any-1.1.0" = {
+ name = "p-any";
+ packageName = "p-any";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-any/-/p-any-1.1.0.tgz";
+ sha512 = "Ef0tVa4CZ5pTAmKn+Cg3w8ABBXh+hHO1aV8281dKOoUHfX+3tjG2EaFcC+aZyagg9b4EYGsHEjz21DnEE8Og2g==";
+ };
+ };
+ "p-cancelable-0.4.1" = {
+ name = "p-cancelable";
+ packageName = "p-cancelable";
+ version = "0.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz";
+ sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==";
+ };
+ };
+ "p-defer-1.0.0" = {
+ name = "p-defer";
+ packageName = "p-defer";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz";
+ sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
+ };
+ };
+ "p-each-series-1.0.0" = {
+ name = "p-each-series";
+ packageName = "p-each-series";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz";
+ sha1 = "930f3d12dd1f50e7434457a22cd6f04ac6ad7f71";
+ };
+ };
+ "p-finally-1.0.0" = {
+ name = "p-finally";
+ packageName = "p-finally";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
+ sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
+ };
+ };
+ "p-is-promise-1.1.0" = {
+ name = "p-is-promise";
+ packageName = "p-is-promise";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz";
+ sha1 = "9c9456989e9f6588017b0434d56097675c3da05e";
+ };
+ };
+ "p-is-promise-2.1.0" = {
+ name = "p-is-promise";
+ packageName = "p-is-promise";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz";
+ sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==";
+ };
+ };
+ "p-limit-1.3.0" = {
+ name = "p-limit";
+ packageName = "p-limit";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
+ sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
+ };
+ };
+ "p-limit-2.2.1" = {
+ name = "p-limit";
+ packageName = "p-limit";
+ version = "2.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz";
+ sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==";
+ };
+ };
+ "p-locate-2.0.0" = {
+ name = "p-locate";
+ packageName = "p-locate";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
+ sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43";
+ };
+ };
+ "p-locate-3.0.0" = {
+ name = "p-locate";
+ packageName = "p-locate";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
+ sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
+ };
+ };
+ "p-map-2.1.0" = {
+ name = "p-map";
+ packageName = "p-map";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz";
+ sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==";
+ };
+ };
+ "p-reduce-1.0.0" = {
+ name = "p-reduce";
+ packageName = "p-reduce";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz";
+ sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa";
+ };
+ };
+ "p-retry-3.0.1" = {
+ name = "p-retry";
+ packageName = "p-retry";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz";
+ sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==";
+ };
+ };
+ "p-some-2.0.1" = {
+ name = "p-some";
+ packageName = "p-some";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-some/-/p-some-2.0.1.tgz";
+ sha1 = "65d87c8b154edbcf5221d167778b6d2e150f6f06";
+ };
+ };
+ "p-timeout-2.0.1" = {
+ name = "p-timeout";
+ packageName = "p-timeout";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz";
+ sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==";
+ };
+ };
+ "p-try-1.0.0" = {
+ name = "p-try";
+ packageName = "p-try";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz";
+ sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
+ };
+ };
+ "p-try-2.2.0" = {
+ name = "p-try";
+ packageName = "p-try";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
+ sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
+ };
+ };
+ "pako-1.0.10" = {
+ name = "pako";
+ packageName = "pako";
+ version = "1.0.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz";
+ sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==";
+ };
+ };
+ "parallel-transform-1.2.0" = {
+ name = "parallel-transform";
+ packageName = "parallel-transform";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz";
+ sha512 = "P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==";
+ };
+ };
+ "parse-asn1-5.1.5" = {
+ name = "parse-asn1";
+ packageName = "parse-asn1";
+ version = "5.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz";
+ sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==";
+ };
+ };
+ "parse-json-4.0.0" = {
+ name = "parse-json";
+ packageName = "parse-json";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz";
+ sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
+ };
+ };
+ "parse-passwd-1.0.0" = {
+ name = "parse-passwd";
+ packageName = "parse-passwd";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz";
+ sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
+ };
+ };
+ "parse5-4.0.0" = {
+ name = "parse5";
+ packageName = "parse5";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz";
+ sha512 = "VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==";
+ };
+ };
+ "parseurl-1.3.3" = {
+ name = "parseurl";
+ packageName = "parseurl";
+ version = "1.3.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz";
+ sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==";
+ };
+ };
+ "pascalcase-0.1.1" = {
+ name = "pascalcase";
+ packageName = "pascalcase";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz";
+ sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14";
+ };
+ };
+ "path-browserify-0.0.1" = {
+ name = "path-browserify";
+ packageName = "path-browserify";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz";
+ sha512 = "BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==";
+ };
+ };
+ "path-dirname-1.0.2" = {
+ name = "path-dirname";
+ packageName = "path-dirname";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz";
+ sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0";
+ };
+ };
+ "path-exists-3.0.0" = {
+ name = "path-exists";
+ packageName = "path-exists";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz";
+ sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
+ };
+ };
+ "path-is-absolute-1.0.1" = {
+ name = "path-is-absolute";
+ packageName = "path-is-absolute";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+ };
+ };
+ "path-is-inside-1.0.2" = {
+ name = "path-is-inside";
+ packageName = "path-is-inside";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz";
+ sha1 = "365417dede44430d1c11af61027facf074bdfc53";
+ };
+ };
+ "path-key-2.0.1" = {
+ name = "path-key";
+ packageName = "path-key";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
+ sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
+ };
+ };
+ "path-parse-1.0.6" = {
+ name = "path-parse";
+ packageName = "path-parse";
+ version = "1.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
+ sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
+ };
+ };
+ "path-to-regexp-0.1.7" = {
+ name = "path-to-regexp";
+ packageName = "path-to-regexp";
+ version = "0.1.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz";
+ sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
+ };
+ };
+ "path-to-regexp-1.7.0" = {
+ name = "path-to-regexp";
+ packageName = "path-to-regexp";
+ version = "1.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz";
+ sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
+ };
+ };
+ "path-type-3.0.0" = {
+ name = "path-type";
+ packageName = "path-type";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz";
+ sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==";
+ };
+ };
+ "pbkdf2-3.0.17" = {
+ name = "pbkdf2";
+ packageName = "pbkdf2";
+ version = "3.0.17";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz";
+ sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==";
+ };
+ };
+ "performance-now-2.1.0" = {
+ name = "performance-now";
+ packageName = "performance-now";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz";
+ sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
+ };
+ };
+ "pify-2.3.0" = {
+ name = "pify";
+ packageName = "pify";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
+ sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
+ };
+ };
+ "pify-3.0.0" = {
+ name = "pify";
+ packageName = "pify";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz";
+ sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176";
+ };
+ };
+ "pify-4.0.1" = {
+ name = "pify";
+ packageName = "pify";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz";
+ sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==";
+ };
+ };
+ "pinkie-2.0.4" = {
+ name = "pinkie";
+ packageName = "pinkie";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+ sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+ };
+ };
+ "pinkie-promise-2.0.1" = {
+ name = "pinkie-promise";
+ packageName = "pinkie-promise";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz";
+ sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
+ };
+ };
+ "pirates-4.0.1" = {
+ name = "pirates";
+ packageName = "pirates";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz";
+ sha512 = "WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==";
+ };
+ };
+ "pkg-dir-2.0.0" = {
+ name = "pkg-dir";
+ packageName = "pkg-dir";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz";
+ sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b";
+ };
+ };
+ "pkg-dir-3.0.0" = {
+ name = "pkg-dir";
+ packageName = "pkg-dir";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz";
+ sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==";
+ };
+ };
+ "pn-1.1.0" = {
+ name = "pn";
+ packageName = "pn";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz";
+ sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==";
+ };
+ };
+ "portfinder-1.0.24" = {
+ name = "portfinder";
+ packageName = "portfinder";
+ version = "1.0.24";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz";
+ sha512 = "ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==";
+ };
+ };
+ "posix-character-classes-0.1.1" = {
+ name = "posix-character-classes";
+ packageName = "posix-character-classes";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz";
+ sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab";
+ };
+ };
+ "prelude-ls-1.1.2" = {
+ name = "prelude-ls";
+ packageName = "prelude-ls";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
+ sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
+ };
+ };
+ "prepend-http-2.0.0" = {
+ name = "prepend-http";
+ packageName = "prepend-http";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz";
+ sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897";
+ };
+ };
+ "prettier-1.18.2" = {
+ name = "prettier";
+ packageName = "prettier";
+ version = "1.18.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz";
+ sha512 = "OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==";
+ };
+ };
+ "pretty-2.0.0" = {
+ name = "pretty";
+ packageName = "pretty";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz";
+ sha1 = "adbc7960b7bbfe289a557dc5f737619a220d06a5";
+ };
+ };
+ "pretty-format-24.9.0" = {
+ name = "pretty-format";
+ packageName = "pretty-format";
+ version = "24.9.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz";
+ sha512 = "00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==";
+ };
+ };
+ "private-0.1.8" = {
+ name = "private";
+ packageName = "private";
+ version = "0.1.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz";
+ sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==";
+ };
+ };
+ "process-0.11.10" = {
+ name = "process";
+ packageName = "process";
+ version = "0.11.10";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz";
+ sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182";
+ };
+ };
+ "process-nextick-args-2.0.1" = {
+ name = "process-nextick-args";
+ packageName = "process-nextick-args";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
+ sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
+ };
+ };
+ "promise-7.3.1" = {
+ name = "promise";
+ packageName = "promise";
+ version = "7.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz";
+ sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
+ };
+ };
+ "promise-inflight-1.0.1" = {
+ name = "promise-inflight";
+ packageName = "promise-inflight";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz";
+ sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
+ };
+ };
+ "prompts-2.2.1" = {
+ name = "prompts";
+ packageName = "prompts";
+ version = "2.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz";
+ sha512 = "VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==";
+ };
+ };
+ "proto-list-1.2.4" = {
+ name = "proto-list";
+ packageName = "proto-list";
+ version = "1.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz";
+ sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
+ };
+ };
+ "proxy-addr-2.0.5" = {
+ name = "proxy-addr";
+ packageName = "proxy-addr";
+ version = "2.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz";
+ sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
+ };
+ };
+ "prr-1.0.1" = {
+ name = "prr";
+ packageName = "prr";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz";
+ sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476";
+ };
+ };
+ "pseudomap-1.0.2" = {
+ name = "pseudomap";
+ packageName = "pseudomap";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
+ sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
+ };
+ };
+ "psl-1.4.0" = {
+ name = "psl";
+ packageName = "psl";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz";
+ sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==";
+ };
+ };
+ "public-encrypt-4.0.3" = {
+ name = "public-encrypt";
+ packageName = "public-encrypt";
+ version = "4.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz";
+ sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==";
+ };
+ };
+ "pug-2.0.4" = {
+ name = "pug";
+ packageName = "pug";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pug/-/pug-2.0.4.tgz";
+ sha512 = "XhoaDlvi6NIzL49nu094R2NA6P37ijtgMDuWE+ofekDChvfKnzFal60bhSdiy8y2PBO6fmz3oMEIcfpBVRUdvw==";
+ };
+ };
+ "pug-attrs-2.0.4" = {
+ name = "pug-attrs";
+ packageName = "pug-attrs";
+ version = "2.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.4.tgz";
+ sha512 = "TaZ4Z2TWUPDJcV3wjU3RtUXMrd3kM4Wzjbe3EWnSsZPsJ3LDI0F3yCnf2/W7PPFF+edUFQ0HgDL1IoxSz5K8EQ==";
+ };
+ };
+ "pug-code-gen-2.0.2" = {
+ name = "pug-code-gen";
+ packageName = "pug-code-gen";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.2.tgz";
+ sha512 = "kROFWv/AHx/9CRgoGJeRSm+4mLWchbgpRzTEn8XCiwwOy6Vh0gAClS8Vh5TEJ9DBjaP8wCjS3J6HKsEsYdvaCw==";
+ };
+ };
+ "pug-error-1.3.3" = {
+ name = "pug-error";
+ packageName = "pug-error";
+ version = "1.3.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pug-error/-/pug-error-1.3.3.tgz";
+ sha512 = "qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ==";
+ };
+ };
+ "pug-filters-3.1.1" = {
+ name = "pug-filters";
+ packageName = "pug-filters";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pug-filters/-/pug-filters-3.1.1.tgz";
+ sha512 = "lFfjNyGEyVWC4BwX0WyvkoWLapI5xHSM3xZJFUhx4JM4XyyRdO8Aucc6pCygnqV2uSgJFaJWW3Ft1wCWSoQkQg==";
+ };
+ };
+ "pug-lexer-4.1.0" = {
+ name = "pug-lexer";
+ packageName = "pug-lexer";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-4.1.0.tgz";
+ sha512 = "i55yzEBtjm0mlplW4LoANq7k3S8gDdfC6+LThGEvsK4FuobcKfDAwt6V4jKPH9RtiE3a2Akfg5UpafZ1OksaPA==";
+ };
+ };
+ "pug-linker-3.0.6" = {
+ name = "pug-linker";
+ packageName = "pug-linker";
+ version = "3.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.6.tgz";
+ sha512 = "bagfuHttfQOpANGy1Y6NJ+0mNb7dD2MswFG2ZKj22s8g0wVsojpRlqveEQHmgXXcfROB2RT6oqbPYr9EN2ZWzg==";
+ };
+ };
+ "pug-load-2.0.12" = {
+ name = "pug-load";
+ packageName = "pug-load";
+ version = "2.0.12";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pug-load/-/pug-load-2.0.12.tgz";
+ sha512 = "UqpgGpyyXRYgJs/X60sE6SIf8UBsmcHYKNaOccyVLEuT6OPBIMo6xMPhoJnqtB3Q3BbO4Z3Bjz5qDsUWh4rXsg==";
+ };
+ };
+ "pug-parser-5.0.1" = {
+ name = "pug-parser";
+ packageName = "pug-parser";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pug-parser/-/pug-parser-5.0.1.tgz";
+ sha512 = "nGHqK+w07p5/PsPIyzkTQfzlYfuqoiGjaoqHv1LjOv2ZLXmGX1O+4Vcvps+P4LhxZ3drYSljjq4b+Naid126wA==";
+ };
+ };
+ "pug-runtime-2.0.5" = {
+ name = "pug-runtime";
+ packageName = "pug-runtime";
+ version = "2.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.5.tgz";
+ sha512 = "P+rXKn9un4fQY77wtpcuFyvFaBww7/91f3jHa154qU26qFAnOe6SW1CbIDcxiG5lLK9HazYrMCCuDvNgDQNptw==";
+ };
+ };
+ "pug-strip-comments-1.0.4" = {
+ name = "pug-strip-comments";
+ packageName = "pug-strip-comments";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.4.tgz";
+ sha512 = "i5j/9CS4yFhSxHp5iKPHwigaig/VV9g+FgReLJWWHEHbvKsbqL0oP/K5ubuLco6Wu3Kan5p7u7qk8A4oLLh6vw==";
+ };
+ };
+ "pug-walk-1.1.8" = {
+ name = "pug-walk";
+ packageName = "pug-walk";
+ version = "1.1.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.8.tgz";
+ sha512 = "GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA==";
+ };
+ };
+ "pump-2.0.1" = {
+ name = "pump";
+ packageName = "pump";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz";
+ sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==";
+ };
+ };
+ "pump-3.0.0" = {
+ name = "pump";
+ packageName = "pump";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
+ sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
+ };
+ };
+ "pumpify-1.5.1" = {
+ name = "pumpify";
+ packageName = "pumpify";
+ version = "1.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz";
+ sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==";
+ };
+ };
+ "punycode-1.3.2" = {
+ name = "punycode";
+ packageName = "punycode";
+ version = "1.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
+ sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
+ };
+ };
+ "punycode-1.4.1" = {
+ name = "punycode";
+ packageName = "punycode";
+ version = "1.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+ sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+ };
+ };
+ "punycode-2.1.1" = {
+ name = "punycode";
+ packageName = "punycode";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
+ sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+ };
+ };
+ "qs-6.5.2" = {
+ name = "qs";
+ packageName = "qs";
+ version = "6.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
+ sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==";
+ };
+ };
+ "qs-6.7.0" = {
+ name = "qs";
+ packageName = "qs";
+ version = "6.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz";
+ sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
+ };
+ };
+ "query-string-5.1.1" = {
+ name = "query-string";
+ packageName = "query-string";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz";
+ sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==";
+ };
+ };
+ "querystring-0.2.0" = {
+ name = "querystring";
+ packageName = "querystring";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz";
+ sha1 = "b209849203bb25df820da756e747005878521620";
+ };
+ };
+ "querystring-es3-0.2.1" = {
+ name = "querystring-es3";
+ packageName = "querystring-es3";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz";
+ sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
+ };
+ };
+ "querystringify-2.1.1" = {
+ name = "querystringify";
+ packageName = "querystringify";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz";
+ sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==";
+ };
+ };
+ "randombytes-2.1.0" = {
+ name = "randombytes";
+ packageName = "randombytes";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz";
+ sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==";
+ };
+ };
+ "randomfill-1.0.4" = {
+ name = "randomfill";
+ packageName = "randomfill";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz";
+ sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==";
+ };
+ };
+ "range-parser-1.2.1" = {
+ name = "range-parser";
+ packageName = "range-parser";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz";
+ sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";
+ };
+ };
+ "raw-body-2.4.0" = {
+ name = "raw-body";
+ packageName = "raw-body";
+ version = "2.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz";
+ sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==";
+ };
+ };
+ "raw-body-2.4.1" = {
+ name = "raw-body";
+ packageName = "raw-body";
+ version = "2.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz";
+ sha512 = "9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==";
+ };
+ };
+ "react-is-16.10.2" = {
+ name = "react-is";
+ packageName = "react-is";
+ version = "16.10.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/react-is/-/react-is-16.10.2.tgz";
+ sha512 = "INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA==";
+ };
+ };
+ "read-pkg-3.0.0" = {
+ name = "read-pkg";
+ packageName = "read-pkg";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz";
+ sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389";
+ };
+ };
+ "read-pkg-up-4.0.0" = {
+ name = "read-pkg-up";
+ packageName = "read-pkg-up";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz";
+ sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==";
+ };
+ };
+ "readable-stream-2.3.6" = {
+ name = "readable-stream";
+ packageName = "readable-stream";
+ version = "2.3.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
+ sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+ };
+ };
+ "readable-stream-3.4.0" = {
+ name = "readable-stream";
+ packageName = "readable-stream";
+ version = "3.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz";
+ sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==";
+ };
+ };
+ "readdirp-2.2.1" = {
+ name = "readdirp";
+ packageName = "readdirp";
+ version = "2.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz";
+ sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==";
+ };
+ };
+ "realpath-native-1.1.0" = {
+ name = "realpath-native";
+ packageName = "realpath-native";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz";
+ sha512 = "wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==";
+ };
+ };
+ "rechoir-0.6.2" = {
+ name = "rechoir";
+ packageName = "rechoir";
+ version = "0.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz";
+ sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
+ };
+ };
+ "regenerate-1.4.0" = {
+ name = "regenerate";
+ packageName = "regenerate";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz";
+ sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==";
+ };
+ };
+ "regenerator-runtime-0.11.1" = {
+ name = "regenerator-runtime";
+ packageName = "regenerator-runtime";
+ version = "0.11.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz";
+ sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
+ };
+ };
+ "regenerator-transform-0.10.1" = {
+ name = "regenerator-transform";
+ packageName = "regenerator-transform";
+ version = "0.10.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz";
+ sha512 = "PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==";
+ };
+ };
+ "regex-not-1.0.2" = {
+ name = "regex-not";
+ packageName = "regex-not";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz";
+ sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==";
+ };
+ };
+ "regexpu-core-2.0.0" = {
+ name = "regexpu-core";
+ packageName = "regexpu-core";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz";
+ sha1 = "49d038837b8dcf8bfa5b9a42139938e6ea2ae240";
+ };
+ };
+ "regjsgen-0.2.0" = {
+ name = "regjsgen";
+ packageName = "regjsgen";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz";
+ sha1 = "6c016adeac554f75823fe37ac05b92d5a4edb1f7";
+ };
+ };
+ "regjsparser-0.1.5" = {
+ name = "regjsparser";
+ packageName = "regjsparser";
+ version = "0.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz";
+ sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c";
+ };
+ };
+ "remove-trailing-separator-1.1.0" = {
+ name = "remove-trailing-separator";
+ packageName = "remove-trailing-separator";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz";
+ sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
+ };
+ };
+ "repeat-element-1.1.3" = {
+ name = "repeat-element";
+ packageName = "repeat-element";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz";
+ sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==";
+ };
+ };
+ "repeat-string-1.6.1" = {
+ name = "repeat-string";
+ packageName = "repeat-string";
+ version = "1.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
+ sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+ };
+ };
+ "repeating-2.0.1" = {
+ name = "repeating";
+ packageName = "repeating";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz";
+ sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
+ };
+ };
+ "request-2.88.0" = {
+ name = "request";
+ packageName = "request";
+ version = "2.88.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
+ sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
+ };
+ };
+ "request-promise-core-1.1.2" = {
+ name = "request-promise-core";
+ packageName = "request-promise-core";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz";
+ sha512 = "UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==";
+ };
+ };
+ "request-promise-native-1.0.7" = {
+ name = "request-promise-native";
+ packageName = "request-promise-native";
+ version = "1.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz";
+ sha512 = "rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==";
+ };
+ };
+ "require-directory-2.1.1" = {
+ name = "require-directory";
+ packageName = "require-directory";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz";
+ sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
+ };
+ };
+ "require-main-filename-1.0.1" = {
+ name = "require-main-filename";
+ packageName = "require-main-filename";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
+ sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
+ };
+ };
+ "require-main-filename-2.0.0" = {
+ name = "require-main-filename";
+ packageName = "require-main-filename";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz";
+ sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
+ };
+ };
+ "requires-port-1.0.0" = {
+ name = "requires-port";
+ packageName = "requires-port";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz";
+ sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
+ };
+ };
+ "resolve-1.1.7" = {
+ name = "resolve";
+ packageName = "resolve";
+ version = "1.1.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+ sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
+ };
+ };
+ "resolve-1.12.0" = {
+ name = "resolve";
+ packageName = "resolve";
+ version = "1.12.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz";
+ sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==";
+ };
+ };
+ "resolve-cwd-2.0.0" = {
+ name = "resolve-cwd";
+ packageName = "resolve-cwd";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz";
+ sha1 = "00a9f7387556e27038eae232caa372a6a59b665a";
+ };
+ };
+ "resolve-dir-1.0.1" = {
+ name = "resolve-dir";
+ packageName = "resolve-dir";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz";
+ sha1 = "79a40644c362be82f26effe739c9bb5382046f43";
+ };
+ };
+ "resolve-from-3.0.0" = {
+ name = "resolve-from";
+ packageName = "resolve-from";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz";
+ sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748";
+ };
+ };
+ "resolve-path-1.4.0" = {
+ name = "resolve-path";
+ packageName = "resolve-path";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve-path/-/resolve-path-1.4.0.tgz";
+ sha1 = "c4bda9f5efb2fce65247873ab36bb4d834fe16f7";
+ };
+ };
+ "resolve-url-0.2.1" = {
+ name = "resolve-url";
+ packageName = "resolve-url";
+ version = "0.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz";
+ sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a";
+ };
+ };
+ "responselike-1.0.2" = {
+ name = "responselike";
+ packageName = "responselike";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz";
+ sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7";
+ };
+ };
+ "restore-cursor-2.0.0" = {
+ name = "restore-cursor";
+ packageName = "restore-cursor";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
+ sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
+ };
+ };
+ "ret-0.1.15" = {
+ name = "ret";
+ packageName = "ret";
+ version = "0.1.15";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz";
+ sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==";
+ };
+ };
+ "retry-0.12.0" = {
+ name = "retry";
+ packageName = "retry";
+ version = "0.12.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz";
+ sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b";
+ };
+ };
+ "right-align-0.1.3" = {
+ name = "right-align";
+ packageName = "right-align";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+ sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+ };
+ };
+ "rimraf-2.7.1" = {
+ name = "rimraf";
+ packageName = "rimraf";
+ version = "2.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
+ sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
+ };
+ };
+ "ripemd160-2.0.2" = {
+ name = "ripemd160";
+ packageName = "ripemd160";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz";
+ sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==";
+ };
+ };
+ "rsvp-4.8.5" = {
+ name = "rsvp";
+ packageName = "rsvp";
+ version = "4.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz";
+ sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==";
+ };
+ };
+ "run-queue-1.0.3" = {
+ name = "run-queue";
+ packageName = "run-queue";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz";
+ sha1 = "e848396f057d223f24386924618e25694161ec47";
+ };
+ };
+ "rxjs-6.5.3" = {
+ name = "rxjs";
+ packageName = "rxjs";
+ version = "6.5.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz";
+ sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==";
+ };
+ };
+ "safe-buffer-5.1.2" = {
+ name = "safe-buffer";
+ packageName = "safe-buffer";
+ version = "5.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+ sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+ };
+ };
+ "safe-buffer-5.2.0" = {
+ name = "safe-buffer";
+ packageName = "safe-buffer";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz";
+ sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==";
+ };
+ };
+ "safe-regex-1.1.0" = {
+ name = "safe-regex";
+ packageName = "safe-regex";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz";
+ sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e";
+ };
+ };
+ "safer-buffer-2.1.2" = {
+ name = "safer-buffer";
+ packageName = "safer-buffer";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
+ sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+ };
+ };
+ "sane-4.1.0" = {
+ name = "sane";
+ packageName = "sane";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz";
+ sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==";
+ };
+ };
+ "sax-1.2.4" = {
+ name = "sax";
+ packageName = "sax";
+ version = "1.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
+ sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
+ };
+ };
+ "schema-utils-1.0.0" = {
+ name = "schema-utils";
+ packageName = "schema-utils";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz";
+ sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==";
+ };
+ };
+ "select-hose-2.0.0" = {
+ name = "select-hose";
+ packageName = "select-hose";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz";
+ sha1 = "625d8658f865af43ec962bfc376a37359a4994ca";
+ };
+ };
+ "selfsigned-1.10.7" = {
+ name = "selfsigned";
+ packageName = "selfsigned";
+ version = "1.10.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz";
+ sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==";
+ };
+ };
+ "semver-5.7.1" = {
+ name = "semver";
+ packageName = "semver";
+ version = "5.7.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+ sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
+ };
+ };
+ "semver-6.3.0" = {
+ name = "semver";
+ packageName = "semver";
+ version = "6.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz";
+ sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==";
+ };
+ };
+ "send-0.17.1" = {
+ name = "send";
+ packageName = "send";
+ version = "0.17.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz";
+ sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==";
+ };
+ };
+ "serialize-javascript-1.9.1" = {
+ name = "serialize-javascript";
+ packageName = "serialize-javascript";
+ version = "1.9.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz";
+ sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==";
+ };
+ };
+ "serve-index-1.9.1" = {
+ name = "serve-index";
+ packageName = "serve-index";
+ version = "1.9.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz";
+ sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239";
+ };
+ };
+ "serve-static-1.14.1" = {
+ name = "serve-static";
+ packageName = "serve-static";
+ version = "1.14.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz";
+ sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==";
+ };
+ };
+ "set-blocking-2.0.0" = {
+ name = "set-blocking";
+ packageName = "set-blocking";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
+ sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+ };
+ };
+ "set-value-2.0.1" = {
+ name = "set-value";
+ packageName = "set-value";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz";
+ sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==";
+ };
+ };
+ "setimmediate-1.0.5" = {
+ name = "setimmediate";
+ packageName = "setimmediate";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
+ sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
+ };
+ };
+ "setprototypeof-1.1.0" = {
+ name = "setprototypeof";
+ packageName = "setprototypeof";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz";
+ sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==";
+ };
+ };
+ "setprototypeof-1.1.1" = {
+ name = "setprototypeof";
+ packageName = "setprototypeof";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz";
+ sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==";
+ };
+ };
+ "sha.js-2.4.11" = {
+ name = "sha.js";
+ packageName = "sha.js";
+ version = "2.4.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz";
+ sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
+ };
+ };
+ "shebang-command-1.2.0" = {
+ name = "shebang-command";
+ packageName = "shebang-command";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
+ sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
+ };
+ };
+ "shebang-regex-1.0.0" = {
+ name = "shebang-regex";
+ packageName = "shebang-regex";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
+ sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
+ };
+ };
+ "shelljs-0.8.3" = {
+ name = "shelljs";
+ packageName = "shelljs";
+ version = "0.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz";
+ sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==";
+ };
+ };
+ "shellwords-0.1.1" = {
+ name = "shellwords";
+ packageName = "shellwords";
+ version = "0.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz";
+ sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==";
+ };
+ };
+ "sigmund-1.0.1" = {
+ name = "sigmund";
+ packageName = "sigmund";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
+ sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
+ };
+ };
+ "signal-exit-3.0.2" = {
+ name = "signal-exit";
+ packageName = "signal-exit";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+ sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+ };
+ };
+ "simple-git-1.96.0" = {
+ name = "simple-git";
+ packageName = "simple-git";
+ version = "1.96.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/simple-git/-/simple-git-1.96.0.tgz";
+ sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ==";
+ };
+ };
+ "sisteransi-1.0.3" = {
+ name = "sisteransi";
+ packageName = "sisteransi";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz";
+ sha512 = "SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==";
+ };
+ };
+ "slash-1.0.0" = {
+ name = "slash";
+ packageName = "slash";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";
+ sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55";
+ };
+ };
+ "slash-2.0.0" = {
+ name = "slash";
+ packageName = "slash";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz";
+ sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==";
+ };
+ };
+ "snapdragon-0.8.2" = {
+ name = "snapdragon";
+ packageName = "snapdragon";
+ version = "0.8.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz";
+ sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==";
+ };
+ };
+ "snapdragon-node-2.1.1" = {
+ name = "snapdragon-node";
+ packageName = "snapdragon-node";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz";
+ sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==";
+ };
+ };
+ "snapdragon-util-3.0.1" = {
+ name = "snapdragon-util";
+ packageName = "snapdragon-util";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz";
+ sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==";
+ };
+ };
+ "sockjs-0.3.19" = {
+ name = "sockjs";
+ packageName = "sockjs";
+ version = "0.3.19";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz";
+ sha512 = "V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==";
+ };
+ };
+ "sockjs-client-1.4.0" = {
+ name = "sockjs-client";
+ packageName = "sockjs-client";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz";
+ sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==";
+ };
+ };
+ "sort-keys-2.0.0" = {
+ name = "sort-keys";
+ packageName = "sort-keys";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz";
+ sha1 = "658535584861ec97d730d6cf41822e1f56684128";
+ };
+ };
+ "source-list-map-2.0.1" = {
+ name = "source-list-map";
+ packageName = "source-list-map";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz";
+ sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==";
+ };
+ };
+ "source-map-0.5.7" = {
+ name = "source-map";
+ packageName = "source-map";
+ version = "0.5.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz";
+ sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
+ };
+ };
+ "source-map-0.6.1" = {
+ name = "source-map";
+ packageName = "source-map";
+ version = "0.6.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz";
+ sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
+ };
+ };
+ "source-map-resolve-0.5.2" = {
+ name = "source-map-resolve";
+ packageName = "source-map-resolve";
+ version = "0.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
+ sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==";
+ };
+ };
+ "source-map-support-0.4.18" = {
+ name = "source-map-support";
+ packageName = "source-map-support";
+ version = "0.4.18";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz";
+ sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==";
+ };
+ };
+ "source-map-support-0.5.13" = {
+ name = "source-map-support";
+ packageName = "source-map-support";
+ version = "0.5.13";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz";
+ sha512 = "SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==";
+ };
+ };
+ "source-map-url-0.4.0" = {
+ name = "source-map-url";
+ packageName = "source-map-url";
+ version = "0.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz";
+ sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
+ };
+ };
+ "spdx-correct-3.1.0" = {
+ name = "spdx-correct";
+ packageName = "spdx-correct";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";
+ sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==";
+ };
+ };
+ "spdx-exceptions-2.2.0" = {
+ name = "spdx-exceptions";
+ packageName = "spdx-exceptions";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
+ sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==";
+ };
+ };
+ "spdx-expression-parse-3.0.0" = {
+ name = "spdx-expression-parse";
+ packageName = "spdx-expression-parse";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz";
+ sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
+ };
+ };
+ "spdx-license-ids-3.0.5" = {
+ name = "spdx-license-ids";
+ packageName = "spdx-license-ids";
+ version = "3.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
+ sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==";
+ };
+ };
+ "spdy-4.0.1" = {
+ name = "spdy";
+ packageName = "spdy";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz";
+ sha512 = "HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==";
+ };
+ };
+ "spdy-transport-3.0.0" = {
+ name = "spdy-transport";
+ packageName = "spdy-transport";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz";
+ sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==";
+ };
+ };
+ "split-string-3.1.0" = {
+ name = "split-string";
+ packageName = "split-string";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz";
+ sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==";
+ };
+ };
+ "sprintf-js-1.0.3" = {
+ name = "sprintf-js";
+ packageName = "sprintf-js";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
+ sha1 = "04e6926f662895354f3dd015203633b857297e2c";
+ };
+ };
+ "sshpk-1.16.1" = {
+ name = "sshpk";
+ packageName = "sshpk";
+ version = "1.16.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
+ sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
+ };
+ };
+ "ssri-5.3.0" = {
+ name = "ssri";
+ packageName = "ssri";
+ version = "5.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz";
+ sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==";
+ };
+ };
+ "ssri-6.0.1" = {
+ name = "ssri";
+ packageName = "ssri";
+ version = "6.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz";
+ sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==";
+ };
+ };
+ "stack-utils-1.0.2" = {
+ name = "stack-utils";
+ packageName = "stack-utils";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz";
+ sha512 = "MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==";
+ };
+ };
+ "static-extend-0.1.2" = {
+ name = "static-extend";
+ packageName = "static-extend";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz";
+ sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6";
+ };
+ };
+ "statuses-1.5.0" = {
+ name = "statuses";
+ packageName = "statuses";
+ version = "1.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz";
+ sha1 = "161c7dac177659fd9811f43771fa99381478628c";
+ };
+ };
+ "stealthy-require-1.1.1" = {
+ name = "stealthy-require";
+ packageName = "stealthy-require";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz";
+ sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b";
+ };
+ };
+ "stream-browserify-2.0.2" = {
+ name = "stream-browserify";
+ packageName = "stream-browserify";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz";
+ sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==";
+ };
+ };
+ "stream-each-1.2.3" = {
+ name = "stream-each";
+ packageName = "stream-each";
+ version = "1.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz";
+ sha512 = "vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==";
+ };
+ };
+ "stream-http-2.8.3" = {
+ name = "stream-http";
+ packageName = "stream-http";
+ version = "2.8.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz";
+ sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==";
+ };
+ };
+ "stream-shift-1.0.0" = {
+ name = "stream-shift";
+ packageName = "stream-shift";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz";
+ sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
+ };
+ };
+ "strict-uri-encode-1.1.0" = {
+ name = "strict-uri-encode";
+ packageName = "strict-uri-encode";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
+ sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
+ };
+ };
+ "string-length-2.0.0" = {
+ name = "string-length";
+ packageName = "string-length";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz";
+ sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed";
+ };
+ };
+ "string-width-1.0.2" = {
+ name = "string-width";
+ packageName = "string-width";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
+ sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+ };
+ };
+ "string-width-2.1.1" = {
+ name = "string-width";
+ packageName = "string-width";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
+ sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
+ };
+ };
+ "string-width-3.1.0" = {
+ name = "string-width";
+ packageName = "string-width";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
+ sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
+ };
+ };
+ "string.prototype.trimleft-2.1.0" = {
+ name = "string.prototype.trimleft";
+ packageName = "string.prototype.trimleft";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
+ sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==";
+ };
+ };
+ "string.prototype.trimright-2.1.0" = {
+ name = "string.prototype.trimright";
+ packageName = "string.prototype.trimright";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
+ sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==";
+ };
+ };
+ "string_decoder-1.1.1" = {
+ name = "string_decoder";
+ packageName = "string_decoder";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+ sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+ };
+ };
+ "strip-ansi-3.0.1" = {
+ name = "strip-ansi";
+ packageName = "strip-ansi";
+ version = "3.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+ sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+ };
+ };
+ "strip-ansi-4.0.0" = {
+ name = "strip-ansi";
+ packageName = "strip-ansi";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
+ sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
+ };
+ };
+ "strip-ansi-5.2.0" = {
+ name = "strip-ansi";
+ packageName = "strip-ansi";
+ version = "5.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz";
+ sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
+ };
+ };
+ "strip-bom-3.0.0" = {
+ name = "strip-bom";
+ packageName = "strip-bom";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz";
+ sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
+ };
+ };
+ "strip-eof-1.0.0" = {
+ name = "strip-eof";
+ packageName = "strip-eof";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
+ sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
+ };
+ };
+ "supports-color-2.0.0" = {
+ name = "supports-color";
+ packageName = "supports-color";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+ sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+ };
+ };
+ "supports-color-5.5.0" = {
+ name = "supports-color";
+ packageName = "supports-color";
+ version = "5.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz";
+ sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==";
+ };
+ };
+ "supports-color-6.1.0" = {
+ name = "supports-color";
+ packageName = "supports-color";
+ version = "6.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz";
+ sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==";
+ };
+ };
+ "symbol-tree-3.2.4" = {
+ name = "symbol-tree";
+ packageName = "symbol-tree";
+ version = "3.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz";
+ sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==";
+ };
+ };
+ "tapable-1.1.3" = {
+ name = "tapable";
+ packageName = "tapable";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz";
+ sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==";
+ };
+ };
+ "terser-4.3.8" = {
+ name = "terser";
+ packageName = "terser";
+ version = "4.3.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/terser/-/terser-4.3.8.tgz";
+ sha512 = "otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==";
+ };
+ };
+ "terser-webpack-plugin-1.4.1" = {
+ name = "terser-webpack-plugin";
+ packageName = "terser-webpack-plugin";
+ version = "1.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz";
+ sha512 = "ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==";
+ };
+ };
+ "test-exclude-5.2.3" = {
+ name = "test-exclude";
+ packageName = "test-exclude";
+ version = "5.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz";
+ sha512 = "M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==";
+ };
+ };
+ "thenify-3.3.0" = {
+ name = "thenify";
+ packageName = "thenify";
+ version = "3.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz";
+ sha1 = "e69e38a1babe969b0108207978b9f62b88604839";
+ };
+ };
+ "thenify-all-1.6.0" = {
+ name = "thenify-all";
+ packageName = "thenify-all";
+ version = "1.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz";
+ sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726";
+ };
+ };
+ "throat-4.1.0" = {
+ name = "throat";
+ packageName = "throat";
+ version = "4.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz";
+ sha1 = "89037cbc92c56ab18926e6ba4cbb200e15672a6a";
+ };
+ };
+ "through2-2.0.5" = {
+ name = "through2";
+ packageName = "through2";
+ version = "2.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz";
+ sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==";
+ };
+ };
+ "thunky-1.0.3" = {
+ name = "thunky";
+ packageName = "thunky";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz";
+ sha512 = "YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==";
+ };
+ };
+ "timed-out-4.0.1" = {
+ name = "timed-out";
+ packageName = "timed-out";
+ version = "4.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz";
+ sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
+ };
+ };
+ "timers-browserify-2.0.11" = {
+ name = "timers-browserify";
+ packageName = "timers-browserify";
+ version = "2.0.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz";
+ sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==";
+ };
+ };
+ "tmpl-1.0.4" = {
+ name = "tmpl";
+ packageName = "tmpl";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz";
+ sha1 = "23640dd7b42d00433911140820e5cf440e521dd1";
+ };
+ };
+ "to-arraybuffer-1.0.1" = {
+ name = "to-arraybuffer";
+ packageName = "to-arraybuffer";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz";
+ sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
+ };
+ };
+ "to-fast-properties-1.0.3" = {
+ name = "to-fast-properties";
+ packageName = "to-fast-properties";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz";
+ sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47";
+ };
+ };
+ "to-fast-properties-2.0.0" = {
+ name = "to-fast-properties";
+ packageName = "to-fast-properties";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz";
+ sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e";
+ };
+ };
+ "to-object-path-0.3.0" = {
+ name = "to-object-path";
+ packageName = "to-object-path";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz";
+ sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af";
+ };
+ };
+ "to-regex-3.0.2" = {
+ name = "to-regex";
+ packageName = "to-regex";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz";
+ sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==";
+ };
+ };
+ "to-regex-range-2.1.1" = {
+ name = "to-regex-range";
+ packageName = "to-regex-range";
+ version = "2.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz";
+ sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38";
+ };
+ };
+ "toidentifier-1.0.0" = {
+ name = "toidentifier";
+ packageName = "toidentifier";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz";
+ sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==";
+ };
+ };
+ "token-stream-0.0.1" = {
+ name = "token-stream";
+ packageName = "token-stream";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz";
+ sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a";
+ };
+ };
+ "tough-cookie-2.4.3" = {
+ name = "tough-cookie";
+ packageName = "tough-cookie";
+ version = "2.4.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
+ sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
+ };
+ };
+ "tr46-1.0.1" = {
+ name = "tr46";
+ packageName = "tr46";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz";
+ sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09";
+ };
+ };
+ "trim-right-1.0.1" = {
+ name = "trim-right";
+ packageName = "trim-right";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz";
+ sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
+ };
+ };
+ "tryer-1.0.1" = {
+ name = "tryer";
+ packageName = "tryer";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz";
+ sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==";
+ };
+ };
+ "ts-jest-24.1.0" = {
+ name = "ts-jest";
+ packageName = "ts-jest";
+ version = "24.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ts-jest/-/ts-jest-24.1.0.tgz";
+ sha512 = "HEGfrIEAZKfu1pkaxB9au17b1d9b56YZSqz5eCVE8mX68+5reOvlM93xGOzzCREIov9mdH7JBG+s0UyNAqr0tQ==";
+ };
+ };
+ "tslib-1.10.0" = {
+ name = "tslib";
+ packageName = "tslib";
+ version = "1.10.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
+ sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
+ };
+ };
+ "tty-browserify-0.0.0" = {
+ name = "tty-browserify";
+ packageName = "tty-browserify";
+ version = "0.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";
+ sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6";
+ };
+ };
+ "tunnel-agent-0.6.0" = {
+ name = "tunnel-agent";
+ packageName = "tunnel-agent";
+ version = "0.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz";
+ sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
+ };
+ };
+ "tweetnacl-0.14.5" = {
+ name = "tweetnacl";
+ packageName = "tweetnacl";
+ version = "0.14.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz";
+ sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
+ };
+ };
+ "type-1.2.0" = {
+ name = "type";
+ packageName = "type";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz";
+ sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==";
+ };
+ };
+ "type-check-0.3.2" = {
+ name = "type-check";
+ packageName = "type-check";
+ version = "0.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
+ sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
+ };
+ };
+ "type-is-1.6.18" = {
+ name = "type-is";
+ packageName = "type-is";
+ version = "1.6.18";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz";
+ sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
+ };
+ };
+ "typedarray-0.0.6" = {
+ name = "typedarray";
+ packageName = "typedarray";
+ version = "0.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+ sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+ };
+ };
+ "typedarray-to-buffer-3.1.5" = {
+ name = "typedarray-to-buffer";
+ packageName = "typedarray-to-buffer";
+ version = "3.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz";
+ sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
+ };
+ };
+ "typescript-3.6.3" = {
+ name = "typescript";
+ packageName = "typescript";
+ version = "3.6.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz";
+ sha512 = "N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==";
+ };
+ };
+ "typical-4.0.0" = {
+ name = "typical";
+ packageName = "typical";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz";
+ sha512 = "VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==";
+ };
+ };
+ "uglify-js-2.8.29" = {
+ name = "uglify-js";
+ packageName = "uglify-js";
+ version = "2.8.29";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz";
+ sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
+ };
+ };
+ "uglify-js-3.6.0" = {
+ name = "uglify-js";
+ packageName = "uglify-js";
+ version = "3.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz";
+ sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==";
+ };
+ };
+ "uglify-to-browserify-1.0.2" = {
+ name = "uglify-to-browserify";
+ packageName = "uglify-to-browserify";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+ sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+ };
+ };
+ "underscore-1.9.1" = {
+ name = "underscore";
+ packageName = "underscore";
+ version = "1.9.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz";
+ sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==";
+ };
+ };
+ "union-value-1.0.1" = {
+ name = "union-value";
+ packageName = "union-value";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz";
+ sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==";
+ };
+ };
+ "unique-filename-1.1.1" = {
+ name = "unique-filename";
+ packageName = "unique-filename";
+ version = "1.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz";
+ sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==";
+ };
+ };
+ "unique-slug-2.0.2" = {
+ name = "unique-slug";
+ packageName = "unique-slug";
+ version = "2.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz";
+ sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==";
+ };
+ };
+ "unpipe-1.0.0" = {
+ name = "unpipe";
+ packageName = "unpipe";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
+ sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
+ };
+ };
+ "unset-value-1.0.0" = {
+ name = "unset-value";
+ packageName = "unset-value";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz";
+ sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559";
+ };
+ };
+ "upath-1.2.0" = {
+ name = "upath";
+ packageName = "upath";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz";
+ sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==";
+ };
+ };
+ "uri-js-4.2.2" = {
+ name = "uri-js";
+ packageName = "uri-js";
+ version = "4.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
+ sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
+ };
+ };
+ "urijs-1.19.1" = {
+ name = "urijs";
+ packageName = "urijs";
+ version = "1.19.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz";
+ sha512 = "xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==";
+ };
+ };
+ "urix-0.1.0" = {
+ name = "urix";
+ packageName = "urix";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz";
+ sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72";
+ };
+ };
+ "url-0.11.0" = {
+ name = "url";
+ packageName = "url";
+ version = "0.11.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz";
+ sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1";
+ };
+ };
+ "url-parse-1.4.7" = {
+ name = "url-parse";
+ packageName = "url-parse";
+ version = "1.4.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz";
+ sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==";
+ };
+ };
+ "url-parse-lax-3.0.0" = {
+ name = "url-parse-lax";
+ packageName = "url-parse-lax";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz";
+ sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c";
+ };
+ };
+ "url-to-options-1.0.1" = {
+ name = "url-to-options";
+ packageName = "url-to-options";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz";
+ sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9";
+ };
+ };
+ "use-3.1.1" = {
+ name = "use";
+ packageName = "use";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz";
+ sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==";
+ };
+ };
+ "util-0.10.3" = {
+ name = "util";
+ packageName = "util";
+ version = "0.10.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz";
+ sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+ };
+ };
+ "util-0.11.1" = {
+ name = "util";
+ packageName = "util";
+ version = "0.11.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/util/-/util-0.11.1.tgz";
+ sha512 = "HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==";
+ };
+ };
+ "util-deprecate-1.0.2" = {
+ name = "util-deprecate";
+ packageName = "util-deprecate";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+ sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+ };
+ };
+ "util.promisify-1.0.0" = {
+ name = "util.promisify";
+ packageName = "util.promisify";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz";
+ sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==";
+ };
+ };
+ "utils-merge-1.0.1" = {
+ name = "utils-merge";
+ packageName = "utils-merge";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz";
+ sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
+ };
+ };
+ "uuid-3.3.3" = {
+ name = "uuid";
+ packageName = "uuid";
+ version = "3.3.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz";
+ sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
+ };
+ };
+ "v8-compile-cache-2.0.3" = {
+ name = "v8-compile-cache";
+ packageName = "v8-compile-cache";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz";
+ sha512 = "CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==";
+ };
+ };
+ "validate-npm-package-license-3.0.4" = {
+ name = "validate-npm-package-license";
+ packageName = "validate-npm-package-license";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
+ sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
+ };
+ };
+ "vary-1.1.2" = {
+ name = "vary";
+ packageName = "vary";
+ version = "1.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz";
+ sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
+ };
+ };
+ "verror-1.10.0" = {
+ name = "verror";
+ packageName = "verror";
+ version = "1.10.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz";
+ sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
+ };
+ };
+ "vm-browserify-1.1.0" = {
+ name = "vm-browserify";
+ packageName = "vm-browserify";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz";
+ sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==";
+ };
+ };
+ "void-elements-2.0.1" = {
+ name = "void-elements";
+ packageName = "void-elements";
+ version = "2.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz";
+ sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
+ };
+ };
+ "w3c-hr-time-1.0.1" = {
+ name = "w3c-hr-time";
+ packageName = "w3c-hr-time";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz";
+ sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045";
+ };
+ };
+ "walker-1.0.7" = {
+ name = "walker";
+ packageName = "walker";
+ version = "1.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz";
+ sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb";
+ };
+ };
+ "watchpack-1.6.0" = {
+ name = "watchpack";
+ packageName = "watchpack";
+ version = "1.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz";
+ sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==";
+ };
+ };
+ "wbuf-1.7.3" = {
+ name = "wbuf";
+ packageName = "wbuf";
+ version = "1.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz";
+ sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==";
+ };
+ };
+ "wcwidth-1.0.1" = {
+ name = "wcwidth";
+ packageName = "wcwidth";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz";
+ sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8";
+ };
+ };
+ "webidl-conversions-4.0.2" = {
+ name = "webidl-conversions";
+ packageName = "webidl-conversions";
+ version = "4.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz";
+ sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
+ };
+ };
+ "webpack-4.41.0" = {
+ name = "webpack";
+ packageName = "webpack";
+ version = "4.41.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack/-/webpack-4.41.0.tgz";
+ sha512 = "yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g==";
+ };
+ };
+ "webpack-bundle-analyzer-3.5.2" = {
+ name = "webpack-bundle-analyzer";
+ packageName = "webpack-bundle-analyzer";
+ version = "3.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.2.tgz";
+ sha512 = "g9spCNe25QYUVqHRDkwG414GTok2m7pTTP0wr6l0J50Z3YLS04+BGodTqqoVBL7QfU/U/9p/oiI5XFOyfZ7S/A==";
+ };
+ };
+ "webpack-cli-3.3.9" = {
+ name = "webpack-cli";
+ packageName = "webpack-cli";
+ version = "3.3.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz";
+ sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==";
+ };
+ };
+ "webpack-dev-middleware-3.7.2" = {
+ name = "webpack-dev-middleware";
+ packageName = "webpack-dev-middleware";
+ version = "3.7.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz";
+ sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==";
+ };
+ };
+ "webpack-dev-server-3.8.2" = {
+ name = "webpack-dev-server";
+ packageName = "webpack-dev-server";
+ version = "3.8.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.8.2.tgz";
+ sha512 = "0xxogS7n5jHDQWy0WST0q6Ykp7UGj4YvWh+HVN71JoE7BwPxMZrwgraBvmdEMbDVMBzF0u+mEzn8TQzBm5NYJQ==";
+ };
+ };
+ "webpack-log-1.2.0" = {
+ name = "webpack-log";
+ packageName = "webpack-log";
+ version = "1.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz";
+ sha512 = "U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==";
+ };
+ };
+ "webpack-log-2.0.0" = {
+ name = "webpack-log";
+ packageName = "webpack-log";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz";
+ sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==";
+ };
+ };
+ "webpack-sources-1.4.3" = {
+ name = "webpack-sources";
+ packageName = "webpack-sources";
+ version = "1.4.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz";
+ sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==";
+ };
+ };
+ "websocket-1.0.30" = {
+ name = "websocket";
+ packageName = "websocket";
+ version = "1.0.30";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/websocket/-/websocket-1.0.30.tgz";
+ sha512 = "aO6klgaTdSMkhfl5VVJzD5fm+Srhh5jLYbS15+OiI1sN6h/RU/XW6WN9J1uVIpUKNmsTvT3Hs35XAFjn9NMfOw==";
+ };
+ };
+ "websocket-driver-0.7.3" = {
+ name = "websocket-driver";
+ packageName = "websocket-driver";
+ version = "0.7.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz";
+ sha512 = "bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==";
+ };
+ };
+ "websocket-extensions-0.1.3" = {
+ name = "websocket-extensions";
+ packageName = "websocket-extensions";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz";
+ sha512 = "nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==";
+ };
+ };
+ "whatwg-encoding-1.0.5" = {
+ name = "whatwg-encoding";
+ packageName = "whatwg-encoding";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz";
+ sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==";
+ };
+ };
+ "whatwg-mimetype-2.3.0" = {
+ name = "whatwg-mimetype";
+ packageName = "whatwg-mimetype";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz";
+ sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==";
+ };
+ };
+ "whatwg-url-6.5.0" = {
+ name = "whatwg-url";
+ packageName = "whatwg-url";
+ version = "6.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz";
+ sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==";
+ };
+ };
+ "whatwg-url-7.0.0" = {
+ name = "whatwg-url";
+ packageName = "whatwg-url";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz";
+ sha512 = "37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==";
+ };
+ };
+ "which-1.3.1" = {
+ name = "which";
+ packageName = "which";
+ version = "1.3.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz";
+ sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==";
+ };
+ };
+ "which-module-2.0.0" = {
+ name = "which-module";
+ packageName = "which-module";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
+ sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a";
+ };
+ };
+ "window-size-0.1.0" = {
+ name = "window-size";
+ packageName = "window-size";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+ sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+ };
+ };
+ "with-5.1.1" = {
+ name = "with";
+ packageName = "with";
+ version = "5.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/with/-/with-5.1.1.tgz";
+ sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe";
+ };
+ };
+ "wordwrap-0.0.2" = {
+ name = "wordwrap";
+ packageName = "wordwrap";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+ sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+ };
+ };
+ "wordwrap-1.0.0" = {
+ name = "wordwrap";
+ packageName = "wordwrap";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
+ sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+ };
+ };
+ "worker-farm-1.7.0" = {
+ name = "worker-farm";
+ packageName = "worker-farm";
+ version = "1.7.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz";
+ sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==";
+ };
+ };
+ "wrap-ansi-2.1.0" = {
+ name = "wrap-ansi";
+ packageName = "wrap-ansi";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
+ sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+ };
+ };
+ "wrap-ansi-5.1.0" = {
+ name = "wrap-ansi";
+ packageName = "wrap-ansi";
+ version = "5.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
+ sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
+ };
+ };
+ "wrappy-1.0.2" = {
+ name = "wrappy";
+ packageName = "wrappy";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+ sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+ };
+ };
+ "write-file-atomic-2.4.1" = {
+ name = "write-file-atomic";
+ packageName = "write-file-atomic";
+ version = "2.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz";
+ sha512 = "TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==";
+ };
+ };
+ "ws-5.2.2" = {
+ name = "ws";
+ packageName = "ws";
+ version = "5.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz";
+ sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==";
+ };
+ };
+ "ws-6.2.1" = {
+ name = "ws";
+ packageName = "ws";
+ version = "6.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz";
+ sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==";
+ };
+ };
+ "xml-name-validator-3.0.0" = {
+ name = "xml-name-validator";
+ packageName = "xml-name-validator";
+ version = "3.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz";
+ sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==";
+ };
+ };
+ "xtend-4.0.2" = {
+ name = "xtend";
+ packageName = "xtend";
+ version = "4.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz";
+ sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
+ };
+ };
+ "y18n-4.0.0" = {
+ name = "y18n";
+ packageName = "y18n";
+ version = "4.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz";
+ sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
+ };
+ };
+ "yaeti-0.0.6" = {
+ name = "yaeti";
+ packageName = "yaeti";
+ version = "0.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz";
+ sha1 = "f26f484d72684cf42bedfb76970aa1608fbf9577";
+ };
+ };
+ "yallist-2.1.2" = {
+ name = "yallist";
+ packageName = "yallist";
+ version = "2.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
+ sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52";
+ };
+ };
+ "yallist-3.1.1" = {
+ name = "yallist";
+ packageName = "yallist";
+ version = "3.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
+ sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
+ };
+ };
+ "yargs-12.0.5" = {
+ name = "yargs";
+ packageName = "yargs";
+ version = "12.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz";
+ sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==";
+ };
+ };
+ "yargs-13.2.4" = {
+ name = "yargs";
+ packageName = "yargs";
+ version = "13.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz";
+ sha512 = "HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==";
+ };
+ };
+ "yargs-13.3.0" = {
+ name = "yargs";
+ packageName = "yargs";
+ version = "13.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
+ sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
+ };
+ };
+ "yargs-3.10.0" = {
+ name = "yargs";
+ packageName = "yargs";
+ version = "3.10.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+ sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
+ };
+ };
+ "yargs-parser-10.1.0" = {
+ name = "yargs-parser";
+ packageName = "yargs-parser";
+ version = "10.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz";
+ sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==";
+ };
+ };
+ "yargs-parser-11.1.1" = {
+ name = "yargs-parser";
+ packageName = "yargs-parser";
+ version = "11.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz";
+ sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==";
+ };
+ };
+ "yargs-parser-13.1.1" = {
+ name = "yargs-parser";
+ packageName = "yargs-parser";
+ version = "13.1.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
+ sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
+ };
+ };
+ "ylru-1.2.1" = {
+ name = "ylru";
+ packageName = "ylru";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz";
+ sha512 = "faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ==";
+ };
+ };
+ };
+in
+{
+ "spacegun-git+https://github.com/dvallin/spacegun.git#v0.3.3" = nodeEnv.buildNodePackage {
+ name = "spacegun";
+ packageName = "spacegun";
+ version = "0.3.3";
+ src = fetchgit {
+ url = "https://github.com/dvallin/spacegun.git";
+ rev = "d32d2df34362f6744e8cff34c2d2bf6ce8b4662a";
+ sha256 = "589bfc9e3e26af38989144e8551547cbeb5ffc9a0b668a7a4cb211a2ebf7a931";
+ };
+ dependencies = [
+ sources."@babel/code-frame-7.5.5"
+ (sources."@babel/core-7.6.2" // {
+ dependencies = [
+ sources."debug-4.1.1"
+ sources."json5-2.1.1"
+ sources."minimist-1.2.0"
+ sources."ms-2.1.2"
+ sources."source-map-0.5.7"
+ ];
+ })
+ (sources."@babel/generator-7.6.2" // {
+ dependencies = [
+ sources."jsesc-2.5.2"
+ sources."source-map-0.5.7"
+ ];
+ })
+ sources."@babel/helper-function-name-7.1.0"
+ sources."@babel/helper-get-function-arity-7.0.0"
+ sources."@babel/helper-plugin-utils-7.0.0"
+ sources."@babel/helper-split-export-declaration-7.4.4"
+ sources."@babel/helpers-7.6.2"
+ (sources."@babel/highlight-7.5.0" // {
+ dependencies = [
+ sources."js-tokens-4.0.0"
+ ];
+ })
+ sources."@babel/parser-7.6.2"
+ sources."@babel/plugin-syntax-object-rest-spread-7.2.0"
+ sources."@babel/template-7.6.0"
+ (sources."@babel/traverse-7.6.2" // {
+ dependencies = [
+ sources."debug-4.1.1"
+ sources."globals-11.12.0"
+ sources."ms-2.1.2"
+ ];
+ })
+ (sources."@babel/types-7.6.1" // {
+ dependencies = [
+ sources."to-fast-properties-2.0.0"
+ ];
+ })
+ (sources."@cnakazawa/watch-1.0.3" // {
+ dependencies = [
+ sources."minimist-1.2.0"
+ ];
+ })
+ (sources."@jest/console-24.9.0" // {
+ dependencies = [
+ sources."slash-2.0.0"
+ ];
+ })
+ (sources."@jest/core-24.9.0" // {
+ dependencies = [
+ sources."slash-2.0.0"
+ ];
+ })
+ sources."@jest/environment-24.9.0"
+ sources."@jest/fake-timers-24.9.0"
+ (sources."@jest/reporters-24.9.0" // {
+ dependencies = [
+ sources."slash-2.0.0"
+ ];
+ })
+ sources."@jest/source-map-24.9.0"
+ sources."@jest/test-result-24.9.0"
+ sources."@jest/test-sequencer-24.9.0"
+ (sources."@jest/transform-24.9.0" // {
+ dependencies = [
+ sources."slash-2.0.0"
+ ];
+ })
+ sources."@jest/types-24.9.0"
+ (sources."@kubernetes/client-node-0.10.3" // {
+ dependencies = [
+ sources."@types/node-10.14.20"
+ ];
+ })
+ sources."@sindresorhus/is-0.7.0"
+ sources."@types/accepts-1.3.5"
+ sources."@types/axios-0.14.0"
+ sources."@types/babel-types-7.0.7"
+ sources."@types/babel__core-7.1.3"
+ sources."@types/babel__generator-7.6.0"
+ sources."@types/babel__template-7.0.2"
+ sources."@types/babel__traverse-7.0.7"
+ sources."@types/babylon-6.16.5"
+ sources."@types/body-parser-1.17.1"
+ sources."@types/caseless-0.12.2"
+ sources."@types/command-line-args-5.0.0"
+ sources."@types/connect-3.4.32"
+ sources."@types/cookies-0.7.4"
+ sources."@types/cron-1.7.1"
+ sources."@types/events-3.0.0"
+ sources."@types/express-4.17.1"
+ sources."@types/express-serve-static-core-4.16.9"
+ sources."@types/formidable-1.0.31"
+ sources."@types/glob-7.1.1"
+ sources."@types/http-assert-1.5.1"
+ sources."@types/istanbul-lib-coverage-2.0.1"
+ sources."@types/istanbul-lib-report-1.1.1"
+ sources."@types/istanbul-reports-1.1.1"
+ sources."@types/jest-24.0.18"
+ sources."@types/jest-diff-20.0.1"
+ sources."@types/js-yaml-3.12.1"
+ sources."@types/keygrip-1.0.1"
+ sources."@types/koa-2.0.50"
+ sources."@types/koa-compose-3.2.4"
+ sources."@types/koa-router-7.0.42"
+ sources."@types/koa-send-4.1.2"
+ sources."@types/koa-static-4.0.1"
+ sources."@types/koa-views-2.0.3"
+ sources."@types/lodash-4.14.141"
+ sources."@types/lodash.clonedeep-4.5.6"
+ sources."@types/mime-2.0.1"
+ sources."@types/minimatch-3.0.3"
+ sources."@types/mkdirp-0.5.2"
+ sources."@types/node-12.7.11"
+ sources."@types/ora-3.2.0"
+ sources."@types/range-parser-1.2.3"
+ (sources."@types/request-2.48.3" // {
+ dependencies = [
+ sources."form-data-2.5.1"
+ ];
+ })
+ sources."@types/serve-static-1.13.3"
+ sources."@types/stack-utils-1.0.1"
+ sources."@types/tough-cookie-2.3.5"
+ sources."@types/underscore-1.9.3"
+ sources."@types/websocket-0.0.40"
+ sources."@types/ws-6.0.3"
+ sources."@types/yargs-13.0.3"
+ sources."@types/yargs-parser-13.1.0"
+ sources."@webassemblyjs/ast-1.8.5"
+ sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
+ sources."@webassemblyjs/helper-api-error-1.8.5"
+ sources."@webassemblyjs/helper-buffer-1.8.5"
+ sources."@webassemblyjs/helper-code-frame-1.8.5"
+ sources."@webassemblyjs/helper-fsm-1.8.5"
+ sources."@webassemblyjs/helper-module-context-1.8.5"
+ sources."@webassemblyjs/helper-wasm-bytecode-1.8.5"
+ sources."@webassemblyjs/helper-wasm-section-1.8.5"
+ sources."@webassemblyjs/ieee754-1.8.5"
+ sources."@webassemblyjs/leb128-1.8.5"
+ sources."@webassemblyjs/utf8-1.8.5"
+ sources."@webassemblyjs/wasm-edit-1.8.5"
+ sources."@webassemblyjs/wasm-gen-1.8.5"
+ sources."@webassemblyjs/wasm-opt-1.8.5"
+ sources."@webassemblyjs/wasm-parser-1.8.5"
+ sources."@webassemblyjs/wast-parser-1.8.5"
+ sources."@webassemblyjs/wast-printer-1.8.5"
+ sources."@xtuc/ieee754-1.2.0"
+ sources."@xtuc/long-4.2.2"
+ sources."abab-2.0.2"
+ sources."abbrev-1.1.1"
+ sources."accepts-1.3.7"
+ sources."acorn-3.3.0"
+ (sources."acorn-globals-3.1.0" // {
+ dependencies = [
+ sources."acorn-4.0.13"
+ ];
+ })
+ sources."acorn-walk-6.2.0"
+ sources."aggregate-error-1.0.0"
+ sources."ajv-6.10.2"
+ sources."ajv-errors-1.0.1"
+ sources."ajv-keywords-3.4.1"
+ sources."align-text-0.1.4"
+ sources."ansi-colors-3.2.4"
+ sources."ansi-escapes-3.2.0"
+ sources."ansi-html-0.0.7"
+ sources."ansi-regex-4.1.0"
+ sources."ansi-styles-3.2.1"
+ sources."any-promise-1.3.0"
+ sources."anymatch-2.0.0"
+ sources."aproba-1.2.0"
+ sources."argparse-1.0.10"
+ sources."arr-diff-4.0.0"
+ sources."arr-flatten-1.1.0"
+ sources."arr-union-3.1.0"
+ sources."array-back-3.1.0"
+ sources."array-equal-1.0.0"
+ sources."array-flatten-1.1.1"
+ sources."array-union-1.0.2"
+ sources."array-uniq-1.0.3"
+ sources."array-unique-0.3.2"
+ sources."asap-2.0.6"
+ sources."asn1-0.2.4"
+ sources."asn1.js-4.10.1"
+ (sources."assert-1.5.0" // {
+ dependencies = [
+ sources."inherits-2.0.1"
+ sources."util-0.10.3"
+ ];
+ })
+ sources."assert-plus-1.0.0"
+ sources."assign-symbols-1.0.0"
+ sources."astral-regex-1.0.0"
+ sources."async-1.5.2"
+ sources."async-each-1.0.3"
+ sources."async-limiter-1.0.1"
+ sources."asynckit-0.4.0"
+ sources."atob-2.1.2"
+ sources."awesome-typescript-loader-5.2.1"
+ sources."aws-sign2-0.7.0"
+ sources."aws4-1.8.0"
+ sources."axios-0.19.0"
+ sources."babel-6.23.0"
+ (sources."babel-code-frame-6.26.0" // {
+ dependencies = [
+ sources."ansi-regex-2.1.1"
+ sources."ansi-styles-2.2.1"
+ sources."chalk-1.1.3"
+ sources."strip-ansi-3.0.1"
+ sources."supports-color-2.0.0"
+ ];
+ })
+ (sources."babel-core-6.26.3" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ sources."json5-0.5.1"
+ sources."source-map-0.5.7"
+ ];
+ })
+ (sources."babel-generator-6.26.1" // {
+ dependencies = [
+ sources."source-map-0.5.7"
+ ];
+ })
+ sources."babel-helper-builder-binary-assignment-operator-visitor-6.24.1"
+ sources."babel-helper-call-delegate-6.24.1"
+ sources."babel-helper-define-map-6.26.0"
+ sources."babel-helper-explode-assignable-expression-6.24.1"
+ sources."babel-helper-function-name-6.24.1"
+ sources."babel-helper-get-function-arity-6.24.1"
+ sources."babel-helper-hoist-variables-6.24.1"
+ sources."babel-helper-optimise-call-expression-6.24.1"
+ sources."babel-helper-regex-6.26.0"
+ sources."babel-helper-remap-async-to-generator-6.24.1"
+ sources."babel-helper-replace-supers-6.24.1"
+ sources."babel-helpers-6.24.1"
+ (sources."babel-jest-24.9.0" // {
+ dependencies = [
+ sources."slash-2.0.0"
+ ];
+ })
+ sources."babel-messages-6.23.0"
+ sources."babel-plugin-check-es2015-constants-6.22.0"
+ sources."babel-plugin-istanbul-5.2.0"
+ sources."babel-plugin-jest-hoist-24.9.0"
+ sources."babel-plugin-syntax-async-functions-6.13.0"
+ sources."babel-plugin-syntax-exponentiation-operator-6.13.0"
+ sources."babel-plugin-syntax-trailing-function-commas-6.22.0"
+ sources."babel-plugin-transform-async-to-generator-6.24.1"
+ sources."babel-plugin-transform-es2015-arrow-functions-6.22.0"
+ sources."babel-plugin-transform-es2015-block-scoped-functions-6.22.0"
+ sources."babel-plugin-transform-es2015-block-scoping-6.26.0"
+ sources."babel-plugin-transform-es2015-classes-6.24.1"
+ sources."babel-plugin-transform-es2015-computed-properties-6.24.1"
+ sources."babel-plugin-transform-es2015-destructuring-6.23.0"
+ sources."babel-plugin-transform-es2015-duplicate-keys-6.24.1"
+ sources."babel-plugin-transform-es2015-for-of-6.23.0"
+ sources."babel-plugin-transform-es2015-function-name-6.24.1"
+ sources."babel-plugin-transform-es2015-literals-6.22.0"
+ sources."babel-plugin-transform-es2015-modules-amd-6.24.1"
+ sources."babel-plugin-transform-es2015-modules-commonjs-6.26.2"
+ sources."babel-plugin-transform-es2015-modules-systemjs-6.24.1"
+ sources."babel-plugin-transform-es2015-modules-umd-6.24.1"
+ sources."babel-plugin-transform-es2015-object-super-6.24.1"
+ sources."babel-plugin-transform-es2015-parameters-6.24.1"
+ sources."babel-plugin-transform-es2015-shorthand-properties-6.24.1"
+ sources."babel-plugin-transform-es2015-spread-6.22.0"
+ sources."babel-plugin-transform-es2015-sticky-regex-6.24.1"
+ sources."babel-plugin-transform-es2015-template-literals-6.22.0"
+ sources."babel-plugin-transform-es2015-typeof-symbol-6.23.0"
+ sources."babel-plugin-transform-es2015-unicode-regex-6.24.1"
+ sources."babel-plugin-transform-exponentiation-operator-6.24.1"
+ sources."babel-plugin-transform-regenerator-6.26.0"
+ sources."babel-plugin-transform-strict-mode-6.24.1"
+ sources."babel-preset-env-1.7.0"
+ sources."babel-preset-jest-24.9.0"
+ (sources."babel-register-6.26.0" // {
+ dependencies = [
+ sources."source-map-0.5.7"
+ sources."source-map-support-0.4.18"
+ ];
+ })
+ sources."babel-runtime-6.26.0"
+ sources."babel-template-6.26.0"
+ (sources."babel-traverse-6.26.0" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ ];
+ })
+ sources."babel-types-6.26.0"
+ sources."babylon-6.18.0"
+ sources."balanced-match-1.0.0"
+ (sources."base-0.11.2" // {
+ dependencies = [
+ sources."define-property-1.0.0"
+ ];
+ })
+ sources."base64-js-1.3.1"
+ sources."base64url-3.0.1"
+ sources."batch-0.6.1"
+ sources."bcrypt-pbkdf-1.0.2"
+ sources."bfj-6.1.2"
+ sources."big.js-5.2.2"
+ sources."binary-extensions-1.13.1"
+ sources."bluebird-3.7.0"
+ sources."bn.js-4.11.8"
+ (sources."body-parser-1.19.0" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ sources."http-errors-1.7.2"
+ sources."inherits-2.0.3"
+ sources."qs-6.7.0"
+ sources."raw-body-2.4.0"
+ ];
+ })
+ (sources."bonjour-3.5.0" // {
+ dependencies = [
+ sources."array-flatten-2.1.2"
+ ];
+ })
+ sources."brace-expansion-1.1.11"
+ sources."braces-2.3.2"
+ sources."brorand-1.1.0"
+ sources."browser-process-hrtime-0.1.3"
+ (sources."browser-resolve-1.11.3" // {
+ dependencies = [
+ sources."resolve-1.1.7"
+ ];
+ })
+ sources."browserify-aes-1.2.0"
+ sources."browserify-cipher-1.0.1"
+ sources."browserify-des-1.0.2"
+ sources."browserify-rsa-4.0.1"
+ sources."browserify-sign-4.0.4"
+ sources."browserify-zlib-0.2.0"
+ sources."browserslist-3.2.8"
+ sources."bs-logger-0.2.6"
+ sources."bser-2.1.0"
+ sources."buffer-4.9.1"
+ sources."buffer-from-1.1.1"
+ sources."buffer-indexof-1.1.1"
+ sources."buffer-xor-1.0.3"
+ sources."builtin-status-codes-3.0.0"
+ sources."byline-5.0.0"
+ sources."bytes-3.1.0"
+ (sources."cacache-10.0.4" // {
+ dependencies = [
+ sources."lru-cache-4.1.5"
+ sources."yallist-2.1.2"
+ ];
+ })
+ sources."cache-base-1.0.1"
+ sources."cache-content-type-1.0.1"
+ (sources."cacheable-request-2.1.4" // {
+ dependencies = [
+ sources."get-stream-3.0.0"
+ sources."lowercase-keys-1.0.0"
+ ];
+ })
+ sources."callsites-3.1.0"
+ sources."camelcase-1.2.1"
+ sources."caniuse-lite-1.0.30000999"
+ sources."capture-exit-2.0.0"
+ sources."caseless-0.12.0"
+ sources."center-align-0.1.3"
+ sources."chalk-2.4.2"
+ sources."character-parser-2.2.0"
+ sources."check-types-8.0.3"
+ (sources."chokidar-2.1.8" // {
+ dependencies = [
+ sources."normalize-path-3.0.0"
+ ];
+ })
+ sources."chownr-1.1.3"
+ sources."chrome-trace-event-1.0.2"
+ sources."ci-info-2.0.0"
+ sources."cipher-base-1.0.4"
+ (sources."class-utils-0.3.6" // {
+ dependencies = [
+ sources."define-property-0.2.5"
+ (sources."is-accessor-descriptor-0.1.6" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
+ sources."is-buffer-1.1.6"
+ (sources."is-data-descriptor-0.1.4" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
+ sources."is-descriptor-0.1.6"
+ sources."kind-of-5.1.0"
+ ];
+ })
+ sources."clean-css-4.2.1"
+ sources."clean-stack-1.3.0"
+ sources."cli-cursor-2.1.0"
+ sources."cli-spinners-2.2.0"
+ sources."cliui-2.1.0"
+ sources."clone-1.0.4"
+ sources."clone-response-1.0.2"
+ sources."co-4.6.0"
+ sources."co-body-5.2.0"
+ sources."code-point-at-1.1.0"
+ sources."collection-visit-1.0.0"
+ sources."color-convert-1.9.3"
+ sources."color-name-1.1.3"
+ sources."combined-stream-1.0.8"
+ sources."command-line-args-5.1.1"
+ sources."commander-2.20.1"
+ sources."commondir-1.0.1"
+ sources."component-emitter-1.3.0"
+ sources."compressible-2.0.17"
+ (sources."compression-1.7.4" // {
+ dependencies = [
+ sources."bytes-3.0.0"
+ sources."debug-2.6.9"
+ sources."safe-buffer-5.1.2"
+ ];
+ })
+ sources."concat-map-0.0.1"
+ sources."concat-stream-1.6.2"
+ sources."condense-newlines-0.2.1"
+ sources."config-chain-1.1.12"
+ sources."connect-history-api-fallback-1.6.0"
+ sources."console-browserify-1.1.0"
+ sources."consolidate-0.15.1"
+ sources."constantinople-3.1.2"
+ sources."constants-browserify-1.0.0"
+ (sources."content-disposition-0.5.3" // {
+ dependencies = [
+ sources."safe-buffer-5.1.2"
+ ];
+ })
+ sources."content-type-1.0.4"
+ (sources."convert-source-map-1.6.0" // {
+ dependencies = [
+ sources."safe-buffer-5.1.2"
+ ];
+ })
+ sources."cookie-0.4.0"
+ sources."cookie-signature-1.0.6"
+ sources."cookies-0.7.3"
+ sources."copy-concurrently-1.0.5"
+ sources."copy-descriptor-0.1.1"
+ (sources."copy-webpack-plugin-4.6.0" // {
+ dependencies = [
+ sources."p-limit-1.3.0"
+ sources."p-try-1.0.0"
+ ];
+ })
+ sources."core-js-2.6.9"
+ sources."core-util-is-1.0.2"
+ sources."create-ecdh-4.0.3"
+ sources."create-hash-1.2.0"
+ sources."create-hmac-1.1.7"
+ sources."cron-1.7.2"
+ sources."cross-spawn-6.0.5"
+ sources."crypto-browserify-3.12.0"
+ sources."cssom-0.3.8"
+ sources."cssstyle-1.4.0"
+ sources."cyclist-1.0.1"
+ sources."d-1.0.1"
+ sources."dashdash-1.14.1"
+ (sources."data-urls-1.1.0" // {
+ dependencies = [
+ sources."whatwg-url-7.0.0"
+ ];
+ })
+ sources."date-now-0.1.4"
+ sources."debug-3.1.0"
+ sources."decamelize-1.2.0"
+ sources."decode-uri-component-0.2.0"
+ sources."decompress-response-3.3.0"
+ sources."deep-equal-1.0.1"
+ sources."deep-is-0.1.3"
+ sources."default-gateway-4.2.0"
+ sources."defaults-1.0.3"
+ sources."define-properties-1.1.3"
+ sources."define-property-2.0.2"
+ (sources."del-4.1.1" // {
+ dependencies = [
+ (sources."globby-6.1.0" // {
+ dependencies = [
+ sources."pify-2.3.0"
+ ];
+ })
+ sources."pify-4.0.1"
+ ];
+ })
+ sources."delayed-stream-1.0.0"
+ sources."delegates-1.0.0"
+ sources."depd-1.1.2"
+ sources."des.js-1.0.0"
+ sources."destroy-1.0.4"
+ sources."detect-file-1.0.0"
+ sources."detect-indent-4.0.0"
+ sources."detect-newline-2.1.0"
+ sources."detect-node-2.0.4"
+ sources."diff-sequences-24.9.0"
+ sources."diffie-hellman-5.0.3"
+ sources."dir-glob-2.2.2"
+ sources."dns-equal-1.0.0"
+ sources."dns-packet-1.3.1"
+ sources."dns-txt-2.0.2"
+ sources."doctypes-1.1.0"
+ sources."domain-browser-1.2.0"
+ sources."domexception-1.0.1"
+ sources."duplexer-0.1.1"
+ sources."duplexer3-0.1.4"
+ sources."duplexify-3.7.1"
+ sources."ecc-jsbn-0.1.2"
+ (sources."editorconfig-0.15.3" // {
+ dependencies = [
+ sources."lru-cache-4.1.5"
+ sources."yallist-2.1.2"
+ ];
+ })
+ sources."ee-first-1.1.1"
+ sources."ejs-2.7.1"
+ sources."electron-to-chromium-1.3.275"
+ sources."elliptic-6.5.1"
+ sources."emoji-regex-7.0.3"
+ sources."emojis-list-2.1.0"
+ sources."encodeurl-1.0.2"
+ sources."end-of-stream-1.4.4"
+ sources."enhanced-resolve-4.1.0"
+ sources."errno-0.1.7"
+ sources."error-ex-1.3.2"
+ sources."error-inject-1.0.0"
+ sources."es-abstract-1.15.0"
+ sources."es-to-primitive-1.2.0"
+ sources."es5-ext-0.10.51"
+ sources."es6-iterator-2.0.3"
+ sources."es6-promise-4.2.8"
+ sources."es6-symbol-3.1.2"
+ sources."escape-html-1.0.3"
+ sources."escape-string-regexp-1.0.5"
+ sources."escodegen-1.12.0"
+ sources."eslint-scope-4.0.3"
+ sources."esprima-3.1.3"
+ sources."esrecurse-4.2.1"
+ sources."estraverse-4.3.0"
+ sources."esutils-2.0.3"
+ sources."etag-1.8.1"
+ sources."eventemitter3-4.0.0"
+ sources."events-3.0.0"
+ sources."eventsource-1.0.7"
+ sources."evp_bytestokey-1.0.3"
+ sources."exec-sh-0.3.2"
+ sources."execa-1.0.0"
+ sources."exit-0.1.2"
+ (sources."expand-brackets-2.1.4" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ sources."define-property-0.2.5"
+ (sources."is-accessor-descriptor-0.1.6" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
+ sources."is-buffer-1.1.6"
+ (sources."is-data-descriptor-0.1.4" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
+ sources."is-descriptor-0.1.6"
+ sources."kind-of-5.1.0"
+ ];
+ })
+ sources."expand-tilde-2.0.2"
+ sources."expect-24.9.0"
+ (sources."express-4.17.1" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ sources."path-to-regexp-0.1.7"
+ sources."qs-6.7.0"
+ sources."safe-buffer-5.1.2"
+ ];
+ })
+ sources."extend-3.0.2"
+ sources."extend-shallow-2.0.1"
+ (sources."extglob-2.0.4" // {
+ dependencies = [
+ sources."define-property-1.0.0"
+ ];
+ })
+ sources."extsprintf-1.3.0"
+ sources."fast-deep-equal-2.0.1"
+ sources."fast-json-stable-stringify-2.0.0"
+ sources."fast-levenshtein-2.0.6"
+ sources."faye-websocket-0.10.0"
+ sources."fb-watchman-2.0.0"
+ sources."figgy-pudding-3.5.1"
+ sources."filesize-3.6.1"
+ sources."fill-range-4.0.0"
+ (sources."finalhandler-1.1.2" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ ];
+ })
+ sources."find-cache-dir-1.0.0"
+ sources."find-replace-3.0.0"
+ sources."find-up-3.0.0"
+ sources."findup-sync-3.0.0"
+ sources."flush-write-stream-1.1.1"
+ sources."follow-redirects-1.5.10"
+ sources."for-in-1.0.2"
+ sources."forever-agent-0.6.1"
+ sources."form-data-2.3.3"
+ sources."formidable-1.2.1"
+ sources."forwarded-0.1.2"
+ sources."fragment-cache-0.2.1"
+ sources."fresh-0.5.2"
+ sources."from2-2.3.0"
+ sources."fs-write-stream-atomic-1.0.10"
+ sources."fs.realpath-1.0.0"
+ sources."fsevents-1.2.9"
+ sources."function-bind-1.1.1"
+ sources."get-caller-file-2.0.5"
+ (sources."get-paths-0.0.7" // {
+ dependencies = [
+ sources."pify-4.0.1"
+ ];
+ })
+ sources."get-stream-4.1.0"
+ sources."get-value-2.0.6"
+ sources."getpass-0.1.7"
+ sources."glob-7.1.4"
+ (sources."glob-parent-3.1.0" // {
+ dependencies = [
+ sources."is-glob-3.1.0"
+ ];
+ })
+ (sources."global-modules-2.0.0" // {
+ dependencies = [
+ sources."global-prefix-3.0.0"
+ sources."kind-of-6.0.2"
+ ];
+ })
+ sources."global-prefix-1.0.2"
+ sources."globals-9.18.0"
+ sources."globby-7.1.1"
+ (sources."got-8.3.2" // {
+ dependencies = [
+ sources."get-stream-3.0.0"
+ ];
+ })
+ sources."graceful-fs-4.2.2"
+ sources."growly-1.3.0"
+ (sources."gzip-size-5.1.1" // {
+ dependencies = [
+ sources."pify-4.0.1"
+ ];
+ })
+ sources."handle-thing-2.0.0"
+ (sources."handlebars-4.4.2" // {
+ dependencies = [
+ sources."uglify-js-3.6.0"
+ ];
+ })
+ sources."har-schema-2.0.0"
+ sources."har-validator-5.1.3"
+ sources."has-1.0.3"
+ (sources."has-ansi-2.0.0" // {
+ dependencies = [
+ sources."ansi-regex-2.1.1"
+ ];
+ })
+ sources."has-flag-3.0.0"
+ sources."has-symbol-support-x-1.4.2"
+ sources."has-symbols-1.0.0"
+ sources."has-to-string-tag-x-1.4.1"
+ sources."has-value-1.0.0"
+ (sources."has-values-1.0.0" // {
+ dependencies = [
+ sources."is-buffer-1.1.6"
+ sources."kind-of-4.0.0"
+ ];
+ })
+ sources."hash-base-3.0.4"
+ sources."hash.js-1.1.7"
+ sources."hmac-drbg-1.0.1"
+ sources."home-or-tmp-2.0.0"
+ sources."homedir-polyfill-1.0.3"
+ sources."hoopy-0.1.4"
+ sources."hosted-git-info-2.8.4"
+ sources."hpack.js-2.1.6"
+ sources."html-encoding-sniffer-1.0.2"
+ sources."html-entities-1.2.1"
+ sources."http-assert-1.4.1"
+ sources."http-cache-semantics-3.8.1"
+ sources."http-deceiver-1.2.7"
+ sources."http-errors-1.7.3"
+ sources."http-parser-js-0.4.10"
+ sources."http-proxy-1.18.0"
+ sources."http-proxy-middleware-0.19.1"
+ sources."http-signature-1.2.0"
+ sources."https-browserify-1.0.0"
+ sources."iconv-lite-0.4.24"
+ sources."ieee754-1.1.13"
+ sources."iferr-0.1.5"
+ sources."ignore-3.3.10"
+ (sources."import-local-2.0.0" // {
+ dependencies = [
+ sources."pkg-dir-3.0.0"
+ ];
+ })
+ sources."imurmurhash-0.1.4"
+ sources."indent-string-3.2.0"
+ sources."infer-owner-1.0.4"
+ sources."inflation-2.0.0"
+ sources."inflight-1.0.6"
+ sources."inherits-2.0.4"
+ sources."ini-1.3.5"
+ sources."internal-ip-4.3.0"
+ sources."interpret-1.2.0"
+ sources."into-stream-3.1.0"
+ sources."invariant-2.2.4"
+ sources."invert-kv-2.0.0"
+ sources."ip-1.1.5"
+ sources."ip-regex-2.1.0"
+ sources."ipaddr.js-1.9.0"
+ sources."is-absolute-url-3.0.3"
+ (sources."is-accessor-descriptor-1.0.0" // {
+ dependencies = [
+ sources."kind-of-6.0.2"
+ ];
+ })
+ sources."is-arrayish-0.2.1"
+ sources."is-binary-path-1.0.1"
+ sources."is-buffer-2.0.4"
+ sources."is-callable-1.1.4"
+ sources."is-ci-2.0.0"
+ (sources."is-data-descriptor-1.0.0" // {
+ dependencies = [
+ sources."kind-of-6.0.2"
+ ];
+ })
+ sources."is-date-object-1.0.1"
+ (sources."is-descriptor-1.0.2" // {
+ dependencies = [
+ sources."kind-of-6.0.2"
+ ];
+ })
+ (sources."is-expression-3.0.0" // {
+ dependencies = [
+ sources."acorn-4.0.13"
+ ];
+ })
+ sources."is-extendable-0.1.1"
+ sources."is-extglob-2.1.1"
+ sources."is-finite-1.0.2"
+ sources."is-fullwidth-code-point-2.0.0"
+ sources."is-generator-fn-2.1.0"
+ sources."is-generator-function-1.0.7"
+ sources."is-glob-4.0.1"
+ sources."is-number-3.0.0"
+ sources."is-object-1.0.1"
+ sources."is-path-cwd-2.2.0"
+ sources."is-path-in-cwd-2.1.0"
+ sources."is-path-inside-2.1.0"
+ sources."is-plain-obj-1.1.0"
+ sources."is-plain-object-2.0.4"
+ sources."is-promise-2.1.0"
+ sources."is-regex-1.0.4"
+ sources."is-retry-allowed-1.2.0"
+ sources."is-stream-1.1.0"
+ sources."is-symbol-1.0.2"
+ sources."is-typedarray-1.0.0"
+ sources."is-whitespace-0.3.0"
+ sources."is-windows-1.0.2"
+ sources."is-wsl-1.1.0"
+ sources."isarray-1.0.0"
+ sources."isexe-2.0.0"
+ sources."isobject-3.0.1"
+ sources."isomorphic-ws-4.0.1"
+ sources."isstream-0.1.2"
+ sources."istanbul-lib-coverage-2.0.5"
+ (sources."istanbul-lib-instrument-3.3.0" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ (sources."istanbul-lib-report-2.0.8" // {
+ dependencies = [
+ sources."make-dir-2.1.0"
+ sources."pify-4.0.1"
+ sources."supports-color-6.1.0"
+ ];
+ })
+ (sources."istanbul-lib-source-maps-3.0.6" // {
+ dependencies = [
+ sources."debug-4.1.1"
+ sources."make-dir-2.1.0"
+ sources."ms-2.1.2"
+ sources."pify-4.0.1"
+ ];
+ })
+ sources."istanbul-reports-2.2.6"
+ sources."isurl-1.0.0"
+ sources."jest-24.9.0"
+ sources."jest-changed-files-24.9.0"
+ (sources."jest-cli-24.9.0" // {
+ dependencies = [
+ sources."cliui-5.0.0"
+ sources."yargs-13.3.0"
+ ];
+ })
+ sources."jest-config-24.9.0"
+ sources."jest-diff-24.9.0"
+ sources."jest-docblock-24.9.0"
+ sources."jest-each-24.9.0"
+ sources."jest-environment-jsdom-24.9.0"
+ sources."jest-environment-node-24.9.0"
+ sources."jest-get-type-24.9.0"
+ sources."jest-haste-map-24.9.0"
+ sources."jest-jasmine2-24.9.0"
+ sources."jest-leak-detector-24.9.0"
+ sources."jest-matcher-utils-24.9.0"
+ (sources."jest-message-util-24.9.0" // {
+ dependencies = [
+ sources."slash-2.0.0"
+ ];
+ })
+ sources."jest-mock-24.9.0"
+ sources."jest-pnp-resolver-1.2.1"
+ sources."jest-regex-util-24.9.0"
+ sources."jest-resolve-24.9.0"
+ sources."jest-resolve-dependencies-24.9.0"
+ sources."jest-runner-24.9.0"
+ (sources."jest-runtime-24.9.0" // {
+ dependencies = [
+ sources."cliui-5.0.0"
+ sources."slash-2.0.0"
+ sources."yargs-13.3.0"
+ ];
+ })
+ sources."jest-serializer-24.9.0"
+ (sources."jest-snapshot-24.9.0" // {
+ dependencies = [
+ sources."semver-6.3.0"
+ ];
+ })
+ (sources."jest-util-24.9.0" // {
+ dependencies = [
+ sources."slash-2.0.0"
+ ];
+ })
+ (sources."jest-validate-24.9.0" // {
+ dependencies = [
+ sources."camelcase-5.3.1"
+ ];
+ })
+ sources."jest-watcher-24.9.0"
+ (sources."jest-worker-24.9.0" // {
+ dependencies = [
+ sources."supports-color-6.1.0"
+ ];
+ })
+ sources."js-beautify-1.10.2"
+ sources."js-stringify-1.0.2"
+ sources."js-tokens-3.0.2"
+ (sources."js-yaml-3.13.1" // {
+ dependencies = [
+ sources."esprima-4.0.1"
+ ];
+ })
+ sources."jsbn-0.1.1"
+ (sources."jsdom-11.12.0" // {
+ dependencies = [
+ sources."acorn-5.7.3"
+ (sources."acorn-globals-4.3.4" // {
+ dependencies = [
+ sources."acorn-6.3.0"
+ ];
+ })
+ sources."ws-5.2.2"
+ ];
+ })
+ sources."jsesc-1.3.0"
+ sources."json-buffer-3.0.0"
+ sources."json-parse-better-errors-1.0.2"
+ sources."json-schema-0.2.3"
+ sources."json-schema-traverse-0.4.1"
+ sources."json-stringify-safe-5.0.1"
+ sources."json3-3.3.3"
+ (sources."json5-1.0.1" // {
+ dependencies = [
+ sources."minimist-1.2.0"
+ ];
+ })
+ sources."jsonpath-plus-0.19.0"
+ sources."jsprim-1.4.1"
+ sources."jstransformer-1.0.0"
+ sources."keygrip-1.0.3"
+ sources."keyv-3.0.0"
+ sources."killable-1.0.1"
+ (sources."kind-of-3.2.2" // {
+ dependencies = [
+ sources."is-buffer-1.1.6"
+ ];
+ })
+ sources."kleur-3.0.3"
+ sources."koa-2.8.2"
+ sources."koa-body-4.1.1"
+ sources."koa-compose-4.1.0"
+ (sources."koa-convert-1.2.0" // {
+ dependencies = [
+ sources."koa-compose-3.2.1"
+ ];
+ })
+ sources."koa-is-json-1.0.0"
+ (sources."koa-router-7.4.0" // {
+ dependencies = [
+ sources."koa-compose-3.2.1"
+ ];
+ })
+ sources."koa-send-5.0.0"
+ sources."koa-static-5.0.0"
+ (sources."koa-views-6.2.1" // {
+ dependencies = [
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
+ ];
+ })
+ sources."lazy-cache-1.0.4"
+ sources."lcid-2.0.0"
+ sources."left-pad-1.3.0"
+ sources."leven-3.1.0"
+ sources."levn-0.3.0"
+ sources."load-json-file-4.0.0"
+ sources."loader-runner-2.4.0"
+ sources."loader-utils-1.2.3"
+ sources."locate-path-3.0.0"
+ sources."lodash-4.17.15"
+ sources."lodash.camelcase-4.3.0"
+ sources."lodash.clonedeep-4.5.0"
+ sources."lodash.memoize-4.1.2"
+ sources."lodash.sortby-4.7.0"
+ sources."log-symbols-2.2.0"
+ sources."loglevel-1.6.4"
+ sources."loglevelnext-1.0.5"
+ sources."long-4.0.0"
+ sources."longest-1.0.1"
+ sources."loose-envify-1.4.0"
+ sources."lowercase-keys-1.0.1"
+ sources."lru-cache-5.1.1"
+ sources."make-dir-1.3.0"
+ sources."make-error-1.3.5"
+ sources."makeerror-1.0.11"
+ sources."mamacro-0.0.3"
+ sources."map-age-cleaner-0.1.3"
+ sources."map-cache-0.2.2"
+ sources."map-visit-1.0.0"
+ sources."md5.js-1.3.5"
+ sources."media-typer-0.3.0"
+ (sources."mem-4.3.0" // {
+ dependencies = [
+ sources."mimic-fn-2.1.0"
+ sources."p-is-promise-2.1.0"
+ ];
+ })
+ sources."memory-fs-0.4.1"
+ sources."merge-descriptors-1.0.1"
+ sources."merge-stream-2.0.0"
+ sources."methods-1.1.2"
+ (sources."micromatch-3.1.10" // {
+ dependencies = [
+ sources."extend-shallow-3.0.2"
+ sources."is-extendable-1.0.1"
+ sources."kind-of-6.0.2"
+ ];
+ })
+ sources."miller-rabin-4.0.1"
+ sources."mime-1.6.0"
+ sources."mime-db-1.40.0"
+ sources."mime-types-2.1.24"
+ sources."mimic-fn-1.2.0"
+ sources."mimic-response-1.0.1"
+ sources."minimalistic-assert-1.0.1"
+ sources."minimalistic-crypto-utils-1.0.1"
+ sources."minimatch-3.0.4"
+ sources."minimist-0.0.8"
+ (sources."mississippi-2.0.0" // {
+ dependencies = [
+ sources."pump-2.0.1"
+ ];
+ })
+ (sources."mixin-deep-1.3.2" // {
+ dependencies = [
+ sources."is-extendable-1.0.1"
+ ];
+ })
+ sources."mkdirp-0.5.1"
+ sources."moment-2.24.0"
+ sources."moment-timezone-0.5.26"
+ sources."move-concurrently-1.0.1"
+ sources."ms-2.0.0"
+ sources."multicast-dns-6.2.3"
+ sources."multicast-dns-service-types-1.1.0"
+ sources."mz-2.7.0"
+ sources."nan-2.14.0"
+ (sources."nanomatch-1.2.13" // {
+ dependencies = [
+ sources."extend-shallow-3.0.2"
+ sources."is-extendable-1.0.1"
+ sources."kind-of-6.0.2"
+ ];
+ })
+ sources."natural-compare-1.4.0"
+ sources."negotiator-0.6.2"
+ sources."neo-async-2.6.1"
+ sources."next-tick-1.0.0"
+ sources."nice-try-1.0.5"
+ sources."node-forge-0.8.5"
+ sources."node-int64-0.4.0"
+ sources."node-jose-1.1.3"
+ (sources."node-libs-browser-2.2.1" // {
+ dependencies = [
+ sources."punycode-1.4.1"
+ ];
+ })
+ sources."node-modules-regexp-1.0.0"
+ sources."node-notifier-5.4.3"
+ sources."nopt-4.0.1"
+ sources."normalize-package-data-2.5.0"
+ sources."normalize-path-2.1.1"
+ sources."normalize-url-2.0.1"
+ sources."npm-run-path-2.0.2"
+ sources."number-is-nan-1.0.1"
+ sources."nwsapi-2.1.4"
+ sources."oauth-sign-0.9.0"
+ sources."object-assign-4.1.1"
+ (sources."object-copy-0.1.0" // {
+ dependencies = [
+ sources."define-property-0.2.5"
+ sources."is-accessor-descriptor-0.1.6"
+ sources."is-data-descriptor-0.1.4"
+ (sources."is-descriptor-0.1.6" // {
+ dependencies = [
+ sources."kind-of-5.1.0"
+ ];
+ })
+ ];
+ })
+ sources."object-hash-1.3.1"
+ sources."object-inspect-1.6.0"
+ sources."object-keys-1.1.1"
+ sources."object-visit-1.0.1"
+ sources."object.assign-4.1.0"
+ sources."object.getownpropertydescriptors-2.0.3"
+ sources."object.pick-1.3.0"
+ sources."obuf-1.1.2"
+ sources."oidc-token-hash-3.0.2"
+ sources."on-finished-2.3.0"
+ sources."on-headers-1.0.2"
+ sources."once-1.4.0"
+ sources."onetime-2.0.1"
+ sources."only-0.0.2"
+ sources."opener-1.5.1"
+ sources."openid-client-2.5.0"
+ sources."opn-5.5.0"
+ sources."optimist-0.6.1"
+ (sources."optionator-0.8.2" // {
+ dependencies = [
+ sources."wordwrap-1.0.0"
+ ];
+ })
+ sources."ora-3.4.0"
+ sources."original-1.0.2"
+ sources."os-browserify-0.3.0"
+ sources."os-homedir-1.0.2"
+ sources."os-locale-3.1.0"
+ sources."os-tmpdir-1.0.2"
+ sources."osenv-0.1.5"
+ sources."p-any-1.1.0"
+ sources."p-cancelable-0.4.1"
+ sources."p-defer-1.0.0"
+ sources."p-each-series-1.0.0"
+ sources."p-finally-1.0.0"
+ sources."p-is-promise-1.1.0"
+ sources."p-limit-2.2.1"
+ sources."p-locate-3.0.0"
+ sources."p-map-2.1.0"
+ sources."p-reduce-1.0.0"
+ sources."p-retry-3.0.1"
+ sources."p-some-2.0.1"
+ sources."p-timeout-2.0.1"
+ sources."p-try-2.2.0"
+ sources."pako-1.0.10"
+ sources."parallel-transform-1.2.0"
+ sources."parse-asn1-5.1.5"
+ sources."parse-json-4.0.0"
+ sources."parse-passwd-1.0.0"
+ sources."parse5-4.0.0"
+ sources."parseurl-1.3.3"
+ sources."pascalcase-0.1.1"
+ sources."path-browserify-0.0.1"
+ sources."path-dirname-1.0.2"
+ sources."path-exists-3.0.0"
+ sources."path-is-absolute-1.0.1"
+ sources."path-is-inside-1.0.2"
+ sources."path-key-2.0.1"
+ sources."path-parse-1.0.6"
+ (sources."path-to-regexp-1.7.0" // {
+ dependencies = [
+ sources."isarray-0.0.1"
+ ];
+ })
+ sources."path-type-3.0.0"
+ sources."pbkdf2-3.0.17"
+ sources."performance-now-2.1.0"
+ sources."pify-3.0.0"
+ sources."pinkie-2.0.4"
+ sources."pinkie-promise-2.0.1"
+ sources."pirates-4.0.1"
+ (sources."pkg-dir-2.0.0" // {
+ dependencies = [
+ sources."find-up-2.1.0"
+ sources."locate-path-2.0.0"
+ sources."p-limit-1.3.0"
+ sources."p-locate-2.0.0"
+ sources."p-try-1.0.0"
+ ];
+ })
+ sources."pn-1.1.0"
+ (sources."portfinder-1.0.24" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ ];
+ })
+ sources."posix-character-classes-0.1.1"
+ sources."prelude-ls-1.1.2"
+ sources."prepend-http-2.0.0"
+ sources."prettier-1.18.2"
+ sources."pretty-2.0.0"
+ sources."pretty-format-24.9.0"
+ sources."private-0.1.8"
+ sources."process-0.11.10"
+ sources."process-nextick-args-2.0.1"
+ sources."promise-7.3.1"
+ sources."promise-inflight-1.0.1"
+ sources."prompts-2.2.1"
+ sources."proto-list-1.2.4"
+ sources."proxy-addr-2.0.5"
+ sources."prr-1.0.1"
+ sources."pseudomap-1.0.2"
+ sources."psl-1.4.0"
+ sources."public-encrypt-4.0.3"
+ sources."pug-2.0.4"
+ sources."pug-attrs-2.0.4"
+ sources."pug-code-gen-2.0.2"
+ sources."pug-error-1.3.3"
+ sources."pug-filters-3.1.1"
+ sources."pug-lexer-4.1.0"
+ sources."pug-linker-3.0.6"
+ sources."pug-load-2.0.12"
+ sources."pug-parser-5.0.1"
+ sources."pug-runtime-2.0.5"
+ sources."pug-strip-comments-1.0.4"
+ sources."pug-walk-1.1.8"
+ sources."pump-3.0.0"
+ (sources."pumpify-1.5.1" // {
+ dependencies = [
+ sources."pump-2.0.1"
+ ];
+ })
+ sources."punycode-2.1.1"
+ sources."qs-6.5.2"
+ sources."query-string-5.1.1"
+ sources."querystring-0.2.0"
+ sources."querystring-es3-0.2.1"
+ sources."querystringify-2.1.1"
+ sources."randombytes-2.1.0"
+ sources."randomfill-1.0.4"
+ sources."range-parser-1.2.1"
+ sources."raw-body-2.4.1"
+ sources."react-is-16.10.2"
+ sources."read-pkg-3.0.0"
+ sources."read-pkg-up-4.0.0"
+ (sources."readable-stream-2.3.6" // {
+ dependencies = [
+ sources."safe-buffer-5.1.2"
+ ];
+ })
+ sources."readdirp-2.2.1"
+ sources."realpath-native-1.1.0"
+ sources."rechoir-0.6.2"
+ sources."regenerate-1.4.0"
+ sources."regenerator-runtime-0.11.1"
+ sources."regenerator-transform-0.10.1"
+ (sources."regex-not-1.0.2" // {
+ dependencies = [
+ sources."extend-shallow-3.0.2"
+ sources."is-extendable-1.0.1"
+ ];
+ })
+ sources."regexpu-core-2.0.0"
+ sources."regjsgen-0.2.0"
+ (sources."regjsparser-0.1.5" // {
+ dependencies = [
+ sources."jsesc-0.5.0"
+ ];
+ })
+ sources."remove-trailing-separator-1.1.0"
+ sources."repeat-element-1.1.3"
+ sources."repeat-string-1.6.1"
+ sources."repeating-2.0.1"
+ sources."request-2.88.0"
+ sources."request-promise-core-1.1.2"
+ sources."request-promise-native-1.0.7"
+ sources."require-directory-2.1.1"
+ sources."require-main-filename-2.0.0"
+ sources."requires-port-1.0.0"
+ sources."resolve-1.12.0"
+ sources."resolve-cwd-2.0.0"
+ (sources."resolve-dir-1.0.1" // {
+ dependencies = [
+ sources."global-modules-1.0.0"
+ ];
+ })
+ sources."resolve-from-3.0.0"
+ (sources."resolve-path-1.4.0" // {
+ dependencies = [
+ sources."http-errors-1.6.3"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.1.0"
+ ];
+ })
+ sources."resolve-url-0.2.1"
+ sources."responselike-1.0.2"
+ sources."restore-cursor-2.0.0"
+ sources."ret-0.1.15"
+ sources."retry-0.12.0"
+ sources."right-align-0.1.3"
+ sources."rimraf-2.7.1"
+ sources."ripemd160-2.0.2"
+ sources."rsvp-4.8.5"
+ sources."run-queue-1.0.3"
+ sources."rxjs-6.5.3"
+ sources."safe-buffer-5.2.0"
+ sources."safe-regex-1.1.0"
+ sources."safer-buffer-2.1.2"
+ (sources."sane-4.1.0" // {
+ dependencies = [
+ sources."minimist-1.2.0"
+ ];
+ })
+ sources."sax-1.2.4"
+ sources."schema-utils-1.0.0"
+ sources."select-hose-2.0.0"
+ (sources."selfsigned-1.10.7" // {
+ dependencies = [
+ sources."node-forge-0.9.0"
+ ];
+ })
+ sources."semver-5.7.1"
+ (sources."send-0.17.1" // {
+ dependencies = [
+ (sources."debug-2.6.9" // {
+ dependencies = [
+ sources."ms-2.0.0"
+ ];
+ })
+ sources."ms-2.1.1"
+ ];
+ })
+ sources."serialize-javascript-1.9.1"
+ (sources."serve-index-1.9.1" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ sources."http-errors-1.6.3"
+ sources."inherits-2.0.3"
+ sources."setprototypeof-1.1.0"
+ ];
+ })
+ sources."serve-static-1.14.1"
+ sources."set-blocking-2.0.0"
+ sources."set-value-2.0.1"
+ sources."setimmediate-1.0.5"
+ sources."setprototypeof-1.1.1"
+ sources."sha.js-2.4.11"
+ sources."shebang-command-1.2.0"
+ sources."shebang-regex-1.0.0"
+ sources."shelljs-0.8.3"
+ sources."shellwords-0.1.1"
+ sources."sigmund-1.0.1"
+ sources."signal-exit-3.0.2"
+ sources."simple-git-1.96.0"
+ sources."sisteransi-1.0.3"
+ sources."slash-1.0.0"
+ (sources."snapdragon-0.8.2" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ sources."define-property-0.2.5"
+ (sources."is-accessor-descriptor-0.1.6" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
+ sources."is-buffer-1.1.6"
+ (sources."is-data-descriptor-0.1.4" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
+ sources."is-descriptor-0.1.6"
+ sources."kind-of-5.1.0"
+ sources."source-map-0.5.7"
+ ];
+ })
+ (sources."snapdragon-node-2.1.1" // {
+ dependencies = [
+ sources."define-property-1.0.0"
+ ];
+ })
+ sources."snapdragon-util-3.0.1"
+ sources."sockjs-0.3.19"
+ (sources."sockjs-client-1.4.0" // {
+ dependencies = [
+ sources."debug-3.2.6"
+ sources."faye-websocket-0.11.3"
+ sources."ms-2.1.2"
+ ];
+ })
+ sources."sort-keys-2.0.0"
+ sources."source-list-map-2.0.1"
+ sources."source-map-0.6.1"
+ sources."source-map-resolve-0.5.2"
+ sources."source-map-support-0.5.13"
+ sources."source-map-url-0.4.0"
+ sources."spdx-correct-3.1.0"
+ sources."spdx-exceptions-2.2.0"
+ sources."spdx-expression-parse-3.0.0"
+ sources."spdx-license-ids-3.0.5"
+ (sources."spdy-4.0.1" // {
+ dependencies = [
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
+ ];
+ })
+ (sources."spdy-transport-3.0.0" // {
+ dependencies = [
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
+ sources."readable-stream-3.4.0"
+ ];
+ })
+ (sources."split-string-3.1.0" // {
+ dependencies = [
+ sources."extend-shallow-3.0.2"
+ sources."is-extendable-1.0.1"
+ ];
+ })
+ sources."sprintf-js-1.0.3"
+ sources."sshpk-1.16.1"
+ sources."ssri-5.3.0"
+ sources."stack-utils-1.0.2"
+ (sources."static-extend-0.1.2" // {
+ dependencies = [
+ sources."define-property-0.2.5"
+ (sources."is-accessor-descriptor-0.1.6" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
+ sources."is-buffer-1.1.6"
+ (sources."is-data-descriptor-0.1.4" // {
+ dependencies = [
+ sources."kind-of-3.2.2"
+ ];
+ })
+ sources."is-descriptor-0.1.6"
+ sources."kind-of-5.1.0"
+ ];
+ })
+ sources."statuses-1.5.0"
+ sources."stealthy-require-1.1.1"
+ sources."stream-browserify-2.0.2"
+ sources."stream-each-1.2.3"
+ sources."stream-http-2.8.3"
+ sources."stream-shift-1.0.0"
+ sources."strict-uri-encode-1.1.0"
+ (sources."string-length-2.0.0" // {
+ dependencies = [
+ sources."ansi-regex-3.0.0"
+ sources."strip-ansi-4.0.0"
+ ];
+ })
+ sources."string-width-3.1.0"
+ sources."string.prototype.trimleft-2.1.0"
+ sources."string.prototype.trimright-2.1.0"
+ (sources."string_decoder-1.1.1" // {
+ dependencies = [
+ sources."safe-buffer-5.1.2"
+ ];
+ })
+ sources."strip-ansi-5.2.0"
+ sources."strip-bom-3.0.0"
+ sources."strip-eof-1.0.0"
+ sources."supports-color-5.5.0"
+ sources."symbol-tree-3.2.4"
+ sources."tapable-1.1.3"
+ sources."terser-4.3.8"
+ (sources."terser-webpack-plugin-1.4.1" // {
+ dependencies = [
+ sources."cacache-12.0.3"
+ sources."find-cache-dir-2.1.0"
+ sources."make-dir-2.1.0"
+ sources."mississippi-3.0.0"
+ sources."pify-4.0.1"
+ sources."pkg-dir-3.0.0"
+ sources."ssri-6.0.1"
+ ];
+ })
+ sources."test-exclude-5.2.3"
+ sources."thenify-3.3.0"
+ sources."thenify-all-1.6.0"
+ sources."throat-4.1.0"
+ sources."through2-2.0.5"
+ sources."thunky-1.0.3"
+ sources."timed-out-4.0.1"
+ sources."timers-browserify-2.0.11"
+ sources."tmpl-1.0.4"
+ sources."to-arraybuffer-1.0.1"
+ sources."to-fast-properties-1.0.3"
+ sources."to-object-path-0.3.0"
+ (sources."to-regex-3.0.2" // {
+ dependencies = [
+ sources."extend-shallow-3.0.2"
+ sources."is-extendable-1.0.1"
+ ];
+ })
+ sources."to-regex-range-2.1.1"
+ sources."toidentifier-1.0.0"
+ sources."token-stream-0.0.1"
+ (sources."tough-cookie-2.4.3" // {
+ dependencies = [
+ sources."punycode-1.4.1"
+ ];
+ })
+ sources."tr46-1.0.1"
+ sources."trim-right-1.0.1"
+ sources."tryer-1.0.1"
+ (sources."ts-jest-24.1.0" // {
+ dependencies = [
+ sources."camelcase-4.1.0"
+ sources."json5-2.1.1"
+ sources."minimist-1.2.0"
+ sources."yargs-parser-10.1.0"
+ ];
+ })
+ sources."tslib-1.10.0"
+ sources."tty-browserify-0.0.0"
+ sources."tunnel-agent-0.6.0"
+ sources."tweetnacl-0.14.5"
+ sources."type-1.2.0"
+ sources."type-check-0.3.2"
+ sources."type-is-1.6.18"
+ sources."typedarray-0.0.6"
+ sources."typedarray-to-buffer-3.1.5"
+ sources."typescript-3.6.3"
+ sources."typical-4.0.0"
+ (sources."uglify-js-2.8.29" // {
+ dependencies = [
+ sources."source-map-0.5.7"
+ ];
+ })
+ sources."uglify-to-browserify-1.0.2"
+ sources."underscore-1.9.1"
+ sources."union-value-1.0.1"
+ sources."unique-filename-1.1.1"
+ sources."unique-slug-2.0.2"
+ sources."unpipe-1.0.0"
+ (sources."unset-value-1.0.0" // {
+ dependencies = [
+ (sources."has-value-0.3.1" // {
+ dependencies = [
+ sources."isobject-2.1.0"
+ ];
+ })
+ sources."has-values-0.1.4"
+ ];
+ })
+ sources."upath-1.2.0"
+ sources."uri-js-4.2.2"
+ sources."urijs-1.19.1"
+ sources."urix-0.1.0"
+ (sources."url-0.11.0" // {
+ dependencies = [
+ sources."punycode-1.3.2"
+ ];
+ })
+ sources."url-parse-1.4.7"
+ sources."url-parse-lax-3.0.0"
+ sources."url-to-options-1.0.1"
+ sources."use-3.1.1"
+ (sources."util-0.11.1" // {
+ dependencies = [
+ sources."inherits-2.0.3"
+ ];
+ })
+ sources."util-deprecate-1.0.2"
+ sources."util.promisify-1.0.0"
+ sources."utils-merge-1.0.1"
+ sources."uuid-3.3.3"
+ sources."v8-compile-cache-2.0.3"
+ sources."validate-npm-package-license-3.0.4"
+ sources."vary-1.1.2"
+ sources."verror-1.10.0"
+ sources."vm-browserify-1.1.0"
+ sources."void-elements-2.0.1"
+ sources."w3c-hr-time-1.0.1"
+ sources."walker-1.0.7"
+ sources."watchpack-1.6.0"
+ sources."wbuf-1.7.3"
+ sources."wcwidth-1.0.1"
+ sources."webidl-conversions-4.0.2"
+ (sources."webpack-4.41.0" // {
+ dependencies = [
+ sources."acorn-6.3.0"
+ ];
+ })
+ (sources."webpack-bundle-analyzer-3.5.2" // {
+ dependencies = [
+ sources."acorn-6.3.0"
+ ];
+ })
+ (sources."webpack-cli-3.3.9" // {
+ dependencies = [
+ sources."cliui-5.0.0"
+ sources."supports-color-6.1.0"
+ sources."yargs-13.2.4"
+ ];
+ })
+ (sources."webpack-dev-middleware-3.7.2" // {
+ dependencies = [
+ sources."mime-2.4.4"
+ sources."webpack-log-2.0.0"
+ ];
+ })
+ (sources."webpack-dev-server-3.8.2" // {
+ dependencies = [
+ sources."ansi-regex-2.1.1"
+ sources."camelcase-5.3.1"
+ (sources."cliui-4.1.0" // {
+ dependencies = [
+ sources."ansi-regex-3.0.0"
+ sources."strip-ansi-4.0.0"
+ ];
+ })
+ sources."debug-4.1.1"
+ sources."get-caller-file-1.0.3"
+ sources."is-fullwidth-code-point-1.0.0"
+ sources."ms-2.1.2"
+ sources."require-main-filename-1.0.1"
+ sources."semver-6.3.0"
+ (sources."string-width-2.1.1" // {
+ dependencies = [
+ sources."ansi-regex-3.0.0"
+ sources."is-fullwidth-code-point-2.0.0"
+ sources."strip-ansi-4.0.0"
+ ];
+ })
+ sources."strip-ansi-3.0.1"
+ sources."supports-color-6.1.0"
+ sources."webpack-log-2.0.0"
+ (sources."wrap-ansi-2.1.0" // {
+ dependencies = [
+ sources."string-width-1.0.2"
+ ];
+ })
+ sources."yargs-12.0.5"
+ sources."yargs-parser-11.1.1"
+ ];
+ })
+ sources."webpack-log-1.2.0"
+ sources."webpack-sources-1.4.3"
+ (sources."websocket-1.0.30" // {
+ dependencies = [
+ sources."debug-2.6.9"
+ ];
+ })
+ sources."websocket-driver-0.7.3"
+ sources."websocket-extensions-0.1.3"
+ sources."whatwg-encoding-1.0.5"
+ sources."whatwg-mimetype-2.3.0"
+ sources."whatwg-url-6.5.0"
+ sources."which-1.3.1"
+ sources."which-module-2.0.0"
+ sources."window-size-0.1.0"
+ sources."with-5.1.1"
+ sources."wordwrap-0.0.2"
+ sources."worker-farm-1.7.0"
+ sources."wrap-ansi-5.1.0"
+ sources."wrappy-1.0.2"
+ sources."write-file-atomic-2.4.1"
+ sources."ws-6.2.1"
+ sources."xml-name-validator-3.0.0"
+ sources."xtend-4.0.2"
+ sources."y18n-4.0.0"
+ sources."yaeti-0.0.6"
+ sources."yallist-3.1.1"
+ sources."yargs-3.10.0"
+ (sources."yargs-parser-13.1.1" // {
+ dependencies = [
+ sources."camelcase-5.3.1"
+ ];
+ })
+ sources."ylru-1.2.1"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ license = "MIT";
+ };
+ production = false;
+ bypassCache = true;
+ reconstructLock = true;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/spacegun/package.json b/pkgs/applications/networking/cluster/spacegun/package.json
new file mode 100644
index 000000000000..7d419edb74a2
--- /dev/null
+++ b/pkgs/applications/networking/cluster/spacegun/package.json
@@ -0,0 +1,3 @@
+[
+ { "spacegun": "git+https://github.com/dvallin/spacegun.git#v0.3.3" }
+]
diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix
index fcc55c5e1d05..cd37083d9359 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix
@@ -4,27 +4,31 @@
{
owner = "terraform-providers";
repo = "terraform-provider-acme";
- version = "1.3.5";
- sha256 = "0xjxxz3vxq7vk7sv6b5p57z5x92dmrm44v6ksffcg76ngc40nrxk";
+ rev = "v1.5.0";
+ version = "1.5.0";
+ sha256 = "1h53bgflchavnn4laf801d920bsgqqg0ph4slnf7y1fpb0mz5vdv";
};
alicloud =
{
owner = "terraform-providers";
repo = "terraform-provider-alicloud";
- version = "1.54.0";
- sha256 = "01pmhwdnhfsk785ja11hxn5l5fmklnkiv12kv2pw2280cdljfcv4";
+ rev = "v1.63.0";
+ version = "1.63.0";
+ sha256 = "0353zsga4ic7rsgnk243v202l4hpy0xlzp95fnbmrz7p5wy2k8js";
};
archive =
{
owner = "terraform-providers";
repo = "terraform-provider-archive";
- version = "1.2.2";
- sha256 = "1saprj2r74b63z03n80m3mfj3vhgvlm4gp2hzqzjbdgibxsz4jaw";
+ rev = "v1.3.0";
+ version = "1.3.0";
+ sha256 = "1hwg8ai4bvsmgnl669608lr4v940xnyig1xshps490f47c8hqy6y";
};
arukas =
{
owner = "terraform-providers";
repo = "terraform-provider-arukas";
+ rev = "v1.1.0";
version = "1.1.0";
sha256 = "1akl9fzgm5qv01vz18xjzyqjnlxw699qq4x8vr96j16l1zf10h99";
};
@@ -32,6 +36,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-atlas";
+ rev = "v0.1.1";
version = "0.1.1";
sha256 = "0k73vv14vnjl5qm33w54s5zzi0mmk1kn2zs3qkfq71aqi9ml7d14";
};
@@ -39,41 +44,47 @@
{
owner = "terraform-providers";
repo = "terraform-provider-aws";
- version = "2.23.0";
- sha256 = "0yscy0qmdl07air0b16i6zd0w8y3z20pk5l53pwm78ssdxn3w6qc";
+ rev = "v2.41.0";
+ version = "2.41.0";
+ sha256 = "0i9bh78ihmxj7hjbqzkkj7k6lvr3xdakf8qv0bfckcinwpzwzbxa";
};
azuread =
{
owner = "terraform-providers";
repo = "terraform-provider-azuread";
- version = "0.5.1";
- sha256 = "0bjy6wdfzsxchqclgp7c06b49b5h60nips69hcpwd45564iql5fh";
+ rev = "v0.7.0";
+ version = "0.7.0";
+ sha256 = "1a7w31dvjz5498445ia4m5gd1js3k7ghz6qqfq51f2n86iafs0xq";
};
azurerm =
{
owner = "terraform-providers";
repo = "terraform-provider-azurerm";
- version = "1.32.1";
- sha256 = "0ydzibmvz52i62pk0g96rl7vxhff5izrsgdwk6lgc56nw63w2l8g";
+ rev = "v1.37.0";
+ version = "1.37.0";
+ sha256 = "0n0582v8g3np8glyxnpnayps014jxclzrglcxf35wszfz9mspryg";
};
azurestack =
{
owner = "terraform-providers";
repo = "terraform-provider-azurestack";
- version = "0.8.1";
- sha256 = "1sbmjrqzzn8rf9xhaax2ykyg199sggx80apx0xvd4ab82c3ldyfw";
+ rev = "v0.9.0";
+ version = "0.9.0";
+ sha256 = "1msm7jwzry0vmas3l68h6p0migrsm6d18zpxcncv197m8xbvg324";
};
bigip =
{
owner = "terraform-providers";
repo = "terraform-provider-bigip";
- version = "0.12.3";
- sha256 = "1zlwk7jp5r45b3rwkxsq9mqf4nym3ifx56vhcvyc9a3w25s0ss8p";
+ rev = "v1.1.0";
+ version = "1.1.0";
+ sha256 = "15fmxr1c39xx6ix38nigf8izrqzlmjjr6hvlkf7yhb5z7485nvsg";
};
bitbucket =
{
owner = "terraform-providers";
repo = "terraform-provider-bitbucket";
+ rev = "v1.1.0";
version = "1.1.0";
sha256 = "06bjagbgpgfphwym015wl00wx6qf7lsdig0fhpxqaykvlkn3sg49";
};
@@ -81,6 +92,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-brightbox";
+ rev = "v1.2.0";
version = "1.2.0";
sha256 = "0s1b2k58r2kmjrdqrkw2dlfpby79i81gml9rpa10y372bwq314zd";
};
@@ -88,6 +100,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-chef";
+ rev = "v0.2.0";
version = "0.2.0";
sha256 = "0ihn4706fflmf0585w22l7arzxsa9biq4cgh8nlhlp5y0zy934ns";
};
@@ -95,13 +108,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-circonus";
- version = "0.2.0";
- sha256 = "1vcia3p31cgdwjs06k4244bk7ib2qp1f2lhc7hmyhdfi1c8jym45";
+ rev = "v0.4.0";
+ version = "0.4.0";
+ sha256 = "0iz7v7gfjgbca47vjnvcv9159kgladkad7cmjw2hpncrn2jjinwg";
};
clc =
{
owner = "terraform-providers";
repo = "terraform-provider-clc";
+ rev = "v0.1.0";
version = "0.1.0";
sha256 = "0gvsjnwk6xkgxai1gxsjf0hsjxbv8d8jg5hq8yd3hjhc6785fgnf";
};
@@ -109,20 +124,23 @@
{
owner = "terraform-providers";
repo = "terraform-provider-cloudflare";
- version = "1.17.1";
- sha256 = "0kmkk5fhgsvjakqrfs7p92dcljn04asxq15af1r9n5csq54q7na3";
+ rev = "v2.1.0";
+ version = "2.1.0";
+ sha256 = "1ll06p4fz88mr4a51rqgvxykivx9xina6507mflyxaic59xlkdz4";
};
cloudscale =
{
owner = "terraform-providers";
repo = "terraform-provider-cloudscale";
- version = "2.0.0";
- sha256 = "145hj4pbi5zrkgamicy3m1n3380fpd2ndd6ym7mwd65d95g39vwb";
+ rev = "v2.1.0";
+ version = "2.1.0";
+ sha256 = "12vxzhpsivvq343mqkmnwklvnv6dc9h2ah0ixla9svdwjp91xfcd";
};
cloudstack =
{
owner = "terraform-providers";
repo = "terraform-provider-cloudstack";
+ rev = "v0.3.0";
version = "0.3.0";
sha256 = "0zmyww6z3j839ydlmv254hr8gcsixng4lcvmiwkhxb3hj1nw8hcw";
};
@@ -130,6 +148,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-cobbler";
+ rev = "v1.1.0";
version = "1.1.0";
sha256 = "08ljqibfi6alpvv8f7pzvjl2k4w6br6g6ac755x4xw4ycrr24xw9";
};
@@ -137,27 +156,31 @@
{
owner = "terraform-providers";
repo = "terraform-provider-consul";
- version = "2.5.0";
- sha256 = "1nmldxn4y87fyb308dajjzcyvxrr6ka5nicyw84a8s7pixzbqh6q";
+ rev = "v2.6.0";
+ version = "2.6.0";
+ sha256 = "1c7qpgf2vh4crs69alzwwaicsz29b2y72x4xjmfb9dg5cy7gk1i5";
};
datadog =
{
owner = "terraform-providers";
repo = "terraform-provider-datadog";
- version = "2.1.0";
- sha256 = "0k7apad2r07gw9kf0zzqc8wa2wcmxihi3x8sdssl32qjib20qwv1";
+ rev = "v2.5.0";
+ version = "2.5.0";
+ sha256 = "0l5jix165ghfj72l3mr76d5b5lx5pgr45zimk8lr0fwn79f4bs74";
};
digitalocean =
{
owner = "terraform-providers";
repo = "terraform-provider-digitalocean";
- version = "1.6.0";
- sha256 = "06cxm3qcym8jwp4nl1bzk3p9fbaz26bvddqzn3p8l57c802qqds6";
+ rev = "v1.11.0";
+ version = "1.11.0";
+ sha256 = "0s8z0zsfibclx0431fcqbi9yqkhwj4w0rz780z1dwv50xpgnmzql";
};
dme =
{
owner = "terraform-providers";
repo = "terraform-provider-dme";
+ rev = "v0.1.0";
version = "0.1.0";
sha256 = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv";
};
@@ -165,6 +188,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-dns";
+ rev = "v2.2.0";
version = "2.2.0";
sha256 = "11xdxj6hfclaq9glbh14nihmrsk220crm9ld8bdv77w0bppmrrch";
};
@@ -172,6 +196,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-dnsimple";
+ rev = "v0.2.0";
version = "0.2.0";
sha256 = "0jj82fffqaz7gramj5d4avx7vka6w190yz4r9q7628qh8ih2pfhz";
};
@@ -179,13 +204,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-docker";
- version = "2.1.1";
- sha256 = "0px3xj76ay5ixpmynas49z31xmk4zmpn0917y6a20kr2x2abi9zb";
+ rev = "v2.6.0";
+ version = "2.6.0";
+ sha256 = "12qq7m75yxfczik78klqaimrzhp70m2vk5q0h3v8b2dwvvynj0dg";
};
dyn =
{
owner = "terraform-providers";
repo = "terraform-provider-dyn";
+ rev = "v1.2.0";
version = "1.2.0";
sha256 = "1a3kxmbib2y0nl7gnxknbhsflj5kfknxnm3gjxxrb2h5d2kvqy48";
};
@@ -193,6 +220,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-external";
+ rev = "v1.2.0";
version = "1.2.0";
sha256 = "1kx28bffhd1pg3m0cbldclc8l9zic16mqrk7gybcls9vyds5gbvc";
};
@@ -200,48 +228,55 @@
{
owner = "terraform-providers";
repo = "terraform-provider-fastly";
- version = "0.9.0";
- sha256 = "0g3rgi6s9hyb6vzl682n8zqz5virdxvxh04v88n9iy5r7hwrxxzg";
+ rev = "v0.11.0";
+ version = "0.11.0";
+ sha256 = "0wq8l1lkfpv5nfd04dsjaa9wv09373i6wwnapifx1wncjyhs4jd4";
};
flexibleengine =
{
owner = "terraform-providers";
repo = "terraform-provider-flexibleengine";
- version = "1.6.0";
- sha256 = "0vz68nhpy93zsdssxzr41flrwhjqh7wcjrc4nklg6kmr99n6jcc6";
+ rev = "v1.9.0";
+ version = "1.9.0";
+ sha256 = "1y66xy5yqdjdrh3zkw1q7ml5b2rsyy4ayc4m026c4mmh0x1vfk9y";
};
github =
{
owner = "terraform-providers";
repo = "terraform-provider-github";
- version = "2.2.0";
- sha256 = "1h44v7428z3v3hv6ywi3n0yhnvgx9cr6vgqb1n2w1qf7k2f0jkzx";
+ rev = "v2.2.1";
+ version = "2.2.1";
+ sha256 = "1dg5jgd3cdz98wfd71l58wsp949mvs2lrcqh1amgql0s90pwjmvg";
};
gitlab =
{
owner = "terraform-providers";
repo = "terraform-provider-gitlab";
- version = "2.2.0";
- sha256 = "0iz5ggjkcip86cz2zmsryad34hly542grwzlm5rvpcmfw5csjadw";
+ rev = "v2.4.0";
+ version = "2.4.0";
+ sha256 = "0409n8miva205wkx968ggzmz0y121s99iybsjlkx0gja20x68yxx";
};
google =
{
owner = "terraform-providers";
repo = "terraform-provider-google";
- version = "2.12.0";
- sha256 = "15fdpmdikm77hlfksdbcblysb82sd51vw4ninx60hzgddqp6ll4m";
+ rev = "v2.20.0";
+ version = "2.20.0";
+ sha256 = "1b19hql244lv74gxdwgqh9955d3zkwj7riaq6kj5ylbj44spcpjy";
};
google-beta =
{
owner = "terraform-providers";
repo = "terraform-provider-google-beta";
- version = "2.12.0";
- sha256 = "11aky7jvm7i39pnj3ypy42d9yk9akqb3wjb03hyllzfddwhvay5q";
+ rev = "v2.20.0";
+ version = "2.20.0";
+ sha256 = "0zkhyn17kji6yyl5582g5vhqj3rcbin73ym6vn6f0m7sf5yaplky";
};
grafana =
{
owner = "terraform-providers";
repo = "terraform-provider-grafana";
+ rev = "v1.5.0";
version = "1.5.0";
sha256 = "0zy3bqgpxymp2zygaxzllk1ysdankwxa1sy1djfgr4fs2nlggkwi";
};
@@ -249,34 +284,39 @@
{
owner = "terraform-providers";
repo = "terraform-provider-hcloud";
- version = "1.12.0";
- sha256 = "1r61s7chq636fcjv67g0vjlc35xx0ycy58hg6b5i5rdc9737v7hp";
+ rev = "v1.15.0";
+ version = "1.15.0";
+ sha256 = "0l554mf6s248j0453b4r5pafshcvhn2smk4pp23y9kq5g1xd0xmd";
};
hedvig =
{
owner = "terraform-providers";
repo = "terraform-provider-hedvig";
- version = "1.0.4";
- sha256 = "0y6brzznxp8khdfbnpmnbjqf140411z0pvnp88p8mj2kmbk7kkjd";
+ rev = "v1.0.5";
+ version = "1.0.5";
+ sha256 = "0dic4kqjwi3s8pss1pmgixnr7xi503gl5i7pcx66fam5y5ar92v5";
};
helm =
{
owner = "terraform-providers";
repo = "terraform-provider-helm";
- version = "0.10.2";
- sha256 = "1xp8dx6ncskmfa9bjd54434f4a7pnjz5r3yvnh1hmv3i5ykfxzdn";
+ rev = "v0.10.4";
+ version = "0.10.4";
+ sha256 = "0xl0wgh1j6yhymadqvlj21qddxfzaxk3d5wpzskfmhfk732795rc";
};
heroku =
{
owner = "terraform-providers";
repo = "terraform-provider-heroku";
- version = "2.1.2";
- sha256 = "0n8id5rw4hzsiic9yv4rzm709npagv9sfp6dd1ax6np5kai78b87";
+ rev = "v2.2.1";
+ version = "2.2.1";
+ sha256 = "145kfm4asca0ksprb076mjdhs5ahrlrad8cqz8spxra5fa3j46sq";
};
http =
{
owner = "terraform-providers";
repo = "terraform-provider-http";
+ rev = "v1.1.1";
version = "1.1.1";
sha256 = "0ah4wi9gm5m7z0wyy6vn3baz2iw2sq7ah7q0lb9srwr887aai3x0";
};
@@ -284,13 +324,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-huaweicloud";
- version = "1.7.0";
- sha256 = "1yhyyh33hvzs74pryb383p1w0c0d4vn23pnm6snxi1cw49wgiiyf";
+ rev = "v1.10.0";
+ version = "1.10.0";
+ sha256 = "0aa83y0bzfldijd4jbmhqppc13jdqaax83p75kffwaxw1rmxrana";
};
icinga2 =
{
owner = "terraform-providers";
repo = "terraform-provider-icinga2";
+ rev = "v0.2.0";
version = "0.2.0";
sha256 = "02ladn2w75k35vn8llj3zh9hbpnnnvpm47c9f29zshfs04acwbq0";
};
@@ -298,13 +340,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-ignition";
- version = "1.1.0";
- sha256 = "0vpjbb70wnlrvw7z2zc92fbisgjk49ivdmv10ahyqlgvc23js5va";
+ rev = "v1.2.0";
+ version = "1.2.0";
+ sha256 = "0dg5xak02rv7h9z07kjqxf55al188ligzq3m6711rlh62zam2cjc";
};
influxdb =
{
owner = "terraform-providers";
repo = "terraform-provider-influxdb";
+ rev = "v1.3.0";
version = "1.3.0";
sha256 = "19af40g8hgz2rdz6523v0fs71ww7qdlf2mh5j9vb7pfzriqwa5k9";
};
@@ -312,13 +356,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-kubernetes";
- version = "1.8.1";
- sha256 = "0jcc3i10x0qz7sj8l5yv98jc2g32a6yhdpc45sq33wmhcvp1fsn4";
+ rev = "v1.10.0";
+ version = "1.10.0";
+ sha256 = "04hd9n9jm72fi81cmdz0yf374fg52r8yinsxy0ag29rd3r2l1k81";
};
librato =
{
owner = "terraform-providers";
repo = "terraform-provider-librato";
+ rev = "v0.1.0";
version = "0.1.0";
sha256 = "0bxadwj5s7bvc4vlymn3w6qckf14hz82r7q98w2nh55sqr52d923";
};
@@ -326,20 +372,23 @@
{
owner = "terraform-providers";
repo = "terraform-provider-linode";
- version = "1.8.0";
- sha256 = "1jgh2ij58a5mr6ns604cfpvfvr19qr0q51j57gvchz53iv683m9q";
+ rev = "v1.9.1";
+ version = "1.9.1";
+ sha256 = "10f7nij91fhgf1808r6rv3l13nz7p37mcln5p3nfvhsxskss3vxn";
};
local =
{
owner = "terraform-providers";
repo = "terraform-provider-local";
- version = "1.3.0";
- sha256 = "1z6b52vdq7wzzipldys28z45glwgj9k15ighjix1dy78mzi0p99n";
+ rev = "v1.4.0";
+ version = "1.4.0";
+ sha256 = "1k1kbdn99ypn1pi6vqbs1l9a8vvf4vs32wl8waa16i26514sz1wk";
};
logentries =
{
owner = "terraform-providers";
repo = "terraform-provider-logentries";
+ rev = "v1.0.0";
version = "1.0.0";
sha256 = "04xprkb9zwdjyzmsdf10bgmn8sa8q7jw0izz8lw0cc9hag97qgbq";
};
@@ -347,6 +396,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-logicmonitor";
+ rev = "v1.2.1";
version = "1.2.1";
sha256 = "1fcv5g92l6xr4x69h9rg48zazjr99wrz9mkmr122fyq9s7kdd98y";
};
@@ -354,20 +404,23 @@
{
owner = "terraform-providers";
repo = "terraform-provider-mailgun";
- version = "0.1.0";
- sha256 = "1hjhjfxqbr43wa248c6hc91lx5b2gdw4vl92l2i6aqp17rbc0wfj";
+ rev = "v0.4.1";
+ version = "0.4.1";
+ sha256 = "1l76pg4hmww9zg2n4rkhm5dwjh42fxri6d41ih1bf670krkxwsmz";
};
mysql =
{
owner = "terraform-providers";
repo = "terraform-provider-mysql";
- version = "1.7.0";
- sha256 = "19l1ihp5jlaahm8zncjlrnfw8d8gcpnq3z6pn421j1x0d5v5vw9b";
+ rev = "v1.9.0";
+ version = "1.9.0";
+ sha256 = "14gxxki3jhncv3s2x828ns2vgmf2xxzigdyp9b54mbkw5rnv1k2g";
};
netlify =
{
owner = "terraform-providers";
repo = "terraform-provider-netlify";
+ rev = "v0.3.0";
version = "0.3.0";
sha256 = "0mmbli6d3fbpyvvdfsg32f1w83g8ga3x21b36rgmx3mn156r7yij";
};
@@ -375,34 +428,39 @@
{
owner = "terraform-providers";
repo = "terraform-provider-newrelic";
- version = "1.5.1";
- sha256 = "1xrwh9m1sig4hd2vvb7apy2gh8rz15wdrajggzmmpc1z1rlhf90p";
+ rev = "v1.8.0";
+ version = "1.8.0";
+ sha256 = "16fdif6hshdb1aswv22k590rcr3f6b3a9gmg8vc4lbyi6l2dfabd";
};
nomad =
{
owner = "terraform-providers";
repo = "terraform-provider-nomad";
- version = "1.4.1";
- sha256 = "1v4wwinnb2qc71jgil4607kgdccjivssabqgb5l3yk8pwfidgdnr";
+ rev = "v1.4.2";
+ version = "1.4.2";
+ sha256 = "0h0snkzqdi4g5lp78f5pq98x6556ldwgkg9p9jkmrg04y7928w5v";
};
ns1 =
{
owner = "terraform-providers";
repo = "terraform-provider-ns1";
- version = "1.5.0";
- sha256 = "1m6f1hsx2gcb5b50sm8cj04hkmn71xlxji8qwlswasz2sg1sllrx";
+ rev = "v1.6.1";
+ version = "1.6.1";
+ sha256 = "0zyn165h42p640k1q85x3n8fw1fs9j72z9lnfa8pas89jy2fmi8b";
};
nsxt =
{
owner = "terraform-providers";
repo = "terraform-provider-nsxt";
- version = "1.1.1";
- sha256 = "19bbycify25bshpyq65qjxnl72b6wmwwwdb7hxl94hhbgx2c9z29";
+ rev = "v1.1.2";
+ version = "1.1.2";
+ sha256 = "1hnxivad7371j363sp3460mfzl5alb3dhxsbp0qwfl5mzvriwrbl";
};
null =
{
owner = "terraform-providers";
repo = "terraform-provider-null";
+ rev = "v2.1.2";
version = "2.1.2";
sha256 = "0di1hxmd3s80sz8hl5q2i425by8fbk15f0r4jmnm6vra0cq89jw2";
};
@@ -410,20 +468,23 @@
{
owner = "terraform-providers";
repo = "terraform-provider-nutanix";
- version = "1.0.1";
- sha256 = "1g7p6qg32g75x8fgspgxcdsa086mz3yabdgv1k68rykhw3zbri5d";
+ rev = "v1.0.2";
+ version = "1.0.2";
+ sha256 = "17sgsxsh8minirks08c6gz52cf7ndn220sx4xzi6bq64yi6qw2yc";
};
oci =
{
owner = "terraform-providers";
repo = "terraform-provider-oci";
- version = "3.37.0-rc1";
- sha256 = "0ahqnh9qzixp434qn2ckj8p32kb9x26l1xz8yr84h6sqfrn58bcv";
+ rev = "v3.54.0-rc1";
+ version = "3.54.0-rc1";
+ sha256 = "14mfkjjpq4sfw0j4w1mnh37x9kwn76rs1y6cjqq9zb8fnhva6gax";
};
oneandone =
{
owner = "terraform-providers";
repo = "terraform-provider-oneandone";
+ rev = "v1.3.0";
version = "1.3.0";
sha256 = "0c412nqg3k17124i51nn3ffra6gcll904h37h7hyvz97cdblcncn";
};
@@ -431,6 +492,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-opc";
+ rev = "v1.3.7";
version = "1.3.7";
sha256 = "01g09w8mqfp1d8phplsdj0vz63q5bgq9fqwy2kp4vrnwb70dq52w";
};
@@ -438,34 +500,39 @@
{
owner = "terraform-providers";
repo = "terraform-provider-openstack";
- version = "1.21.1";
- sha256 = "0nvhn2bnk11sz4i98yw7rpxi8b3c2y04qq37ybvqx2jyi3n9kj30";
+ rev = "v1.24.0";
+ version = "1.24.0";
+ sha256 = "1w82ix6l6ad7q0zl00hys8c4gm27nnk12wm2n8i3prwpjnrar70m";
};
opentelekomcloud =
{
owner = "terraform-providers";
repo = "terraform-provider-opentelekomcloud";
- version = "1.11.0";
- sha256 = "175j2bbw3bdbjq1b7b1kwsr8iay9aafz165d0brfpb8gf096y7xa";
+ rev = "v1.14.0";
+ version = "1.14.0";
+ sha256 = "1mjb6br8iy76q417lmg04xnv4hkgi2fgdn3qnr3nvlwnnccp230k";
};
opsgenie =
{
owner = "terraform-providers";
repo = "terraform-provider-opsgenie";
- version = "0.1.0";
- sha256 = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm";
+ rev = "v0.2.5";
+ version = "0.2.5";
+ sha256 = "0brjqnlnxqss285n2g1z006bibbdh5v47g75l5kyhyhhchavccma";
};
oraclepaas =
{
owner = "terraform-providers";
repo = "terraform-provider-oraclepaas";
- version = "1.5.2";
- sha256 = "0m886wfg5ski8s1zr7g1h1m6q5ai08jk35ymipxpb6ipx781qvvk";
+ rev = "v1.5.3";
+ version = "1.5.3";
+ sha256 = "0xb03b5jgm06rgrllib6zj1nkh54zv2mqjnyfflgnazpf4c1ia15";
};
ovh =
{
owner = "terraform-providers";
repo = "terraform-provider-ovh";
+ rev = "v0.5.0";
version = "0.5.0";
sha256 = "07n8ismxbv0gngh4kibqhr4ndqkrg6gxbpj3zl764rrwp54gwgbw";
};
@@ -473,41 +540,47 @@
{
owner = "terraform-providers";
repo = "terraform-provider-packet";
- version = "2.3.0";
- sha256 = "1v2758wjhrn7rhwdx658w3sf1q5lp4cawl6llbv4p16c5fyzwwc2";
+ rev = "v2.7.1";
+ version = "2.7.1";
+ sha256 = "1hmja9c8ab66yr814psz1zsa4y0nbmd5rcnp3qxdgizp45yrvz3i";
};
pagerduty =
{
owner = "terraform-providers";
repo = "terraform-provider-pagerduty";
- version = "1.3.1";
- sha256 = "1x29ya0xcjj2b3x2q2q7iyqric8vswf18a5bwhwv2017c1g4n299";
+ rev = "v1.4.1";
+ version = "1.4.1";
+ sha256 = "0dmafnlziyczad907isjqzsn1fyjzc8pdigp3m6114bbnca0ry5k";
};
panos =
{
owner = "terraform-providers";
repo = "terraform-provider-panos";
- version = "1.5.2";
- sha256 = "0sycgr4k4dlhxj5klmgg2xcw3xha06332ij8cfzz4xvgdq0xky3j";
+ rev = "v1.6.1";
+ version = "1.6.1";
+ sha256 = "06hwi426x7ipmn4dbg5dyv9z84sxaa8q1jlcd2l264n9s2y3xhiq";
};
postgresql =
{
owner = "terraform-providers";
repo = "terraform-provider-postgresql";
- version = "1.1.0";
- sha256 = "1dxspqajfy8dmplasazi4s34f47n1qz7qg2dr9ypdvd3jp63072w";
+ rev = "v1.3.0";
+ version = "1.3.0";
+ sha256 = "14ma5lm6ng52dfl8bl4rmpy8ylnkbvnbskvkr6r5sn28x51p601y";
};
powerdns =
{
owner = "terraform-providers";
repo = "terraform-provider-powerdns";
- version = "1.0.0";
- sha256 = "1qh4z69b0sqxwjjgc8xis165gdszav9yc85ba6pgyl3wbymkld30";
+ rev = "v1.2.0";
+ version = "1.2.0";
+ sha256 = "1108hq4z4is305hnbkn95gv0f5lx5l27wvxvq0g03fcdqdimkrfn";
};
profitbricks =
{
owner = "terraform-providers";
repo = "terraform-provider-profitbricks";
+ rev = "v1.4.4";
version = "1.4.4";
sha256 = "0pzcl3pdhaykihvv1v38zrv607mydchvkzrzhwcakgmdkp3vq54i";
};
@@ -515,6 +588,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-rabbitmq";
+ rev = "v1.1.0";
version = "1.1.0";
sha256 = "0xihc44923kx8c3v6wrvczzbhmbjkhy7dhgx3sy5sqhmm22y0gys";
};
@@ -522,6 +596,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-rancher";
+ rev = "v1.4.0";
version = "1.4.0";
sha256 = "106arszmdjmgrz4iv01bbf72jarn7zjqvmc43b6n1s3lzd7jnfpc";
};
@@ -529,13 +604,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-random";
- version = "2.2.0";
- sha256 = "0vg33jbvyxvg4dwcwjb2p57jjkq7qj50d356r4a1f2ysl2axwwjw";
+ rev = "v2.2.1";
+ version = "2.2.1";
+ sha256 = "1qklsxj443vsj61lwl7qf7xwgnllwcvb2yk6s0kn9g3iq63pcv30";
};
rightscale =
{
owner = "terraform-providers";
repo = "terraform-provider-rightscale";
+ rev = "v1.3.1";
version = "1.3.1";
sha256 = "0abwxaghrxpahpsk6kd02fjh0rhck4xsdrzcpv629yh8ip9rzcaj";
};
@@ -543,6 +620,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-rundeck";
+ rev = "v0.4.0";
version = "0.4.0";
sha256 = "1x131djsny8w84yf7w2il33wlc3ysy3k399dziii2lmq4h8sgrpr";
};
@@ -550,6 +628,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-runscope";
+ rev = "v0.6.0";
version = "0.6.0";
sha256 = "1fsph2cnyvzdwa5hwdjabfk4azmc3x8a7afpwpawxfdvqhgpr595";
};
@@ -557,20 +636,23 @@
{
owner = "terraform-providers";
repo = "terraform-provider-scaleway";
- version = "1.10.0";
- sha256 = "0sbcvcd413f53b25piymmh4rfmlmqsxdscpar8gf2dx6mrsacgf0";
+ rev = "v1.12.0";
+ version = "1.12.0";
+ sha256 = "0044fq5jkdx2ryc2bxqajkrngs6z81kd2narg4zxvfn0r1bfswvc";
};
selectel =
{
owner = "terraform-providers";
repo = "terraform-provider-selectel";
- version = "2.3.0";
- sha256 = "0n0nqlajcx44zxbc2k58lv3jy2y6p9zqkby2vy5a2856kcksm7pf";
+ rev = "v3.0.0";
+ version = "3.0.0";
+ sha256 = "0fr97j85inaqvdqmlfk3xcq73zvncn001nsd03pp2ws30qqa8p7r";
};
skytap =
{
owner = "terraform-providers";
repo = "terraform-provider-skytap";
+ rev = "v0.11.1";
version = "0.11.1";
sha256 = "1mlv6jp6lp47chcnsmx8dzy01bxpb9jx1wl122lxd88app9nxq1k";
};
@@ -578,6 +660,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-softlayer";
+ rev = "v0.0.1";
version = "0.0.1";
sha256 = "1xcg5zm2n1pc3l7ng94k589r7ykv6fxsmr5qn9xmmpdf912rdnfq";
};
@@ -585,13 +668,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-spotinst";
- version = "1.13.3";
- sha256 = "0s75xlw8y3rz1ik11dnh3dzkk1jfklvq3wsf2fam0789z2j1zr1m";
+ rev = "v1.13.4";
+ version = "1.13.4";
+ sha256 = "063lhm065y6qh9b2k11qjnqyfg5zrx6wa3bqrm7d1dqcha1i6d9f";
};
statuscake =
{
owner = "terraform-providers";
repo = "terraform-provider-statuscake";
+ rev = "v1.0.0";
version = "1.0.0";
sha256 = "1x295va6c72465cxps0kx3rrb7s9aip2cniy6icsg1b2yrsb9b26";
};
@@ -599,6 +684,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-telefonicaopencloud";
+ rev = "v1.0.0";
version = "1.0.0";
sha256 = "1761wkjz3d2458xl7855lxklyxgyk05fddh92rp6975y0ca6xa5m";
};
@@ -606,6 +692,7 @@
{
owner = "terraform-providers";
repo = "terraform-provider-template";
+ rev = "v2.1.2";
version = "2.1.2";
sha256 = "18w1mmma81m9j7yf6q500w8v9ss28w6sw2ynssl99pyw2gwmd04q";
};
@@ -613,13 +700,15 @@
{
owner = "terraform-providers";
repo = "terraform-provider-tencentcloud";
- version = "1.15.0";
- sha256 = "1ics91fxsl1z1wqd961wdn2s22ck25yphp341qlbs8ln2dcwk8r7";
+ rev = "v1.25.2";
+ version = "1.25.2";
+ sha256 = "1pf4l9rvkarl4vhf51np4kdqcgs4jhsr5gw7vs6rn8gv97lb40kw";
};
terraform =
{
owner = "terraform-providers";
repo = "terraform-provider-terraform";
+ rev = "v1.0.2";
version = "1.0.2";
sha256 = "1aj6g6l68n9kqmxfjlkwwxnac7fhha6wrmvsw4yylf0qyssww75v";
};
@@ -627,34 +716,39 @@
{
owner = "terraform-providers";
repo = "terraform-provider-tfe";
- version = "0.10.1";
- sha256 = "09hrdschgydnziq1sv6ql7gc4qwx8j4dnmx4fdw8452qpszk17n2";
+ rev = "v0.11.1";
+ version = "0.11.1";
+ sha256 = "0iagddaivpd7cxgf8ha2pk0m66gi4a804s86fsxla0j1knmmyra0";
};
tls =
{
owner = "terraform-providers";
repo = "terraform-provider-tls";
- version = "2.0.1";
- sha256 = "08fh4k5fvkijl2ds8mxdc5fxlwhs11y5s48vvxdskklvkjhygzc7";
+ rev = "v2.1.1";
+ version = "2.1.1";
+ sha256 = "1qsx540pjcq4ra034q2dwnw5nmzab5h1c3vm20ppg5dkhhyiizq8";
};
triton =
{
owner = "terraform-providers";
repo = "terraform-provider-triton";
- version = "0.5.1";
- sha256 = "1bn5x6nmhfkrzpxhyfclls85l9qqffvzx1xsgcb3368lhwzarn2f";
+ rev = "v0.6.0";
+ version = "0.6.0";
+ sha256 = "10z032fa64sd8d6r4v2f4m7gp93v8wb2zk2r13fflzg5rfk5740z";
};
ucloud =
{
owner = "terraform-providers";
repo = "terraform-provider-ucloud";
- version = "1.11.1";
- sha256 = "1la5kapdwpd2f6x00yc9j25rl8qkrndgqpzp2jp6mcbj5zif82ns";
+ rev = "v1.14.1";
+ version = "1.14.1";
+ sha256 = "04vi87q2fhy907l7rwsbq5p6l9vm6avm1hbf9qwddkbxx2kjjf64";
};
ultradns =
{
owner = "terraform-providers";
repo = "terraform-provider-ultradns";
+ rev = "v0.1.0";
version = "0.1.0";
sha256 = "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj";
};
@@ -662,41 +756,71 @@
{
owner = "terraform-providers";
repo = "terraform-provider-vault";
- version = "2.2.0";
- sha256 = "0k9frx29pjrrx67cwzsrnj0x90ff5k99l5yzfgb58sajkz1j8nln";
+ rev = "v2.6.0";
+ version = "2.6.0";
+ sha256 = "0sw1swy2j9n3ji48sxmj093zzlq7sdmp8ixmz488ps3m4jjyfk6k";
};
vcd =
{
owner = "terraform-providers";
repo = "terraform-provider-vcd";
- version = "2.4.0";
- sha256 = "020wmdl5cbma9r7sv3bx6v8b59w5nwkzgwj4xm7a2s6kn8jygr2x";
+ rev = "v2.5.0";
+ version = "2.5.0";
+ sha256 = "0h78ij9rkx43i9kdcfy7waa6xyn2j40zgm6im3zp0yswy6vjlcyq";
};
vsphere =
{
owner = "terraform-providers";
repo = "terraform-provider-vsphere";
- version = "1.12.0";
- sha256 = "0g3pnk2b4dmz5bkr7xjpp45dwy767k6a02rjva38xls185qs7i7c";
+ rev = "v1.13.0";
+ version = "1.13.0";
+ sha256 = "10gl042l5mlmklhjjknwln1qcwl65xz8sbg1acyv8xkb6nsaxcf1";
};
yandex =
{
owner = "terraform-providers";
repo = "terraform-provider-yandex";
- version = "0.9.0";
- sha256 = "0x3l0pbpdsm43jsx42xzc46r9j40l7szkcf851q16wsxf70lchqr";
+ rev = "v0.24.0";
+ version = "0.24.0";
+ sha256 = "0a9isivn3ni0d1id8ww97xbcwrxc0c4pn1m1q21cipqs6mwksq9m";
+ };
+ segment =
+ {
+ owner = "ajbosco";
+ repo = "terraform-provider-segment";
+ rev = "v0.2.0";
+ version = "0.2.0";
+ sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz";
+ };
+ pass =
+ {
+ owner = "camptocamp";
+ repo = "terraform-provider-pass";
+ rev = "1.2.1";
+ version = "1.2.1";
+ sha256 = "1hf5mvgz5ycp7shiy8px205d9kwswfjmclg7mlh9a55bkraffahk";
};
matchbox =
{
owner = "poseidon";
repo = "terraform-provider-matchbox";
+ rev = "v0.3.0";
version = "0.3.0";
sha256 = "1nq7k8qa7rv8xyryjigwpwcwvj1sw85c4j46rkfdv70b6js25jz3";
};
+ wavefront =
+ {
+ owner = "spaceapegames";
+ repo = "terraform-provider-wavefront";
+ rev = "v2.1.1";
+ version = "2.1.1";
+ sha256 = "0cbs74kd820i8f13a9jfbwh2y5zmmx3c2mp07qy7m0xx3m78jksn";
+ };
nixos =
{
owner = "tweag";
repo = "terraform-provider-nixos";
+ rev = "v0.0.1";
version = "0.0.1";
sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf";
};
@@ -704,21 +828,8 @@
{
owner = "tweag";
repo = "terraform-provider-secret";
- version = "1.0.0";
- sha256 = "03q78d0g3b4j4213qjlacj1adh7hjwcqcqrwm8c2r2k5w9kb25k0";
- };
- segment =
- {
- owner = "ajbosco";
- repo = "terraform-provider-segment";
- version = "0.2.0";
- sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz";
- };
- wavefront =
- {
- owner = "spaceapegames";
- repo = "terraform-provider-wavefront";
- version = "2.1.0";
- sha256 = "1ir2wkg5mfng7h5544kar1arkjb5ffjhki5qr25a5x0rpwlg99sx";
+ rev = "v1.1.0";
+ version = "1.1.0";
+ sha256 = "09gv0fpsrxzgna0xrhrdk8d4va9s0gvdbz596r306qxb4mip4w3r";
};
}
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 83157c90a48e..6298c25ba254 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -9,13 +9,12 @@ let
toDrv = data:
buildGoPackage rec {
- inherit (data) owner repo version sha256;
+ inherit (data) owner repo rev version sha256;
name = "${repo}-${version}";
goPackagePath = "github.com/${owner}/${repo}";
subPackages = [ "." ];
src = fetchFromGitHub {
- inherit owner repo sha256;
- rev = "v${version}";
+ inherit owner repo rev sha256;
};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
index d04f85fe455a..bdde66006787 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt
@@ -9,17 +9,10 @@
# include all terraform-providers
terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\)
-# include terraform-provider-matchbox
-poseidon/terraform-provider-matchbox
-
-# include terraform-provider-nixos
-tweag/terraform-provider-nixos
-
-# include terraform-provider-secret
-tweag/terraform-provider-secret
-
-# include terraform-provider-segment
+# include providers from individual repos
ajbosco/terraform-provider-segment
-
-# include terraform-provider-wavefront
+camptocamp/terraform-provider-pass
+poseidon/terraform-provider-matchbox
spaceapegames/terraform-provider-wavefront
+tweag/terraform-provider-nixos
+tweag/terraform-provider-secret
diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all
index 2009d474db7b..893a6b1c7d7d 100755
--- a/pkgs/applications/networking/cluster/terraform-providers/update-all
+++ b/pkgs/applications/networking/cluster/terraform-providers/update-all
@@ -58,12 +58,14 @@ prefetch_github() {
echo_entry() {
local owner=$1
local repo=$2
- local version=${3:1}
+ local rev=$3
+ local version=$(echo $3 | sed 's/^v//')
local sha256=$4
cat < {
+ inherit system;
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+
+let
+ nodeEnv = import ./node-env.nix {
+ inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit nodejs;
+ libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+ };
+locpkgs =
+import ./node-packages.nix {
+ inherit (pkgs) fetchurl fetchgit;
+ inherit nodeEnv;
+ globalBuildInputs = [
+ locpkgs.node-pre-gyp
+ ];
+};
+in locpkgs
diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix
new file mode 100644
index 000000000000..633219626b68
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, pkgs }:
+(import ./composition.nix {
+ inherit pkgs;
+ inherit (stdenv.hostPlatform) system;
+})."package".override {
+ postInstall = ''
+ mkdir "$out/bin"
+ echo '#!/bin/sh' >> "$out/bin/matrix-recorder"
+ echo "'${pkgs.nodejs-12_x}/bin/node'" \
+ "'$out/lib/node_modules/matrix-recorder/matrix-recorder.js'" \
+ '"$@"' >> "$out/bin/matrix-recorder"
+ echo '#!/bin/sh' >> "$out/bin/matrix-recorder-to-html"
+ echo 'cd "$1"' >> "$out/bin/matrix-recorder-to-html"
+ echo "test -d templates/ || ln -sfT '$out/lib/node_modules/matrix-recorder/templates' templates" >> "$out/bin/matrix-recorder-to-html"
+ echo "'${pkgs.nodejs-12_x}/bin/node'" \
+ "'$out/lib/node_modules/matrix-recorder/recorder-to-html.js'" \
+ '.' >> "$out/bin/matrix-recorder-to-html"
+ chmod a+x "$out/bin/matrix-recorder"
+ chmod a+x "$out/bin/matrix-recorder-to-html"
+ '';
+ meta = {
+ description = "Matrix message recorder";
+ homepage = "https://gitlab.com/argit/matrix-recorder/";
+ license = stdenv.lib.licenses.mit;
+ maintainers = [ stdenv.lib.maintainers.raskin ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix
new file mode 100644
index 000000000000..670556bf271a
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix
@@ -0,0 +1,540 @@
+# This file originates from node2nix
+
+{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+
+let
+ python = if nodejs ? python then nodejs.python else python2;
+
+ # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
+ tarWrapper = runCommand "tarWrapper" {} ''
+ mkdir -p $out/bin
+
+ cat > $out/bin/tar <> $out/nix-support/hydra-build-products
+ '';
+ };
+
+ includeDependencies = {dependencies}:
+ stdenv.lib.optionalString (dependencies != [])
+ (stdenv.lib.concatMapStrings (dependency:
+ ''
+ # Bundle the dependencies of the package
+ mkdir -p node_modules
+ cd node_modules
+
+ # Only include dependencies if they don't exist. They may also be bundled in the package.
+ if [ ! -e "${dependency.name}" ]
+ then
+ ${composePackage dependency}
+ fi
+
+ cd ..
+ ''
+ ) dependencies);
+
+ # Recursively composes the dependencies of a package
+ composePackage = { name, packageName, src, dependencies ? [], ... }@args:
+ ''
+ DIR=$(pwd)
+ cd $TMPDIR
+
+ unpackFile ${src}
+
+ # Make the base dir in which the target dependency resides first
+ mkdir -p "$(dirname "$DIR/${packageName}")"
+
+ if [ -f "${src}" ]
+ then
+ # Figure out what directory has been unpacked
+ packageDir="$(find . -maxdepth 1 -type d | tail -1)"
+
+ # Restore write permissions to make building work
+ find "$packageDir" -type d -exec chmod u+x {} \;
+ chmod -R u+w "$packageDir"
+
+ # Move the extracted tarball into the output folder
+ mv "$packageDir" "$DIR/${packageName}"
+ elif [ -d "${src}" ]
+ then
+ # Get a stripped name (without hash) of the source directory.
+ # On old nixpkgs it's already set internally.
+ if [ -z "$strippedName" ]
+ then
+ strippedName="$(stripHash ${src})"
+ fi
+
+ # Restore write permissions to make building work
+ chmod -R u+w "$strippedName"
+
+ # Move the extracted directory into the output folder
+ mv "$strippedName" "$DIR/${packageName}"
+ fi
+
+ # Unset the stripped name to not confuse the next unpack step
+ unset strippedName
+
+ # Include the dependencies of the package
+ cd "$DIR/${packageName}"
+ ${includeDependencies { inherit dependencies; }}
+ cd ..
+ ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+ '';
+
+ pinpointDependencies = {dependencies, production}:
+ let
+ pinpointDependenciesFromPackageJSON = writeTextFile {
+ name = "pinpointDependencies.js";
+ text = ''
+ var fs = require('fs');
+ var path = require('path');
+
+ function resolveDependencyVersion(location, name) {
+ if(location == process.env['NIX_STORE']) {
+ return null;
+ } else {
+ var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
+
+ if(fs.existsSync(dependencyPackageJSON)) {
+ var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
+
+ if(dependencyPackageObj.name == name) {
+ return dependencyPackageObj.version;
+ }
+ } else {
+ return resolveDependencyVersion(path.resolve(location, ".."), name);
+ }
+ }
+ }
+
+ function replaceDependencies(dependencies) {
+ if(typeof dependencies == "object" && dependencies !== null) {
+ for(var dependency in dependencies) {
+ var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
+
+ if(resolvedVersion === null) {
+ process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
+ } else {
+ dependencies[dependency] = resolvedVersion;
+ }
+ }
+ }
+ }
+
+ /* Read the package.json configuration */
+ var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+
+ /* Pinpoint all dependencies */
+ replaceDependencies(packageObj.dependencies);
+ if(process.argv[2] == "development") {
+ replaceDependencies(packageObj.devDependencies);
+ }
+ replaceDependencies(packageObj.optionalDependencies);
+
+ /* Write the fixed package.json file */
+ fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
+ '';
+ };
+ in
+ ''
+ node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
+
+ ${stdenv.lib.optionalString (dependencies != [])
+ ''
+ if [ -d node_modules ]
+ then
+ cd node_modules
+ ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+ cd ..
+ fi
+ ''}
+ '';
+
+ # Recursively traverses all dependencies of a package and pinpoints all
+ # dependencies in the package.json file to the versions that are actually
+ # being used.
+
+ pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
+ ''
+ if [ -d "${packageName}" ]
+ then
+ cd "${packageName}"
+ ${pinpointDependencies { inherit dependencies production; }}
+ cd ..
+ ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+ fi
+ '';
+
+ # Extract the Node.js source code which is used to compile packages with
+ # native bindings
+ nodeSources = runCommand "node-sources" {} ''
+ tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
+ mv node-* $out
+ '';
+
+ # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
+ addIntegrityFieldsScript = writeTextFile {
+ name = "addintegrityfields.js";
+ text = ''
+ var fs = require('fs');
+ var path = require('path');
+
+ function augmentDependencies(baseDir, dependencies) {
+ for(var dependencyName in dependencies) {
+ var dependency = dependencies[dependencyName];
+
+ // Open package.json and augment metadata fields
+ var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
+ var packageJSONPath = path.join(packageJSONDir, "package.json");
+
+ if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
+ console.log("Adding metadata fields to: "+packageJSONPath);
+ var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
+
+ if(dependency.integrity) {
+ packageObj["_integrity"] = dependency.integrity;
+ } else {
+ packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
+ }
+
+ if(dependency.resolved) {
+ packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
+ } else {
+ packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
+ }
+
+ if(dependency.from !== undefined) { // Adopt from property if one has been provided
+ packageObj["_from"] = dependency.from;
+ }
+
+ fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
+ }
+
+ // Augment transitive dependencies
+ if(dependency.dependencies !== undefined) {
+ augmentDependencies(packageJSONDir, dependency.dependencies);
+ }
+ }
+ }
+
+ if(fs.existsSync("./package-lock.json")) {
+ var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
+
+ if(packageLock.lockfileVersion !== 1) {
+ process.stderr.write("Sorry, I only understand lock file version 1!\n");
+ process.exit(1);
+ }
+
+ if(packageLock.dependencies !== undefined) {
+ augmentDependencies(".", packageLock.dependencies);
+ }
+ }
+ '';
+ };
+
+ # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
+ reconstructPackageLock = writeTextFile {
+ name = "addintegrityfields.js";
+ text = ''
+ var fs = require('fs');
+ var path = require('path');
+
+ var packageObj = JSON.parse(fs.readFileSync("package.json"));
+
+ var lockObj = {
+ name: packageObj.name,
+ version: packageObj.version,
+ lockfileVersion: 1,
+ requires: true,
+ dependencies: {}
+ };
+
+ function augmentPackageJSON(filePath, dependencies) {
+ var packageJSON = path.join(filePath, "package.json");
+ if(fs.existsSync(packageJSON)) {
+ var packageObj = JSON.parse(fs.readFileSync(packageJSON));
+ dependencies[packageObj.name] = {
+ version: packageObj.version,
+ integrity: "sha1-000000000000000000000000000=",
+ dependencies: {}
+ };
+ processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
+ }
+ }
+
+ function processDependencies(dir, dependencies) {
+ if(fs.existsSync(dir)) {
+ var files = fs.readdirSync(dir);
+
+ files.forEach(function(entry) {
+ var filePath = path.join(dir, entry);
+ var stats = fs.statSync(filePath);
+
+ if(stats.isDirectory()) {
+ if(entry.substr(0, 1) == "@") {
+ // When we encounter a namespace folder, augment all packages belonging to the scope
+ var pkgFiles = fs.readdirSync(filePath);
+
+ pkgFiles.forEach(function(entry) {
+ if(stats.isDirectory()) {
+ var pkgFilePath = path.join(filePath, entry);
+ augmentPackageJSON(pkgFilePath, dependencies);
+ }
+ });
+ } else {
+ augmentPackageJSON(filePath, dependencies);
+ }
+ }
+ });
+ }
+ }
+
+ processDependencies("node_modules", lockObj.dependencies);
+
+ fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
+ '';
+ };
+
+ prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
+ let
+ forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
+ in
+ ''
+ # Pinpoint the versions of all dependencies to the ones that are actually being used
+ echo "pinpointing versions of dependencies..."
+ source $pinpointDependenciesScriptPath
+
+ # Patch the shebangs of the bundled modules to prevent them from
+ # calling executables outside the Nix store as much as possible
+ patchShebangs .
+
+ # Deploy the Node.js package by running npm install. Since the
+ # dependencies have been provided already by ourselves, it should not
+ # attempt to install them again, which is good, because we want to make
+ # it Nix's responsibility. If it needs to install any dependencies
+ # anyway (e.g. because the dependency parameters are
+ # incomplete/incorrect), it fails.
+ #
+ # The other responsibilities of NPM are kept -- version checks, build
+ # steps, postprocessing etc.
+
+ export HOME=$TMPDIR
+ cd "${packageName}"
+ runHook preRebuild
+
+ ${stdenv.lib.optionalString bypassCache ''
+ ${stdenv.lib.optionalString reconstructLock ''
+ if [ -f package-lock.json ]
+ then
+ echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
+ echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
+ rm package-lock.json
+ else
+ echo "No package-lock.json file found, reconstructing..."
+ fi
+
+ node ${reconstructPackageLock}
+ ''}
+
+ node ${addIntegrityFieldsScript}
+ ''}
+
+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
+
+ if [ "$dontNpmInstall" != "1" ]
+ then
+ # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+ rm -f npm-shrinkwrap.json
+
+ npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+ fi
+ '';
+
+ # Builds and composes an NPM package including all its dependencies
+ buildNodePackage =
+ { name
+ , packageName
+ , version
+ , dependencies ? []
+ , buildInputs ? []
+ , production ? true
+ , npmFlags ? ""
+ , dontNpmInstall ? false
+ , bypassCache ? false
+ , reconstructLock ? false
+ , preRebuild ? ""
+ , dontStrip ? true
+ , unpackPhase ? "true"
+ , buildPhase ? "true"
+ , ... }@args:
+
+ let
+ extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
+ in
+ stdenv.mkDerivation ({
+ name = "node_${name}-${version}";
+ buildInputs = [ tarWrapper python nodejs ]
+ ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+ ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+ ++ buildInputs;
+
+ inherit dontStrip; # Stripping may fail a build for some package deployments
+ inherit dontNpmInstall preRebuild unpackPhase buildPhase;
+
+ compositionScript = composePackage args;
+ pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+ passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
+
+ installPhase = ''
+ # Create and enter a root node_modules/ folder
+ mkdir -p $out/lib/node_modules
+ cd $out/lib/node_modules
+
+ # Compose the package and all its dependencies
+ source $compositionScriptPath
+
+ ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
+
+ # Create symlink to the deployed executable folder, if applicable
+ if [ -d "$out/lib/node_modules/.bin" ]
+ then
+ ln -s $out/lib/node_modules/.bin $out/bin
+ fi
+
+ # Create symlinks to the deployed manual page folders, if applicable
+ if [ -d "$out/lib/node_modules/${packageName}/man" ]
+ then
+ mkdir -p $out/share
+ for dir in "$out/lib/node_modules/${packageName}/man/"*
+ do
+ mkdir -p $out/share/man/$(basename "$dir")
+ for page in "$dir"/*
+ do
+ ln -s $page $out/share/man/$(basename "$dir")
+ done
+ done
+ fi
+
+ # Run post install hook, if provided
+ runHook postInstall
+ '';
+ } // extraArgs);
+
+ # Builds a development shell
+ buildNodeShell =
+ { name
+ , packageName
+ , version
+ , src
+ , dependencies ? []
+ , buildInputs ? []
+ , production ? true
+ , npmFlags ? ""
+ , dontNpmInstall ? false
+ , bypassCache ? false
+ , reconstructLock ? false
+ , dontStrip ? true
+ , unpackPhase ? "true"
+ , buildPhase ? "true"
+ , ... }@args:
+
+ let
+ extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
+
+ nodeDependencies = stdenv.mkDerivation ({
+ name = "node-dependencies-${name}-${version}";
+
+ buildInputs = [ tarWrapper python nodejs ]
+ ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+ ++ stdenv.lib.optional (stdenv.isDarwin) libtool
+ ++ buildInputs;
+
+ inherit dontStrip; # Stripping may fail a build for some package deployments
+ inherit dontNpmInstall unpackPhase buildPhase;
+
+ includeScript = includeDependencies { inherit dependencies; };
+ pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+ passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
+
+ installPhase = ''
+ mkdir -p $out/${packageName}
+ cd $out/${packageName}
+
+ source $includeScriptPath
+
+ # Create fake package.json to make the npm commands work properly
+ cp ${src}/package.json .
+ chmod 644 package.json
+ ${stdenv.lib.optionalString bypassCache ''
+ if [ -f ${src}/package-lock.json ]
+ then
+ cp ${src}/package-lock.json .
+ fi
+ ''}
+
+ # Go to the parent folder to make sure that all packages are pinpointed
+ cd ..
+ ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+ ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
+
+ # Expose the executables that were installed
+ cd ..
+ ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+ mv ${packageName} lib
+ ln -s $out/lib/node_modules/.bin $out/bin
+ '';
+ } // extraArgs);
+ in
+ stdenv.mkDerivation {
+ name = "node-shell-${name}-${version}";
+
+ buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+ buildCommand = ''
+ mkdir -p $out/bin
+ cat > $out/bin/shell <",
+ "main": "matrix-recorder.js",
+ "scripts": {
+ "start": "node matrix-recorder.js"
+ },
+ "repository": {
+ "type": "git",
+ "url": "https://gitlab.com/argit/matrix-recorder.git"
+ },
+ "dependencies": {
+ "marked": "^0.6.2",
+ "matrix-js-sdk": "^0.7.13",
+ "mime-types": "^2.1.14",
+ "mustache": "^2.3.0",
+ "node-fetch": "^1.6.3",
+ "node-localstorage": "^1.3.0",
+ "sqlite3": "^4.0.7",
+ "olm": "https://packages.matrix.org/npm/olm/olm-2.3.0.tgz"
+ },
+ "license": "MIT",
+ "optionalDependencies": {
+ }
+}
diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
new file mode 100644
index 000000000000..54b7ef2bd991
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchgit
+ , buildPythonApplication, buildPythonPackage
+ , pygobject3, pytestrunner, requests, responses, pytest, python-olm
+ , canonicaljson, olm
+}:
+let
+ mainsrc = fetchgit {
+ url = "https://github.com/saadnpq/matrixcli";
+ rev = "61ebde173ca2f77185c261c2b7f6db297ca89863";
+ sha256 = "0xcjjy2xwlcixr9fwgzcfjjkivqpk104h7dslfa7lz9jq9pzqzvq";
+ fetchSubmodules = true;
+ };
+
+ sdk = buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "matrix-python-sdk-matrixcli";
+ version = "0.0.2019-08-15";
+
+ src = "${mainsrc}/matrix-python-sdk/";
+
+ propagatedBuildInputs = [
+ requests responses olm python-olm canonicaljson
+ pytestrunner pytest
+ ];
+
+ doCheck = false;
+ doInstallCheck = false;
+
+ meta = {
+ license = stdenv.lib.licenses.asl20;
+ description = "Fork of Matrix Python SDK";
+ platforms = stdenv.lib.platforms.linux;
+ };
+ };
+
+in
+buildPythonApplication rec {
+ name = "${pname}-${version}";
+ pname = "matrixcli";
+ version = "0.0.2019-08-15";
+
+ src = mainsrc;
+
+ propagatedBuildInputs = [pygobject3 sdk];
+
+ meta = {
+ description = "CLI client for Matrix";
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = [stdenv.lib.maintainers.raskin];
+ platforms = stdenv.lib.platforms.linux;
+ homepage = "https://github.com/saadnpq/matrixcli";
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
index f5f8414c870c..dbfc87b8e8d4 100644
--- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
@@ -1,10 +1,14 @@
{ stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk-pixbuf, glib,
freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage,
libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst,
-libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }:
+libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev, wrapGAppsHook,
+hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk }:
+
let
rpath = stdenv.lib.makeLibraryPath [
alsaLib
+ at-spi2-atk
+ at-spi2-core
atk
cairo
cups
@@ -17,6 +21,7 @@ let
gnome2.GConf
gtk3
pango
+ libuuid
libX11
libXScrnSaver
libXcomposite
@@ -38,18 +43,18 @@ let
in
stdenv.mkDerivation rec {
pname = "mattermost-desktop";
- version = "4.2.3";
+ version = "4.3.1";
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz";
- sha256 = "14xyn8dp0xxl4j9xdsjik9p6srqdxbirgcgym2sv64p01w3kc9wf";
+ sha256 = "076nv5h6xscbw1987az00x493qhqgrli87gnn57zbvz0acgvlhfv";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz";
- sha256 = "063rrxw76mjz71wp9xd3ppkq3s017vrzms879r2cilypmay7fhgs";
+ sha256 = "19ps9g8j6kp4haj6r3yfy4ma2wm6isq5fa8zlcz6g042ajkqq0ij";
}
else
throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}";
@@ -58,6 +63,8 @@ in
dontConfigure = true;
dontPatchELF = true;
+ buildInputs = [ wrapGAppsHook gtk3 hicolor-icon-theme ];
+
installPhase = ''
mkdir -p $out/share/mattermost-desktop
cp -R . $out/share/mattermost-desktop
@@ -71,6 +78,9 @@ in
rm $out/share/mattermost-desktop/create_desktop_file.sh
mkdir -p $out/share/applications
mv Mattermost.desktop $out/share/applications/Mattermost.desktop
+ substituteInPlace \
+ $out/share/applications/Mattermost.desktop \
+ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
index 057e447eb1c8..6d527f3a7e46 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -1,23 +1,31 @@
-{ stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } :
+{ stdenv, fetchFromGitHub, pkgconfig, pidgin, glib, json-glib, nss, nspr
+, libsecret
+} :
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "pidgin-opensteamworks";
- version = "unstable-2018-08-02";
+ version = "1.7";
src = fetchFromGitHub {
owner = "EionRobb";
repo = "pidgin-opensteamworks";
- rev = "b16a636d177f4a8862abdfbdb2c0994712ea0cd3";
- sha256 = "0qyxfrfzsm43f1gmbg350znwxld1fqr9a9yziqs322bx2vglzgfh";
+ rev = version;
+ sha256 = "0zxd45g9ycw5kmm4i0800jnqg1ms2gbqcld6gkyv6n3ac1wxizpj";
};
- preConfigure = "cd steam-mobile";
+ sourceRoot = "source/steam-mobile";
+
installFlags = [
"PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
"DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"
];
- buildInputs = [ pidgin glib json-glib nss nspr libgnome-keyring ];
+ nativeBuildInputs = [
+ pkgconfig
+ ];
+ buildInputs = [
+ pidgin glib json-glib nss nspr libsecret
+ ];
meta = with stdenv.lib; {
homepage = https://github.com/EionRobb/pidgin-opensteamworks;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
index 8a15a3bdd85e..44133e777c76 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } :
+{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } :
-let
- version = "2018-08-03";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "purple-matrix-unstable";
- inherit version;
+ version = "2019-06-06";
- src = fetchgit {
- url = "https://github.com/matrix-org/purple-matrix";
- rev = "5a7166a3f54f85793c6b60662f8d12196aeaaeb0";
- sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0";
+ src = fetchFromGitHub {
+ owner = "matrix-org";
+ repo = "purple-matrix";
+ rev = "4494ba22b479917f0b1f96a3019792d3d75bcff1";
+ sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm";
};
- # glib-2.62 deprecations
- NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+ NIX_CFLAGS_COMPILE = [
+ # glib-2.62 deprecations
+ "-DGLIB_DISABLE_DEPRECATION_WARNINGS"
+ # override "-O0 -Werror" set by build system
+ "-O3" "-Wno-error"
+ ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ];
- hardeningDisable = [ "fortify" ]; # upstream compiles with -O0
-
makeFlags = [
"PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
"DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index 6180f531f47f..3d1a6ac534c5 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -2,21 +2,18 @@
stdenv.mkDerivation rec {
pname = "pidgin-sipe";
- version = "1.24.0";
+ version = "1.25.0";
src = fetchurl {
url = "mirror://sourceforge/sipe/${pname}-${version}.tar.gz";
- sha256 = "04cxprz6dbcsc4n2jg72mr1r9630nhrywn0zim9kwvbgps3wdd9c";
+ sha256 = "0262sz00iqxylx0xfyr48xikhiqzr8pg7b4b7vwj5iv4qxpxv939";
};
nativeBuildInputs = [ intltool ];
buildInputs = [ pidgin gmime libxml2 nss ];
enableParallelBuilding = true;
- # glib-2.62 deprecations
- NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
-
- postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";
+ postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";
meta = with stdenv.lib; {
description = "SIPE plugin for Pidgin IM";
diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix
index eee5fd82bba7..8b1f4d4c0e94 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "rambox-pro";
- version = "1.1.7";
+ version = "1.2.0";
dontBuild = true;
dontStrip = true;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz";
- sha256 = "1d84hlac3qwrbi8khp6r3bm5y25zcz52l6z54k7jmyplay46r5as";
+ sha256 = "189rpsrs25c4100xf1zhcwvdyigbzsw8ffhayj8mmrx4akg39653";
};
installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index 30012970d789..c49934b96f77 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
- "version": "1.5.0",
+ "version": "1.5.6",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index de941d94fc87..9b6f591bd42d 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, yarn2nix-moretea }:
+{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, mkYarnPackage }:
# Notes for maintainers:
# * versions of `riot-web` and `riot-desktop` should be kept in sync.
@@ -6,15 +6,15 @@
let
executableName = "riot-desktop";
- version = "1.5.0";
+ version = "1.5.6";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
- sha256 = "1xi5zg3602d7gdjxskpk2q3anpn2drrkxyirfvi9mzcfp2r05557";
+ sha256 = "148rg6wc84xy53bj16v5riw78s999ridid59x6v9jas827l0bdpk";
};
-in yarn2nix-moretea.mkYarnPackage rec {
+in mkYarnPackage rec {
name = "riot-desktop-${version}";
inherit version;
@@ -31,6 +31,7 @@ in yarn2nix-moretea.mkYarnPackage rec {
ln -s '${riot-web}' "$out/share/riot/webapp"
cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator"
cp -r './deps/riot-web' "$out/share/riot/electron"
+ cp -r './deps/riot-web/img' "$out/share/riot"
rm "$out/share/riot/electron/node_modules"
cp -r './node_modules' "$out/share/riot/electron"
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index ccfad7259a5d..ada903701e26 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "riot-web";
- version = "1.5.0";
+ version = "1.5.6";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "08r9473ncfy3wzqhnds729s77fq82jjgz8w3yya07aahcxzasi94";
+ sha256 = "063ynbil038y201skyldj2ysr0hwgwq981w1iw104xd17x31zmn0";
};
installPhase = let
@@ -17,9 +17,13 @@ stdenv.mkDerivation rec {
then writeText "riot-config.json" conf
else "$out/config.sample.json";
in ''
+ runHook preInstall
+
mkdir -p $out/
cp -R . $out/
ln -s ${configFile} $out/config.json
+
+ runHook postInstall
'';
meta = {
diff --git a/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
index b646a9e03adf..f516e4a76f0a 100755
--- a/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
+++ b/pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix-moretea.yarn2nix
+#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix
set -euo pipefail
diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index 7c474d26c88c..c821c4b0f44e 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -1,25 +1,33 @@
-{ stdenv, lib, fetchurl, makeWrapper, jre_headless }:
+{ stdenv, lib, fetchurl, makeWrapper, jre_headless, libmatthew_java, dbus, dbus_java }:
stdenv.mkDerivation rec {
pname = "signal-cli";
- version = "0.6.3";
+ version = "0.6.5";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
- sha256 = "1gvdifscyxmxn2dwlkqi684ahy5kbcj84mqda0m8l4aa8iaq1d59";
+ sha256 = "082kq8kadxbwzf31fmlq4in714id2irk0hhqsl53vsl3wmv45zvv";
};
- buildInputs = [ makeWrapper ];
+ buildInputs = lib.optional stdenv.isLinux [ libmatthew_java dbus dbus_java ];
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
cp -r lib $out/lib
cp bin/signal-cli $out/bin/signal-cli
+ '' + (if stdenv.isLinux then ''
+ makeWrapper ${jre_headless}/bin/java $out/bin/signal-cli \
+ --set JAVA_HOME "${jre_headless}" \
+ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
+ --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
+ --add-flags "org.asamk.signal.Main"
+ '' else ''
wrapProgram $out/bin/signal-cli \
--prefix PATH : ${lib.makeBinPath [ jre_headless ]} \
--set JAVA_HOME ${jre_headless}
- '';
+ '');
# Execution in the macOS (10.13) sandbox fails with
# dyld: Library not loaded: /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa
@@ -29,6 +37,7 @@ stdenv.mkDerivation rec {
# /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat()
# /nix/store/in41dz8byyyz4c0w132l7mqi43liv4yr-stdenv-darwin/setup: line 1310: 2231 Abort trap: 6 signal-cli --version
doInstallCheck = stdenv.isLinux;
+
installCheckPhase = ''
export PATH=$PATH:$out/bin
# --help returns non-0 exit code even when working
@@ -39,7 +48,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/AsamK/signal-cli;
description = "Command-line and dbus interface for communicating with the Signal messaging service";
license = licenses.gpl3;
- maintainers = with maintainers; [ ivan ];
+ maintainers = with maintainers; [ ivan erictapen ];
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 564e5e17b0a0..2e8581f4eae5 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -59,7 +59,7 @@ let
in stdenv.mkDerivation rec {
pname = "signal-desktop";
- version = "1.27.4"; # Please backport all updates to the stable channel.
+ version = "1.29.3"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -69,7 +69,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "1aza1s70xzx9qkv7b5mpfi4zgdn5dq3rl03lx3jixij3x3pxg5sj";
+ sha256 = "1rkj6rwmwwvyd5041r96j1dxlfbmc6xsdrza43c0ykdrhfj73h11";
};
phases = [ "unpackPhase" "installPhase" ];
@@ -114,7 +114,7 @@ in stdenv.mkDerivation rec {
'';
homepage = https://signal.org/;
license = lib.licenses.gpl3;
- maintainers = with lib.maintainers; [ ixmatus primeos ];
+ maintainers = with lib.maintainers; [ ixmatus primeos equirosa ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index cbab67e5e1a5..a368473b0c8c 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -7,7 +7,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
- version = "8.51.0.72";
+ version = "8.54.0.91";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -59,8 +59,11 @@ let
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
- url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
- sha256 = "1rv3jxirlfy0gvphw8cxmwmghbak5m5wj0y3bgamcvma48mzdfk3";
+ urls = [
+ "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
+ "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
+ ];
+ sha256 = "1hnha8sqk78zxkjqg62npmg6dymi5fnyj2bmxlwpgi61v3pyxj94";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index d3aa302d601a..e501d3bcdbfc 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,16 +1,17 @@
{ theme ? null, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo,
cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk-pixbuf,
libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg,
-at-spi2-atk, libuuid, nodePackages
+at-spi2-atk, at-spi2-core, libuuid, nodePackages, libpulseaudio, xdg_utils
}:
let
- version = "4.0.2";
+ version = "4.2.0";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
at-spi2-atk
+ at-spi2-core
atk
cairo
cups
@@ -32,6 +33,7 @@ let
stdenv.cc.cc
systemd
libuuid
+ libpulseaudio
xorg.libxkbfile
xorg.libX11
@@ -51,7 +53,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
- sha256 = "053j5py16ilpwy868rhh5l2g93xj1fq4fwxrsi2bkfsnmq261hkm";
+ sha256 = "01b2klhky04fijdqcpfafgdqx2c5nh2fpnzvzgvz10hv7h16cinv";
}
else
throw "Slack is not supported on ${stdenv.hostPlatform.system}";
@@ -63,18 +65,22 @@ in stdenv.mkDerivation {
inherit src;
buildInputs = [
- dpkg
gtk3 # needed for GSETTINGS_SCHEMAS_PATH
];
- nativeBuildInputs = [ makeWrapper nodePackages.asar ];
+ nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ];
dontUnpack = true;
- buildCommand = ''
+ dontBuild = true;
+ dontPatchELF = true;
+
+ installPhase = ''
+ # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
+ dpkg --fsys-tarfile $src | tar --extract
+ rm -rf usr/share/lintian
+
mkdir -p $out
- dpkg -x $src $out
- cp -av $out/usr/* $out
- rm -rf $out/etc $out/usr $out/share/lintian
+ mv usr/* $out
# Otherwise it looks "suspicious"
chmod -R g-w $out
@@ -87,7 +93,8 @@ in stdenv.mkDerivation {
# Replace the broken bin/slack symlink with a startup wrapper
rm $out/bin/slack
makeWrapper $out/lib/slack/slack $out/bin/slack \
- --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH
+ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
+ --prefix PATH : ${xdg_utils}/bin
# Fix the desktop link
substituteInPlace $out/share/applications/slack.desktop \
diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh
index e5f793883538..6a15298c4e7d 100755
--- a/pkgs/applications/networking/instant-messengers/slack/update.sh
+++ b/pkgs/applications/networking/instant-messengers/slack/update.sh
@@ -3,7 +3,7 @@
set -eu -o pipefail
-oldVersion="$(nix-instantiate --eval -E "with import ./. {}; slack-theme-black.version or (builtins.parseDrvName slack-theme-black.name).version" | tr -d '"')"
+oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion slack-theme-black" | tr -d '"')"
latestSha="$(curl -L -s https://api.github.com/repos/laCour/slack-night-mode/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')"
if [ ! "null" = "${latestSha}" ]; then
diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
new file mode 100644
index 000000000000..0921dcfccdd9
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -0,0 +1,63 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, wrapGAppsHook
+, dpkg
+, atomEnv
+, libuuid
+, pulseaudio
+, at-spi2-atk
+, coreutils
+, gawk
+, xdg_utils
+, systemd }:
+
+stdenv.mkDerivation rec {
+ pname = "teams";
+ version = "1.2.00.32451";
+
+ src = fetchurl {
+ url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
+ sha256 = "1p053kg5qksr78v2h7cxia5mb9kzgfwm6n99x579vfx48kka1n18";
+ };
+
+ nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];
+
+ unpackCmd = "dpkg -x $curSrc .";
+
+ buildInputs = atomEnv.packages ++ [
+ libuuid
+ at-spi2-atk
+ ];
+
+ runtimeDependencies = [
+ systemd.lib
+ pulseaudio
+ ];
+
+ preFixup = ''
+ gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin:${xdg_utils}/bin")
+ '';
+
+ installPhase = ''
+ mkdir -p $out/{opt,bin}
+
+ mv share/teams $out/opt/
+ mv share $out/share
+
+ substituteInPlace $out/share/applications/teams.desktop \
+ --replace /usr/bin/ $out/bin/
+
+ ln -s $out/opt/teams/teams $out/bin/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Microsoft Teams";
+ homepage = "https://teams.microsoft.com";
+ downloadPage = "https://teams.microsoft.com/downloads";
+ license = licenses.unfree;
+ maintainers = [ maintainers.liff ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index 15cec96afc77..9c57ac829afb 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -4,13 +4,13 @@ let
arch = if stdenv.is64bit then "amd64" else "x86";
in stdenv.mkDerivation rec {
pname = "teamspeak-server";
- version = "3.9.1";
+ version = "3.10.2";
src = fetchurl {
url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2";
sha256 = if stdenv.is64bit
- then "0vzi0prnqhjxrwlghwgii0rsmml6aa3qk3yv227g9wz5m3b9f10a"
- else "1nn0fh4s5rmnn27djbsk21jaah1kxyvap9qaf5p4r7cydwr1bzm6";
+ then "03c717qjlbym02nwy82l6jhrkbidsdm1jv5k8p3c10p6a46jy9nl"
+ else "1ay0lmbv2rw9klz289yg0hhsac83kfzzlbwwhjpi28xndl2lq4bf";
};
buildInputs = [ stdenv.cc.cc ];
@@ -28,12 +28,12 @@ in stdenv.mkDerivation rec {
ln -s $out/lib/teamspeak/tsdns/tsdnsserver $out/bin/tsdnsserver
'';
- meta = {
+ meta = with stdenv.lib; {
description = "TeamSpeak voice communication server";
homepage = https://teamspeak.com/;
- license = stdenv.lib.licenses.unfreeRedistributable;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.arobyn ];
+ license = licenses.unfreeRedistributable;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ arobyn gerschtli ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
index 3368ec1124eb..f3d1e6cfd750 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, gnome3, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
+{ stdenv, fetchurl, glib, dconf, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }:
stdenv.mkDerivation rec {
pname = "telepathy-idle";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib gnome3.dconf) makeWrapper ];
+ buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (stdenv.lib.getLib dconf) makeWrapper ];
preFixup = ''
wrapProgram "$out/libexec/telepathy-idle" \
- --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
'';
meta = {
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 8c777cd3f7d6..af0ca1589e5a 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig
-, gnome3, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
+, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
stdenv.mkDerivation rec {
project = "telepathy-logger";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
preFixup = ''
wrapProgram "$out/libexec/telepathy-logger" \
- --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index 6bbe82c4a28e..ef842275a5de 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -1,7 +1,7 @@
{ stdenv
, fetchurl
, pkgconfig
-, gnome3
+, dconf
, telepathy-glib
, python3
, libxslt
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
preFixup = ''
wrapProgram "$lib/libexec/mission-control-5" \
- --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
new file mode 100644
index 000000000000..0378f50a9c00
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
@@ -0,0 +1,78 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, libxml2
+, libsndfile
+, file
+, readline
+, bison
+, flex
+, ucommon
+, ccrtp
+, qtbase
+, qttools
+, qtquickcontrols2
+, alsaLib
+, speex
+, ilbc
+, fetchurl
+, mkDerivation
+, bcg729
+}:
+
+mkDerivation rec {
+ pname = "twinkle";
+ version = "1.10.2";
+
+ src = fetchFromGitHub {
+ repo = pname;
+ owner = "LubosD";
+ rev = "v${version}";
+ sha256 = "0s0gi03xwvzp02ah4q6j33r9jx9nbayr6dxlg2ck9pwbay1nq1hx";
+ };
+
+ buildInputs = [
+ libxml2
+ file # libmagic
+ libsndfile
+ readline
+ ucommon
+ ccrtp
+ qtbase
+ qttools
+ qtquickcontrols2
+ alsaLib
+ speex
+ ilbc
+ ];
+
+ patches = [
+ (fetchurl { # https://github.com/LubosD/twinkle/pull/152 patch for bcg729 1.0.2+
+ url = "https://github.com/LubosD/twinkle/compare/05082ae12051821b1d969e6672d9e4e5afe1bc07...7a6c533cda387652b5b4cb2a867be1a18585890c.patch";
+ sha256 = "39fc6cef3e88cfca8db44612b2d082fb618027b0f99509138d3c0d2777a494c2";
+ })
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ bison
+ flex
+ bcg729
+ ];
+
+ cmakeFlags = [
+ "-DWITH_G729=On"
+ "-DWITH_SPEEX=On"
+ "-DWITH_ILBC=On"
+ /* "-DWITH_DIAMONDCARD=On" seems ancient and broken */
+ ];
+
+ meta = with stdenv.lib; {
+ changelog = "https://github.com/LubosD/twinkle/blob/${version}/NEWS";
+ description = "A SIP-based VoIP client";
+ homepage = "http://twinkle.dolezel.info/";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.mkg20001 ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index 1b3e1c8ad81a..acdec1dc99c9 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -1,6 +1,6 @@
{fetchurl, stdenv, dpkg, makeWrapper,
alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap,
- libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
+ libpulseaudio, libxml2, libxslt, libGLU, libGL, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
}:
stdenv.mkDerivation {
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
libpulseaudio
libxml2
libxslt
- libGLU_combined
+ libGLU libGL
nspr
nss
openssl
diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
index 983b8509dc2b..165e3e959e0c 100644
--- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, rpmextract, autoPatchelfHook
-, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify }:
+, xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify
+, wrapGAppsHook }:
let
version = "4.5.2";
@@ -17,7 +18,7 @@ in stdenv.mkDerivation {
};
}.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
- nativeBuildInputs = [ rpmextract autoPatchelfHook ];
+ nativeBuildInputs = [ rpmextract autoPatchelfHook wrapGAppsHook ];
buildInputs = (with xorg; [
libXdamage libXtst libXScrnSaver libxkbfile
]) ++ [
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 13ac4ceb138d..fde40c62e4d8 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, makeDesktopItem
-
-, alsaLib, at-spi2-atk, atk, cairo, cups, dbus, dpkg, expat, fontconfig
-, freetype, gdk-pixbuf, glib, gtk3, hunspell, libX11, libXScrnSaver
-, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr
-, libXrender, libXtst, libnotify, libuuid, nspr, nss, pango, pciutils
-, pulseaudio, udev, xdg_utils, xorg
-
-, cpio, xar
+{ atomEnv
+, autoPatchelfHook
+, dpkg
+, fetchurl
+, makeDesktopItem
+, makeWrapper
+, stdenv
+, udev
+, wrapGAppsHook
+, cpio
+, xar
}:
let
@@ -18,13 +20,13 @@ let
pname = "wire-desktop";
version = {
- x86_64-linux = "3.11.2912";
x86_64-darwin = "3.10.3215";
+ x86_64-linux = "3.11.2912";
}.${system} or throwSystem;
sha256 = {
- x86_64-linux = "1d2wa13d750dd2vslnvzf0ibwjmf5s299pxq0rs2x98y2sabw3sl";
x86_64-darwin = "0ygm3fgy9k1dp2kjfwsrrwq1i88wgxc6k8y80yz61ivdawgph9wa";
+ x86_64-linux = "1d2wa13d750dd2vslnvzf0ibwjmf5s299pxq0rs2x98y2sabw3sl";
}.${system} or throwSystem;
meta = with stdenv.lib; {
@@ -40,11 +42,19 @@ let
* Timed messages and chats
* Synced across your phone, desktop and tablet
'';
- homepage = https://wire.com/;
- downloadPage = https://wire.com/download/;
+ homepage = "https://wire.com/";
+ downloadPage = "https://wire.com/download/";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ toonn worldofpeace ];
- platforms = [ "x86_64-darwin" "x86_64-linux" ];
+ maintainers = with maintainers; [
+ arianvp
+ kiwi
+ toonn
+ worldofpeace
+ ];
+ platforms = [
+ "x86_64-darwin"
+ "x86_64-linux"
+ ];
};
linux = stdenv.mkDerivation rec {
@@ -52,54 +62,58 @@ let
src = fetchurl {
url = "https://wire-app.wire.com/linux/debian/pool/main/"
- + "Wire-${version}_amd64.deb";
+ + "Wire-${version}_amd64.deb";
inherit sha256;
};
desktopItem = makeDesktopItem {
- name = "wire-desktop";
- exec = "wire-desktop %U";
- icon = "wire-desktop";
- comment = "Secure messenger for everyone";
- desktopName = "Wire Desktop";
- genericName = "Secure messenger";
categories = "Network;InstantMessaging;Chat;VideoConference";
+ comment = "Secure messenger for everyone";
+ desktopName = "Wire";
+ exec = "wire-desktop %U";
+ genericName = "Secure messenger";
+ icon = "wire-desktop";
+ name = "wire-desktop";
+ extraEntries = ''
+ StartupWMClass="Wire"
+ '';
};
dontBuild = true;
- dontPatchELF = true;
dontConfigure = true;
+ dontPatchELF = true;
+ dontWrapGApps = true;
- nativeBuildInputs = [ dpkg ];
- rpath = stdenv.lib.makeLibraryPath [
- alsaLib at-spi2-atk atk cairo cups dbus expat fontconfig freetype
- gdk-pixbuf glib gtk3 hunspell libX11 libXScrnSaver libXcomposite
- libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
- libXtst libnotify libuuid nspr nss pango pciutils pulseaudio
- stdenv.cc.cc udev xdg_utils xorg.libxcb
+ nativeBuildInputs = [
+ autoPatchelfHook
+ dpkg
+ makeWrapper
+ wrapGAppsHook
];
+ buildInputs = atomEnv.packages;
+
unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
- mkdir -p "$out"
+ mkdir -p "$out/bin"
cp -R "opt" "$out"
cp -R "usr/share" "$out/share"
chmod -R g-w "$out"
- # Patch wire-desktop
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${rpath}:$out/opt/Wire" \
- "$out/opt/Wire/wire-desktop"
-
- # Symlink to bin
- mkdir -p "$out/bin"
- ln -s "$out/opt/Wire/wire-desktop" "$out/bin/wire-desktop"
-
# Desktop file
mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* "$out/share/applications"
'';
+
+ runtimeDependencies = [
+ udev.lib
+ ];
+
+ postFixup = ''
+ makeWrapper $out/opt/Wire/wire-desktop $out/bin/wire-desktop \
+ "''${gappsWrapperArgs[@]}"
+ '';
};
darwin = stdenv.mkDerivation {
@@ -107,18 +121,20 @@ let
src = fetchurl {
url = "https://github.com/wireapp/wire-desktop/releases/download/"
- + "macos%2F${version}/Wire.pkg";
+ + "macos%2F${version}/Wire.pkg";
inherit sha256;
};
- buildInputs = [ cpio xar ];
+ buildInputs = [
+ cpio
+ xar
+ ];
unpackPhase = ''
xar -xf $src
cd com.wearezeta.zclient.mac.pkg
'';
-
buildPhase = ''
cat Payload | gunzip -dc | cpio -i
'';
@@ -129,6 +145,7 @@ let
'';
};
-in if stdenv.isDarwin
- then darwin
- else linux
+in
+if stdenv.isDarwin
+then darwin
+else linux
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 7f3628dfdb7b..972d7c13a283 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mkDerivation, autoPatchelfHook
+{ stdenv, fetchurl, mkDerivation, autoPatchelfHook, bash
, fetchFromGitHub
# Dynamic libraries
, dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
- version = "3.0.309708.1027";
+ version = "3.5.336627.1216";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
- sha256 = "0g0nmlbcps331vdnfj571lzhcw8cb2gxbll09jananxdpnmwv5l6";
+ sha256 = "04r45z2rjjn9gr7bxhfwg49xkyhmpcn5y6pdbkdnrfwzaqzisavz";
};
};
@@ -94,19 +94,35 @@ in mkDerivation {
mkdir -p $out/share/icons/hicolor/$path/apps
cp $icon $out/share/icons/hicolor/$path/apps/us.zoom.Zoom.png
done
-
- ln -s $out/share/zoom-us/zoom $out/bin/zoom-us
'';
+ # $out/share/zoom-us isn't in auto-wrap directories list, need manual wrapping
+ dontWrapQtApps = true;
+
qtWrapperArgs = [
''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}''
''--prefix LD_PRELOAD : ${libv4l}/lib/libv4l/v4l2convert.so''
+ # --run "cd ${placeholder "out"}/share/zoom-us"
+ # ^^ unfortunately, breaks run arg into multiple array elements, due to
+ # some bad array propagation. We'll do that in bash below
];
+ postFixup = ''
+ # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect
+ # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm:
+ qtWrapperArgs+=( --run "cd ${placeholder "out"}/share/zoom-us" )
+
+ for app in ZoomLauncher zopen zoom; do
+ wrapQtApp $out/share/zoom-us/$app
+ done
+
+ ln -s $out/share/zoom-us/ZoomLauncher $out/bin/zoom-us
+ '';
+
passthru.updateScript = ./update.sh;
meta = {
- homepage = https://zoom.us/;
+ homepage = "https://zoom.us/";
description = "zoom.us video conferencing application";
license = stdenv.lib.licenses.unfree;
platforms = builtins.attrNames srcs;
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
index e06320424938..6214d4e26255 100755
--- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh
@@ -3,7 +3,7 @@
set -eu -o pipefail
-oldVersion=$(nix-instantiate --eval -E "with import ./. {}; zoom-us.version or (builtins.parseDrvName zoom-us.name).version" | tr -d '"')
+oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion zoom-us" | tr -d '"')
version="$(curl -sI https://zoom.us/client/latest/zoom_x86_64.tar.xz | grep -Fi 'Location:' | pcregrep -o1 '/(([0-9]\.?)+)/')"
if [ ! "${oldVersion}" = "${version}" ]; then
diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix
new file mode 100644
index 000000000000..33392af766c9
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, fetchurl
+, appimageTools
+}:
+
+let
+ pname = "zulip";
+ version = "4.0.0";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
+ sha256 = "1pni02mb5bvwx3k45vd6ga269ghdl633gjklyslai24rrhp16h9z";
+ name="${pname}-${version}.AppImage";
+ };
+
+ appimageContents = appimageTools.extractType2 {
+ inherit name src;
+ };
+
+in appimageTools.wrapType2 {
+ inherit name src;
+
+ extraInstallCommands = ''
+ mv $out/bin/${name} $out/bin/${pname}
+ install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop
+ install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \
+ $out/share/icons/hicolor/512x512/apps/zulip.png
+ substituteInPlace $out/share/applications/zulip.desktop \
+ --replace 'Exec=AppRun' 'Exec=${pname}'
+ '';
+
+ meta = with lib; {
+ description = "Desktop client for Zulip Chat";
+ homepage = https://zulipchat.com;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ jonafato ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index 426619908d65..76cc393f26a3 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -1,35 +1,19 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx, gx-go }:
+{ stdenv, buildGoModule, fetchFromGitHub, fetchgx, gx-go }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "ipfs-cluster";
- version = "0.9.0";
+ version = "0.11.0";
rev = "v${version}";
- goPackagePath = "github.com/ipfs/ipfs-cluster";
-
- extraSrcPaths = [
- (fetchgx {
- inherit src;name = "${pname}-${version}";
- sha256 = "1k7xcirvi07p5g9gr9jcx5h39wk7jxfsyjrn5yraa8xdqhn6b6nx";
- })
- ];
+ modSha256 = "03bqwg9nqh7w6j887gzxr2mcn14jc8f07z896b3swg5wzaz1i6hs";
src = fetchFromGitHub {
owner = "ipfs";
repo = "ipfs-cluster";
inherit rev;
- sha256 = "1bxwcp0355f1ykjcidbxv218zp9d20nma7lnpn9xcjqc8vaq03kn";
+ sha256 = "0q5lanm2zdwwhdwv05fssb34y4y4dha3dq7x1iaabbf70lpqv6yx";
};
- nativeBuildInputs = [ gx-go ];
-
- preBuild = ''
- # fetchgx stores packages by their ipfs hash
- # this will rewrite github.com/ imports to gx/ipfs/
- cd go/src/${goPackagePath}
- gx-go rewrite
- '';
-
meta = with stdenv.lib; {
description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons";
homepage = https://cluster.ipfs.io/;
diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix
index 8bdb23d50dd3..2d12386bafac 100644
--- a/pkgs/applications/networking/irc/glowing-bear/default.nix
+++ b/pkgs/applications/networking/irc/glowing-bear/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "glowing-bear";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
rev = version;
owner = "glowing-bear";
repo = "glowing-bear";
- sha256 = "0gwrf67l3i3nl7zy1miljz6f3vv6zzc3g9as06by548f21cizzjb";
+ sha256 = "14a3fqsmi28g7j3lzk4l4m47p2iml1aaf3514wazn2clw48lnqhw";
};
installPhase = ''
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index f537627f976f..7dd3792a3cb3 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3
, pciutils, dbus-glib, libcanberra-gtk2, libproxy
-, libsexy, enchant2, libnotify, openssl, isocodes
+, enchant2, libnotify, openssl, isocodes
, desktop-file-utils
, meson, ninja
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy
- libsexy libnotify openssl desktop-file-utils
+ libnotify openssl desktop-file-utils
isocodes
];
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index ec806c86ebd2..13ac80677ee9 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib
-, ncurses, openssl, aspell, gnutls
+, ncurses, openssl, aspell, gnutls, gettext
, zlib, curl, pkgconfig, libgcrypt
, cmake, makeWrapper, libobjc, libresolv, libiconv
, asciidoctor # manpages
@@ -27,12 +27,12 @@ let
in
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec {
- version = "2.6";
+ version = "2.7";
pname = "weechat";
src = fetchurl {
url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
- sha256 = "1narazk28m7lmn1vqi7bhyvnr8apjrmaa4w1hbadn64hwr8ya1hb";
+ sha256 = "00hzchzw1w2181kczcrrnj8ngml3bwk7qciha3higxq3qynf0h8c";
};
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
@@ -41,13 +41,15 @@ let
cmakeFlags = with stdenv.lib; [
"-DENABLE_MAN=ON"
"-DENABLE_DOC=ON"
+ "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360
+ "-DENABLE_PHP=OFF"
]
++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins
;
buildInputs = with stdenv.lib; [
- ncurses openssl aspell gnutls zlib curl pkgconfig
+ ncurses openssl aspell gnutls gettext zlib curl pkgconfig
libgcrypt makeWrapper cmake asciidoctor
]
++ optionals stdenv.isDarwin [ libobjc libresolv ]
diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix
index 81ee484f3b30..0880a32af92f 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix
@@ -1,10 +1,12 @@
-{ callPackage, luaPackages }:
+{ callPackage, luaPackages, python3Packages }:
{
weechat-matrix-bridge = callPackage ./weechat-matrix-bridge {
inherit (luaPackages) cjson luaffi;
};
+ weechat-matrix = python3Packages.callPackage ./weechat-matrix { };
+
wee-slack = callPackage ./wee-slack { };
weechat-autosort = callPackage ./weechat-autosort { };
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
new file mode 100644
index 000000000000..ff6a7d947411
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@@ -0,0 +1,58 @@
+{ buildPythonPackage, stdenv, python, fetchFromGitHub,
+ pyopenssl, webcolors, future, atomicwrites,
+ attrs, Logbook, pygments, cachetools, matrix-nio }:
+
+let
+ matrixUploadPython = python.withPackages (ps: with ps; [
+ magic
+ ]);
+in buildPythonPackage {
+ pname = "weechat-matrix";
+ version = "unstable-2019-11-10";
+
+ src = fetchFromGitHub {
+ owner = "poljar";
+ repo = "weechat-matrix";
+ rev = "69ad2a9c03d516c212d3d0700dbb2bfe654f6365";
+ sha256 = "1mfbkag5np2lgv6f31nyfnvavyh67jrrx6gxhzb8m99dd43lgs8c";
+ };
+
+ propagatedBuildInputs = [
+ pyopenssl
+ webcolors
+ future
+ atomicwrites
+ attrs
+ Logbook
+ pygments
+ cachetools
+ matrix-nio
+ ];
+
+ passthru.scripts = [ "matrix.py" ];
+
+ dontBuild = true;
+ doCheck = false;
+
+ installPhase = ''
+ mkdir -p $out/share $out/bin
+ cp $src/main.py $out/share/matrix.py
+
+ cp $src/contrib/matrix_upload $out/bin/
+ substituteInPlace $out/bin/matrix_upload \
+ --replace '/usr/bin/env -S python3 -u' '${matrixUploadPython}/bin/python -u'
+
+ mkdir -p $out/${python.sitePackages}
+ cp -r $src/matrix $out/${python.sitePackages}/matrix
+ '';
+
+ dontPatchShebangs = true;
+
+ meta = with stdenv.lib; {
+ description = "A Python plugin for Weechat that lets Weechat communicate over the Matrix protocol";
+ homepage = "https://github.com/poljar/weechat-matrix";
+ license = licenses.isc;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.tilpner ];
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
index b94ce2695662..6915cfd79821 100644
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -1,21 +1,26 @@
{ stdenv, buildGoModule, fetchurl
-, go, ncurses, scdoc
+, go, ncurses, notmuch, scdoc
, python3, perl, w3m, dante
}:
buildGoModule rec {
pname = "aerc";
- version = "0.2.1";
+ version = "0.3.0";
src = fetchurl {
url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz";
- sha256 = "1ky1nl5b54lf5jnac2kb5404fplwnwypjplas8imdlsf517fw32n";
+ sha256 = "188jln8hmgiqn5il5m54bns0wk4grj09di8y6mmid58ibw6spma4";
};
nativeBuildInputs = [
go
scdoc
python3.pkgs.wrapPython
+ notmuch
+ ];
+
+ patches = [
+ ./runtime-sharedir.patch
];
pythonPath = [
@@ -24,6 +29,8 @@ buildGoModule rec {
buildInputs = [ python3 perl ];
+ GOFLAGS="-tags=notmuch";
+
buildPhase = "
runHook preBuild
# we use make instead of go build
@@ -39,12 +46,12 @@ buildGoModule rec {
postFixup = ''
wrapProgram $out/bin/aerc --prefix PATH ":" \
- "$out/share/aerc/filters:${stdenv.lib.makeBinPath [ ncurses.dev ]}"
+ "$out/share/aerc/filters:${stdenv.lib.makeBinPath [ ncurses ]}"
wrapProgram $out/share/aerc/filters/html --prefix PATH ":" \
${stdenv.lib.makeBinPath [ w3m dante ]}
'';
- modSha256 = "0fc9m1qb8innypc8cxzbqyrfkawawyaqq3gqy7lqwmyh32f300jh";
+ modSha256 = "0pxbv4zfhii0g41cy0ycfpkkxw6nnd4ibavic6zqw30j476jnm2x";
meta = with stdenv.lib; {
description = "aerc is an email client for your terminal";
diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
new file mode 100644
index 000000000000..ed670d61a7b3
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
@@ -0,0 +1,56 @@
+From 6cf3c2e42d219b9665a43ca65f321c653b0aa102 Mon Sep 17 00:00:00 2001
+From: Tadeo Kondrak
+Date: Mon, 28 Oct 2019 08:36:36 -0600
+Subject: [PATCH] Fix aerc breaking every time the package is rebuilt.
+
+On NixOS, the SHAREDIR changes on every rebuild to the package, but aerc
+fills it in as part of the default config and then installs that config
+to the users home folder. Fix this by not substituting @SHAREDIR@ in the
+default config until runtime.
+---
+ Makefile | 2 +-
+ config/config.go | 8 ++++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index d1c755d..1185a96 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,7 +24,7 @@ aerc: $(GOSRC)
+ -o $@
+
+ aerc.conf: config/aerc.conf.in
+- sed -e 's:@SHAREDIR@:$(SHAREDIR):g' > $@ < config/aerc.conf.in
++ cat config/aerc.conf.in > $@
+
+ DOCS := \
+ aerc.1 \
+diff --git a/config/config.go b/config/config.go
+index 32d07fc..8ffd3e8 100644
+--- a/config/config.go
++++ b/config/config.go
+@@ -355,6 +355,11 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) {
+ return nil, err
+ }
+ }
++ if sec, err := file.GetSection("templates"); err == nil {
++ if key, err := sec.GetKey("template-dirs"); err == nil {
++ sec.NewKey("template-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir))
++ }
++ }
+ file.NameMapper = mapName
+ config := &AercConfig{
+ Bindings: BindingConfig{
+@@ -423,6 +428,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) {
+ if err = config.LoadConfig(file); err != nil {
+ return nil, err
+ }
++ for i, filter := range config.Filters {
++ config.Filters[i].Command = strings.ReplaceAll(filter.Command, "@SHAREDIR@", sharedir)
++ }
+ if ui, err := file.GetSection("general"); err == nil {
+ if err := ui.MapTo(&config.General); err != nil {
+ return nil, err
+--
+2.23.0
+
diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix
index 85b73141966b..54b3e10b5e29 100644
--- a/pkgs/applications/networking/mailreaders/afew/default.nix
+++ b/pkgs/applications/networking/mailreaders/afew/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, pythonPackages, notmuch }:
+{ stdenv, python3Packages, notmuch }:
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "afew";
version = "2.0.0";
- src = pythonPackages.fetchPypi {
+ src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0j60501nm242idf2ig0h7p6wrg58n5v2p6zfym56v9pbvnbmns0s";
};
- nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ];
+ nativeBuildInputs = with python3Packages; [ sphinx setuptools_scm ];
- propagatedBuildInputs = with pythonPackages; [
- pythonPackages.setuptools pythonPackages.notmuch chardet dkimpy
- ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32;
+ propagatedBuildInputs = with python3Packages; [
+ python3Packages.setuptools python3Packages.notmuch chardet dkimpy
+ ] ++ stdenv.lib.optional (!python3Packages.isPy3k) subprocess32;
makeWrapperArgs = [
''--prefix PATH ':' "${notmuch}/bin"''
@@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec {
outputs = [ "out" "doc" ];
postBuild = ''
- python setup.py build_sphinx -b html,man
+ ${python3Packages.python.interpreter} setup.py build_sphinx -b html,man
'';
postInstall = ''
diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix
index ff6599598760..e7c9d50cb9be 100644
--- a/pkgs/applications/networking/mailreaders/balsa/default.nix
+++ b/pkgs/applications/networking/mailreaders/balsa/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "balsa";
- version = "2.5.7";
+ version = "2.5.9";
src = fetchurl {
url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.bz2";
- sha256 = "0yfqhfpwm1qnwmbpr6dfn2f5w8a8xxq51pn8ypgg0fw973l1c1nx";
+ sha256 = "19gs1qfvbk9qx4rjmgrmvid00kl9k153zjjx8zjii2lz09w7g19i";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 9fcf72ce4bc0..e89a36eade07 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -1,7 +1,7 @@
{ config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook
, curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme
, libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager
-, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2
+, openldap, perl, pkgconfig, poppler, python, shared-mime-info
, glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical
# Build options
# TODO: A flag to build the manual.
@@ -13,7 +13,6 @@
, enableNetworkManager ? config.networking.networkmanager.enable or false
, enablePgp ? true
, enablePluginArchive ? false
-, enablePluginFancy ? false
, enablePluginNotificationDialogs ? true
, enablePluginNotificationSounds ? true
, enablePluginPdf ? false
@@ -64,12 +63,10 @@ stdenv.mkDerivation rec {
++ optional enablePluginArchive libarchive
++ optional enablePluginNotificationSounds libcanberra-gtk2
++ optional enablePluginNotificationDialogs libnotify
- ++ optional enablePluginFancy libsoup
++ optional enablePluginRssyl libxml2
++ optional enableNetworkManager networkmanager
++ optional enableLdap openldap
++ optional enablePluginPdf poppler
- ++ optional enablePluginFancy webkitgtk24x-gtk2
++ optional enablePluginVcalendar libical;
configureFlags =
@@ -81,7 +78,6 @@ stdenv.mkDerivation rec {
"--disable-pgpmime-plugin"
]
++ optional (!enablePluginArchive) "--disable-archive-plugin"
- ++ optional (!enablePluginFancy) "--disable-fancy-plugin"
++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin"
++ optional (!enablePluginPython) "--disable-python-plugin"
++ optional (!enablePluginRavatar) "--disable-libravatar-plugin"
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index 7d7972c3e582..38e4bf5d7105 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "imapfilter";
- version = "2.6.13";
+ version = "2.6.16";
src = fetchFromGitHub {
owner = "lefcha";
repo = "imapfilter";
rev = "v${version}";
- sha256 = "02997rnnvid3rfkxmlgjpbspi4svdmq8r8wd2zvf25iadim3hxqi";
+ sha256 = "0f65sg6hhv6778fxwsz4hvarbm97dsb8jj0mg7a9qs273r35pqck";
};
makeFlagsArray = "PREFIX=$(out)";
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
description = "Mail filtering utility";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 3af4c7f5e15f..f0b8fdcf8e2a 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mutt";
- version = "1.12.2";
+ version = "1.13.2";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
- sha256 = "10k8352s0z7yan6d4z2am80qd3bsaky4h89g72wl4xr3x067ahmw";
+ sha256 = "0x4yfvk8415p80h9an242n6q3b43mw6mnnczh95zd3j0zwdr6wrg";
};
patches = optional smimeSupport (fetchpatch {
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 4fe86d08d06b..274d9d4718e2 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,23 +1,23 @@
{ stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
-, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell
+, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite
}:
stdenv.mkDerivation rec {
- version = "20191102";
+ version = "20191207";
pname = "neomutt";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = version;
- sha256 = "0x5f9zbvxsxg5y2ir4xq4xw1q2snaxkidhdyhcxw5ljw3qqwhlyq";
+ sha256 = "147yjpqnsbfy01fhsflxlixk0985r91a6bjmqq3cwmf7gka3sihm";
};
buildInputs = [
cyrus_sasl gss gpgme kerberos libidn ncurses
notmuch openssl perl lmdb
- mailcap
+ mailcap sqlite
];
nativeBuildInputs = [
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
+ "--enable-autocrypt"
"--gpgme"
"--gss"
"--lmdb"
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 680d7652b5a0..f46e355cd570 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -34,7 +34,7 @@
, libgnome
, libgnomeui
, gnome3
-, libGLU_combined
+, libGLU, libGL
, nspr
, nss
, pango
@@ -116,7 +116,7 @@ stdenv.mkDerivation {
libcanberra-gtk2
libgnome
libgnomeui
- libGLU_combined
+ libGLU libGL
nspr
nss
pango
@@ -160,11 +160,15 @@ stdenv.mkDerivation {
EOF
# SNAP_NAME: https://github.com/NixOS/nixpkgs/pull/61980
+ # MOZ_LEGACY_PROFILES and MOZ_ALLOW_DOWNGRADE:
+ # commit 87e261843c4236c541ee0113988286f77d2fa1ee
wrapProgram "$out/bin/thunderbird" \
--argv0 "$out/bin/.thunderbird-wrapped" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \
--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \
- --set SNAP_NAME "thunderbird"
+ --set SNAP_NAME "thunderbird" \
+ --set MOZ_LEGACY_PROFILES 1 \
+ --set MOZ_ALLOW_DOWNGRADE 1
'';
passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
@@ -181,7 +185,7 @@ stdenv.mkDerivation {
free = false;
url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
};
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 6dfb6780f0db..5cfb14d2e2ff 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,615 +1,615 @@
{
- version = "68.1.1";
+ version = "68.3.1";
sources = [
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ar/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ar/thunderbird-68.3.1.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "33accd6fe1f83fc47a34df038f4257571f42281a89f9aab2f54514443856b71aaa2ee81abe98331ecdbbf026a09eea31fb2c5eb72044347c54f51a6ac1e0bfd4";
+ sha512 = "17052536aa5e0a3e2aae2ef7bd07fb44abdb8871df0d5fd99b9c2965ef747d542601bd6088701b5af0fead05617073f5a496af2d6626f77cedc7fa3e8e2a1c85";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ast/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ast/thunderbird-68.3.1.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "1e32c40cd198b51a5836c2ad9a6331c0b3028e57d62e5e057990a48ab80b9fd5bd1290a268da29dc5a45c61e712bf0345f85d0ca43c18b2236c0f4bac7b9328f";
+ sha512 = "218b923ec83a9c049d743ff75207b07619ea4368c0620a162eb2f48e094173b404c4a393327c4dc497ee951d97fc3010c424c3b186da0e1bb1a024d7f7b3769e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/be/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/be/thunderbird-68.3.1.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "0f86506a7cf72c75712f6b507fda6e39da9520865dea5eb4fbfdb78531dc88116d4e8227dd91e8f1fb4dff9ed3e4eb7e118b5a4dde3860ec00c3bca625478a21";
+ sha512 = "74ed02a0e62a2eba57d2fec9485ff38974d8077c3a9e9b5f37bcaa5823a43ebde657f69f863ba72a079e9f3c0e8139dc12b192604c55024a48b1929b39ade504";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/bg/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/bg/thunderbird-68.3.1.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "f25c07ee41767fc1ec9381291662ce5bf269971f3542b4c2427da7240c13cfe44f006b8995e6474309bb6330e21626ca7e3e7463452ddd5d7e0128b799f6f566";
+ sha512 = "95869b21e7141624310a9c6d0a021e84a507f13a06fbc68ece2eb20c8a302ccfae8dfe3fd00141aba0fec3becd5949520436d1a637234dee504a3bb71ed6e966";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/br/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/br/thunderbird-68.3.1.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "c57c207922aa0f1534fd6925305effdea2f09ee83ddfe7eed62d30b91494ddbf6ade0c0cba2e7332c876e10e15593ad985deaec769525fd3a19b21d048383690";
+ sha512 = "8b76d5929bb1a45abe3d86b8725e268e67aa5bc427cdb2e6d3a60c3ae58dc0e1563fbe3b9a205836a71907fb0248ab4d8f9c11d5f646cb1a0ebb4a95aecb578f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ca/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ca/thunderbird-68.3.1.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "4fb66d8e9285cb40cf42f626d38eecabe489fa5311a25ce2e687483b6624819674b0b4a41f486a0ea98edbe27cea2f7f156368516f70afd4f78629aef93cb94f";
+ sha512 = "62e161105db38e5fc9bc55a9cc0edfb42982fbe8af9a01a9664638e5fefa06aa4304ce4ddeffe893007dbdee873772571b99b03644027f42d576ac9d00e978b9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/cak/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/cak/thunderbird-68.3.1.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "2c591767d09c3af59dcda7c44937f012cc14695a7744bca49d2b5788cd44953a85b8cc0005efa4db3daeb6c5f553ead9d15239af37b1c7686e5331cf9bb09ee5";
+ sha512 = "f80101e3ac77d140ee27bd489174c61114b9f72c3b2185e1908d488f3f13c445a02d2c38ec897dcc24a66f87ebe2d76104d37ced482ea9fc1c7241edf38db724";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/cs/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/cs/thunderbird-68.3.1.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "62d58fd817b235d8afea65212f527b99cf67d882a3fef592c2499881d659837ed90f5192111edef9b7d00e37ea5b1becc9fed00eb4af063ffa4ece160996a73b";
+ sha512 = "f4b27aae7c69c4a46c974f75f0f1a7a2154d422e236618df8efdf99859954b04c2b672c553fcadaaf07868fc95b35b75e678b855f5734d204cab32b0c20792ef";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/cy/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/cy/thunderbird-68.3.1.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "7df64966340aed43c1411abeef18ade4891c2d64361d3952967529ea487dbccf6ec4d824f85a740ed4d54bda188acf9992ba9623a72c139268f09efaaa27eb89";
+ sha512 = "5c94a45af181ab8f5c1f1c485a2f2af9fe82eca02f9a910326c69a555c5e3f7bdb99712d9efe0efeba3f2d8af30fe83f62191a4399434f442ffd7442f861fd08";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/da/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/da/thunderbird-68.3.1.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "7bc7c0b44e981f74119cb19f4d27e260a2df53b9188364c367752ca4fa461b1c003ea58d4eb14fd9d9b64ab1cec5cbef6e68080da180ca6e904bc6bed0dea924";
+ sha512 = "1141851239c3808f6fd65a027e7656279c950de67bf02416e43e37baf96e25ae567122e7610baa02fcf168a3b8e3d8b4200493d835a7a40b08cf99b4d42feb26";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/de/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/de/thunderbird-68.3.1.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "6879addb03511e1fa18696069251a3649865fa2410b2503f8588d06e3ad8fe9d127ef414cfa977a323468e037f7fa06d7dbf306bb98608ecc21acedb68e2784d";
+ sha512 = "e201a89c573416cb1ae5d3f6fa9e7dd5f9ab53e60eba55755c78d70545f77341ddd4d7298903e2e424c9f6a14c5e10138348250c843d95b91503132b7909063d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/dsb/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/dsb/thunderbird-68.3.1.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "ab82cc4b35e0bc9bca7611cc9b17cc383e7489f54e976074d34deca5ddf83d380b85ef3db5b35611d59500ba8c421848ca9d0e4e8dc4f8dbbd0b9fabfd13eada";
+ sha512 = "a7f700781d233b78a83cfb35fd1dd2393acd10d685b3dc4b333580c2511946f5e44f057e7ba775160ac2c635b5a15db0bb3faf0e7e946c92d365025eee6b741d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/el/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/el/thunderbird-68.3.1.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "b8aba262bd82149ec9213d0a307ca6579c64b7afa084a251f35efb68384df55c220fe71bbef1741514ddd45c284e669fd4062ce5202f9ba91622b88dd48d5304";
+ sha512 = "f88050e071131929ac728938674e1a77c938538634e6a11f7d085a577bcc7b49855cf568d1bdaf6b86a79052cd294d3cf7962650f11d066f5a98a3cd90856482";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/en-GB/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/en-GB/thunderbird-68.3.1.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "b16a859480d9cc2f2ae2bf644bdff72e5b272a91cd311684012b4f364f7a06742ceac37a1821cd37e5749e6bc7c12b737e35f226c0694710140b154d931d5610";
+ sha512 = "314400d8f9cef4cb6d177b60824b371b6c135d0df5d5a69bf0d8870c3d51e88902df6404e7226abf5cba68de538f0b4019725c1a7f6f788270698ea0d26b75bb";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/en-US/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/en-US/thunderbird-68.3.1.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "3046e6826e5df839ec1e572784bf333f72c5deb3dd472a17f0fdae5ce33bad3980a7f39eddaf99e680084053d66dfe83dace788c392ef027116f03ef49e05d33";
+ sha512 = "6c8dd662d2e2d998476828247e5455219fce61c251a37d08ddfea4b5d78e236c85c61dd3304038d274ebbcfb442c15b94080df57fb002a3627961b204cf8954d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/es-AR/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/es-AR/thunderbird-68.3.1.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "8e7ddd969487ec21ec2b4ad50e0757595d05f44972427d6c7243da15a433d16b14dcf6128f9ef96711bf8ac5353df3c3fb7a844a8f69ceb3761b023b22728f7e";
+ sha512 = "86a55fe5347382b5c607e29d9a1f7fcf15c5db97180fad4e643f2da0a11c98476688cbdac03e37ba8e3483cc5a65a802fa2b6913719083a529dc2ead08473991";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/es-ES/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/es-ES/thunderbird-68.3.1.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "7e59701093cd6c34498b9439d50bb1d03a2089366e793ef3d205dedeb14427d0f2306d18c5c0423a3a7d349006e3986d2c4977a996b3ebe3fed5d79d4a00035d";
+ sha512 = "ffd8390320c7c8fd04dcaea219bc3c51be8af9c922b465e778c7a03d388cc496d9ce288fa6e9c2d5c2ef718f1e870929a7079f76c703961959037111f634db69";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/et/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/et/thunderbird-68.3.1.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "851ed5a2289682a658eb69dbc2e5bab05199b08a3ee53a5d57bc8dbf0bc7882170697b1b382c9abc6f8fd6674c132bdf83f2b05aceeb4edeab57eb510f95f64a";
+ sha512 = "b8b7305eb644b5637fad17015dc6ef37f35ac2f238327589e50c6ddcb80e1fdd365451de3ee28fb5ac34e37ce3f69883a38464d799aad0cfa8c8da6a41b8ea6e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/eu/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/eu/thunderbird-68.3.1.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "b006a9d2ca2510ce975509fa505200e3ad66dbc21a3e029007b01b60ea0021c34056b5972e7610ffbbd1d083e70745328ad36d7c64d97fab9973ffe2458d7c94";
+ sha512 = "68b424b3b53f66efbc90543683ad83f76ecb8a2e0469c00aeb013b5828a95a88bef6de6d1809767238715ffb81495508b765a1a7b347810e69e51bd2d732a0a2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/fi/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/fi/thunderbird-68.3.1.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "c08b0567e22048a36ed6838464af84867cf6119130a5c1aa01e093bc7b564cc5d12d22bd530de6aab4e247ffdca1a3757b22dbe2be65edf846026733a8ab6cbb";
+ sha512 = "4088e2260609b14b8a8dbf6b60b3f88fd4fbdaa182da5671056333e01906a5dedfbf63f39cccf331de25ce2e905811fa6be6b25f615bf0244dff4f3b11a5fe6a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/fr/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/fr/thunderbird-68.3.1.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "0dc66c2136f6bdd0d11d450603f13f9c3822f3a50ecfa0d8f0173475243ca145dd1082fac9f8b9a25e7e6d4e0f19cb127510c40c86bc721074b301536aa114df";
+ sha512 = "c986e334221e56f9c7b45a09bc3cb8ff2c8376ed363e52ab6421a468a050b9369206942830043aee9acc1b1f5ffbc03df649542c69e05d99a6ef4ee604bcae3c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/fy-NL/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/fy-NL/thunderbird-68.3.1.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "685f664ebb6545f85d52604ea9e26477ba7ab6b36b2cb26fa81caccabe42e99c4cf57de40ce0615e830b0199b1317764e90f2d112fde42344606a39eaf454c1c";
+ sha512 = "8ae6e8aacb6e7788fddb3169db4099a6c4cbf0ced65bd2892977a9c6a480de7437abce78dd526cf442aa9f6d56d369248252442249bc21e333e218a927fe852d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ga-IE/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ga-IE/thunderbird-68.3.1.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "ecc63d373496bbef6992dd619d637956ce9d753f2eeadb0b2d45d11c11b71e9018c33d6deed7bddb1781285949dfa8f245b99d881126a8076db403e9036ac39c";
+ sha512 = "8528b198a821ed03d859c1a05704cfcaef3a809205521a07fb08422e93c0bb46e205b26466223b1dd5722ffcb2966298f6b3d98dbd31a211bd9862e536c7cc48";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/gd/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/gd/thunderbird-68.3.1.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "9cc2e9a105b2e1d3410fbde8d06c3340ba2d50ef8790b31c928385607baa8735bfe02ff6010315c1068d7585ac94bd9fa002cdc27c30007e6be44b37a6ebb6e1";
+ sha512 = "273acb355638ae7f8d14bf9ad8a9f55ed31c64c2f08a2e10eb987b2a061b77e5b87616421375346dc12c23ceb134c00b607ebf96de6bd80c745bdc19cfbe3e47";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/gl/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/gl/thunderbird-68.3.1.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "223c36a2ac4b02e991b90134deb0ac6d2a18d77bf0e8b8627b0cc5c0af49e0d9b10b06c05efb31b93aad90a75792ecf4f803a2fc5471595612697f92e1d3aaf0";
+ sha512 = "d7ce4c44846140365cbc950429feda5204c5683ca760aa70ba7c5d81c5213968ea0bd81d6eab304b383778be7bcaf041784f4d91a4b1f7cadea45a4a102e3bae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/he/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/he/thunderbird-68.3.1.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "865fff7acc60d6b4c19bda1ea38e532e96e0cfde18c441970389c34dd1e6f90f635202f4d98457d2373d42cd47cb3462b2ce0a3d7a385593be654edc54f2b756";
+ sha512 = "a7847097dedf3337211a79b18323b3cb81d208286dfbb4371cbb306a52923461e016587e62a9e74ef1cf9eb21a1d8ae961ef10822c774ffbf6d4ef8c66789e24";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/hr/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/hr/thunderbird-68.3.1.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "34c410ab7a1b16c2c172a0c45fcf69d9e2b4462f98f926c391b71eacac351162dfb55f29728627ed2fef28ef7ba40530b899d637690926297e797a3a2be5ceb3";
+ sha512 = "e92d6ecd1c32e411d5f8af94aeb9f5880e20f752ade3d30357770d9e35af8bf68f14db25503a0d52a58e6f36687f0ac4666e320db942f69700d239a0ad4bbb3d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/hsb/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/hsb/thunderbird-68.3.1.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "f885d2b366fdf1806dd8e882fdabf8994e56471cf01cc0c6ef6d1e1d4972186dc8ec5d35b18ceab8f7982d45724544f4f20afb4621499d9543eb98a3d87a9e43";
+ sha512 = "b13eb09fef032e74424b7ec24d551e1e4de12fbedc6a21786165ba7c4799fdea2bfe9a7142cb218af2dc9199ac5412146a3c954457d0c3a1801031733d6c65c0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/hu/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/hu/thunderbird-68.3.1.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "e66ac6ad21527936f65e82be605d061b9b93688e94ef35d85699e2ac03d639e00db07d113071af08f11ac1742d811d66048e1d6de4ecfc01e25e325788fdc208";
+ sha512 = "d507f27473f7e1213208405ec8b266e0bd3f91ff23ac026180361445d59e92d69838212343684d12dca6f05c15ba2de19fd60062395b1f791ff6954dc6754097";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/hy-AM/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/hy-AM/thunderbird-68.3.1.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "fa959b64625773fdca62414269f1b3d0eb369d1e4d3d45b260d4ebfc367a156f70bda5b13d30a0fb4d576ff96bea5712edde51eab62db211fe636340b73999e2";
+ sha512 = "ec1ecb62ae98887a49d5da9f81c97909a9d59a01b90c0435e8bd9efe682266faef88845f810a95af109e621d4a56b404e9283ae3a9c9104d6eb55afad4ae14dc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/id/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/id/thunderbird-68.3.1.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "b20294eb413344fc550200ecf6780c79a919e9d4498bfb97c660cffc14ef18e1d38ad5033b6ecca703467f832c40d4ed4022e335cf3e28e12b43e7c6321fc1a5";
+ sha512 = "1a96c8b40bf843ccf8fb1223a5f1f1f4418184b63e38c1a6b2c7f03fd43b97acb81917be5ba1acad5bf67fcecbc5374b56d7de34b651b21738dbfbe009ac36d1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/is/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/is/thunderbird-68.3.1.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "99c70cf0baed763feaa41799a51a15ecac4190131d74996101b00e99c2b4b674cdcfd0896573bd5fe4e22a25067f6c0dc3c19ecdc2706e010719d19f97aef20f";
+ sha512 = "0f11e5aa11bc4ba7ab2064d69d8b0770c0db7b4dae5821a3d0c35257777ab690b114eb6c2d5e8dabb1efc17f9f5668ba32e824f3bc1650b65b9835758faf1d0a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/it/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/it/thunderbird-68.3.1.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "b711ad04c405b7cf0796f242bcc08cb5906a8b4fea4b2655251b135347a4539e974606f88626093376ce16a11995d23c6dfb16fbea38842a0b9dbcd8ce2a93a5";
+ sha512 = "2c3387fde0b35db4995ddad6ad3c4cefadea2f53eaa44a9dc34747fef8188c61e3eb3142952faa9a3800bcfab6ab0cd01268b5d5f94083e3fc0efdf72e6cc137";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ja/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ja/thunderbird-68.3.1.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "bad79952ae19ee63892c357ca2e55e0ee220532fa2d28836a15866f7549c82448196ddb51b91eb2abe75d87188fc1139c886c24f66a557f87253c843622fad64";
+ sha512 = "139d60c3aa21e5f9bde72b1bec2954ba1eead8a3806ffb54269211e44c343ebeb9bd2ef12a35c0e1dab004e44248454fea5e96b8c9f936d2b33ea91ae5969f95";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ka/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ka/thunderbird-68.3.1.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "f129b230d2572b25e289a7b8c1f1b4be71a8f57b639d0264cc50068a2767af8fbb64ffc0c4ae7d50cb489015fe9a810e34682cf351f6711d40a333c2fcbf9493";
+ sha512 = "2ac9802728c2d5d9a380c28af124d0f983d818d3f4dd0d8465e7c14278db81b0eaf7bdaeed408920e64644cbf6857641791c8d02cb0c48dfeca663d5f2658b42";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/kab/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/kab/thunderbird-68.3.1.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "2346f5acab924faf1eda887f29777dbdccd4569a3163f385dbd3ff8fd7be9767df4c19496ac7a550426784a04f1cea6a4370288eb8d12e3cb93abf8b0726979d";
+ sha512 = "8105ae7b35653796128da3bb34200787649bf5ce0bdc4da9dbd43b02b64c7c5f0aad4c26413032b63fd0eb4600cc2992464da55da953dbb358b0ddfd1a676f90";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/kk/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/kk/thunderbird-68.3.1.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "12a7dfe909bf22a2a2906cd749aa409e023a777defeab4a28d4456e76e84a24d10c8a6cd1dfe54371b110acbb04c89c3259341ebd6e0ad497d175d1f9eb8c871";
+ sha512 = "80d85a5d30309964a6e139eb89a75fbddfe4e3ba2c8d8990040f2e9f25ee20d945e43a0de365ab44d6d54c593ba4e0bcb427334e3eaae2750e6fe4c6300a13b8";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ko/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ko/thunderbird-68.3.1.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "7a3ec307a546c9adbf56a0b41c7b900edb76b0e52a773b486997c1f294abfd7262208a9717936e4e6ccdf109d20cdacd4cc5b4aefec30e82e23c6080154174e9";
+ sha512 = "034769456f8c78ae75b4ca094838c1398ecfeb570620f6f7f9a6beb68df1fa91fb6ff47296982edd720fc38c04a795525d1276c23172cbaae05cd8f367f6658c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/lt/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/lt/thunderbird-68.3.1.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "3f0cbd3e185594fb16694020788b22aec01c12682aea86ede1052d766da797b24b9b99b8ecb44dee008cfcd7a10ea36e7e1bbd39842fa416b8e69eea0bd831a4";
+ sha512 = "7726cc77d6346d9c80d6eefea6898a7a911d3ffc0f11c990183b90a21b216f0f26b80a01861c5d0be5e07a56cd6442cc4429cd8dc5e1274e1fc1086068aecdf7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ms/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ms/thunderbird-68.3.1.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "cb70f35114b3fb3c0324b80ece639a4bf733abe15b74bf0f04201e272703eecdffe66a2cd50e66d986332b40d3ba7dee04cf7624cea48e9925294437def77853";
+ sha512 = "78ddacb75e28022d0bfc9add0ec0f397bee3b69c924d5f8a9731d74bbba150fcc160a84b67c27879560aa572a423c4973390b9bb221d8897460cb3ae6d1a4a5b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/nb-NO/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/nb-NO/thunderbird-68.3.1.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "3bd4914a8b0cad71622a79e34d182aa7c1aa115780980c29f732454ec219a19ca4d1af3f61693595842b27cac7c64138c094dbb13b0329950d79ef8674ea610d";
+ sha512 = "3b70a504a6e2ac0ff8e7835b43b8dd1527ea934354e3cd97610e26ed60b3b4b2565ef6213a11ef9a5b58307e3c836f35d3359bbf79a4187ffdf58ac8718feb6a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/nl/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/nl/thunderbird-68.3.1.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "3335baf0974932247e73704a5272d3bb4b182908a76e9e3e0f15bc0c40fca7763a3fe1f4303b3f3374a0f758bb00d6639595b8cfe9c03999f3bfefd8b6f0153c";
+ sha512 = "309be3866ced93396a528645c286e9ba9c031031a2cd3d608edb99b19b285a6ee313ff25067d25774d0f55c4a93c60dba4ab81ffca67786dca0873294ef96681";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/nn-NO/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/nn-NO/thunderbird-68.3.1.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "b9c93af9d330bec6f7182163fc680161a138a99691897263b74e81d9a30c6d892c4639aa28d0b311ac51800b72de9e092065ce03cd7683b86bd571c7e394a49b";
+ sha512 = "026ba56748d96225c801aa8fa12e3c88b66ae9327155831e86ab5109afdacb69883b63a855c118c803f267cc04af91362cbb7155bec5eb23c28422c592f4b583";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/pl/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/pl/thunderbird-68.3.1.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "3f66d17f0e231c608b1f45dd51cdb231826a3159ce188e9036cae8f45486d38d95d9878429dc1f15a90df3a91069b4c4c5d64ba9d35ca071cc7c1383d6c89239";
+ sha512 = "53e64d86f139bc8463e63252ad52970a7eee25f281ca39ac73cf34affc302e0f9b620115d953fb40c661e8dfac08d219d2b65932ddbd93e4d9e3467f899e329f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/pt-BR/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/pt-BR/thunderbird-68.3.1.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "dfa439f4decb4bd22945584772d837acc79ac9227763ffe061a551d334b4ab5b8479516ece0c32ae5d7b05c7168c7ab32b390a83edb61f5d33e20cad965e6b75";
+ sha512 = "8625c47ed663c68bdc25e16658bec052582ef48e582a7f932d072e29409554375e1787d36d2269ef32bbe9f9b0408530450c20b3be8c2526b96986308a87ff18";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/pt-PT/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/pt-PT/thunderbird-68.3.1.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "79dcbab7997b1610a33db0654d5e2a831e63dc1e5be7794105bf3d9739d749b75ee56a9892c112d1da5fa5c5bcd76b945b1fb7532ef2b075f1c09706abe64165";
+ sha512 = "a17325aee249eb11cb8af4b787dbaa93f3c68fb57c6c27a7771ea04921f40c00a60b43f13fa0eb88c42a937b0c8d7b6697c74078be2427fb35702b7405e6c866";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/rm/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/rm/thunderbird-68.3.1.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "e79789f61bd59fcad82e25b62e4a324476d48297e826118352f9a8cbfb3b6807cf565fbcdc49fb1c90f22595f5d5e9b41c67b994d83a15f0bfd8b98645552b35";
+ sha512 = "dea2186fcc46d3a795430a4fb15c3f50ff04eda053a54a1949335134b28044dd961bd6d52a5e8237aaffbc60ae6adaba2387a3b153362bfb7572046e002be0d9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ro/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ro/thunderbird-68.3.1.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "77e7deeb8e0fb2d77e7a672d0ef77acf171b602036fc14f8685c3b247b42d953dc18e816812067d025f17ec64daf1895508c11ce27de1f55cca7474377eadb6d";
+ sha512 = "94e30dc37fbc38528908c2e434c15a02e6e95e279b6fe92d9ea8df1b8ccc988f95f1fd5129e02c20be7bdd5e2201037ad47209d75f5fc005bc670a023aae143b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ru/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/ru/thunderbird-68.3.1.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "74993af15f9afbe5034966d2c5ed17d1f1d43a47422acd7e671b4cbb8176ad845b1bf26d45d81a05e6cb4e6f7cb1be0dcec38d22ec4ef82aca45db49a22de1f8";
+ sha512 = "c4f8b328c497760ee9149de6407a7bb9d1f2e63b8482ed279d70f693f5645ed688b8e5c4ee9a0d5a4e593819718f5e6764d1bc5e0b14061ecf03a0e2eca609b0";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/si/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/si/thunderbird-68.3.1.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "a2feda066e1cac0e3d4e9ae5837cae50ec864190b9620694817eb7659a1292b488b820aefc2c3e11393ac52934827c368d379f9a74babe53dcbc48c447cfb538";
+ sha512 = "80698a5bca63711db2f2f08617868803c99ce4afe2e0998ec98fab255bf632833e7d6cc84affd5306469854b29ade93eaf568fc870792dee29397335ea6c2e38";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sk/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/sk/thunderbird-68.3.1.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "ecf370133d0fcda81c9caed13f5307bf27b50e85f255a5c13cb37da4466ca60cceceabe8463dbec3b2e4e7349c92c759803eb2ec01448dce1778d2bcfd2d9fac";
+ sha512 = "844d63101e62f7525bfe7e47cef0017aec6a8aaeb3693a345b247a50749c078f3d7697ee7ea0c758af48f2d12e354d0f0ad939959bfc8c813761e1cd092a065a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sl/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/sl/thunderbird-68.3.1.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "2fd49d0f88c145ab65ba3887363b969da2b6ca141de373fe7b3fe95cb1af27cd4fcc1e21b146e241c312862736aebeb8ddf813548e7e5e133188eaeb94933124";
+ sha512 = "5641b327576f56e44506dbcf4234e2885df4c1de482ca5acabafc29bd9885b263818eeb5d0c49693194721b03c6572ddb4ca8136c88438db457a80f442bb153e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sq/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/sq/thunderbird-68.3.1.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "4adb9557d053c8485dd2abb89285c3559004653d4200025205758f54bf349d79f4a1db8229af5a2fbb7598554e47ebd7f6b1823f3a1cd0bff53a6080d17ed363";
+ sha512 = "070cb427f6e80935ed43f27145491c7a8d6eca7b54a69958912aeec724699362c4beedd8067ad94f30dde2b74f5763ae5c4375320c7aec039716e6274a540fd2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sr/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/sr/thunderbird-68.3.1.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "4132d8b2470b50d3565d4ab32ce23eae77874b6cba8451c06a10cf5e10d0f1d03170004985d61cc9d7ce4f1c5c31f017b7ed8392ac070e63227d996b0d9cabbf";
+ sha512 = "1966fbae58c58112afcae545d36e03d0555d6ca3e172ce6077c32b692ef049d3304f44534f7d2d05ff8d9877cef6297aecfe3aeb03bf6727d544f01475d731a7";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sv-SE/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/sv-SE/thunderbird-68.3.1.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "7d24c7ab6f7cb5fd6cfffa21b1d55040a626109ed2cff7859dc8c28b78b2dfc40b7b3c9a5ed12aafbc15368f294990a35d172bfa69aeddf8b65505f65f38898c";
+ sha512 = "5a07a3e16166fc7b0d8333279250f08dda228b588f5437a78469a30a3a2f28259658eef183dd7fbc595ee8133297cbaba5912a7260db4e5ec3bf3d45b0b51b49";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/tr/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/tr/thunderbird-68.3.1.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "17393c5c522cb0fb6de9c9fc13a2ed0743f995cb51d852ebffcaa03e59b39d93c2137e62aadc70131bc8fd61f2d6c3c70baddfae299e2244109f35b4f7443572";
+ sha512 = "f04678b9d30747a44279f5bb7660e5a4e24e48545054889752268dd130f184f00089ebdb74f1439f2d2861acc3d326513c483a5a82b0a2857696438783494986";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/uk/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/uk/thunderbird-68.3.1.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "e8dad1bfa1b118141e65198014cc405a3041fc552cd1bf4186b22877433805357fe39a5adc6cdb9b9afaa86493442bf32ee73bf2c2859f8ad535c7996744f60c";
+ sha512 = "7b812fe4736d064a8854c52d7f4422fe0cbe1a82fe45d04a1713e5ac961e35e8df85fd0690e2b6102f631f64b487545b5886d9033cb5d26fce95dcb444a4312f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/uz/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/uz/thunderbird-68.3.1.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "5a99a2ec1539f452db613f7fef10d180bb57c642e0098ecb234fe03521f1ac9c781cce50eb025d8a5adae280b466dbcdbc08be08a0106c6d8ad99ff250eec4e4";
+ sha512 = "0f1d60b83e48ebc2ee38e24aea951d7e1b17e7ede4145ba3170380b51479271d04f32da493e3d9eda751c41974320d2c3e75587fdcd9fa716d9795bde597d0b9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/vi/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/vi/thunderbird-68.3.1.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "fc39ef4d2bdd5791cd8661a522f74b2a1f9f3b534968f10b3abfaaa287a160d01debc56c9cd416c35e50b38f80d2a1b5ba10f4134e9fac3ac32748e3891f4026";
+ sha512 = "ef8f8aa5f676d9b629ad0491be1767d5a66f25cccd1cf4e089cd48b0dc91efb4be22ee037b21645236b49f0c1d5016e89285dabafcca9a9dba27dd272cea7559";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/zh-CN/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/zh-CN/thunderbird-68.3.1.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "96e2cb653a93d788a7e721bf6677e7dd50ad67e4e173bcfc23dbf190440a35ec2349241adbe7bb1a74c4732f3990a15636a0563448cd90b7526c06bc106d083b";
+ sha512 = "15eb738721b6cb0bbcc9547422ff89a1f3d9b28abddbc0c386a56ba44d91a1eeade1a4367aab0532b37b009ba7a29e8faea42cf84b320155defcae22ae113e46";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/zh-TW/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-x86_64/zh-TW/thunderbird-68.3.1.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "c9d720e70d55998343c4d20257a0385e3764da751e57eb992d7ddf2723f565099d6e8c880ec009f9ea71609ddbf172a8ee7f82e603f42529388d0627e882ce79";
+ sha512 = "012a043f5c66eb76876dfa44925751f37e7cd149dd7158cef2121c73e3bce714443663ba4fea011879e7c80d6a653d7cddfa889657b2ee6d6f62a287c3d17507";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ar/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ar/thunderbird-68.3.1.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "79e4d01a88156ddbc1db2afd10b83e6e069a69df8cedfb0e247706aebbb8053ae68bf44b0ab1849e859ae15d8a6332c4e795033ce7e3385210cf9c12e4f3c37b";
+ sha512 = "5beb572e48d06893a38c17e7b5c9bae1f6a4f74e9d5f36137f73fef085c6e1a5583f7d1ddf1efa587479e682eeec96999f2c5ee82827665f27b963f242c87710";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ast/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ast/thunderbird-68.3.1.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "72f4ac14a13e364e4ab66d9659845abd4be47f07311cc79d71e05dedea1aa796a8e6d5772faef836e2eae410c1f8ea2b7b1bb460ccd60a0cd2bc7d48f511cd2b";
+ sha512 = "f0c5bfb629f594fe83692133496526df6d26147ea392451f9c279545cf2be8a160f6a9a1f7bdfe8684b099223764c5e0b3d751ce64e92eed7005fd970dc5dfcf";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/be/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/be/thunderbird-68.3.1.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "aaef151a1ac5b0f4adcb1d708925f5d6452f04fe3f73617bd2a5fd0e2a54e48229c9fc27ec48d5d9ebe8db9e1925b2df7542cd543cf9f312ea7e65ece10d44ce";
+ sha512 = "446102c112be7dd92f1bcfd377c88b7801f0aad56f0b7f36ad18aa4bacd51e68ef3a6caf758465c42d0bc0d19d7845514a4f8920a98910244a73769c1177cc63";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/bg/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/bg/thunderbird-68.3.1.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "28c9f71d5674a21785656309f40876917c27d979f082269f8b32f1600664fa10a3689abf856aa391cb42776fd2d2af18731e4af22fb1c5e75f3616c44772e54f";
+ sha512 = "455f22009b00a8ab2afe829181fa0d2d4fe973bc595a999da01521d514f2c4ea3df203e439426ce3bdd389e58f3c954af15068dcffbdf4b0d2988f197703cb1b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/br/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/br/thunderbird-68.3.1.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "08d2e1186d18f3dd80282597927c7c747152d13d2511eea5169b2b42eb4318a817261a2518509f8b26ac83d770d0e70e3ca0521fed8c3f253b5e6f211424ef6c";
+ sha512 = "56c5dd9bbb19cde280b2b0c6cf4835dbfa4cf72f2dcaf5cef50e5d13e28aab99fd42c716c9fbbe5ef6b571e22aa0d6c7e82bf24d14746428547747026a41355a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ca/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ca/thunderbird-68.3.1.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "d6c0a548b4eaee0c0ab8f7f03e3cf329d353f7e0d2403796b7db8f1693afdcb8454715e4d0e0d2e1f074cd816b2c9ec9be5ccc76b4d7f0d00f8615bfce4f193b";
+ sha512 = "c35b3bd4752b3cd72347eaee3a48d288e9c0a65ba9c50d2da80aafab0d57df7315531941e89c1ce374ba3f2171553e465b8f1a653acf0032aa08cdefd06399a3";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/cak/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/cak/thunderbird-68.3.1.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "3bd32854eccddf411c294bf0dee5f3d945a1016d1ede639ab8c1e2e86ca97b9866f1e4149f1fb0402fe3ebb148e8f34f7b12ede4853c6cd2edb87d9e822d1e27";
+ sha512 = "ea7b2fd5abc216603897264efbd3501b5eadf4d0714dfa00ee351c53dd4595de5ee1f314bffd86a8a3e5dd92548d5c1ae28339e9bb0c32be2fe05f1279db009c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/cs/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/cs/thunderbird-68.3.1.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "33c87e9a016097991fdee92d5f8813b4cdeab355ddd5d65d25a017640bd50dba94d5936148e0873ea596fdab2e214eb70bafeb5edb6576397ba300eacbd873c0";
+ sha512 = "24e07fab3d550a3c5bf3e5c649dadf5466d2f7ea86bf607173802385f2a79454aebedc4ecff7d25c8fb86ebc7594a29ae2cce6cfa551cc3c0ddc165fd77a350b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/cy/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/cy/thunderbird-68.3.1.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "f28f46b5d8004ade5b91e3fa10659ab87c85f33faef90c534a5c4c0680d11dc0f013abc28003b1a7111b4f67040ba54a4616c85cf9c906e52048ceaf6d9de7b2";
+ sha512 = "36c2b67b0c88cd2341ad6dab022afe7a5d37a2796fb75fac6014bac9b4b81e7734ab8d803bd97846bcf6b16e1e15921ea7e983b07fe77ca52d51a9819d785f81";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/da/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/da/thunderbird-68.3.1.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "21eafecbc13e8f63f36386a64fd947ca566ff6878e96a6ccbd124e1020a62ecede74f8578b56c66b13ef63a4197f527d406aaea6559b833017bb3e1931052dfa";
+ sha512 = "c200e146778c1719b2ef1c31cf3b3a5cad8b07cd4f773d1e889a6fac8f6a4cc3700bbf8d108eaec90f8319056c036719601bebcdc975ac4ecbf86b962d65732c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/de/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/de/thunderbird-68.3.1.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "5c7c528fbff84823ffa46300081f2d5352bfc5316af574d39e020ca53e9b61b1c5784ec7b863fb095645d908ca18862610babf31f7e094d1e0280ce8069573bc";
+ sha512 = "ebc55f82e83dd9d17bfcb8c5f471418ca561bc5acf01ec08251dc7c0715ce0c5dd2fb1ee28c2e92e1dc9b24b6fc8ecc1902a5e78e1b23967d683e2825c92aead";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/dsb/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/dsb/thunderbird-68.3.1.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "f18ab27c8bf26e2ee2feb2007cfab28622c9df0f03facb20f0ee581d6bc33c67227a2422f9bda7edd5cec8fc1ce0096764e26d35262559162a3a37481a92ac3f";
+ sha512 = "9f67dd9f57b0f1289cee31750409b14fef52202c4cc205fa7426e81ec8f262f8d39786ee4750a47cc100fff133063a5a16c67729871e86eaddd1fcfde419f7ae";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/el/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/el/thunderbird-68.3.1.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "f3fb8cca78a51fa0b855c8e112625af364b59a6ef2c05c7712da6451790a8749f26260aec716943a785c6006582977ebd950f09cfee8ed9041a875f9ffb632f7";
+ sha512 = "6b9624e4779d1720d7bfd6d5ac72affb2559ea730222edd85322d17216a6d0491a745a15e98d1a5bb8b68df9bc6ba33144f9e4af1558844aba98583051a07f0d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/en-GB/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/en-GB/thunderbird-68.3.1.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "5d53ae6575e6f3580dab921cc2ee11c00834fee39cd321c906b81103fa14b82e4e129d48642aa9b857921abb11a6877b774ad685069a921d417fd93d25ab2198";
+ sha512 = "9e8ff4441e1f0813f7a797c7815961f229f6e4bacb3090e3417546d3c62274d94b7bcc7cd4e83319f456024fcbb6d4f5a1d347d8789d6cb5c530aed2369bd18d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/en-US/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/en-US/thunderbird-68.3.1.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "9a4ead1f16785db8778ead96eb4ed21c5d52e9d3669d2d3bbded0d616e6b57d0649347b067d48437b769c51093627b47503408aa109dc899d62ace8fed83f62f";
+ sha512 = "413614f1508befe9f5b518125bdb53791d2fc86acabf899f7d48ff645f02f09d74e751671be4e1a5aba8d816d3f45fd5f3cf5490fc037d87596a10574301af43";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/es-AR/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/es-AR/thunderbird-68.3.1.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "15e85f3f51409fac915b095310158a5313dcd82f66470c85874e4306f1efa70e63bc4b39b615dd8e1eeda22b863c6fe0c5ba15bbc6dd94b6fb4a0859f22ceea3";
+ sha512 = "2ae7b1883b238727d2fa6261c7eda3bd428c996153b1cbb468f371e5fbf9f2101e4e2c078246359659fd495ad3ba80e71437aeb6157799225dbffaa7b7462f25";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/es-ES/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/es-ES/thunderbird-68.3.1.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "b136302034d987594f65e68564eb1e6b1713d79be39e7b90f8ca73c74faba06d97afd60253ca34f15a415575c412be6ec1113598e86b0b7c4d8ddba35301cbe5";
+ sha512 = "927801de4ffc11354994cef415b231b967d8d70326c86ade52432287c8a8a10756974e3286b8c9b372c08db2530c0e28be7913537ff4d83a80c7a69fbe191959";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/et/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/et/thunderbird-68.3.1.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "5a344c70202d884827231d0a7ba06703c7a265fd3ad59f1442b7d4bdb57fed06b8d6aabff4a5d6193a7b62027e243cfd27cbcafcdc1ce97baa7e0f3317f64e49";
+ sha512 = "e800b51e43a0e4ea23442419f51a17de6a0695bbbd03c2b5431097c1438befd31cf2e07b70ea4ddfdc02a68494d56e2263a5f6d97f84b9d077ab600a6e3b7d4a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/eu/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/eu/thunderbird-68.3.1.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "ae417ccef00a3c5a2fd33ca653d35575126d18cd991ae32e25bbcd8f6d8a85f282929c2f2c78ae0f12ccf85a418cbd9518f6d28f89d6bf38c41d3509801caf45";
+ sha512 = "deb4999da8a2a5bb6b695666581f544cb33d844a4a69fb802802c9eeef96fa945faeb88311ceb10fca4762c98e0134ff09705b3c76ca4f1b25f342fea048f69c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/fi/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/fi/thunderbird-68.3.1.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "2046eda267c49edb5bdf268265dd02f638670c8d6f1310fcc496c1acab2c777e39c5a974dedbb7bb1305f7a9ecf11c64303f8857aa7fba66f76a62cb89e45b23";
+ sha512 = "c6913908c29f26242062ed647838d07a70183ede0712b5542125b121506ddffc6454ada2557d2bf5090b4d5f5a5f94300b979e3426c57af8949326bf4ed9a3c2";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/fr/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/fr/thunderbird-68.3.1.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "f483c884064d13d11d4085a72c8805b5c10564f2926182c649c5422c31c8014a75948d2dbaa612f29b1f64b615e6e9bbdb2c4c1c406c8b57f13498ec1f29674d";
+ sha512 = "53e65c88271b04f4b73de9b2ce32020da0aa0f27ccc383d6a567f65639a4d9274f7699506115893029f150969554aafa2e09ed97a345e0f5c9ebce0e33273003";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/fy-NL/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/fy-NL/thunderbird-68.3.1.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "b8fc327bb911c25be29c8ae5a664a2b000ee08183388dea6b75f56105365f541a5f81f6d00089868ad20037809c2e4a33dfcc988567fbec187f41abf66d4d6d6";
+ sha512 = "197182e6f8c024f1ad04e157bb33b9e9c2742adc58177434b070454de1d7fa529f7f4b7738b43bd7c5167774666de23c4031ad5418ab828ea354248351eb4b98";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ga-IE/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ga-IE/thunderbird-68.3.1.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "4c456ec8474109c7b136b14ba49ec8b155f6b7194ca4db618a3daa7affb7dab4b757a8536798cd59241425f4b2404a28f6f3d99969beeb9448192a8faf8fa324";
+ sha512 = "4001e0b11f7d9aff506b84bbe183d8d1a6b9f9db948b345ee302f5327631def91bd28ed101905bf024e3294c3c4ca3e80286b62dd42895d4845a98f321fdb27c";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/gd/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/gd/thunderbird-68.3.1.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "d126c7f9c29102392c8bf2643130f7cca7add29e60d540bdd344f54bc7535b10e70b224ff6adb0d1f8eebb86b933f1f232b768ce65cbb0cda68347dccd8fe373";
+ sha512 = "1059be94966f3451ec366ff7490face91f4af446f072356ec6f34c34b18df0a8b55577a074cd3ac55a631803bc2e6af1f7de50d3d6c4e52577f3d6990485ae45";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/gl/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/gl/thunderbird-68.3.1.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "35c855e9d0df8030e455af1fc1c704ef12f598f598f15b2951b412f9147ad5f3dc129c7ce7b4d3757ab67773e9af75459bc4acc07fdd1390c0d080214840d903";
+ sha512 = "405f4c81edaf4d00925966c22f7c85f0aed9b01ff362e93977a561e36ccfb40ffc7ef5569c580f1be48e731aa44fdc3c182b740342a8d5470a425c58d87edfe9";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/he/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/he/thunderbird-68.3.1.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "361df030e5bd3e876865fe727e41885cc063f1091e0fb6ed71530aaf2cb88b8ed02c6d762939668cc2bd2fc7d861ef0e737dbd7c7ace9a859158c978f87fa6c3";
+ sha512 = "87c6e427f40603a68f86aed839ae7b06e488ebe6f20838a49ac967ab08d13a715621fa20c103a8f9511a8aca1d42b89c8329fbe0334ebc64b03e8bbe47ca3ca6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/hr/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/hr/thunderbird-68.3.1.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "92bc3303a6a0bfde8c287e98593f3a88ed1b44257dd660cfc418beae15780c06919509c48498633ee85fff990ae447f71916bffbdbd1a5eb691fe8d880052c4c";
+ sha512 = "8137ea66317afac5c40bf81b49195662a3aa7fff827bf9c5da1aab46cd41bbf1237a5205f5be50faf456cbe8a8e95abdada90b44e6a31ee9b48b21144848ad40";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/hsb/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/hsb/thunderbird-68.3.1.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "6a18e62fe60fe7694fbe305a65a497987934af299c83ea0410b08fd139cb988640f511595340b4522fa64550616864060df7423bb0e23696a29dcf274c5987af";
+ sha512 = "76f99828d3716d209e2fc2220f1a42a9e2de7ae905d833f286a3161f20bd4b9f015108a1c2d7fe5bee5aae11289568516010f347929e8f504601b96dbb3b051b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/hu/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/hu/thunderbird-68.3.1.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "f6a4e4844eb10964c95e0cd6a143128e970f40bda283d63ca542ad707c8818c47106e638fe2cd0e5c88420d31fcb7dd86888fa764ccf4d6de009841dd06bef65";
+ sha512 = "fa73fe24c69419e38edf786c3cb2085038f11b8071d03958ae82468a7782c523382784c4bfbb686db167b2b16059f4faf73df2faaf3ffcc94f00abf25e498c3b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/hy-AM/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/hy-AM/thunderbird-68.3.1.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "1ab27605d214695d3db36d337ecd33853cad37b2355c5a5a89da995c3fe655f25f3a1f7e01a9903e5628061bd65d0fe43c49e93558939d152449a81cc91916fc";
+ sha512 = "4e0c4d4cdedc595d73d2ef5618ee89018a574ed56055545ed41015bcd7fb1f8ca6c2e9f9916f09f043a62259f71b1a1b5e49ff59d3f7e2d58ad735b1f059896a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/id/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/id/thunderbird-68.3.1.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "330f0b9b8c854c37250679ce6e9cf3882153dec717b3b0e6a29524967c5e75c6c784547e9055aae232156c6e0aa0cf833060ea9e192746185c472b1289c662cf";
+ sha512 = "0c53ed9927037db892c37f6b8c930af53c49d9325f35df7cffafab07500d8b3a76708ee01742b63ebbe952fd6e95e2e90d2445d06bdfcc86d293722d2c472609";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/is/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/is/thunderbird-68.3.1.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "e8856b72d2950238ea82095fe96fb93872ff6ca8da2ccc666386ce08700f7fc137fb3957ac75c90872b7db3b15095892a3bf39d4169d364c93b79abffcec0588";
+ sha512 = "fe9da6b03a962cf613e46613dca0652a17e27f1084ad60b26d9b301ff8a81b8e9b7c81222ea9aa1c5ad50bd5a0b8baa565d70d479712abae4618724e2c64237f";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/it/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/it/thunderbird-68.3.1.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "75c7cbd7659f5b2156ee6ff05fad47f8c0e9e41461a79ec1f9c35bf15d696f9526789a6192e3dc32b36851d17958351f65f76be50ab70309fd8bfedfcf579e64";
+ sha512 = "a309f5cb7fd7e2187470fc46ffb008a829f5e33ce888afb3c015ce741d902534cc09a3338f3649223b2fef84368108e0fd1d5852c3fcc0dca0abbb1853c626d5";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ja/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ja/thunderbird-68.3.1.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "ad790fdab0bed7a4828e3654999e3c3b04dc51f04ba4ca12e60d9c70b44236e6902b0dfaa70842db661c5fefc28eb7f2045d78ff5df82224d7e0550dca516f95";
+ sha512 = "83af58ca30ebca413ab71cfc033ee3d7589088e73d739a89a81441725b67d1fe271db806538b0882ae802cdab45480f7c6d6d04f63e10b9a5dbb62c497a50389";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ka/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ka/thunderbird-68.3.1.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "371fb961b63f170ab0521bd2fd590244966a8ce9935f5352baaa244922425ddd46f40fc6f8d5512fb7b61c12d01e8d050fe53e77bd7c69f7b6a9135bdeb81e3d";
+ sha512 = "9ca88cc5a66041e1db771c7551ce9f246b8eb25946c3a90988615287f4089c5e1c0c9dc89ce776d5ab7f3015005229aba3dc724efde954147411315c8e964f17";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/kab/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/kab/thunderbird-68.3.1.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "a1e6fa908913e56e17272545765092f3cb32d6f5807db7b7bf02d3eaceac37a76136cbfdf0c11e274c7a59b8a1db8d8b54ddea6bdda75d0b1e9f869eb62d8fbe";
+ sha512 = "b7ed2fbb279c5aaaed7b219bd2e3097a9b2f524df91b37c9d68d2b94187323cecfc92b176d6205a4d184f64273b75eb4121a882583a0e06a9c07b09501f06841";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/kk/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/kk/thunderbird-68.3.1.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "2953c0e23c7153e96cde831a607e688540522698649bed526066bdd527ab8024e6007842ce8cc2f6681ab6de81250e63f52c3a0bd51f9ce1a495d19f2446b2e0";
+ sha512 = "86215ba52d4bae535706159c60dbbe471f0656d4c69473771566205fb1a700111bb8181c156fa3593cfcd32e0a8d2c51b72056277cc2d6946cfb797d24c67b47";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ko/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ko/thunderbird-68.3.1.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "bbae4b68e771c5416285edf8bd5e8d9f117d5bb9b5da4b4d2d4a90e89dc74e0be32b53f123426bf356749dcb3077f3c28fff47037df2a4afde90d08899794e01";
+ sha512 = "d97cce3025365dd274903630aaa096e89ebabdbf3335f03a3593c90f372b2df100df059391f16c7d1262dddb7dcc4e2e48b104e10a5735767d0d359f1d8f27ec";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/lt/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/lt/thunderbird-68.3.1.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "a074abc38275119652bbd69765fa36d3865253f32ca7efaaf628aea94ba6316fb581d083eb0284eeba530bbbd8f2613ea43ef6cbec6090c377449e16a1cab272";
+ sha512 = "6e4f5e35b61589a10de95f2e8269893a061ba26fb19fd072643764f5c5b476c807f149abb9557c646e38dd4cffd63f6a1cc343803ea4bf3b2ebdec730ccca64d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ms/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ms/thunderbird-68.3.1.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "a956870831e313917eb15e836aa1c3b5f774afce7a1962f0041c07008b627d5dc12821c091e4777181a15de94d62df565caff10c620cf48d08db0fe2391ec8d8";
+ sha512 = "32149a9dd72da68862e44203e1e89f3702cf01203f5a6c6362d696dfd6de8ac850f6aca273a8bc8b2e6146ef9987b1c054fc738942f64fcfb5d3f98016cbee38";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/nb-NO/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/nb-NO/thunderbird-68.3.1.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "425ba2a0e7401d83a4f98389e108eeb85ffafe685a748526012a47c07768278879d0a9795da0bfca5a955f607afdfb5243a4a5980d85d0f827d0253c5f84daa8";
+ sha512 = "2a28c4585dba6642f5216228380dfd4b3ff0b7cfa23bd44feffdd0baea3dd352d290d6d236547fb8e7f6e7d7c724607e472d718006884f35a00cd257f91e83d6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/nl/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/nl/thunderbird-68.3.1.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "dd05524929e09c8459ea9bde675e645af56e516cfe087862d4b869401b54fea9766553de4edf340ae936d9db169861fe655b3e258cb2f824237de68ba087088e";
+ sha512 = "055f6e6eb1a6cb84e1a3268b394eb514ba45278a26ff507339d00f5b2fbc8f1704bccc59a691d8068e94be9a84296640401146ab522a393e0db2f32f2d31490d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/nn-NO/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/nn-NO/thunderbird-68.3.1.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "5d74324cdc78563e109f0dd151dd90133baa3d93ecd7c24e3ab8d0b36a402f524e97c58889a4d5ad2bbf5ca08d785b45c660099777b9706441bd7fe5b8c508d1";
+ sha512 = "a0fe6bddc1babd7671da9105e5870edd8bce128adacaee0f8f31b904c022d62d593d32863d4c8e836dab2f2cfa11e79d2cdc0f71bf0909f44b46b7883beddecc";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/pl/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/pl/thunderbird-68.3.1.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "09521b3fb8f49631c318f6bd1e8bad27f9b75994c3b1e8b57014d9b290cf6cf338ea30ff46c6b07fb2dfd456fbca18cb609696341417bfb39740253be2a9f678";
+ sha512 = "6bf2693ac1dc360cb0af200fa07cc59d8a85e1da3db62e90dbb372e6ea92551224ad638dfaf0789c006b7e6800e18bab3f8a787e58aaee1070e7e799733bd0d1";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/pt-BR/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/pt-BR/thunderbird-68.3.1.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "9a5c096a5e2bf3d3446c0de33fb92995ca71e994e40fb5b66001f7afe5d0e196a7b3b0088b8e51fa8e079af42095c321ebf9acf367408d9c99c33ecdc90dd57b";
+ sha512 = "d428949e8e1157201e068127cab265a546d358c0015341cfb489d2ee212675dfb3b5b837eae90cc50a3d997cacaa92a7b0777542e6aada37b29df16644113d7e";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/pt-PT/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/pt-PT/thunderbird-68.3.1.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "c19d39ace2beb65123f09129545cdddd303726c2efce12b57f5919435cd6d432c592c5fe48f86ede44a949edf1a1a995b3094f26266baf18cabb79188b00ad58";
+ sha512 = "9d03c8563c16a1b765890e3d45686b02f8cf222628d44c2abf8069308e1c5698c4f7dce34a5dfe872cfbfed9f37c2ed9483b84fd56c85d1e9a42ef77a31297a6";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/rm/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/rm/thunderbird-68.3.1.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "839f4e56a788762578de09a74ce8974573b575eb0e0f641f36d2d6086eae08e2a0cb6a610f4ee2ce00db0b8f0549c9cdc3ea433ba3e0a1eb5f6a9093542b94d1";
+ sha512 = "307b2858f594ae685e0800a6c17c498f239e848e2c7c2df9d360b0bc34716b51e6ffd405614428d213af22e4dec188f2ceaa0ac9b88ac70504473c6182c52191";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ro/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ro/thunderbird-68.3.1.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "0ae5d25b55971b41594676678dfeed2c5f0c89c3f4c8b2649ce2a1ae9183c1518a07410e46b9fa86d5f09f18f53f4a6c37ecf1e4e72d6414b065dbe3f46d0d6e";
+ sha512 = "711d7bbffd932f26e2ff4001ee72147daa247ab4952f5b7dd5bd382df59f0f21edd18e20aeb5ae74f3cb4dec6f1d357e3ce479607b8b049088b5126829e66e96";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ru/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/ru/thunderbird-68.3.1.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "fc00117c0caffb90ee70583692add1a0aadb8a03970c8cf501aeb248bf4abe1d8d8046c2c170b42248d0f1f11241067508e35aeb0db320579882905156827527";
+ sha512 = "1983e078d89de73e9767a03321278dac6adbf3684a0b06d9073a79b765a7abd1602a90e7a69774d878c3fc3ed2819a6cac0ea55e662a03d85242b2f2f5897355";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/si/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/si/thunderbird-68.3.1.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "6345bfa3abf1ec899320696b10553f0a75b48f2f2dc317c5d6ac10ddaf09a7269353a73aec84ef4d7501d064e409d434054711441da3698f1ed5af653de4970f";
+ sha512 = "478a7faf1aa49f3416e0191bd733b1bac609cd5fc422e1ff5a6b45adac73572d32a12460c4577f3c9037fcb82f2bf672399a68b161d8e1d2f76a8b20ed272a44";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sk/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/sk/thunderbird-68.3.1.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "745514c55e85f71cf07bda02a842c8452c454a80a10bfea20e9c5750f1702809b4c589a2c1d3127c599a91ac0fab458de8c4d66afc8511e64278f02638fff63c";
+ sha512 = "11754a89286dfc86868b6373ac73948efd239fc91dde87007ba07b7d62aed780ae6030818a8e3803098c2a8881705b1e39ac517e1883ff3064e2d37d5dd13caa";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sl/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/sl/thunderbird-68.3.1.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "2449333ceec017fd3b6e3bf673c3aa553b9c52c07a09e02e773e42e2c6acec60573183d6a09c5c085ed9389c1d48c4f02acf50d83499421bedb3094823ddb34d";
+ sha512 = "4f4142f9e0673eb4f53c21027f1ba74c02cb0ffce2894f2cc077d299b082da554bd972811daef73c14281cdad2de3af9ae2456032cb3dead186b75cd27ece020";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sq/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/sq/thunderbird-68.3.1.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "7a2ac8f6c04cbdbc222ea1218dcc64928b6d5038381a7655db34cd568717854197fe4b77645b2ea07b4b76a724c2e8196db693c5e367d09367edf1af471f358e";
+ sha512 = "cdfc9cf530d813a69073f481dca6ecbeb58c3e5b90d1f682f2ef84b2e0ea4b3c823e88704ad781e9b29e7cdb98732c66d8fd6182f7b721b18a29ceef75174c12";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sr/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/sr/thunderbird-68.3.1.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "06db22ff1ed32c1311d62d1cb860bb22686d5893985bf16fe2effaff864b4352788889d5e2f2ff6c450edd4be9d9c1f33ddcff513d5eb2cc3e88fe5e50c33485";
+ sha512 = "81f6a3376db8db3eac012fe4b13bc9a47107cebc4114627ba1d6aa06007bba83b7f8348543b30056658a0080dd9e710ec8dff039d5383cd4cf7c91b4c2337f87";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sv-SE/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/sv-SE/thunderbird-68.3.1.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "f1a43a44dc155a01cda07041f554eb3474c35621ee8d8c7596aeee2746da12aa934d94f436014218a360b7848888d0e49285ca66cca8209b7b02d044c29571f4";
+ sha512 = "4ce8d5244836c9935cf8c3413ec5189e9ef952c207df5d5cf83772f0d5e2d64519674344aa45838abd2c23a19a6170a213c4c76e57ccdd94efa1c238401e9a3b";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/tr/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/tr/thunderbird-68.3.1.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "e430c26852fd2cc3b9afabe9f8c3e1480e3454614bd90c766dce2b2cf652fe526146f79bdc0e25a1ce4979c1e22c0af90540659df5fdae89b0498428a61e0d1b";
+ sha512 = "648d8e03df497c67254a3757b52b555f032a4637f54a24cbd67d6c51a99db8b758c76e0b2c9523bd43a835c979f57975cc6d8df661b3d10526b33b3d1f535a63";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/uk/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/uk/thunderbird-68.3.1.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "d6717aee4e1367ba031d03a90fc46ef397f9bbe6ef1d2a5537df77dca1d042e83c6fb44baef9ab01dc47de0f481742186220542831bfb6670c7a756a77eddfad";
+ sha512 = "7a121928cb1bb2f47db14bfe06a738249041e3a9ddb90895a9e9db614cc22980a5da1c0d6ad0e8f534a345c1765fd8240a307c0c8409c1554618ad822cd9c20d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/uz/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/uz/thunderbird-68.3.1.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "58ba68d642eeb1700c6d0994260bb16028fd15b49697c6e99e61e73d90275e0e4d2e6957c2af60122ca7be8804c1ddeb15dc38090287335a674104da3cd1cb47";
+ sha512 = "5a79dfeed1e2ab362df3500f94c177df5ec7b2a266c3f1362af5f74c74a6760deb85a0ca822a3777b6236639495d8e0c52203024582626d8fc4a6d5de18f1c1a";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/vi/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/vi/thunderbird-68.3.1.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "9968cf02fe2b58f21e228b9292b48fcf9df5beb805335e7c77332231690b2bfcea29a4abfe9e834a85c2e4f79fe55df4590a2ec17676712c1b30736f48704bf8";
+ sha512 = "4a88c3605b365265fc0c807b753a7b5b7fdb1ac2dfc781e9a8457690a5ea11a26eda39e617bd12e67d86ba26fd28f27088404e17af286546978abdba9349b71d";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/zh-CN/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/zh-CN/thunderbird-68.3.1.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "41369b102e82285050147d0e883fc20c6b7d311a1a8cef2efd31480a6eeee8c3ea5e0a9e9968c3d903d1fd92aeec331ade3cbcedd16cb254a74c6049ec0ab410";
+ sha512 = "0499ab6f076c44901122c302208d919a977a5ae68df4780926efecdb4281bc085ee1e6a3e7f889dd2fe90d16f0ea939b1447203ad8a2950789e1972262149724";
}
- { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/zh-TW/thunderbird-68.1.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.3.1/linux-i686/zh-TW/thunderbird-68.3.1.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "37e07f78c2ab67d040d6cd4a511fb3e6a641ca00dd659b51d5d320e79251bb2096dd6719da819c22306e10af9fc88389212129d20064ce110d06d49bf01545b5";
+ sha512 = "b1456490911eead3f8afa640cff10f33673631df6431e2074fcf7baeea3f128a60a1e07a5d9224bc2776aeb3f1ab3655e27f51b16ed118bb8437ef50797930ac";
}
];
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 0f4679a42237..a6c743a85ed8 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -1,217 +1,341 @@
-{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python2, python3, nodejs
-, libIDL, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
-, freetype, fontconfig, file, nspr, nss, libnotify
-, yasm, libGLU_combined, sqlite, zip, unzip
-, libevent, libstartup_notification
-, icu, libpng, jemalloc
-, autoconf213, which, m4, fetchpatch
-, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
-, runtimeShell
-, cargo, rustc, rust-cbindgen, llvmPackages, nasm
-, enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper
-, enableCalendar ? true
-, debugBuild ? false
-, # If you want the resulting program to call itself "Thunderbird" instead
- # of "Earlybird" or whatever, enable this option. However, those
- # binaries may not be distributed without permission from the
- # Mozilla Foundation, see
- # http://www.mozilla.org/foundation/trademarks/.
- enableOfficialBranding ? false
+{ autoconf213
+, bzip2
+, cargo
+, common-updater-scripts
+, coreutils
+, curl
+, dbus
+, dbus-glib
+, fetchurl
+, file
+, fontconfig
+, freetype
+, glib
+, gnugrep
+, gnused
+, icu
+, jemalloc
+, lib
+, libGL
+, libGLU
+, libIDL
+, libevent
+, libjpeg
+, libnotify
+, libpng
+, libstartup_notification
+, libvpx
+, libwebp
+, llvmPackages
+, m4
, makeDesktopItem
+, nasm
+, nodejs
+, nspr
+, nss
+, pango
+, perl
+, pkgconfig
+, python2
+, python3
+, runtimeShell
+, rust-cbindgen
+, rustc
+, sqlite
+, stdenv
+, unzip
+, which
+, writeScript
+, xidel
+, xorg
+, yasm
+, zip
+, zlib
+
+, debugBuild ? false
+
+, alsaSupport ? stdenv.isLinux, alsaLib
+, pulseaudioSupport ? stdenv.isLinux, libpulseaudio
+, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook
+, waylandSupport ? true
+, libxkbcommon, calendarSupport ? true
+
+, # If you want the resulting program to call itself "Thunderbird" instead
+# of "Earlybird" or whatever, enable this option. However, those
+# binaries may not be distributed without permission from the
+# Mozilla Foundation, see
+# http://www.mozilla.org/foundation/trademarks/.
+enableOfficialBranding ? false
}:
-let
- wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper;
- gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
-in stdenv.mkDerivation rec {
+assert waylandSupport -> gtk3Support == true;
+
+stdenv.mkDerivation rec {
pname = "thunderbird";
- version = "68.1.1";
+ version = "68.3.1";
src = fetchurl {
- url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
- sha512 = "2ng5wwd7fn9247ggzlxx96scc2nalaahzvxkzvb87mp9fbfcsi3v9dh370cm42px8hrknnsp2lrfk9hqx4287zyn9pl3k9vr6a9cswl";
+ url =
+ "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
+ sha512 =
+ "01vn2snp631lngfy0kz6fax6r6w5w2iqc27hqr3zsvkfsl6ji0rkxm17g4ifv2qvkqgrnhxicdh4gj80x7fkw2nmmsqsypdddp5a91f";
};
- # from firefox, but without sound libraries
- buildInputs =
- [ gtk2 zip libIDL libjpeg zlib bzip2
- dbus dbus-glib pango freetype fontconfig xorg.libXi
- xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
- nspr nss libnotify xorg.pixman yasm libGLU_combined
- xorg.libXScrnSaver xorg.xorgproto
- xorg.libXext sqlite unzip
- libevent libstartup_notification /* cairo */
- icu libpng jemalloc nasm
- ]
- ++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ];
+ nativeBuildInputs = [
+ autoconf213
+ cargo
+ gnused
+ llvmPackages.llvm
+ m4
+ nasm
+ nodejs
+ perl
+ pkgconfig
+ python2
+ python3
+ rust-cbindgen
+ rustc
+ which
+ yasm
+ ] ++ lib.optional gtk3Support wrapGAppsHook;
- # from firefox + m4 + wrapperTool
- # llvm is for llvm-objdump
- nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python2 python3 nodejs wrapperTool cargo rustc rust-cbindgen llvmPackages.llvm ];
+ buildInputs = [
+ bzip2
+ dbus
+ dbus-glib
+ file
+ fontconfig
+ freetype
+ glib
+ gtk2
+ icu
+ jemalloc
+ libGL
+ libGLU
+ libIDL
+ libevent
+ libjpeg
+ libnotify
+ libpng
+ libstartup_notification
+ libvpx
+ libwebp
+ nspr
+ nss
+ pango
+ perl
+ sqlite
+ unzip
+ xorg.libX11
+ xorg.libXScrnSaver
+ xorg.libXcursor
+ xorg.libXext
+ xorg.libXft
+ xorg.libXi
+ xorg.libXrender
+ xorg.libXt
+ xorg.pixman
+ xorg.xorgproto
+ zip
+ zlib
+ ] ++ lib.optional alsaSupport alsaLib
+ ++ lib.optional gtk3Support gtk3
+ ++ lib.optional pulseaudioSupport libpulseaudio
+ ++ lib.optional waylandSupport libxkbcommon;
+
+ NIX_CFLAGS_COMPILE =[
+ "-I${glib.dev}/include/gio-unix-2.0"
+ "-I${nss.dev}/include/nss"
+ ];
patches = [
- # Remove buildconfig.html to prevent a dependency on clang etc.
./no-buildconfig.patch
- (fetchpatch {
- # https://phabricator.services.mozilla.com/D47796
- url = "https://d3kxowhw4s8amj.cloudfront.net/file/data/a54c6fszaol23yh5aa27/PHID-FILE-sql3i57neyrztfdngrwe/D47796.diff";
- sha256 = "18i1bk6rz875dly2vnkrdgbah8kx0lv4akjzl0i9gxc58hi5q3nq";
- })
- ]
- ++ lib.optional (lib.versionOlder version "69")
- (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29
- name = "write_error-parallel_make.diff";
- url = "https://hg.mozilla.org/mozilla-central/raw-diff/562655fe/python/mozbuild/mozbuild/action/node.py";
- sha256 = "11d7rgzinb4mwl7yzhidjkajynmxgmffr4l9isgskfapyax9p88y";
- });
+ ];
- configureFlags =
- [ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio)
- "--enable-application=comm/mail"
- "--disable-alsa"
- "--disable-pulseaudio"
-
- "--with-system-jpeg"
- "--with-system-zlib"
- "--with-system-bz2"
- "--with-system-nspr"
- "--with-system-nss"
- "--with-system-libevent"
- "--with-system-png" # needs APNG support
- "--with-system-icu"
- #"--enable-rust-simd" # not supported since rustc 1.32.0 -> 1.33.0; TODO: probably OK since 68.0.0
- "--enable-system-ffi"
- "--enable-system-pixman"
- "--enable-system-sqlite"
- #"--enable-system-cairo"
- "--enable-startup-notification"
- "--disable-crashreporter"
- "--disable-tests"
- "--disable-necko-wifi" # maybe we want to enable this at some point
- "--disable-updater"
- "--enable-jemalloc"
- "--disable-gconf"
- "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}"
- "--enable-js-shell"
- ]
- ++ lib.optional enableCalendar "--enable-calendar"
- ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
- else [ "--disable-debug" "--enable-release"
- "--disable-debug-symbols"
- "--enable-optimize" "--enable-strip" ])
- ++ lib.optional enableOfficialBranding "--enable-official-branding"
- ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
- # on i686-linux: --with-libclang-path is not available in this configuration
- "--with-libclang-path=${llvmPackages.libclang}/lib"
- "--with-clang-path=${llvmPackages.clang}/bin/clang"
- ];
-
- enableParallelBuilding = true;
+ postPatch = ''
+ rm -rf obj-x86_64-pc-linux-gnu
+ '';
hardeningDisable = [ "format" ];
- preConfigure =
- ''
- cxxLib=$( echo -n ${gcc}/include/c++/* )
- archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine )
+ preConfigure = ''
+ # remove distributed configuration files
+ rm -f configure
+ rm -f js/src/configure
+ rm -f .mozconfig*
- test -f layout/style/ServoBindings.toml && sed -i -e '/"-DRUST_BINDGEN"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml
+ configureScript="$(realpath ./mach) configure"
+ # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
+ unset AS
- configureScript="$(realpath ./configure)"
- mkdir ../objdir
- cd ../objdir
+ export MOZCONFIG=$(pwd)/mozconfig
- # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
- unset AS
- '';
+ # Set C flags for Rust's bindgen program. Unlike ordinary C
+ # compilation, bindgen does not invoke $CC directly. Instead it
+ # uses LLVM's libclang. To make sure all necessary flags are
+ # included we need to look in a few places.
+ # TODO: generalize this process for other use-cases.
- dontWrapGApps = true; # we do it ourselves
- postInstall =
- ''
- # TODO: Move to a dev output?
- rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
-
- # $binary is a symlink to $target.
- # We wrap $target by replacing the $binary symlink.
- local target="$out/lib/thunderbird/thunderbird"
- local binary="$out/bin/thunderbird"
-
- # Wrap correctly, this is needed to
- # 1) find Mozilla runtime, because argv0 must be the real thing,
- # or a symlink thereto. It cannot be the wrapper itself
- # 2) detect itself as the default mailreader across builds
- gappsWrapperArgs+=(
- --argv0 "$target"
- --set MOZ_APP_LAUNCHER thunderbird
- # https://github.com/NixOS/nixpkgs/pull/61980
- --set SNAP_NAME "thunderbird"
- )
+ BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \
+ $(< ${stdenv.cc}/nix-support/cc-cflags) \
+ ${stdenv.cc.default_cxx_stdlib_compile} \
${
- # We wrap manually because wrapGAppsHook does not detect the symlink
- # To mimic wrapGAppsHook, we run it with dontWrapGApps, so
- # gappsWrapperArgs gets defined correctly
- lib.optionalString enableGTK3 "wrapGAppsHook"
- }
+ lib.optionalString stdenv.cc.isClang
+ "-idirafter ${stdenv.cc.cc}/lib/clang/${
+ lib.getVersion stdenv.cc.cc
+ }/include"
+ } \
+ ${
+ lib.optionalString stdenv.cc.isGNU
+ "-isystem ${stdenv.cc.cc}/include/c++/${
+ lib.getVersion stdenv.cc.cc
+ } -isystem ${stdenv.cc.cc}/include/c++/${
+ lib.getVersion stdenv.cc.cc
+ }/$(cc -dumpmachine)"
+ } \
+ $NIX_CFLAGS_COMPILE"
- # "$binary" is a symlink, replace it by the wrapper
- rm "$binary"
- makeWrapper "$target" "$binary" "''${gappsWrapperArgs[@]}"
+ echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG
+ '';
- ${ let desktopItem = makeDesktopItem {
- name = "thunderbird";
- exec = "thunderbird %U";
- desktopName = "Thunderbird";
- icon = "$out/lib/thunderbird/chrome/icons/default/default256.png";
- genericName = "Mail Reader";
- categories = "Application;Network";
- mimeType = stdenv.lib.concatStringsSep ";" [
- # Email
- "x-scheme-handler/mailto"
- "message/rfc822"
- # Newsgroup
- "x-scheme-handler/news"
- "x-scheme-handler/snews"
- "x-scheme-handler/nntp"
- # Feed
- "x-scheme-handler/feed"
- "application/rss+xml"
- "application/x-extension-rss"
- ];
- }; in desktopItem.buildCommand
- }
- '';
+ configureFlags = let
+ toolkitSlug = if gtk3Support then
+ "3${lib.optionalString waylandSupport "-wayland"}"
+ else
+ "2";
+ toolkitValue = "cairo-gtk${toolkitSlug}";
+ in [
+ "--enable-application=comm/mail"
- postFixup =
- # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712.
- ''
- patchelf --set-rpath "${lib.getLib libnotify
- }/lib:$(patchelf --print-rpath "$out"/lib/thunderbird*/libxul.so)" \
- "$out"/lib/thunderbird*/libxul.so
- '';
+ "--with-system-bz2"
+ "--with-system-icu"
+ "--with-system-jpeg"
+ "--with-system-libevent"
+ "--with-system-nspr"
+ "--with-system-nss"
+ "--with-system-png" # needs APNG support
+ "--with-system-icu"
+ "--with-system-zlib"
+ "--with-system-webp"
+ "--with-system-libvpx"
+
+ "--enable-rust-simd"
+ "--enable-crashreporter"
+ "--enable-default-toolkit=${toolkitValue}"
+ "--enable-js-shell"
+ "--enable-necko-wifi"
+ "--enable-startup-notification"
+ "--enable-system-ffi"
+ "--enable-system-pixman"
+ "--enable-system-sqlite"
+
+ "--disable-gconf"
+ "--disable-tests"
+ "--disable-updater"
+ "--enable-jemalloc"
+ ] ++ (if debugBuild then [
+ "--enable-debug"
+ "--enable-profiling"
+ ] else [
+ "--disable-debug"
+ "--enable-release"
+ "--disable-debug-symbols"
+ "--enable-optimize"
+ "--enable-strip"
+ ]) ++ lib.optionals (!stdenv.hostPlatform.isi686) [
+ # on i686-linux: --with-libclang-path is not available in this configuration
+ "--with-libclang-path=${llvmPackages.libclang}/lib"
+ "--with-clang-path=${llvmPackages.clang}/bin/clang"
+ ] ++ lib.optional alsaSupport "--enable-alsa"
+ ++ lib.optional calendarSupport "--enable-calendar"
+ ++ lib.optional enableOfficialBranding "--enable-official-branding"
+ ++ lib.optional pulseaudioSupport "--enable-pulseaudio";
+
+ enableParallelBuilding = true;
+
+ postConfigure = ''
+ cd obj-*
+ '';
+
+ makeFlags = lib.optionals enableOfficialBranding [
+ "MOZILLA_OFFICIAL=1"
+ "BUILD_OFFICIAL=1"
+ ];
+
+ doCheck = false;
+
+ postInstall = let
+ desktopItem = makeDesktopItem {
+ categories = lib.concatStringsSep ";" [ "Application" "Network" ];
+ desktopName = "Thunderbird";
+ genericName = "Mail Reader";
+ name = "thunderbird";
+ exec = "thunderbird %U";
+ icon = "$out/lib/thunderbird/chrome/icons/default/default256.png";
+ mimeType = lib.concatStringsSep ";" [
+ # Email
+ "x-scheme-handler/mailto"
+ "message/rfc822"
+ # Feeds
+ "x-scheme-handler/feed"
+ "application/rss+xml"
+ "application/x-extension-rss"
+ # Newsgroups
+ "x-scheme-handler/news"
+ "x-scheme-handler/snews"
+ "x-scheme-handler/nntp"
+ ];
+ };
+ in ''
+ # TODO: Move to a dev output?
+ rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
+
+ ${desktopItem.buildCommand}
+ '';
+
+ preFixup = ''
+ # Needed to find Mozilla runtime
+ gappsWrapperArgs+=(
+ --argv0 "$out/bin/thunderbird"
+ --set MOZ_APP_LAUNCHER thunderbird
+ # https://github.com/NixOS/nixpkgs/pull/61980
+ --set SNAP_NAME "thunderbird"
+ --set MOZ_LEGACY_PROFILES 1
+ --set MOZ_ALLOW_DOWNGRADE 1
+ )
+ '';
+
+ # FIXME: This can probably be removed as soon as we package a
+ # Thunderbird >=71.0 since XUL shouldn't be anymore (in use)?
+ postFixup = ''
+ local xul="$out/lib/thunderbird/libxul.so"
+ patchelf --set-rpath "${libnotify}/lib:$(patchelf --print-rpath $xul)" $xul
+ '';
doInstallCheck = true;
- installCheckPhase =
- ''
- # Some basic testing
- "$out/bin/thunderbird" --version
- '';
+ installCheckPhase = ''
+ "$out/bin/thunderbird" --version
+ '';
- disallowedRequisites = [ stdenv.cc ];
-
- meta = with stdenv.lib; {
- description = "A full-featured e-mail client";
- homepage = http://www.mozilla.org/thunderbird/;
- license =
- # Official branding implies thunderbird name and logo cannot be reuse,
- # see http://www.mozilla.org/foundation/licensing.html
- if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
- maintainers = [ maintainers.pierron maintainers.eelco ];
- platforms = platforms.linux;
- };
+ disallowedRequisites = [
+ stdenv.cc
+ ];
passthru.updateScript = import ./../../browsers/firefox/update.nix {
attrPath = "thunderbird";
baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
- inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl runtimeShell;
+ inherit writeScript lib common-updater-scripts xidel coreutils gnused
+ gnugrep curl runtimeShell;
+ };
+
+ meta = with stdenv.lib; {
+ description = "A full-featured e-mail client";
+ homepage = "https://www.thunderbird.net";
+ maintainers = with maintainers; [
+ eelco
+ lovesegfault
+ pierron
+ ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
index 65eba3a2fc28..fe3a93ebda7b 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
+++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
@@ -21,3 +21,15 @@ diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn
content/global/buildconfig.css
content/global/contentAreaUtils.js
content/global/datepicker.xhtml
+--- a/comm/mail/base/jar.mn
++++ b/comm/mail/base/jar.mn
+@@ -117,9 +117,7 @@
+ % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js
+ % override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul
+
+-* content/messenger/buildconfig.html (content/buildconfig.html)
+ content/messenger/buildconfig.css (content/buildconfig.css)
+-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html
+ % override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css
+
+ # L10n resources and overrides.
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index b3d945710f09..dfb49e14133f 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, qt5
, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
, alsaLib, python
+, rnnoise
, jackSupport ? false, libjack2 ? null
, speechdSupport ? false, speechd ? null
, pulseSupport ? false, libpulseaudio ? null
@@ -15,7 +16,8 @@ assert iceSupport -> zeroc-ice != null;
with stdenv.lib;
let
generic = overrides: source: qt5.mkDerivation (source // overrides // {
- name = "${overrides.type}-${source.version}";
+ pname = overrides.type;
+ version = source.version;
patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch;
@@ -62,9 +64,9 @@ let
meta = {
description = "Low-latency, high quality voice chat software";
- homepage = https://mumble.info;
+ homepage = "https://mumble.info";
license = licenses.bsd3;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ petabyteboy ];
platforms = platforms.linux;
};
});
@@ -73,7 +75,7 @@ let
type = "mumble";
nativeBuildInputs = [ qt5.qttools ];
- buildInputs = [ libopus libsndfile speex qt5.qtsvg ]
+ buildInputs = [ libopus libsndfile speex qt5.qtsvg rnnoise ]
++ optional stdenv.isLinux alsaLib
++ optional jackSupport libjack2
++ optional speechdSupport speechd
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 3f90f65476e4..f50d9516167a 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -7,7 +7,7 @@
assert spellChecking -> gtkspell3 != null;
-let version = "0.145"; in
+let version = "0.146"; in
stdenv.mkDerivation {
pname = "pan";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
- sha256 = "1b4wamv33hprghcjk903bpvnd233yxyrm18qnh13alc8h1553nk8";
+ sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55";
};
nativeBuildInputs = [ pkgconfig gettext intltool itstool libxml2 makeWrapper ];
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 3a72ae8ce5f9..d54e8eca78e4 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "quiterss";
- version = "0.18.12";
+ version = "0.19.2";
src = fetchFromGitHub {
owner = "QuiteRSS";
repo = "quiterss";
rev = version;
- sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa";
+ sha256 = "1dmfag5hmy4jac20nizwgd92w8h2hdl2ch57hvw5hmjyfckn9rpj";
};
nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 27ccbf6d88a6..71fce57504c0 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -12,19 +12,18 @@
, qtkeychain
, qttools
, qtwebengine
-, qtwebkit
, sqlite
}:
mkDerivation rec {
pname = "nextcloud-client";
- version = "2.6.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
- sha256 = "1cggk8yfy6lak48nfh691ad5y3bap49cfa2krp7vak108krgvkxi";
+ sha256 = "18318j488pxksf4zc6zag8pdpyaks55yivn91nx3x458ax6albkz";
};
patches = [
@@ -45,7 +44,6 @@ mkDerivation rec {
qtkeychain
qttools
qtwebengine
- qtwebkit
sqlite
];
@@ -55,6 +53,7 @@ mkDerivation rec {
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH
+ "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit
];
meta = with lib; {
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index c674956066ac..998944838e8e 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }:
+{ stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtkeychain, sqlite }:
mkDerivation rec {
pname = "owncloud-client";
@@ -10,10 +10,11 @@ mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig cmake ];
- buildInputs = [ qtbase qtwebkit qtkeychain sqlite ];
+ buildInputs = [ qtbase qtkeychain sqlite ];
cmakeFlags = [
"-UCMAKE_INSTALL_LIBDIR"
+ "-DNO_SHIBBOLETH=1"
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix
deleted file mode 100644
index 56eb9c354275..000000000000
--- a/pkgs/applications/networking/p2p/firestr/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, boost, botan, snappy, libopus, libuuid
-, libXScrnSaver, openssl, qtbase, qtmultimedia }:
-
-stdenv.mkDerivation {
- name = "firestr-0.8";
-
- src = fetchFromGitHub {
- owner = "mempko";
- repo = "firestr";
- rev = "f888890f71d49953d05bccdd27a1c4f6690e165c";
- sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb";
- };
-
- buildInputs = [ cmake boost botan snappy libopus libuuid qtbase qtmultimedia
- libXScrnSaver openssl ];
-
- patches = ./return.patch;
-
- postPatch = ''
- substituteInPlace CMakeLists.txt \
- --replace "set(Boost_USE_STATIC_LIBS on)" "" \
- --replace "/usr/include/botan" "${botan}/include/botan" \
- --replace "libopus.a" "libopus.so" \
- --replace "libsnappy.a" "libsnappy.so" \
- --replace "libbotan-1.10.a" "libbotan-1.10.so.0"
- '';
-
- meta = with stdenv.lib; {
- description = "Grass computing platform";
- homepage = http://firestr.com/;
- license = licenses.gpl3;
- maintainers = [ maintainers.ehmry ];
- platforms = platforms.linux;
- broken = true;
- };
-}
diff --git a/pkgs/applications/networking/p2p/firestr/return.patch b/pkgs/applications/networking/p2p/firestr/return.patch
deleted file mode 100644
index c3e469ae92b0..000000000000
--- a/pkgs/applications/networking/p2p/firestr/return.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/message/master_post.cpp b/src/message/master_post.cpp
-index c3a5ea9..7c821b9 100644
---- a/src/message/master_post.cpp
-+++ b/src/message/master_post.cpp
-@@ -56,7 +56,7 @@ namespace fire
-
- metadata::encryption_type to_message_encryption_type(sc::encryption_type s)
- {
-- metadata::encryption_type r;
-+ metadata::encryption_type r = metadata::encryption_type::asymmetric;
- switch(s)
- {
- case sc::encryption_type::plaintext: r = metadata::encryption_type::plaintext; break;
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index eaa6b07c8fae..eff2499be9df 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnunet";
- version = "0.11.6";
+ version = "0.11.8";
src = fetchurl {
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
- sha256 = "1gspr1lh885sb9r2anh7bi4zan3zjqx33lpyhq9hm2g0n5ip187q";
+ sha256 = "1zkmcq75sfr3iyg8rgxp9dbl7fwsvc1a71rc0vgisghcbrx1n7yj";
};
enableParallelBuilding = true;
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://gnunet.org/;
- license = licenses.gpl2Plus;
+ license = licenses.agpl3Plus;
maintainers = with maintainers; [ vrthra ];
platforms = platforms.gnu ++ platforms.linux;
};
diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix
index c9e2f8f67140..e8f209239bfe 100644
--- a/pkgs/applications/networking/p2p/gnunet/git.nix
+++ b/pkgs/applications/networking/p2p/gnunet/git.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
'';
*/
- meta = {
+ meta = with stdenv.lib; {
description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
longDescription = ''
@@ -84,9 +84,9 @@ stdenv.mkDerivation {
homepage = https://gnunet.org/;
- license = stdenv.lib.licenses.gpl2Plus;
+ license = licenses.agpl3Plus;
maintainers = with stdenv.lib.maintainers; [ ];
- platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+ platforms = platforms.gnu ++ platforms.linux;
};
}
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index 535991312f1d..e38378d09b32 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, cmake
+{ mkDerivation, lib, fetchurl, fetchpatch, cmake
, extra-cmake-modules, qtbase, qtscript
, karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig
, kdoctools, kross, kcmutils, kwindowsystem
, libktorrent, taglib, libgcrypt, kplotting
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "ktorrent";
version = "${libktorrent.mainVersion}";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "KDE integrated BtTorrent client";
homepage = https://www.kde.org/applications/internet/ktorrent/;
license = licenses.gpl2;
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index aebdeda61084..173b4f02cdf0 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,13 +10,13 @@ with lib;
mkDerivation rec {
pname = "qbittorrent";
- version = "4.1.9.1";
+ version = "4.2.0";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qbittorrent";
rev = "release-${version}";
- sha256 = "19zgqlby7i1kr20wa4zd99qzd062a879xxxbmlf40rnqiqy4bhyi";
+ sha256 = "17vm6aa2k8k1q14z9r2r06c794bcr4m0l0fdsn08wid6mj1zjsbx";
};
# NOTE: 2018-05-31: CMake is working but it is not officially supported
diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index 704c439bb27d..b52320c96814 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -1,53 +1,47 @@
-{ stdenv
-, fetchurl
+{ stdenv, lib, fetchurl, mkDerivation
+, autoPatchelfHook
, dbus
-, zlib, fontconfig
-, qtbase, qtmultimedia
-, libjson, libgpgerror
-, libX11, libxcb, libXau, libXdmcp, freetype, libbsd
-, pythonPackages, squashfsTools, desktop-file-utils
+, desktop-file-utils
+, fontconfig
+, libjson
+, pythonPackages
+, qtmultimedia
+, squashfsTools
+, zlib
}:
-with stdenv.lib;
-let
- libPath = makeLibraryPath
- [ stdenv.cc.cc qtbase qtmultimedia dbus libX11 zlib libX11 libxcb libXau libXdmcp freetype fontconfig libbsd libjson libgpgerror];
-
+mkDerivation rec {
+ pname = "soulseekqt";
version = "2018-1-30";
- mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit");
- srcs = {
- x86_64-linux = fetchurl {
- url = "https://www.dropbox.com/s/0vi87eef3ooh7iy/${mainbin}.tgz";
+ src = fetchurl {
+ urls = [
+ "https://www.dropbox.com/s/0vi87eef3ooh7iy/SoulseekQt-${version}.tgz"
+ "https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-${version}-64bit-appimage.tgz"
+ ];
sha256 = "0d1cayxr1a4j19bc5a3qp9pg22ggzmd55b6f5av3lc6lvwqqg4w6";
};
- };
-
-in stdenv.mkDerivation rec {
-
- pname = "soulseekqt";
- inherit version;
- src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
dontBuild = true;
- buildInputs = [ pythonPackages.binwalk squashfsTools desktop-file-utils ];
+ nativeBuildInputs = [ autoPatchelfHook pythonPackages.binwalk squashfsTools desktop-file-utils ];
+ buildInputs = [ qtmultimedia stdenv.cc.cc ];
- # avoid usage of appimage's runner option --appimage-extract
+ # avoid usage of appimage's runner option --appimage-extract
unpackCmd = ''
export HOME=$(pwd) # workaround for binwalk
appimage=$(tar xvf $curSrc) && binwalk --quiet \
$appimage -D 'squashfs:squashfs:unsquashfs %e'
'';
-
+
patchPhase = ''
cd squashfs-root/
binary="$(readlink AppRun)"
-
+
# fixup desktop file
desktop-file-edit --set-key Exec --set-value $binary default.desktop
desktop-file-edit --set-key Comment --set-value "${meta.description}" default.desktop
- desktop-file-edit --set-key Categories --set-value Network default.desktop
+ desktop-file-edit --set-key Categories --set-value Network default.desktop
'';
installPhase = ''
@@ -57,13 +51,7 @@ in stdenv.mkDerivation rec {
cp $binary $out/bin/
'';
- fixupPhase = ''
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath ${libPath} \
- $out/bin/$binary
- '';
-
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Official Qt SoulSeek client";
homepage = http://www.soulseekqt.net;
license = licenses.unfree;
diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix
index 0ca5402d6dae..01da8a633742 100644
--- a/pkgs/applications/networking/p2p/torrential/default.nix
+++ b/pkgs/applications/networking/p2p/torrential/default.nix
@@ -50,6 +50,12 @@ stdenv.mkDerivation rec {
pantheon.granite
];
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS";
homepage = https://github.com/davidmhewitt/torrential;
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index 55bdced74b52..68babaddd1bc 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -1,5 +1,5 @@
{ stdenv, autoconf, automake, libtool, wrapGAppsHook, fetchFromGitHub, pkgconfig
-, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib }:
+, intltool, gtk3, json-glib, curl, glib, autoconf-archive, appstream-glib, fetchpatch }:
stdenv.mkDerivation rec {
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk";
};
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/transmission-remote-gtk/transmission-remote-gtk/commit/0f5cc8a9942e220ea0f7d0b17db4a78d094e3b65.patch";
+ sha256 = "195rsjpbc0gzmr9bycvq4mra7abp3hd9by3a5vvcmxsh5ipikycf";
+ })
+ ];
+
preConfigure = "./autogen.sh";
nativeBuildInputs= [
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 65abcf35a352..683507f8b19a 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,48 +1,51 @@
-{ stdenv, fetchurl, pythonPackages, makeWrapper, imagemagick
-, enablePlayer ? true, vlc ? null, qt5 }:
+{ stdenv, fetchurl, pkgs, python3Packages, makeWrapper
+, enablePlayer ? true, vlc ? null, qt5, lib }:
stdenv.mkDerivation rec {
pname = "tribler";
- version = "7.1.2";
+ version = "7.4.0-exp1";
src = fetchurl {
- url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.gz";
- sha256 = "1ayzqx4358qlx56hsnsn5s8xl6mzdb6nw4kwsalmp86dw6vmmis8";
+ url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
+ sha256 = "18ziisg0v2gdxnprbhqsryz92yk270waj0la7m2h326k5qql3qkf";
};
- buildInputs = [
- pythonPackages.python
- pythonPackages.wrapPython
+ nativeBuildInputs = [
+ python3Packages.wrapPython
makeWrapper
- imagemagick
+ ];
+
+ buildInputs = [
+ python3Packages.python
];
pythonPath = [
- pythonPackages.libtorrentRasterbar
- pythonPackages.apsw
- pythonPackages.twisted
- pythonPackages.netifaces
- pythonPackages.pycrypto
- pythonPackages.pyasn1
- pythonPackages.requests
- pythonPackages.setuptools
- pythonPackages.m2crypto
- pythonPackages.pyqt5
- pythonPackages.chardet
- pythonPackages.cherrypy
- pythonPackages.cryptography
- pythonPackages.libnacl
- pythonPackages.configobj
- pythonPackages.matplotlib
- pythonPackages.plyvel
- pythonPackages.decorator
- pythonPackages.feedparser
- pythonPackages.service-identity
- pythonPackages.psutil
- pythonPackages.meliae
- pythonPackages.sip
- pythonPackages.pillow
- pythonPackages.networkx
+ python3Packages.libtorrentRasterbar
+ python3Packages.twisted
+ python3Packages.netifaces
+ python3Packages.pycrypto
+ python3Packages.pyasn1
+ python3Packages.requests
+ python3Packages.m2crypto
+ python3Packages.pyqt5
+ python3Packages.chardet
+ python3Packages.cherrypy
+ python3Packages.cryptography
+ python3Packages.libnacl
+ python3Packages.configobj
+ python3Packages.decorator
+ python3Packages.feedparser
+ python3Packages.service-identity
+ python3Packages.psutil
+ python3Packages.pillow
+ python3Packages.networkx
+ python3Packages.pony
+ python3Packages.lz4
+ python3Packages.pyqtgraph
+
+ # there is a BTC feature, but it requires some unclear version of
+ # bitcoinlib, so this doesn't work right now.
+ # python3Packages.bitcoinlib
];
postPatch = ''
@@ -54,12 +57,11 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- find . -name '*.png' -exec convert -strip {} {} \;
mkdir -pv $out
# Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
wrapPythonPrograms
cp -prvd ./* $out/
- makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \
+ makeWrapper ${python3Packages.python}/bin/python $out/bin/tribler \
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \
--set _TRIBLERPATH $out \
--set PYTHONPATH $out:$program_PYTHONPATH \
diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix
index 4d1d39a05c25..925618bbe991 100644
--- a/pkgs/applications/networking/ping/default.nix
+++ b/pkgs/applications/networking/ping/default.nix
@@ -49,6 +49,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "A helpful tool that lets you debug what part of your API is causing you issues";
homepage = https://github.com/jeremyvaartjes/ping;
diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix
index 7fdb062ef805..8785d2449b3e 100644
--- a/pkgs/applications/networking/protocol/default.nix
+++ b/pkgs/applications/networking/protocol/default.nix
@@ -1,14 +1,14 @@
{ stdenv, buildPythonApplication, fetchFromGitHub }:
buildPythonApplication {
- pname = "protocol";
- version = "20171226";
+ pname = "protocol-unstable";
+ version = "2019-03-28";
src = fetchFromGitHub {
owner = "luismartingarcia";
repo = "protocol";
- rev = "d450da7d8a58595d8ef82f1d199a80411029fc7d";
- sha256 = "1g31s2xx0bw8ak5ag1c6mv0p0b8bj5dp3lkk9mxaf2ndj1m1qdkw";
+ rev = "4e8326ea6c2d288be5464c3a7d9398df468c0ada";
+ sha256 = "13l10jhf4vghanmhh3pn91b2jdciispxy0qadz4n08blp85qn9cm";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 3ee934e8b291..573752b5b533 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem
-, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
-, lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome
+, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg
+, lsb-release, freetype, fontconfig, polkit, polkit_gnome
, pulseaudio }:
let
sha256 = {
- x86_64-linux = "0mixw2sk7li1hjagibwzdgbfnrih5acricczqmfks1gsinjqrn82";
- i386-linux = "1gshd4vm8ysn636r1z44vmzdzrgybsmj8ma4zdabvs9jsbm2da3c";
+ x86_64-linux = "1ysd8fwzm0360qs6ijr6l0y2agqb3njz20h7am1x4kxmhy8ravq9";
+ i386-linux = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg";
}.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
arch = {
@@ -28,19 +28,22 @@ let
in stdenv.mkDerivation rec {
pname = "anydesk";
- version = "5.1.2";
+ version = "5.5.1";
src = fetchurl {
- url = "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz";
+ urls = [
+ "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz"
+ "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-${arch}.tar.gz"
+ ];
inherit sha256;
};
buildInputs = [
atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
- gnome2.gtkglext libGLU_combined freetype fontconfig
- pangox_compat polkit polkit_gnome pulseaudio
+ gnome2.gtkglext libGLU libGL freetype fontconfig
+ polkit polkit_gnome pulseaudio
] ++ (with xorg; [
- libxcb libX11 libXdamage libXext libXfixes libXi libXmu
+ libxcb libxkbfile libX11 libXdamage libXext libXfixes libXi libXmu
libXrandr libXtst libXt libICE libSM libXrender
]);
@@ -64,6 +67,11 @@ in stdenv.mkDerivation rec {
--set-rpath "${stdenv.lib.makeLibraryPath buildInputs}" \
$out/bin/anydesk
+ # pangox is not actually necessary (it was only added as a part of gtkglext)
+ patchelf \
+ --remove-needed libpangox-1.0.so.0 \
+ $out/bin/anydesk
+
wrapProgram $out/bin/anydesk \
--prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]}
diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix
index 26e8cf59a9e9..a4deda99f5b2 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/default.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix
@@ -9,6 +9,7 @@
, makeDesktopItem
, tzdata
, cacert
+, dconf
, glib
, gtk2
, atk
@@ -23,7 +24,7 @@
, gtk_engines
, alsaLib
, zlib
-, version ? "19.10.0"
+, version ? "19.12.0"
}:
let
@@ -70,7 +71,18 @@ let
x86hash = "000zjik8wf8b6fadnsai0p77b4n2l95544zx503iyrb9pv53bj3y";
x64suffix = "15";
x86suffix = "15";
- homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest1.html;
+ homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1910.html;
+ };
+
+ "19.12.0" = {
+ major = "19";
+ minor = "12";
+ patch = "0";
+ x64hash = "1si5mkxbgb8m99bkvgc3l80idjfdp0kby6pv47s07nn43dbr1j7a";
+ x86hash = "07rfp90ksnvr8zv7ix7f0z6a59n48s7bd4kqbzilfwxgs4ddqmcy";
+ x64suffix = "19";
+ x86suffix = "19";
+ homepage = https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html;
};
};
@@ -137,7 +149,7 @@ let
gdk-pixbuf
cairo
pango
- gnome3.dconf
+ dconf
xorg.libX11
xorg.libXext
xorg.libXrender
diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index adb70c3916f4..3c624faaf87a 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -4,7 +4,7 @@
, pcre, libdbusmenu-gtk3, libappindicator-gtk3
, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon
, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
-, openssl, gsettings-desktop-schemas, json-glib
+, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz
# The themes here are soft dependencies; only icons are missing without them.
, gnome3
}:
@@ -13,13 +13,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "remmina";
- version = "1.3.4";
+ version = "1.3.8";
src = fetchFromGitLab {
owner = "Remmina";
repo = "Remmina";
rev = "v${version}";
- sha256 = "18p6v2lalpiba0r318grlc2bvqh2qlpjw811i0934g33faviyfj1";
+ sha256 = "017bm43d56clgray7sjvb00wpchr4zazc9ll0cd5wimirm12cxba";
};
nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
pcre libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
- openssl gnome3.adwaita-icon-theme json-glib
+ openssl gnome3.adwaita-icon-theme json-glib libsodium webkitgtk
+ harfbuzz
];
cmakeFlags = [
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 97e561da93bb..68a454745c70 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -6,11 +6,11 @@
mkDerivation rec {
pname = "teamviewer";
- version = "14.6.2452";
+ version = "15.0.8397";
src = fetchurl {
- url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb";
- sha256 = "0j677bqwvlczbja9msayqpdgandb2mvyvcr0vasc3hhnmnk70ahw";
+ url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb";
+ sha256 = "0bidlwlpzqpba9c0zfasm08vp308hgfnq4pslj1b04v64mlci66s";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix
index 349c4f5e799e..04ab1d1c98d0 100644
--- a/pkgs/applications/networking/ssb/patchwork/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork/default.nix
@@ -2,12 +2,12 @@
let
pname = "ssb-patchwork";
- version = "3.16.2";
- name = "${pname}-${version}";
+ version = "3.17.1";
+ name = "Patchwork-${version}";
src = fetchurl {
- url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${pname}-${version}-x86_64.AppImage";
- sha256 = "0hi9ysmwhiiww82a3mqdd2b1anj7qa41b46f6zb3q9d0b8nmvlz4";
+ url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage";
+ sha256 = "06wcgdcagmh80nr8nyrnz83wgq7j8r96hn3ccka7nmn02pdgvp3k";
};
binary = appimageTools.wrapType2 {
diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix
index b1a5e8e74cb3..dc38debd3050 100644
--- a/pkgs/applications/networking/sync/onedrive/default.nix
+++ b/pkgs/applications/networking/sync/onedrive/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "onedrive";
- version = "2.3.10";
+ version = "2.3.12";
src = fetchFromGitHub {
owner = "abraunegg";
repo = "onedrive";
rev = "v${version}";
- sha256 = "0ks22anxih63zwlc11z0gi531wvcricbkv1wlkrgfihi58l8fhfk";
+ sha256 = "0605nb3blvnncjx09frg2liarrd6pw8ph5jhnh764qcx0hyxcgs6";
};
nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
description = "A complete tool to interact with OneDrive on Linux";
homepage = "https://github.com/abraunegg/onedrive";
license = licenses.gpl3;
- maintainers = with maintainers; [ doronbehar ];
+ maintainers = with maintainers; [ doronbehar srgom ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 7475692b962c..71421eaf1e71 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "rclone";
- version = "1.49.5";
+ version = "1.50.2";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "0firfb2300grfp5fnqaifhp346m4d0x8r1xshs9d8r6jxb160n03";
+ sha256 = "0yaspkh88q8i58i8g8mm6sqb75hczavz2lvzdd1iif1bqgi6b5fz";
};
goPackagePath = "github.com/rclone/rclone";
diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix
index 3e5d3187e9b2..920a1c97539e 100644
--- a/pkgs/applications/networking/syncplay/default.nix
+++ b/pkgs/applications/networking/syncplay/default.nix
@@ -1,8 +1,8 @@
-{ lib, fetchFromGitHub, buildPythonApplication, pyside, twisted, certifi }:
+{ lib, fetchFromGitHub, buildPythonApplication, pyside2, shiboken2, twisted, certifi, qt5 }:
buildPythonApplication rec {
pname = "syncplay";
- version = "1.6.4";
+ version = "1.6.4a";
format = "other";
@@ -10,13 +10,18 @@ buildPythonApplication rec {
owner = "Syncplay";
repo = "syncplay";
rev = "v${version}";
- sha256 = "0afh2a0l1c3hwgj5q6wy0v5iimg8qcjam3pw7b8mf63lasx6iqk4";
+ sha256 = "0zz4a3vzfg808z1qkqz31z4818wzpfa2lika7wl0jgpmw4zi85ix";
};
- propagatedBuildInputs = [ pyside twisted certifi ] ++ twisted.extras.tls;
+ propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls;
+ nativeBuildInputs = [ qt5.wrapQtAppsHook ];
makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
+ postFixup = ''
+ wrapQtApp $out/bin/syncplay
+ '';
+
meta = with lib; {
homepage = https://syncplay.pl/;
description = "Free software that synchronises media players";
diff --git a/pkgs/applications/networking/syncthing/add-stcli-target.patch b/pkgs/applications/networking/syncthing/add-stcli-target.patch
index 58ac15253aed..07b5e334b2c9 100644
--- a/pkgs/applications/networking/syncthing/add-stcli-target.patch
+++ b/pkgs/applications/networking/syncthing/add-stcli-target.patch
@@ -1,17 +1,17 @@
-diff --git i/build.go w/build.go
-index 7d400d6f..1b5e1d25 100644
---- i/build.go
-+++ w/build.go
-@@ -175,6 +175,12 @@ var targets = map[string]target{
+diff --git a/build.go b/build.go
+index c8a5c1cf..d75a8491 100644
+--- a/build.go
++++ b/build.go
+@@ -202,6 +202,12 @@ var targets = map[string]target{
{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644},
},
},
+ "stcli": {
+ name: "stcli",
+ description: "Syncthing CLI",
-+ buildPkg: "github.com/syncthing/syncthing/cmd/stcli",
-+ binaryName: "stcli", // .exe will be added automatically for Windows builds
++ buildPkgs: []string{"github.com/syncthing/syncthing/cmd/stcli"},
++ binaryName: "stcli",
+ },
}
- func init() {
+ // These are repos we need to clone to run "go generate"
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 555550d4d9e7..c7663ef4117b 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,19 +3,19 @@
let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
- version = "1.3.0";
+ version = "1.3.2";
name = "${stname}-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
- sha256 = "14k1acap9y1z8sj28gcn72lkfxdzpcqj9d27hk8vzm47zjaxgp8l";
+ sha256 = "029mym3vdfg616gpmhv6p22iy65h8vff2sq6z70l37bjf3zx1cms";
};
goPackagePath = "github.com/syncthing/syncthing";
- modSha256 = "17np8ym84ql7hwzsqfx2l6yiy9hag7h96q8ysvarlfg9l95g1m64";
+ modSha256 = "06anhfi9mswmwhhjyz8mla6h8v83cc7slfr752fvgfaxra1fwgx8";
patches = [
./add-stcli-target.patch
diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index 0c30a3def336..e518502d6f37 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "testssl.sh";
- version = "3.0rc5";
+ version = "3.0rc6";
src = fetchFromGitHub {
owner = "drwetter";
repo = pname;
rev = version;
- sha256 = "14b9n0h4f2dsa292wi9gnan5ncgqblis6wyh5978lhjzi1d7gyds";
+ sha256 = "1ks7pqgrg382ry0a0jf1dwgcwv81snhkrhkjdbcpym6w5flmpjsv";
};
nativeBuildInputs = [ makeWrapper ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
CLI tool which checks a server's service on any port for the support of
TLS/SSL ciphers, protocols as well as recent cryptographic flaws and more.
'';
- homepage = https://testssl.sh/;
+ homepage = "https://testssl.sh/";
license = licenses.gpl2;
maintainers = with maintainers; [ etu ];
};
diff --git a/pkgs/applications/networking/trebleshot/default.nix b/pkgs/applications/networking/trebleshot/default.nix
new file mode 100644
index 000000000000..1b049ff2dc7f
--- /dev/null
+++ b/pkgs/applications/networking/trebleshot/default.nix
@@ -0,0 +1,29 @@
+{ mkDerivation, lib, fetchFromGitHub
+, cmake, qtbase, kdnssd
+}:
+
+mkDerivation rec {
+ pname = "trebleshot";
+ version = "0.1.0-alpha2-15-ga7ac23c";
+ # name="${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "genonbeta";
+ repo = "TrebleShot-Desktop";
+ rev = "${version}";
+ sha256 = "1k8wagw6arsi1lqkhn1nl6j11mb122vi1qs0q2np6nznwfy7pn1k";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ qtbase kdnssd ];
+
+ meta = with lib; {
+ description = "Android file transferring tool for desktop";
+ homepage = https://github.com/genonbeta/TrebleShot-Desktop;
+ license = licenses.gpl2;
+
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ woffs ];
+ };
+}
diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix
index 5fe52d5f33db..64fef08ceefd 100644
--- a/pkgs/applications/networking/weather/meteo/default.nix
+++ b/pkgs/applications/networking/weather/meteo/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "meteo";
- version = "0.9.7";
+ version = "0.9.8";
src = fetchFromGitLab {
owner = "bitseater";
repo = pname;
rev = version;
- sha256 = "014x3mg2dc58h1qwy2nrz3a5mzdnbzish8zgn3x6lj6szfz5c72n";
+ sha256 = "1ll5fja0dqxcr6hrh2dk4hgw9gf8ms9bcp1ifznd21byxzyhdlr0";
};
nativeBuildInputs = [
@@ -40,9 +40,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Know the forecast of the next hours & days";
- homepage = https://gitlab.com/bitseater/meteo;
- license = licenses.gpl3Plus;
+ homepage = https://gitlab.com/bitseater/meteo;
+ license = licenses.gpl3Plus;
maintainers = with maintainers; [ worldofpeace ];
- platforms = platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix
index 603f80189931..5b166711693a 100644
--- a/pkgs/applications/office/aesop/default.nix
+++ b/pkgs/applications/office/aesop/default.nix
@@ -1,17 +1,26 @@
{ stdenv, vala, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, gtk3
-, desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook }:
+, desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook, fetchpatch }:
stdenv.mkDerivation rec {
pname = "aesop";
- version = "1.1.2";
+ version = "1.1.3";
src = fetchFromGitHub {
owner = "lainsce";
repo = pname;
rev = version;
- sha256 = "1vadm8295jb7jaah2qykf3h9zvl5c013sanmxqi4snmmq4pa32ax";
+ sha256 = "1hnwhxaz0zx4fswrxjzyv5s77v5fimn87yid9sd1qgfv2g1ck0jc";
};
+ patches = [
+ # Fix build
+ # https://github.com/lainsce/aesop/pull/33
+ (fetchpatch {
+ url = "https://github.com/lainsce/aesop/commit/850ec86bbfef5168e537a5af7e0d73d96db56330.patch";
+ sha256 = "14b251wp11rypqw4fafwjbsqy92mxzr8mmaxlv7n4whvwxrzqirh";
+ })
+ ];
+
nativeBuildInputs = [
desktop-file-utils
meson
@@ -37,6 +46,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "The simplest PDF viewer around";
homepage = https://github.com/lainsce/aesop;
diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index 6ef6e51527e2..6894f1ca635a 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "atlassian-cli";
- version = "8.5.0";
+ version = "9.0.0";
src = fetchzip {
url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
- sha256 = "0c9jq7q0bx0db0zhdh89bv1ijfg7cddbx04v451vl8caqcyhkfgz";
+ sha256 = "1z8723krq65fcy5aapgiz216vrpw2nw8fbn1h3a4zpis7kw8qp0f";
extraPostFetch = "chmod go-w $out";
};
diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix
index d839f4c81f21..be6fe172e29f 100644
--- a/pkgs/applications/office/bookworm/default.nix
+++ b/pkgs/applications/office/bookworm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk
+{ stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee
, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
pantheon.elementary-icon-theme
pantheon.granite
glib
- gnome3.libgee
+ libgee
gtk3
html2text
poppler
diff --git a/pkgs/applications/office/envelope/default.nix b/pkgs/applications/office/envelope/default.nix
index 9142fff9a2c2..bb85ae2e12b9 100644
--- a/pkgs/applications/office/envelope/default.nix
+++ b/pkgs/applications/office/envelope/default.nix
@@ -64,6 +64,12 @@ stdenv.mkDerivation rec {
patchShebangs data/post_install.py
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "Personal finance manager for elementary OS";
homepage = "https://github.com/cjfloss/envelope";
diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index a5de74a6f165..6693d35dbd1d 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -5,11 +5,11 @@ let
in
buildPythonApplication rec {
pname = "fava";
- version = "1.11";
+ version = "1.12";
src = fetchPypi {
inherit pname version;
- sha256 = "0gyrxqmfr8igfjnp9lcsl4km17yakj556xns3jp4m9l2407b5zhc";
+ sha256 = "0309y25l7aijk7il9hpjia23yc5dfac0h78xdmzb0w0ynxbjsmi6";
};
checkInputs = [ python3.pkgs.pytest ];
@@ -25,6 +25,8 @@ buildPythonApplication rec {
markdown2
ply
simplejson
+ werkzeug
+ jaraco_functools
];
# CLI test expects fava on $PATH. Not sure why static_url fails.
diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/applications/office/flexibee/default.nix
index 71c696036317..c215b9ef637d 100644
--- a/pkgs/applications/office/flexibee/default.nix
+++ b/pkgs/applications/office/flexibee/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, jre }:
let
- version = "2019.3.0.3";
+ version = "2019.3.1.3";
majorVersion = builtins.substring 0 6 version;
in
@@ -11,16 +11,25 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz";
- sha256 = "1ivhqh1rl4ll0af9nfgfm7f647vc9zk61aplinvz73xb3grb4j6f";
+ sha256 = "0jfj0vmrwa05ga4rhqn0sapad06mq0pampmkr75vail2289zkga2";
};
nativeBuildInputs = [ makeWrapper ];
+ prePatch = ''
+ substituteInPlace usr/sbin/flexibee-server \
+ --replace "/usr/share/flexibee" $out \
+ --replace "/var/run" "/run"
+ '';
+
+
installPhase = ''
runHook preInstall
cp -R usr/share/flexibee/ $out/
install -Dm755 usr/bin/flexibee $out/bin/flexibee
- wrapProgram $out/bin/flexibee --set JAVA_HOME "${jre}"
+ install -Dm755 usr/sbin/flexibee-server $out/bin/flexibee-server
+ wrapProgram $out/bin/flexibee --set JAVA_HOME "${jre}"
+ wrapProgram $out/bin/flexibee-server --set JAVA_HOME "${jre}"
runHook postInstall
'';
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 70d1e3d79ba5..979c960f7a81 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -1,31 +1,22 @@
{ stdenv, fetchurl, pkgconfig, intltool, perlPackages
, goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages
-, itstool, autoreconfHook
+, itstool
}:
let
inherit (pythonPackages) python pygobject3;
in stdenv.mkDerivation rec {
pname = "gnumeric";
- version = "1.12.45"; # TODO next release: remove gamma patch and autoreconfHook
+ version = "1.12.46";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h";
+ sha256 = "9fdc67377af52dfe69a7db4f533938024a75f454fc5d25ab43b8e6739be0b5e1";
};
- patches = stdenv.lib.optional stdenv.isDarwin
- # https://gitlab.gnome.org/GNOME/gnumeric/issues/402
- (fetchurl {
- name = "math-gamma.patch";
- url = "https://gitlab.gnome.org/GNOME/gnumeric/uploads/cf8d162bc719de92e97d01cb0ba5b637/ppp";
- sha256 = "17wiigs06qc86a1nghwcg3pcnpa28123jblgsxpy3j7drardgnlp";
- });
-
configureFlags = [ "--disable-component" ];
- nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ]
- ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+ nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ];
# ToDo: optional libgda, introspection?
buildInputs = [
diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix
index b249186c2f17..d0a7757e49d2 100644
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Open source bibliography reference manager";
- homepage = http://jabref.sourceforge.net;
+ homepage = https://www.jabref.org;
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = [ maintainers.gebner ];
diff --git a/pkgs/applications/office/libreoffice/README.md b/pkgs/applications/office/libreoffice/README.md
index eb21fe2f441e..a084572d2177 100644
--- a/pkgs/applications/office/libreoffice/README.md
+++ b/pkgs/applications/office/libreoffice/README.md
@@ -1,10 +1,9 @@
LibreOffice
===========
-To generate `libreoffice-srcs.nix`:
+To generate `src-$VARIANT/download.nix`, i.e. list of additional sources that
+the libreoffice build process needs to download:
- nix-shell default-gen-shell.nix --run generate
+ nix-shell gen-shell.nix --argstr variant VARIANT --run generate
-To generate `libreoffice-srcs-still.nix`:
-
- nix-shell still-gen-shell.nix --run generate
+Where VARIANT is either `still` or `fresh`.
diff --git a/pkgs/applications/office/libreoffice/default-gen-shell.nix b/pkgs/applications/office/libreoffice/default-gen-shell.nix
deleted file mode 100644
index 366030971237..000000000000
--- a/pkgs/applications/office/libreoffice/default-gen-shell.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ pkgs ? (import {}) }:
-
-with pkgs;
-
-let
-
- primary-src = callPackage ./default-primary-src.nix {};
-
-in
-
-stdenv.mkDerivation {
- name = "generate-libreoffice-srcs-shell";
-
- buildCommand = "exit 1";
-
- downloadList = stdenv.mkDerivation {
- name = "libreoffice-${primary-src.version}-download-list";
- inherit (primary-src) src version;
- builder = ./download-list-builder.sh;
- };
-
- buildInputs = [ python3 ];
-
- shellHook = ''
- function generate {
- python3 generate-libreoffice-srcs.py > libreoffice-srcs.nix
- }
- '';
-}
diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
deleted file mode 100644
index b3b21174bc3a..000000000000
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ fetchurl }:
-
-rec {
- major = "6";
- minor = "3";
- patch = "0";
- tweak = "4";
-
- subdir = "${major}.${minor}.${patch}";
-
- version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
-
- src = fetchurl {
- url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7";
- };
-}
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index a459302177b9..374810138f6e 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
+{ stdenv, fetchurl, fetchpatch, pam, python3, libxslt, perl, ArchiveZip, gettext
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
-, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
+, libxml2, db, curl, fontconfig, libsndfile, neon
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
-, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
+, librsvg, gnome_vfs, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@@ -13,30 +13,28 @@
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, gnome3, glib, ncurses, epoxy, gpgme
-, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "ru" "sl" "zh-CN" ]
+, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ru" "sl" "zh-CN" ]
, withHelp ? true
, kdeIntegration ? false
-}:
+, variant ? "fresh"
+} @ args:
+
+assert builtins.elem variant [ "fresh" "still" ];
let
- primary-src = import ./default-primary-src.nix { inherit fetchurl; };
-in
+ importVariant = f: import (./. + "/src-${variant}/${f}");
-let inherit (primary-src) major minor subdir version; in
+ primary-src = importVariant "primary.nix" { inherit fetchurl; };
+
+ inherit (primary-src) major minor subdir version;
-let
lib = stdenv.lib;
langsSpaces = lib.concatStringsSep " " langs;
- fetchSrc = {name, sha256}: fetchurl {
- url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
- inherit sha256;
- };
-
srcs = {
third_party =
map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;}))
- ((import ./libreoffice-srcs.nix) ++ [
+ (importVariant "download.nix" ++ [
(rec {
name = "unowinreg.dll";
url = "https://dev-www.libreoffice.org/extern/${md5name}";
@@ -46,31 +44,36 @@ let
})
]);
- translations = fetchSrc {
- name = "translations";
- sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009";
- };
-
- # TODO: dictionaries
-
- help = fetchSrc {
- name = "help";
- sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z";
- };
-
+ translations = primary-src.translations;
+ help = primary-src.help;
};
-in stdenv.mkDerivation rec {
+in (stdenv.mkDerivation rec {
pname = "libreoffice";
inherit version;
inherit (primary-src) src;
+ outputs = [ "out" "dev" ];
+
# For some reason librdf_redland sometimes refers to rasqal.h instead
# of rasqal/rasqal.h
NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ] ++ lib.optional stdenv.isx86_64 "-mno-fma";
patches = [
./xdg-open-brief.patch
+
+ # Poppler-0.82 compatibility
+ # https://gerrit.libreoffice.org/81545
+ (fetchpatch {
+ url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch";
+ sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
+ })
+ # Poppler-0.83 compatibility
+ # https://gerrit.libreoffice.org/84384
+ (fetchpatch {
+ url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch";
+ sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2";
+ })
];
tarballPath = "external/tarballs";
@@ -276,6 +279,9 @@ in stdenv.mkDerivation rec {
cp -r sysui/desktop/icons "$out/share"
sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
+
+ mkdir -p $dev
+ cp -r include $dev
'';
configureFlags = [
@@ -360,10 +366,10 @@ in stdenv.mkDerivation rec {
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
- libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
+ libXdmcp libpthreadstubs libGLU libGL mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base glib libmysqlclient
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
- python3 sablotron sane-backends unzip vigra which zip zlib
+ python3 sane-backends unzip vigra which zip zlib
mdds bluez5 libcmis libwps libabw libzmf
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy
@@ -384,4 +390,4 @@ in stdenv.mkDerivation rec {
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
};
-}
+}).overrideAttrs ((importVariant "override.nix") args)
diff --git a/pkgs/applications/office/libreoffice/still-gen-shell.nix b/pkgs/applications/office/libreoffice/gen-shell.nix
similarity index 66%
rename from pkgs/applications/office/libreoffice/still-gen-shell.nix
rename to pkgs/applications/office/libreoffice/gen-shell.nix
index c5c17c2aaad0..7429bb0cb382 100644
--- a/pkgs/applications/office/libreoffice/still-gen-shell.nix
+++ b/pkgs/applications/office/libreoffice/gen-shell.nix
@@ -1,10 +1,10 @@
-{ pkgs ? (import {}) }:
+{ pkgs ? (import {}), variant }:
with pkgs;
let
- primary-src = callPackage ./still-primary-src.nix {};
+ primary-src = callPackage (./. + "/src-${variant}/primary.nix") {};
in
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
shellHook = ''
function generate {
- python3 generate-libreoffice-srcs.py > libreoffice-srcs-still.nix
+ python3 generate-libreoffice-srcs.py ${variant} > src-${variant}/download.nix
}
'';
}
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix
similarity index 100%
rename from pkgs/applications/office/libreoffice/libreoffice-srcs.nix
rename to pkgs/applications/office/libreoffice/src-fresh/download.nix
diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix
new file mode 100644
index 000000000000..fb5a82b1aa8f
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix
@@ -0,0 +1 @@
+args: f: {}
diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
new file mode 100644
index 000000000000..28bf127c3988
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
@@ -0,0 +1,35 @@
+{ fetchurl }:
+
+rec {
+ fetchSrc = {name, sha256}: fetchurl {
+ url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
+ inherit sha256;
+ };
+
+ major = "6";
+ minor = "3";
+ patch = "0";
+ tweak = "4";
+
+ subdir = "${major}.${minor}.${patch}";
+
+ version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
+
+ src = fetchurl {
+ url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
+ sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7";
+ };
+
+ # FIXME rename
+ translations = fetchSrc {
+ name = "translations";
+ sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009";
+ };
+
+ # TODO: dictionaries
+
+ help = fetchSrc {
+ name = "help";
+ sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z";
+ };
+}
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/src-still/download.nix
similarity index 100%
rename from pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
rename to pkgs/applications/office/libreoffice/src-still/download.nix
diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix
new file mode 100644
index 000000000000..9edf76849e34
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/src-still/override.nix
@@ -0,0 +1,7 @@
+{ stdenv, ... }:
+attrs:
+{
+ NIX_CFLAGS_COMPILE = stdenv.lib.lists.remove "-mno-fma" attrs.NIX_CFLAGS_COMPILE;
+ configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags;
+ meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; };
+}
diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix
new file mode 100644
index 000000000000..a27087a1b051
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/src-still/primary.nix
@@ -0,0 +1,34 @@
+{ fetchurl }:
+
+rec {
+ fetchSrc = {name, sha256}: fetchurl {
+ url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
+ inherit sha256;
+ };
+
+ major = "6";
+ minor = "2";
+ patch = "6";
+ tweak = "2";
+
+ subdir = "${major}.${minor}.${patch}";
+
+ version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
+
+ src = fetchurl {
+ url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
+ sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq";
+ };
+
+ translations = fetchSrc {
+ name = "translations";
+ sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh";
+ };
+
+ # TODO: dictionaries
+
+ help = fetchSrc {
+ name = "help";
+ sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz";
+ };
+}
diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix
deleted file mode 100644
index 07f30a5525d5..000000000000
--- a/pkgs/applications/office/libreoffice/still-primary-src.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ fetchurl }:
-
-rec {
- major = "6";
- minor = "2";
- patch = "6";
- tweak = "2";
-
- subdir = "${major}.${minor}.${patch}";
-
- version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
-
- src = fetchurl {
- url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
- sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq";
- };
-}
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
deleted file mode 100644
index 4739d5265584..000000000000
--- a/pkgs/applications/office/libreoffice/still.nix
+++ /dev/null
@@ -1,384 +0,0 @@
-{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext
-, IOCompress, zlib, libjpeg, expat, freetype, libwpd
-, libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
-, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
-, icu, boost, jdk, ant, cups, xorg, libcmis, fontforge
-, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
-, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient
-, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra
-, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
-, fontsConf, pkgconfig, bluez5, libtool, carlito
-, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
-, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
-, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
-, gnome3, glib, ncurses, epoxy, gpgme
-, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "ru" "sl" "zh-CN" ]
-, withHelp ? true
-, kdeIntegration ? false
-}:
-
-let
- primary-src = import ./still-primary-src.nix { inherit fetchurl; };
-in
-
-let inherit (primary-src) major minor subdir version; in
-
-let
- lib = stdenv.lib;
- langsSpaces = lib.concatStringsSep " " langs;
-
- fetchSrc = {name, sha256}: fetchurl {
- url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz";
- inherit sha256;
- };
-
- srcs = {
- third_party =
- map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;}))
- ((import ./libreoffice-srcs-still.nix) ++ [
- (rec {
- name = "unowinreg.dll";
- url = "https://dev-www.libreoffice.org/extern/${md5name}";
- sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
- md5 = "185d60944ea767075d27247c3162b3bc";
- md5name = "${md5}-${name}";
- })
- ]);
-
- translations = fetchSrc {
- name = "translations";
- sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh";
- };
-
- # TODO: dictionaries
-
- help = fetchSrc {
- name = "help";
- sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz";
- };
-
- };
-in stdenv.mkDerivation rec {
- pname = "libreoffice";
- inherit version;
-
- inherit (primary-src) src;
-
- # For some reason librdf_redland sometimes refers to rasqal.h instead
- # of rasqal/rasqal.h
- NIX_CFLAGS_COMPILE = [ "-I${librdf_rasqal}/include/rasqal" ];
-
- patches = [
- ./xdg-open-brief.patch
- ];
-
- tarballPath = "external/tarballs";
-
- postUnpack = ''
- mkdir -v $sourceRoot/${tarballPath}
- '' + (lib.flip lib.concatMapStrings srcs.third_party (f: ''
- ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name}
- ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name}
- ''))
- + ''
- ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name}
- ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name}
- tar -xf ${srcs.help}
- tar -xf ${srcs.translations}
- '';
-
- postPatch = ''
- sed -e 's@/usr/bin/xdg-open@xdg-open@g' -i shell/source/unix/exec/shellexec.cxx
-
- # configure checks for header 'gpgme++/gpgmepp_version.h',
- # and if it is found (no matter where) uses a hardcoded path
- # in what presumably is an effort to make it possible to write
- # '#include ' instead of '#include '.
- #
- # Fix this path to point to where the headers can actually be found instead.
- substituteInPlace configure.ac --replace \
- 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \
- 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++'
- '';
-
- QT4DIR = qt4;
-
- preConfigure = ''
- configureFlagsArray=(
- "--with-parallelism=$NIX_BUILD_CORES"
- "--with-lang=${langsSpaces}"
- );
-
- chmod a+x ./bin/unpack-sources
- patchShebangs .
-
- # This is required as some cppunittests require fontconfig configured
- cp "${fontsConf}" fonts.conf
- sed -e '/include/i${carlito}/etc/fonts/conf.d ' -i fonts.conf
- export FONTCONFIG_FILE="$PWD/fonts.conf"
-
- NOCONFIGURE=1 ./autogen.sh
- '';
-
- postConfigure =
- # fetch_Download_item tries to interpret the name as a variable name, let it do so...
- ''
- sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
- sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
- ''
- # Test fixups
- # May need to be revisited/pruned, left alone for now.
- + ''
- # unit test sd_tiledrendering seems to be fragile
- # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
- echo > ./sd/CppunitTest_sd_tiledrendering.mk
- sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
- # Pivot chart tests. Fragile.
- sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx
- sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx
- # one more fragile test?
- sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
- # this I actually hate, this should be a data consistency test!
- sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
- # rendering-dependent test
- sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx
- # tilde expansion in path processing checks the existence of $HOME
- sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx
- # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071
- sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx'
- # rendering-dependent: on my computer the test table actually doesn't fit…
- # interesting fact: test disabled on macOS by upstream
- sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx
- # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh?
- sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk
- # one more fragile test?
- sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
- # rendering-dependent tests
- sed -e '/CPPUNIT_TEST(testCustomColumnWidthExportXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
- sed -e '/CPPUNIT_TEST(testColumnWidthExportFromODStoXLSX)/d' -i sc/qa/unit/subsequent_export-test.cxx
- sed -e '/CPPUNIT_TEST(testChartImportXLS)/d' -i sc/qa/unit/subsequent_filters-test.cxx
- sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx
- sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx
- sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
- sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
- sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx
- sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx
- # not sure about this fragile test
- sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
- # bunch of new Fresh failures. Sigh.
- sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx'
- sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx'
- sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx'
- sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx'
- sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
- sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(test);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testConditionalFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF16LErtlSHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256ODF12);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testProtectionKeyODS_UTF8SHA256W3C);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testProtectionKeyODS_XL_SHA1);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testColorScaleExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testDataBarExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testNamedRangeBugfdo62729);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testRichTextExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testFormulaRefSheetNameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testCellValuesExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testCellNoteExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testFormatExportODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testEmbeddedChartODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testCellAnchoredGroupXLS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testCeilingFloorODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testRelativePathsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testSheetProtectionODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testSwappedOutImageExport);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testLinkedGraphicRT);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testImageWithSpecialID);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testAbsNamedRangeHTML);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testMoveCellAnchoredShapesODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testRefStringUnspecified);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testHeaderImageODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testTdf88657ODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testExponentWithoutSignFormatXLSX);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testHiddenRepeatedRowsODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testHyperlinkTargetFrameODS);/d' -i './sc/qa/unit/subsequent_export-test.cxx'
- sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
- sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
- sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
- sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
- sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
- sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx'
- sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx'
- sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx'
- sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx'
- sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
- sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
- sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
- sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
- sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx'
- sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx"
- sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx"
- sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx"
- sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx"
- ''
- # This to avoid using /lib:/usr/lib at linking
- + ''
- sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk
-
- find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \;
- '';
-
- makeFlags = "SHELL=${bash}/bin/bash";
-
- enableParallelBuilding = true;
-
- buildPhase = ''
- make build-nocheck
- '';
-
- doCheck = true;
-
- # It installs only things to $out/lib/libreoffice
- postInstall = ''
- mkdir -p $out/bin $out/share/desktop
-
- mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
-
- for a in sbase scalc sdraw smath swriter simpress soffice; do
- ln -s $out/lib/libreoffice/program/$a $out/bin/$a
- done
-
- ln -s $out/bin/soffice $out/bin/libreoffice
- ln -s $out/lib/libreoffice/share/xdg $out/share/applications
-
- for f in $out/share/applications/*.desktop; do
- substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice"
- substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice"
- substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice"
- done
-
- cp -r sysui/desktop/icons "$out/share"
- sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
- '';
-
- configureFlags = [
- (if withHelp then "" else "--without-help")
- "--with-boost=${boost.dev}"
- "--with-boost-libdir=${boost.out}/lib"
- "--with-beanshell-jar=${bsh}"
- "--with-vendor=NixOS"
- "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
- "--disable-report-builder"
- "--disable-online-update"
- "--enable-python=system"
- "--enable-dbus"
- "--enable-release-build"
- (lib.enableFeature kdeIntegration "kde4")
- "--enable-epm"
- "--with-jdk-home=${jdk.home}"
- "--with-ant-home=${ant}/lib/ant"
- "--with-system-cairo"
- "--with-system-libs"
- "--with-system-headers"
- "--with-system-openssl"
- "--with-system-libabw"
- "--with-system-libcmis"
- "--with-system-libwps"
- "--with-system-openldap"
- "--with-system-coinmp"
-
- "--with-alloc=system"
-
- # Without these, configure does not finish
- "--without-junit"
-
- "--disable-libnumbertext" # system-libnumbertext"
-
- # We do tarball prefetching ourselves
- "--disable-fetch-external"
- "--enable-build-opensymbol"
-
- # I imagine this helps. Copied from go-oo.
- # Modified on every upgrade, though
- "--disable-odk"
- "--disable-postgresql-sdbc"
- "--disable-firebird-sdbc"
- "--without-fonts"
- "--without-myspell-dicts"
- "--without-doxygen"
-
- # TODO: package these as system libraries
- "--with-system-beanshell"
- "--without-system-hsqldb"
- "--without-system-altlinuxhyph"
- "--without-system-lpsolve"
- "--without-system-libetonyek"
- "--without-system-libfreehand"
- "--without-system-liblangtag"
- "--without-system-libmspub"
- "--without-system-libpagemaker"
- "--without-system-libstaroffice"
- "--without-system-libepubgen"
- "--without-system-libqxp"
- "--without-system-mdds"
- # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
- "--without-system-orcus"
- "--without-system-xmlsec"
- ];
-
- checkPhase = ''
- make unitcheck
- make slowcheck
- '';
-
- nativeBuildInputs = [ wrapGAppsHook gdb fontforge autoconf automake bison pkgconfig libtool ];
-
- buildInputs = with xorg;
- [ ant ArchiveZip boost cairo clucene_core
- IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
- freetype GConf getopt gnome_vfs gperf gtk3 gtk2
- hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
- libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
- libXaw libXext libXi libXinerama libxml2 libxslt libXtst
- libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
- gst_all_1.gst-plugins-base glib libmysqlclient
- neon nspr nss openldap openssl ORBit2 pam perl poppler
- python3 sablotron sane-backends unzip vigra which zip zlib
- mdds bluez5 libcmis libwps libabw libzmf
- libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
- librevenge libe-book libmwaw glm glew ncurses epoxy
- libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
- ]
- ++ lib.optional kdeIntegration kdelibs4;
-
- passthru = {
- inherit srcs jdk;
- };
-
- requiredSystemFeatures = [ "big-parallel" ];
-
- meta = with lib; {
- description = "Comprehensive, professional-quality productivity suite (Still/Stable release)";
- homepage = https://libreoffice.org/;
- license = licenses.lgpl3;
- maintainers = with maintainers; [ raskin ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index a7b0afe0754c..9fdeecfee368 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, dpkg, which
+{ fetchurl, stdenv, mkDerivation, dpkg, which
, makeWrapper
, alsaLib
, desktop-file-utils
@@ -90,7 +90,7 @@ let
in
-stdenv.mkDerivation {
+mkDerivation {
pname = "mendeley";
inherit version;
@@ -106,6 +106,8 @@ stdenv.mkDerivation {
dontUnpack = true;
+ dontWrapQtApps = true;
+
installPhase = ''
dpkg-deb -x $src $out
mv $out/opt/mendeleydesktop/{bin,lib,share} $out
@@ -115,7 +117,7 @@ stdenv.mkDerivation {
--set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib \
$out/bin/mendeleydesktop
- wrapProgram $out/bin/mendeleydesktop \
+ wrapQtApp $out/bin/mendeleydesktop \
--add-flags "--unix-distro-build" \
${stdenv.lib.optionalString autorunLinkHandler # ignore errors installing the link handler
''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop ||:"''}
diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix
index 85e8bc131ce3..42802409e59d 100644
--- a/pkgs/applications/office/minetime/default.nix
+++ b/pkgs/applications/office/minetime/default.nix
@@ -1,15 +1,32 @@
-{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }:
+{ appimageTools, fetchurl, lib, runCommandNoCC, stdenv, gsettings-desktop-schemas, gtk3, zlib }:
let
- pname = "minetime";
- version = "1.5.1";
-in
-appimageTools.wrapType2 rec {
name = "${pname}-${version}";
- src = fetchurl {
- url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}-x86_64.AppImage";
- sha256 = "0099cq4p7j01bzs7q79y9xi7g6ji17v9g7cykfjggwsgqfmvd0hz";
+ pname = "minetime";
+ version = "1.7.3";
+ appimage = fetchurl {
+ url = "https://github.com/marcoancona/MineTime/releases/download/v${version}/${name}.AppImage";
+ sha256 = "0zz6p3mwxg9gm1sqzs582pq2nkb10lv0c3r542b9llqyzk9qv5aa";
};
+ extracted = appimageTools.extractType2 {
+ inherit name;
+ src = appimage;
+ };
+ patched = runCommandNoCC "minetime-patchelf" {} ''
+ cp -av ${extracted} $out
+
+ x=$out/resources/app.asar.unpacked/services/scheduling/dist/MinetimeSchedulingService
+ chmod +w $x
+
+ patchelf \
+ --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
+ --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \
+ $x
+ '';
+in
+appimageTools.wrapAppImage rec {
+ inherit name;
+ src = patched;
profile = ''
export LC_ALL=C.UTF-8
@@ -17,7 +34,9 @@ appimageTools.wrapType2 rec {
'';
multiPkgs = null; # no 32bit needed
- extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
+ extraPkgs = ps:
+ appimageTools.defaultFhsEnvArgs.multiPkgs ps
+ ++ (with ps; [ at-spi2-core at-spi2-atk libsecret libnotify ]);
extraInstallCommands = "mv $out/bin/{${name},${pname}}";
meta = with lib; {
diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index 99824cd19ec0..ed33d121a05f 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, sqlite, wxGTK30, gettext }:
+{ stdenv, fetchgit, sqlite, wxGTK30, gettext, wrapGAppsHook }:
let
@@ -14,7 +14,16 @@ in
sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74";
};
- buildInputs = [ sqlite wxGTK30 gettext ];
+ nativeBuildInputs = [
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ gettext
+ sqlite
+ wxGTK30
+ wxGTK30.gtk
+ ];
meta = {
description = "Easy-to-use personal finance software";
diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix
index e7db27bdedc7..6b8694a91d47 100644
--- a/pkgs/applications/office/notes-up/default.nix
+++ b/pkgs/applications/office/notes-up/default.nix
@@ -50,6 +50,12 @@ stdenv.mkDerivation rec {
# Whether to build with contractor support (Pantheon specific)
cmakeFlags = if withPantheon then null else [ "-Dnoele=yes" ];
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "Markdown notes editor and manager designed for elementary OS"
+ stdenv.lib.optionalString withPantheon " - built with Contractor support";
diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix
index 5cb20e4d6138..b4307eb286e5 100644
--- a/pkgs/applications/office/pympress/default.nix
+++ b/pkgs/applications/office/pympress/default.nix
@@ -12,11 +12,11 @@
python3Packages.buildPythonApplication rec {
pname = "pympress";
- version = "1.4.0";
+ version = "1.5.1";
src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "101wj6m931bj0ah6niw79i8ywb5zlb2783g7n7dmkhw6ay3jj4vq";
+ sha256 = "173d9scf2z29qg279jf33zcl7sgc3wp662fgpm943bn9667q18wf";
};
nativeBuildInputs = [
@@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec {
meta = with lib; {
description = "Simple yet powerful PDF reader designed for dual-screen presentations";
license = licenses.gpl2Plus;
- homepage = "https://pympress.xyz/";
+ homepage = "https://cimbali.github.io/pympress/";
maintainers = [ maintainers.tbenst ];
};
}
diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index 4152c08ebaf6..b646d0fc93f7 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "qownnotes";
- version = "19.10.10";
+ version = "19.11.14";
src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Can grab official version like so:
# $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256
- sha256 = "1zhszlrcmi8l96wq6hp48d8qv16jlyni02wf41dvh5r9ccfwlq42";
+ sha256 = "8faa67720443fc9a116feae3e7d641922a08814b9af4d973d348ff8a0ee0e35d";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix
index 3c5ae4c4b0aa..2a602b094ba2 100644
--- a/pkgs/applications/office/scribus/unstable.nix
+++ b/pkgs/applications/office/scribus/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman,
+{ stdenv, fetchurl, fetchpatch, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman,
boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2,
podofo, poppler, poppler_data, python2, qtimageformats, qttools, harfbuzzFull }:
@@ -14,6 +14,19 @@ mkDerivation rec {
sha256 = "eQiyGmzoQyafWM7fX495GJMlfmIBzOX73ccNrKL+P3E=";
};
+ patches = [
+ # fix build with Poppler 0.82
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch";
+ sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939";
+ })
+ # fix build with Poppler 0.83
+ (fetchpatch {
+ url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch";
+ sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx";
+ })
+ ];
+
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index fd68896ca673..1db5ce16fe53 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -7,21 +7,13 @@
mkDerivation rec {
pname = "skrooge";
- version = "2.20.0";
+ version = "2.21.1";
src = fetchurl {
url = "http://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz";
- sha256 = "0rakfngp7j2x7h1isg6lbc5kva6k1kg99dz0zl43dc28s15can1w";
+ sha256 = "0lv953i7cybzbxr5gx6g4libdcjj086jf152mwrwvx1avrpjavb8";
};
- patches = [
- (fetchpatch {
- name = "skrooge-2.20.0-missing-header.patch";
- url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch?id=cb8c91474b0ae2f9e889f89afe2d9114dbd1784f";
- sha256 = "154zsidx45h6qrcqjh6czjxrcwrcmbyv3yh2k1s40v8pzvjwzrld";
- })
- ];
-
nativeBuildInputs = [
cmake extra-cmake-modules kdoctools shared-mime-info
];
diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix
index 8c862cb6ea4f..ff54f8ff90f0 100644
--- a/pkgs/applications/office/softmaker/freeoffice.nix
+++ b/pkgs/applications/office/softmaker/freeoffice.nix
@@ -2,13 +2,13 @@
callPackage ./generic.nix (args // rec {
pname = "freeoffice";
- version = "971";
+ version = "973";
edition = "2018";
suiteName = "FreeOffice";
src = fetchurl {
url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz";
- sha256 = "1h36pjbpbiy4cw383cbrwh1jx2kp1ay29734zailmhifz53gj44f";
+ sha256 = "0xac4ynf1lfh8qmni5bhp4ybaamdfngva4bqaq21n1m4pgrx1ba5";
};
archive = "freeoffice${edition}.tar.lzma";
diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix
index 56dc6a5e4f7f..82ac2b58f68a 100644
--- a/pkgs/applications/office/softmaker/generic.nix
+++ b/pkgs/applications/office/softmaker/generic.nix
@@ -96,6 +96,10 @@ in stdenv.mkDerivation rec {
done
done
+ # freeoffice 973 misses the 96x96 application icons, giving broken symbolic links
+ # remove broken symbolic links
+ find $out -xtype l -ls -exec rm {} \;
+
# Add desktop items
${desktopItems.planmaker.buildCommand}
${desktopItems.presentations.buildCommand}
diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix
index 6c09cc1de472..07a3b26a1a85 100644
--- a/pkgs/applications/office/spice-up/default.nix
+++ b/pkgs/applications/office/spice-up/default.nix
@@ -60,6 +60,12 @@ stdenv.mkDerivation rec {
})
];
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "Create simple and beautiful presentations";
homepage = https://github.com/Philip-Scott/Spice-up;
diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix
index bb13cae08f2f..c652f7656877 100644
--- a/pkgs/applications/office/timetable/default.nix
+++ b/pkgs/applications/office/timetable/default.nix
@@ -47,6 +47,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with stdenv.lib; {
description = "Plot out your own timetable for the week and organize it";
homepage = "https://github.com/lainsce/timetable";
diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch
new file mode 100644
index 000000000000..1a4350ca71a1
--- /dev/null
+++ b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch
@@ -0,0 +1,69 @@
+From 5be803a1171855f976a5b607970fa3949db72181 Mon Sep 17 00:00:00 2001
+From: Christian Kampka
+Date: Mon, 9 Dec 2019 19:40:27 +0100
+Subject: [PATCH] Use console logger instead of rolling files
+
+---
+ src/services/log.js | 26 +++-----------------------
+ 1 file changed, 3 insertions(+), 23 deletions(-)
+
+diff --git a/src/services/log.js b/src/services/log.js
+index 1514c209..456c3749 100644
+--- a/src/services/log.js
++++ b/src/services/log.js
+@@ -1,35 +1,15 @@
+ "use strict";
+
+-const fs = require('fs');
+-const dataDir = require('./data_dir');
+-
+-if (!fs.existsSync(dataDir.LOG_DIR)) {
+- fs.mkdirSync(dataDir.LOG_DIR, 0o700);
+-}
+-
+-const logger = require('simple-node-logger').createRollingFileLogger({
+- errorEventName: 'error',
+- logDirectory: dataDir.LOG_DIR,
+- fileNamePattern: 'trilium-.log',
+- dateFormat:'YYYY-MM-DD'
+-});
+-
+ function info(message) {
+ // info messages are logged asynchronously
+ setTimeout(() => {
+ console.log(message);
+-
+- logger.info(message);
+ }, 0);
+ }
+
+ function error(message) {
+ message = "ERROR: " + message;
+
+- // we're using .info() instead of .error() because simple-node-logger emits weird error for showError()
+- // errors are logged synchronously to make sure it doesn't get lost in case of crash
+- logger.info(message);
+-
+ console.trace(message);
+ }
+
+@@ -45,12 +25,12 @@ function request(req) {
+ if (req.url.includes(".js.map") || req.url.includes(".css.map")) {
+ return;
+ }
+-
+- logger.info(req.method + " " + req.url);
++ if(process.env.DEBUG)
++ console.log(req.method + " " + req.url);
+ }
+
+ module.exports = {
+ info,
+ error,
+ request
+-};
+\ No newline at end of file
++};
+--
+2.23.0
+
diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index 877dfba88c06..d44b51861dc5 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }:
+{ stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }:
let
description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases.";
@@ -11,56 +11,105 @@ let
categories = "Office";
};
-in stdenv.mkDerivation rec {
- pname = "trilium";
- version = "0.33.6";
-
- src = fetchurl {
- url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
- sha256 = "1sg6iqhpgyr8zr6w6dgs0ha0indb9vyp8vh2clj2fds5ahhlvf91";
- };
-
- # Fetch from source repo, no longer included in release.
- # (they did special-case icon.png but we want the scalable svg)
- # Use the version here to ensure we get any changes.
- trilium_svg = fetchurl {
- url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg";
- sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg";
- };
-
-
- nativeBuildInputs = [
- autoPatchelfHook
- makeWrapper
- wrapGAppsHook
- ];
-
- buildInputs = [ atomEnv.packages gtk3 ];
-
- installPhase = ''
- mkdir -p $out/bin
- mkdir -p $out/share/trilium
- mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
-
- cp -r ./* $out/share/trilium
- ln -s $out/share/trilium/trilium $out/bin/trilium
-
- ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg
- cp ${desktopItem}/share/applications/* $out/share/applications
- '';
-
- # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :)
- preFixup = ''
- gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath})
- '';
-
- dontStrip = true;
-
meta = with stdenv.lib; {
inherit description;
homepage = https://github.com/zadam/trilium;
license = licenses.agpl3;
- platforms = platforms.linux;
- maintainers = with maintainers; [ emmanuelrosa dtzWill ];
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ];
+ };
+
+ version = "0.38.2";
+
+in {
+
+ trilium-desktop = stdenv.mkDerivation rec {
+ pname = "trilium-desktop";
+ inherit version;
+ inherit meta;
+
+ src = fetchurl {
+ url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
+ sha256 = "10f5zfqcfcjynw04d5xzrfmkbqpk85i4mq7njhkibx2f1m0br2qa";
+ };
+
+ # Fetch from source repo, no longer included in release.
+ # (they did special-case icon.png but we want the scalable svg)
+ # Use the version here to ensure we get any changes.
+ trilium_svg = fetchurl {
+ url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg";
+ sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg";
+ };
+
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ makeWrapper
+ wrapGAppsHook
+ ];
+
+ buildInputs = [ atomEnv.packages gtk3 ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ mkdir -p $out/share/trilium
+ mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
+
+ cp -r ./* $out/share/trilium
+ ln -s $out/share/trilium/trilium $out/bin/trilium
+
+ ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg
+ cp ${desktopItem}/share/applications/* $out/share/applications
+ '';
+
+ # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :)
+ preFixup = ''
+ gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath})
+ '';
+
+ dontStrip = true;
+ };
+
+
+ trilium-server = stdenv.mkDerivation rec {
+ pname = "trilium-server";
+ inherit version;
+ inherit meta;
+
+ src = fetchurl {
+ url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
+ sha256 = "1df0cx9gpzk0086lgha0qm1g03l8f4rz7y2xzgpzng5rrxjkgz61";
+ };
+
+ nativeBuildInputs = [
+ autoPatchelfHook
+ ];
+
+ buildInputs = [
+ stdenv.cc.cc.lib
+ zlib
+ libxkbfile
+ ];
+
+ patches = [ ./0001-Use-console-logger-instead-of-rolling-files.patch ] ;
+ installPhase = ''
+ mkdir -p $out/bin
+ mkdir -p $out/share/trilium-server
+
+ cp -r ./* $out/share/trilium-server
+ '';
+
+ postFixup = ''
+ cat > $out/bin/trilium-server < python != null && swig != null;
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "gr-osmosdr";
- version = "2018-08-15";
+ version = "0.1.5";
src = fetchgit {
url = "git://git.osmocom.org/gr-osmosdr";
- rev = "4d83c6067f059b0c5015c3f59f8117bbd361e877";
- sha256 = "1d5nb47506qry52bg4cn02d3l4lwxwz44g2fz1ph0q93c7892j60";
+ rev = "v${version}";
+ sha256 = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix
index f45e695486d8..530008702f10 100644
--- a/pkgs/applications/radio/tlf/default.nix
+++ b/pkgs/applications/radio/tlf/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "tlf";
- version = "1.3.2";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "${pname}-${version}";
- sha256 = "0gniysjm8aq5anq0a0az31vd6h1vyg56bifc7rpf53lsh9hkzmgc";
+ sha256 = "0f97hxiwc6blp5haik871q6zzvwy0b3p2jg8ad2dvaxg07xc76l0";
};
nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ];
diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix
index a1b92e7e4e18..eea9bb9027ca 100644
--- a/pkgs/applications/radio/urh/default.nix
+++ b/pkgs/applications/radio/urh/default.nix
@@ -1,25 +1,31 @@
{ stdenv, lib, fetchFromGitHub, python3Packages
, hackrf, rtl-sdr, airspy, limesuite, libiio
+, qt5
, USRPSupport ? false, uhd }:
python3Packages.buildPythonApplication rec {
pname = "urh";
- version = "2.7.3";
+ version = "2.8.1";
src = fetchFromGitHub {
owner = "jopohl";
repo = pname;
rev = "v${version}";
- sha256 = "1jrrj9c4ddm37m8j0g693xjimpnlvx7lan5kxish5p14xpwdak35";
+ sha256 = "0vwc1jw1fjirdpavrnvc95bql8023ayrz9srbwn0p6n0ia038948";
};
+ nativeBuildInputs = [ qt5.wrapQtAppsHook ];
buildInputs = [ hackrf rtl-sdr airspy limesuite libiio ]
++ lib.optional USRPSupport uhd;
propagatedBuildInputs = with python3Packages; [
- pyqt5 numpy psutil cython pyzmq pyaudio
+ pyqt5 numpy psutil cython pyzmq pyaudio setuptools
];
+ postFixup = ''
+ wrapQtApp $out/bin/urh
+ '';
+
doCheck = false;
meta = with lib; {
diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix
index 229200f23528..66a033fef25b 100644
--- a/pkgs/applications/radio/welle-io/default.nix
+++ b/pkgs/applications/radio/welle-io/default.nix
@@ -3,7 +3,7 @@
, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec, lame, mpg123 }:
let
- version = "2.0";
+ version = "2.1";
in mkDerivation {
@@ -14,7 +14,7 @@ in mkDerivation {
owner = "AlbrechtL";
repo = "welle.io";
rev = "v${version}";
- sha256 = "0cp8dyswgwidabaj9bvkkc6hl3160096j6myckd5bw00zxnbfiqn";
+ sha256 = "1j63gdbd66d6rfjsxwdm2agrcww1rs4438kg7313h6zixpcc1icj";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix
index 36d3f14818f0..8e135dee5681 100644
--- a/pkgs/applications/radio/wsjtx/default.nix
+++ b/pkgs/applications/radio/wsjtx/default.nix
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
pname = "wsjtx";
- version = "2.1.0";
+ version = "2.1.2";
# This is a "superbuild" tarball containing both wsjtx and a hamlib fork
src = fetchurl {
url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz";
- sha256 = "04flhyfw0djnnbrzh3f5lx06bnn92khchz3bmswk8if8n8j58v4y";
+ sha256 = "0aj3wg5xjjqwjvw6lra171ag5wq86w0hf1ra4k8mnaf0mc1qgbyl";
};
# Hamlib builds with autotools, wsjtx builds with cmake
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index e3ceffd34c19..e72354c86585 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
-, lua, libGLU_combined, pkgconfig, perl, autoreconfHook
+, lua, libGLU, libGL, pkgconfig, perl, autoreconfHook
}:
let
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU_combined lua
+ buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU libGL lua
perl autoreconfHook ];
patchPhase = ''
diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index 9584c2f41a82..4bb3c7b34fe8 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 = "oct19a";
- version = "20191001_a";
+ srcVersion = "dec19a";
+ version = "20191201_a";
pname = "gildas";
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.xz"
"http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
- sha256 = "0h6g16ra7v8x15j21z5hnb3midwm0asc7bjm9gs5v5sw66vn3wc1";
+ sha256 = "0kwq5gzgzx5hkbabwvbrw2958pqz4m2s501k5cbllgxh4sqp86b1";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
index 03d0018f237b..15f72938effe 100644
--- a/pkgs/applications/science/astronomy/gravit/default.nix
+++ b/pkgs/applications/science/astronomy/gravit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU_combined, libpng, lua5, autoconf, automake }:
+{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }:
stdenv.mkDerivation rec {
name = "gravit-0.5.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7";
};
- buildInputs = [ libGLU_combined SDL SDL_ttf SDL_image lua5 libpng libSM libICE ];
+ buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image lua5 libpng libSM libICE ];
nativeBuildInputs = [ autoconf automake ];
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 59c6a02d3494..eca25774c593 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,24 +1,24 @@
{ mkDerivation, lib, fetchFromGitHub
-, cmake, freetype, libpng, libGLU_combined, openssl, perl, libiconv
+, cmake, freetype, libpng, libGLU, libGL, openssl, perl, libiconv
, qtscript, qtserialport, qttools
, qtmultimedia, qtlocation, qtbase, wrapQtAppsHook
}:
mkDerivation rec {
pname = "stellarium";
- version = "0.19.2";
+ version = "0.19.3";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${version}";
- sha256 = "1ki3s4smazr6xfkr0grrmjp2s8yjprismiaq7l54d0il7rkvhibd";
+ sha256 = "175aj4bgi9b6bif6fvjdlpd68brcwij4x3ml0lxk6i51binv233y";
};
nativeBuildInputs = [ cmake perl wrapQtAppsHook ];
buildInputs = [
- freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools
+ freetype libpng libGLU libGL openssl libiconv qtscript qtserialport qttools
qtmultimedia qtlocation qtbase
];
diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix
index 5f02dc27a224..f306f9265aba 100644
--- a/pkgs/applications/science/astronomy/xplanet/default.nix
+++ b/pkgs/applications/science/astronomy/xplanet/default.nix
@@ -1,29 +1,38 @@
-{stdenv, fetchurl, pkgconfig, freetype, pango, libpng, libtiff, giflib
-, libjpeg, netpbm}:
+{stdenv, fetchurl, fetchpatch, pkgconfig, freetype, pango, libpng, libtiff
+, giflib, libjpeg, netpbm}:
stdenv.mkDerivation rec {
- name = "xplanet-1.3.0";
+ pname = "xplanet";
+ version = "1.3.1";
src = fetchurl {
- url = "mirror://sourceforge/xplanet/${name}.tar.gz";
- sha256 = "0hml2v228wi2r61m1pgka7h96rl92b6apk0iigm62miyp4mp9ys4";
+ url = "mirror://sourceforge/xplanet/${pname}-${version}.tar.gz";
+ sha256 = "1rzc1alph03j67lrr66499zl0wqndiipmj99nqgvh9xzm1qdb023";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ freetype pango libpng libtiff giflib libjpeg netpbm ];
patches = [
- ./giflib.patch
- ./gcc6.patch
+ (fetchpatch {
+ name = "giflib6.patch";
+ url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/giflib6.patch?h=packages/xplanet&id=ce6f25eb369dc011161613894f01fd0a6ae85a09";
+ sha256 = "173l0xkqq0v2bpaff7hhwc7y2aw5cclqw8988k1nalhyfbrjb8bl";
+ })
+ (fetchpatch {
+ name = "xplanet-c++11.patch";
+ url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/xplanet-c++11.patch?h=packages/xplanet&id=ce6f25eb369dc011161613894f01fd0a6ae85a09";
+ sha256 = "0vldai78ixw49bxch774pps6pq4sp0p33qvkvxywcz7p8kzpg8q2";
+ })
];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
- meta = {
+ meta = with stdenv.lib; {
description = "Renders an image of the earth or other planets into the X root window";
homepage = http://xplanet.sourceforge.net;
- license = "GPL";
- maintainers = [ stdenv.lib.maintainers.sander ];
- platforms = stdenv.lib.platforms.all;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ lassulus sander ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/applications/science/astronomy/xplanet/gcc6.patch b/pkgs/applications/science/astronomy/xplanet/gcc6.patch
deleted file mode 100644
index b30385a50f83..000000000000
--- a/pkgs/applications/science/astronomy/xplanet/gcc6.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff --git c/src/libannotate/addArcs.cpp i/src/libannotate/addArcs.cpp
-index 2ee06c0..0ff5478 100644
---- c/src/libannotate/addArcs.cpp
-+++ i/src/libannotate/addArcs.cpp
-@@ -258,7 +258,7 @@ addArcs(PlanetProperties *planetProperties, Planet *planet,
- {
- ifstream inFile(arcFile.c_str());
- char *line = new char[MAX_LINE_LENGTH];
-- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
-+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
- readArcFile(line, planet, view, projection,
- planetProperties, annotationMap);
-
-@@ -292,7 +292,7 @@ addArcs(View *view, multimap &annotationMap)
- {
- ifstream inFile(arcFile.c_str());
- char *line = new char[256];
-- while (inFile.getline (line, 256, '\n') != NULL)
-+ while (inFile.getline (line, 256, '\n'))
- readArcFile(line, NULL, view, NULL, NULL, annotationMap);
-
- inFile.close();
-diff --git c/src/libannotate/addMarkers.cpp i/src/libannotate/addMarkers.cpp
-index 6a8a835..b35d820 100644
---- c/src/libannotate/addMarkers.cpp
-+++ i/src/libannotate/addMarkers.cpp
-@@ -423,7 +423,7 @@ addMarkers(PlanetProperties *planetProperties, Planet *planet,
- {
- ifstream inFile(markerFile.c_str());
- char *line = new char[MAX_LINE_LENGTH];
-- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
-+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
- {
- unsigned char color[3];
- memcpy(color, planetProperties->MarkerColor(), 3);
-@@ -469,7 +469,7 @@ addMarkers(View *view, const int width, const int height,
- {
- ifstream inFile(markerFile.c_str());
- char *line = new char[MAX_LINE_LENGTH];
-- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
-+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
- {
- unsigned char color[3];
- memcpy(color, options->Color(), 3);
-diff --git c/src/libannotate/addSatellites.cpp i/src/libannotate/addSatellites.cpp
-index 2634339..c9ff0b0 100644
---- c/src/libannotate/addSatellites.cpp
-+++ i/src/libannotate/addSatellites.cpp
-@@ -488,10 +488,10 @@ loadSatelliteVector(PlanetProperties *planetProperties)
- {
- ifstream inFile(tleFile.c_str());
- char lines[3][80];
-- while (inFile.getline(lines[0], 80) != NULL)
-+ while (inFile.getline(lines[0], 80))
- {
-- if ((inFile.getline(lines[1], 80) == NULL)
-- || (inFile.getline(lines[2], 80) == NULL))
-+ if ((inFile.getline(lines[1], 80))
-+ || (inFile.getline(lines[2], 80)))
- {
- ostringstream errStr;
- errStr << "Malformed TLE file (" << tleFile << ")?\n";
-@@ -542,7 +542,7 @@ addSatellites(PlanetProperties *planetProperties, Planet *planet,
- {
- ifstream inFile(satFile.c_str());
- char *line = new char[MAX_LINE_LENGTH];
-- while (inFile.getline (line, MAX_LINE_LENGTH, '\n') != NULL)
-+ while (inFile.getline (line, MAX_LINE_LENGTH, '\n'))
- readSatelliteFile(line, planet, view, projection,
- planetProperties, annotationMap);
-
-diff --git c/src/libmultiple/RayleighScattering.cpp i/src/libmultiple/RayleighScattering.cpp
-index d885173..7c25c1c 100644
---- c/src/libmultiple/RayleighScattering.cpp
-+++ i/src/libmultiple/RayleighScattering.cpp
-@@ -369,7 +369,7 @@ RayleighScattering::readConfigFile(string configFile)
-
- diskTemplate_.clear();
- limbTemplate_.clear();
-- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
-+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
- {
- int i = 0;
- while (isDelimiter(line[i]))
-@@ -439,7 +439,7 @@ RayleighScattering::readBlock(ifstream &inFile,
- values.clear();
-
- char line[MAX_LINE_LENGTH];
-- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
-+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
- {
- int i = 0;
- while (isDelimiter(line[i]))
-@@ -470,7 +470,7 @@ RayleighScattering::readValue(ifstream &inFile,
- double &value)
- {
- char line[MAX_LINE_LENGTH];
-- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
-+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
- {
- int i = 0;
- while (isDelimiter(line[i]))
-diff --git c/src/libmultiple/drawStars.cpp i/src/libmultiple/drawStars.cpp
-index ff07c49..22e41a0 100644
---- c/src/libmultiple/drawStars.cpp
-+++ i/src/libmultiple/drawStars.cpp
-@@ -41,7 +41,7 @@ drawStars(DisplayBase *display, View *view)
- ifstream inFile(starMap.c_str());
-
- char line[MAX_LINE_LENGTH];
-- while (inFile.getline(line, MAX_LINE_LENGTH, '\n') != NULL)
-+ while (inFile.getline(line, MAX_LINE_LENGTH, '\n'))
- {
- if (line[0] == '#') continue;
-
-diff --git c/src/readConfig.cpp i/src/readConfig.cpp
-index cc1964f..2946690 100644
---- c/src/readConfig.cpp
-+++ i/src/readConfig.cpp
-@@ -550,7 +550,7 @@ readConfigFile(string configFile, PlanetProperties *planetProperties[])
-
- ifstream inFile(configFile.c_str());
- char *line = new char[256];
-- while (inFile.getline(line, 256, '\n') != NULL)
-+ while (inFile.getline(line, 256, '\n'))
- readConfig(line, planetProperties);
-
- // This condition will only be true if [default] is the only
diff --git a/pkgs/applications/science/astronomy/xplanet/giflib.patch b/pkgs/applications/science/astronomy/xplanet/giflib.patch
deleted file mode 100644
index 653b9c8dc7d6..000000000000
--- a/pkgs/applications/science/astronomy/xplanet/giflib.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -wbBur xplanet-1.3.0/src/libimage/gif.c xplanet-1.3.0.my/src/libimage/gif.c
---- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300
-+++ xplanet-1.3.0.my/src/libimage/gif.c 2014-05-29 18:59:14.830652716 +0400
-@@ -20,7 +20,7 @@
-
- #include
- #include
--
-+#define FALSE 0
- #include
-
- /*
-@@ -42,11 +42,11 @@
- int color_index;
- unsigned char *ptr = NULL;
-
-- infile = DGifOpenFileName(filename);
-+ infile = DGifOpenFileName(filename, NULL);
-
- if (infile == NULL)
- {
-- PrintGifError();
-+ printf("%s\n", GifErrorString(GIF_ERROR));
- return(0);
- }
-
-@@ -54,7 +54,7 @@
- {
- if (DGifGetRecordType(infile, &record_type) == GIF_ERROR)
- {
-- PrintGifError();
-+ printf("%s\n", GifErrorString(GIF_ERROR));
- return(0);
- }
-
-@@ -63,7 +63,7 @@
- case IMAGE_DESC_RECORD_TYPE:
- if (DGifGetImageDesc(infile) == GIF_ERROR)
- {
-- PrintGifError();
-+ printf("%s\n", GifErrorString(GIF_ERROR));
- return(0);
- }
-
-@@ -107,14 +107,14 @@
- GifByteType *ext;
- if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR)
- {
-- PrintGifError();
-+ printf("%s\n", GifErrorString(GIF_ERROR));
- return(0);
- }
- while (ext != NULL)
- {
- if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR)
- {
-- PrintGifError();
-+ printf("%s\n", GifErrorString(GIF_ERROR));
- return(0);
- }
- }
-@@ -154,7 +154,7 @@
-
- free(buffer);
-
-- DGifCloseFile(infile);
-+ DGifCloseFile(infile, NULL);
- return(1);
- }
-
-@@ -178,7 +178,7 @@
- return(0);
- }
-
-- colormap = MakeMapObject(colormap_size, NULL);
-+ colormap = GifMakeMapObject(colormap_size, NULL);
-
- for (i = 0; i < width * height; i++)
- {
-@@ -187,10 +187,10 @@
- blue[i] = (GifByteType) rgb[3*i+2];
- }
-
-- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,
-+ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue,
- buffer, colormap->Colors) == GIF_ERROR)
- {
-- PrintGifError();
-+ printf("%s\n", GifErrorString(GIF_ERROR));
- return(0);
- }
-
-@@ -198,24 +198,24 @@
- free(green);
- free(blue);
-
-- outfile = EGifOpenFileName((char *) filename, FALSE);
-+ outfile = EGifOpenFileName((char *) filename, FALSE, NULL);
- if (outfile == NULL)
- {
-- PrintGifError();
-+ printf("%s\n", GifErrorString(GIF_ERROR));
- return(0);
- }
-
- if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap)
- == GIF_ERROR)
- {
-- PrintGifError();
-+ printf("%s\n", GifErrorString(GIF_ERROR));
- return(0);
- }
-
- if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL)
- == GIF_ERROR)
- {
-- PrintGifError();
-+ printf("%s\n", GifErrorString(GIF_ERROR));
- return(0);
- }
-
-@@ -224,7 +224,7 @@
- {
- if (EGifPutLine(outfile, ptr, width) == GIF_ERROR)
- {
-- PrintGifError();
-+ printf("%s\n", GifErrorString(GIF_ERROR));
- return(0);
- }
- ptr += width;
-@@ -232,8 +232,8 @@
-
- EGifSpew(outfile);
-
-- if (EGifCloseFile(outfile) == GIF_ERROR)
-- PrintGifError();
-+ if (EGifCloseFile(outfile, NULL) == GIF_ERROR)
-+ printf("%s\n", GifErrorString(GIF_ERROR));
-
- free(buffer);
-
diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix
index 4e4c093ad7f7..9af2ec88c392 100644
--- a/pkgs/applications/science/biology/bedtools/default.nix
+++ b/pkgs/applications/science/biology/bedtools/default.nix
@@ -2,19 +2,20 @@
stdenv.mkDerivation rec {
pname = "bedtools";
- version = "2.29.0";
+ version = "2.29.2";
src = fetchFromGitHub {
owner = "arq5x";
repo = "bedtools2";
rev = "v${version}";
- sha256 = "0d6i985qqxp92ddq4n6558m70qi5rqhl724wrfys0hm0p6a9h56x";
+ sha256 = "015qq3pwrwgnyxyi959niijjlswl231b3wxlsm3l8msv6fdhmkz8";
};
buildInputs = [ zlib python bzip2 lzma ];
- cc = if stdenv.cc.isClang then "clang++" else "g++";
- buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} -j $NIX_BUILD_CORES";
- installPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} install";
+ cxx = if stdenv.cc.isClang then "clang++" else "g++";
+ cc = if stdenv.cc.isClang then "clang" else "gcc";
+ buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} -j $NIX_BUILD_CORES";
+ installPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cxx} CC=${cc} install";
meta = with stdenv.lib; {
description = "A powerful toolset for genome arithmetic.";
diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/applications/science/biology/bftools/default.nix
index 158291049347..29e8bca52625 100644
--- a/pkgs/applications/science/biology/bftools/default.nix
+++ b/pkgs/applications/science/biology/bftools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bftools";
- version = "5.9.2";
+ version = "6.3.0";
src = fetchzip {
url = "http://downloads.openmicroscopy.org/bio-formats/${version}/artifacts/bftools.zip";
- sha256 = "08lmbg3kfxh17q6548il0i2h3f9a6ch8r0r067p14dajhzfpjyqj";
+ sha256 = "02nvvmpfglpah1ihd08aw65g1794w588c988cdar1hfl4s80qwhb";
};
installPhase = ''
diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix
index e1e84c9423bb..7d0a36e755f6 100644
--- a/pkgs/applications/science/biology/freebayes/default.nix
+++ b/pkgs/applications/science/biology/freebayes/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "freebayes";
- version = "2017-08-23";
+ version = "1.3.1";
src = fetchFromGitHub {
name = "freebayes-${version}-src";
owner = "ekg";
repo = "freebayes";
- rev = "8d2b3a060da473e1f4f89be04edfce5cba63f1d3";
- sha256 = "0yyrgk2639lz1yvg4jf0ccahnkic31dy77q05pb3i28rjf37v45z";
+ rev = "v${version}";
+ sha256 = "035nriknjqq8gvil81vvsmvqwi35v80q8h1cw24vd1gdyn1x7bys";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix
index 3adbaf0079ef..69ecb228697b 100644
--- a/pkgs/applications/science/biology/hmmer/default.nix
+++ b/pkgs/applications/science/biology/hmmer/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "3.2.1";
+ version = "3.3";
pname = "hmmer";
src = fetchurl {
url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz";
- sha256 = "171bivy6xhgjsz5nv53n81pc3frnwz29ylblawk2bv46szwjjqd5";
+ sha256 = "0v3kcgkr6jihq0xmpgn2xd5q7wiwvj6yswa905k2c0v7mx0bz1h1";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
index de93ae5d7829..1a6555e0d634 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "kallisto";
- version = "0.46.0";
+ version = "0.46.1";
src = fetchFromGitHub {
repo = "kallisto";
owner = "pachterlab";
rev = "v${version}";
- sha256 = "09vgdqwpigl4x3sdw5vjfyknsllkli339mh8xapbf7ldm0jldfn9";
+ sha256 = "09ldgy70wziw51ma4a3b7vyrphzf2v1cnq1j5r1wwgfmx8fgbh2z";
};
nativeBuildInputs = [ autoconf cmake ];
diff --git a/pkgs/applications/science/biology/kssd/default.nix b/pkgs/applications/science/biology/kssd/default.nix
new file mode 100644
index 000000000000..ef8a0ce136f8
--- /dev/null
+++ b/pkgs/applications/science/biology/kssd/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, zlib, automake, autoconf, libtool }:
+
+stdenv.mkDerivation rec {
+ pname = "kssd";
+ version = "1.0";
+
+ src = fetchurl {
+ url = "https://github.com/yhg926/public_${pname}/archive/v${version}.tar.gz";
+ sha256 = "a5dcaf520049a962bef625cb59a567ea2b4252d4dc9be28dd06123d340e03919";
+ };
+
+ buildInputs = [ zlib automake autoconf libtool ];
+
+ installPhase = ''
+ install -vD kssd $out/bin/kssd
+ '';
+
+ meta = with stdenv.lib; {
+ description = "K-mer substring space decomposition";
+ license = licenses.asl20;
+ homepage = "https://github.com/yhg926/public_kssd";
+ maintainers = with maintainers; [ unode ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix
index 689d3e42c979..f70054e97716 100644
--- a/pkgs/applications/science/biology/niftyseg/default.nix
+++ b/pkgs/applications/science/biology/niftyseg/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
homepage = http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg;
description = "Software for medical image segmentation, bias field correction, and cortical thickness calculation";
maintainers = with maintainers; [ bcdarwin ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
license = licenses.bsd3;
};
diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix
index fe6919656d9d..731e31c588fa 100644
--- a/pkgs/applications/science/biology/paml/default.nix
+++ b/pkgs/applications/science/biology/paml/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- version = "4.9i";
+ version = "4.9j";
pname = "paml";
src = fetchurl {
url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz";
- sha256 = "1k5lcyls6c33ppp5fxl8ply2fy7i2k0gcqaifsl7gnc81d8ay4dw";
+ sha256 = "0qflf3i27x6jwks3c6q560m1q8r043ja96syah145113iz5wdalp";
};
preBuild = ''
@@ -29,6 +29,5 @@ stdenv.mkDerivation rec {
longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.'';
license = "non-commercial";
homepage = http://abacus.gene.ucl.ac.uk/software/paml.html;
- broken = true;
};
}
diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 5a9cb5de528e..a67653c84373 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "picard-tools";
- version = "2.21.1";
+ version = "2.21.3";
src = fetchurl {
url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
- sha256 = "0knfx0by7rml19kr5ynb7860iykij1z1mx2hx0bg3s287sld1ppl";
+ sha256 = "0s1gn2bkya41866kd8zj0g8xjbivs763jqmlzdpjz4c25h6xkhns";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix
index c791e8ef89bb..cb83b19269bd 100644
--- a/pkgs/applications/science/biology/strelka/default.nix
+++ b/pkgs/applications/science/biology/strelka/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib python2 ];
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ];
+
preConfigure = ''
sed -i 's|/usr/bin/env python|${python2}/bin/python|' src/python/lib/makeRunScript.py
patchShebangs .
@@ -33,7 +35,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/Illumina/strelka;
maintainers = with maintainers; [ jbedo ];
platforms = [ "x86_64-linux" ];
- broken = true;
};
}
diff --git a/pkgs/applications/science/biology/svaba/default.nix b/pkgs/applications/science/biology/svaba/default.nix
new file mode 100644
index 000000000000..ae8dc95d6fea
--- /dev/null
+++ b/pkgs/applications/science/biology/svaba/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, zlib, bzip2, lzma, fetchFromGitHub } :
+
+stdenv.mkDerivation rec {
+ version = "1.1.0";
+ pname = "svaba";
+
+ src = fetchFromGitHub {
+ owner = "walaj";
+ repo = pname;
+ rev = version;
+ sha256 = "1vv5mc9z5d22kgdy7mm27ya5aahnqgkcrskdr2405058ikk9g8kp";
+ fetchSubmodules = true;
+ };
+
+ buildInputs = [ zlib bzip2 lzma ];
+
+ installPhase = ''
+ runHook preInstall
+ install -Dm555 src/svaba/svaba $out/bin/svaba
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Structural variant and INDEL caller for DNA sequencing data, using genome-wide local assembly";
+ license = licenses.gpl3;
+ homepage = "https://github.com/walaj/svaba";
+ maintainers = with maintainers; [ scalavision ];
+ platforms = platforms.linux;
+ longDescription = ''
+ SvABA is a method for detecting structural variants in sequencing data
+ using genome-wide local assembly. Under the hood, SvABA uses a custom
+ implementation of SGA (String Graph Assembler) by Jared Simpson,
+ and BWA-MEM by Heng Li. Contigs are assembled for every 25kb window
+ (with some small overlap) for every region in the genome.
+ The default is to use only clipped, discordant, unmapped and indel reads,
+ although this can be customized to any set of reads at the command line using VariantBam rules.
+ These contigs are then immediately aligned to the reference with BWA-MEM and parsed to identify variants.
+ Sequencing reads are then realigned to the contigs with BWA-MEM, and variants are scored by their read support.
+ '';
+
+ };
+}
diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix
index a569b82ff59d..6aca678480da 100644
--- a/pkgs/applications/science/chemistry/avogadro/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU_combined, libX11, doxygen }:
+{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU, libGL, libX11, doxygen }:
stdenv.mkDerivation rec {
name = "avogadro-1.1.1";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy";
};
- buildInputs = [ qt4 eigen zlib openbabel libGLU_combined libX11 ];
+ buildInputs = [ qt4 eigen zlib openbabel libGL libGLU libX11 ];
nativeBuildInputs = [ cmake pkgconfig doxygen ];
- NIX_CFLAGS_COMPILE = "-include ${libGLU_combined}/include/GL/glu.h";
+ NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h";
patches = [
(fetchurl {
diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index e32900ed720f..2577b2a16e6d 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -17,14 +17,14 @@ let
};
in
stdenv.mkDerivation rec {
- version = "14.29.55";
+ version = "14.30.1";
pname = "jmol";
src = let
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
in fetchurl {
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
- sha256 = "1w841yyck5j97p72q3iq0by0sixiyh3rzscbfcx21gv2dj45vq46";
+ sha256 = "0qnxsw6pjjkn6yigrfh85fz58ibqdmbv1jhf6i5q68wm5pr1ff3d";
};
patchPhase = ''
diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
index 391ed54dfcb4..8b7da71c80ff 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "marvin";
- version = "19.1.0";
+ version = "19.23.0";
src = fetchurl {
name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
- sha256 = "1ccsimfvms5q4prjyk6sg5hsc3hkcjjfq3gl7jjm8dgd2173zzyc";
+ sha256 = "1m28jki2qan6gdzs544y1v72ybp4vyj66ri5sy44jqi94xg1mb5f";
};
nativeBuildInputs = [ dpkg makeWrapper ];
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix
index 6dec5b3b11f1..d37f8d17336e 100644
--- a/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/pkgs/applications/science/chemistry/octopus/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Real-space time dependent density-functional theory code";
- homepage = http://octopus-code.org;
+ homepage = https://octopus-code.org;
maintainers = with maintainers; [ markuskowa ];
license = licenses.gpl2;
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
index 7789f4cf8bae..db4c1e42fea0 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem
+{ stdenv, mkDerivation, fetchurl, makeDesktopItem
, libXrender, libXrandr, libXcursor, libX11, libXext, libXi, libxcb
, libGL, glib, nss, nspr, expat, alsaLib
, qtbase, qtdeclarative, qtsvg, qtlocation, qtwebchannel, qtwebengine
@@ -11,13 +11,13 @@ let
qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine
];
in
- stdenv.mkDerivation rec {
+ mkDerivation rec {
pname = "eagle";
- version = "9.5.0";
+ version = "9.5.1";
src = fetchurl {
url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz";
- sha256 = "0wakaja98mkdgcxp18d7499i0254ns1xhnx4bag2lqi7j8qn8rqy";
+ sha256 = "07lvjn0mxqkv5kx41bzakifpb5bjhljx0ssvk33ipzb0nvl6nx63";
};
desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 64c1c3daba82..75d69d3e499e 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,18 +1,23 @@
-{stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
+{ stdenv, fetchurl, glib, gtk3, gperf, pkgconfig, bzip2, tcl, tk, wrapGAppsHook, judy, xz }:
stdenv.mkDerivation rec {
pname = "gtkwave";
- version = "3.3.102";
+ version = "3.3.103";
src = fetchurl {
- url = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz";
- sha256 = "1izyfx6b1n9nr08c7q0gkgcf0q04bb4qz92ckwh74n5l5nwprfw0";
+ url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
+ sha256 = "0djqfnxy772a9p44wnm5ansbih7jg76xv1hvcpkv3gblhkzg49ay";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gtk2 gperf bzip2 tcl tk judy xz ];
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+ buildInputs = [ glib gtk3 gperf bzip2 tcl tk judy xz ];
- configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ];
+ configureFlags = [
+ "--with-tcl=${tcl}/lib"
+ "--with-tk=${tk}/lib"
+ "--enable-judy"
+ "--enable-gtk3"
+ ];
meta = {
description = "VCD/Waveform viewer for Unix and Win32";
diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 5d069c5a219f..6b0c998d751a 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,4 +1,4 @@
-{ wxGTK, lib, stdenv, fetchurl, fetchFromGitHub, cmake, libGLU_combined, zlib
+{ wxGTK, lib, stdenv, fetchurl, fetchFromGitHub, cmake, libGLU, libGL, zlib
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
, doxygen, pcre, libpthreadstubs, libXdmcp
, wrapGAppsHook
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ pythonPackages.wxPython ];
buildInputs = [
- libGLU_combined zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs
+ libGLU libGL zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs
cairo curl openssl boost
swig (python.withPackages (ps: with ps; [ wxPython ]))
] ++ optional (oceSupport) opencascade
diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix
index 5310da0699e2..df0d9932b8a0 100644
--- a/pkgs/applications/science/electronics/kicad/unstable.nix
+++ b/pkgs/applications/science/electronics/kicad/unstable.nix
@@ -1,4 +1,4 @@
-{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib
+{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, zlib
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
, doxygen, pcre, libpthreadstubs, libXdmcp
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake doxygen pkgconfig ];
buildInputs = [
- libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
+ libGLU libGL zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
cairo curl openssl boost
] ++ optional (oceSupport) opencascade
++ optional (ngspiceSupport) libngspice
diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix
index 7514aed9f243..d68d4ace54b9 100644
--- a/pkgs/applications/science/electronics/pcb/default.nix
+++ b/pkgs/applications/science/electronics/pcb/default.nix
@@ -1,25 +1,59 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex
-, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined
-, shared-mime-info, tcl, tk, gnome2, pangox_compat, gd, xorg
+{ stdenv
+, fetchurl
+, pkgconfig
+, gtk2
+, bison
+, intltool
+, flex
+, netpbm
+, imagemagick
+, dbus
+, xlibsWrapper
+, libGLU
+, libGL
+, shared-mime-info
+, tcl
+, tk
+, gnome2
+, gd
+, xorg
}:
stdenv.mkDerivation rec {
pname = "pcb";
- version = "20140316";
+ version = "4.2.0";
src = fetchurl {
- url = "http://ftp.geda-project.org/pcb/pcb-20140316/${pname}-${version}.tar.gz";
- sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42";
+ url = "mirror://sourceforge/pcb/${pname}-${version}.tar.gz";
+ sha256 = "0hwsqmcrnk4wipbmfqx1yckmmgfn8vr37d1gh5srfy27czgkcjyd";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper
- libGLU_combined tcl shared-mime-info tk
- gnome2.gtkglext pangox_compat gd xorg.libXmu
+ nativeBuildInputs = [
+ pkgconfig
+ bison
+ intltool
+ flex
+ netpbm
+ imagemagick
];
- configureFlags = ["--disable-update-desktop-database"];
+ buildInputs = [
+ gtk2
+ dbus
+ xlibsWrapper
+ libGLU
+ libGL
+ tcl
+ shared-mime-info
+ tk
+ gnome2.gtkglext
+ gd
+ xorg.libXmu
+ ];
+
+ configureFlags = [
+ "--disable-update-desktop-database"
+ ];
meta = with stdenv.lib; {
description = "Printed Circuit Board editor";
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index b59f628dfe9f..98deda0ae6b2 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "verilator";
- version = "4.020";
+ version = "4.022";
src = fetchurl {
url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
- sha256 = "06n3vds762vza4byrav0j3kp3aivvadndkgw7nirvasclp19zmxb";
+ sha256 = "1sj0qzl387pl2ygii3ssx35c3m601nb07j16lqj5zcxzhcg62i9p";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix
index 10d94e2bb8c7..0f65c9b7eaea 100644
--- a/pkgs/applications/science/logic/aiger/default.nix
+++ b/pkgs/applications/science/logic/aiger/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
homepage = http://fmv.jku.at/aiger/;
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix
index d6190942efab..6af7eaf3a5b8 100644
--- a/pkgs/applications/science/logic/aspino/default.nix
+++ b/pkgs/applications/science/logic/aspino/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ gebner ma27 ];
platforms = platforms.unix;
license = licenses.asl20;
- homepage = http://alviano.net/software/maxino/;
+ homepage = https://alviano.net/software/maxino/;
# See pkgs/applications/science/logic/glucose/default.nix
badPlatforms = [ "aarch64-linux" ];
};
diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix
index f1f74bcb5810..4cf0b0f1ea1e 100644
--- a/pkgs/applications/science/logic/boolector/default.nix
+++ b/pkgs/applications/science/logic/boolector/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, fetchpatch
, cmake, lingeling, btor2tools
}:
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "15i3ni5klss423m57wcy1gx0m5wfrjmglapwg85pm7fb3jj1y7sz";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2019-7560.patch";
+ url = "https://github.com/Boolector/boolector/commit/8d979d02e0482c7137c9f3a34e6d430dbfd1f5c5.patch";
+ sha256 = "1a1g02mk8b0azzjcigdn5zpshn0dn05fciwi8sd5q38yxvnvpbbi";
+ })
+ ];
+
nativeBuildInputs = [ cmake ];
buildInputs = [ lingeling btor2tools ];
diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix
index 2d00e9f30464..2aedfb1d07ec 100644
--- a/pkgs/applications/science/logic/btor2tools/default.nix
+++ b/pkgs/applications/science/logic/btor2tools/default.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" "lib" ];
meta = with stdenv.lib; {
- description = "Fast SAT solver";
- homepage = http://fmv.jku.at/lingeling/;
+ description = "A generic parser and tool package for the BTOR2 format";
+ homepage = "https://github.com/Boolector/btor2tools";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice ];
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index a463a2c5f3a2..2378cb9408ef 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -31,6 +31,8 @@ let
"8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2";
"8.10.0" = "138jw94wp4mg5dgjc2asn8ng09ayz1mxdznq342n0m469j803gzg";
"8.10.1" = "072v2zkjzf7gj48137wpr3c9j0hg9pdhlr5l8jrgrwynld8fp7i4";
+ "8.10.2" = "0znxmpy71bfw0p6x47i82jf5k7v41zbz9bdpn901ysn3ir8l3wrz";
+ "8.11+beta1" = "06dlxj6v7gd51dh6ir121z7lgqdagkq717xxxrc8bdqhz7d2z7qj";
}.${version};
coq-version = stdenv.lib.versions.majorMinor version;
versionAtLeast = stdenv.lib.versionAtLeast coq-version;
@@ -124,7 +126,7 @@ self = stdenv.mkDerivation {
setupHook = writeText "setupHook.sh" ''
addCoqPath () {
if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then
- export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
+ export COQPATH="''${COQPATH-}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
fi
}
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index f9a911d82108..e9ef16b2392b 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -4,7 +4,7 @@ rustPlatform.buildRustPackage rec {
pname = "elan";
version = "0.7.5";
- cargoSha256 = "0lc320m3vw76d6pa5wp6c9jblac6lmyf9qqnxmsnkn4ixdhnghsd";
+ cargoSha256 = "0q0xlvyyf88dbz43r7kk9v8rrp6hj0nl5i2i9mg6ibk2gphgdv6v";
src = fetchFromGitHub {
owner = "kha";
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index cda3656dc59e..d799b52d115e 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -45,6 +45,6 @@ stdenv.mkDerivation {
homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/;
license = licenses.bsd2;
platforms = platforms.unix;
- maintainers = with maintainers; [ thoughtpolice z77z vbgl ];
+ maintainers = with maintainers; [ thoughtpolice maggesi vbgl ];
};
}
diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix
index 287dbd36eabf..94be89d4736f 100644
--- a/pkgs/applications/science/logic/lingeling/default.nix
+++ b/pkgs/applications/science/logic/lingeling/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
description = "Fast SAT solver";
homepage = http://fmv.jku.at/lingeling/;
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice ];
};
}
diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix
index 93212c5b8546..a479e31e3395 100644
--- a/pkgs/applications/science/logic/mcrl2/default.nix
+++ b/pkgs/applications/science/logic/mcrl2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, libGLU_combined, qt5, boost}:
+{stdenv, fetchurl, cmake, libGLU, libGL, qt5, boost}:
stdenv.mkDerivation rec {
version = "201707";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m";
};
- buildInputs = [ cmake libGLU_combined qt5.qtbase boost ];
+ buildInputs = [ cmake libGLU libGL qt5.qtbase boost ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 8e100716c874..ddefcf1b3aa2 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, yosys, bash, python3 }:
+{ stdenv, fetchFromGitHub, yosys, bash, python3, yices }:
stdenv.mkDerivation {
pname = "symbiyosys";
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
buildInputs = [ python3 yosys ];
+ propagatedBuildInputs = [ yices ];
+
buildPhase = "true";
installPhase = ''
mkdir -p $out/bin $out/share/yosys/python3
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 6f338f214783..eeb3a6b6d361 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation {
pname = "why3";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchurl {
- url = https://gforge.inria.fr/frs/download.php/file/37903/why3-1.2.0.tar.gz;
- sha256 = "0xz001jhi71ja8vqrjz27v63bidrzj4qvg1yqarq6p4dmpxhk348";
+ url = https://gforge.inria.fr/frs/download.php/file/38185/why3-1.2.1.tar.gz;
+ sha256 = "014gkwisjp05x3342zxkryb729p02ngx1hcjjsrplpa53jzgz647";
};
buildInputs = with ocamlPackages; [
diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 14f75fb68b5e..170a56b95b91 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "z3";
- version = "4.8.5";
+ version = "4.8.7";
src = fetchFromGitHub {
owner = "Z3Prover";
repo = pname;
- rev = "Z3-${version}";
- sha256 = "11sy98clv7ln0a5vqxzvh6wwqbswsjbik2084hav5kfws4xvklfa";
+ rev = "z3-${version}";
+ sha256 = "0hprcdwhhyjigmhhk6514m71bnmvqci9r8gglrqilgx424r6ff7q";
};
buildInputs = [ python fixDarwinDylibNames ];
diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix
new file mode 100644
index 000000000000..c7bdf0f12a40
--- /dev/null
+++ b/pkgs/applications/science/machine-learning/streamlit/default.nix
@@ -0,0 +1,34 @@
+{ lib, buildPythonApplication, fetchPypi
+ , altair, astor, base58, blinker, boto3, botocore, click, enum-compat
+ , future, pillow, protobuf, requests, toml, tornado, tzlocal, validators, watchdog
+ , jinja2, setuptools
+}:
+
+buildPythonApplication rec {
+ pname = "streamlit";
+ version = "0.50.2";
+ format = "wheel"; # the only distribution available
+
+ src = fetchPypi {
+ inherit pname version format;
+ sha256 = "1wymv7qckafs0p2jdjlxjaf1xrhm3iyd185jkldanbb0na5n3ndz";
+ };
+
+ propagatedBuildInputs = [
+ altair astor base58 blinker boto3 botocore click enum-compat
+ future pillow protobuf requests toml tornado tzlocal validators watchdog
+ jinja2 setuptools
+ ];
+
+ postInstall = ''
+ rm $out/bin/streamlit.cmd # remove windows helper
+ '';
+
+ meta = with lib; {
+ homepage = https://streamlit.io/;
+ description = "The fastest way to build custom ML tools";
+ maintainers = with maintainers; [ yrashk ];
+ license = licenses.asl20;
+ };
+
+}
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index bc0f7ed88316..517fc9d7b320 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -11,11 +11,11 @@
}:
stdenv.mkDerivation rec {
- name = "R-3.6.1";
+ name = "R-3.6.2";
src = fetchurl {
url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz";
- sha256 = "128kifbq0w25y8aq77w289ddax5i5w2djcfsqgffrb3i7syrxajv";
+ sha256 = "0m69pfi0nxyriyb2yz74xfzaxwfkinnf9kpvf1rz727vvmfa8rdx";
};
dontUseImakeConfigure = true;
@@ -23,9 +23,8 @@ stdenv.mkDerivation rec {
buildInputs = [
bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
pango pcre perl readline texLive xz zlib less texinfo graphviz icu
- pkgconfig bison imake which openblas curl
- ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]
+ pkgconfig bison imake which openblas curl tcl tk
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]
++ stdenv.lib.optional javaSupport jdk;
patches = [
@@ -62,8 +61,6 @@ stdenv.mkDerivation rec {
RANLIB=$(type -p ranlib)
R_SHELL="${stdenv.shell}"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
- --without-tcltk
- --without-aqua
--disable-R-framework
OBJC="clang"
CPPFLAGS="-isystem ${libcxx}/include/c++/v1"
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index 0ab4c1699449..75c495916755 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "geogebra";
- version = "5-0-560-0";
+ version = "5-0-569-0";
preferLocalBuild = true;
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
"https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
"http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
];
- sha256 = "16w6z3axzb9g51w4cbyf5zj6gpm9qab65xbw1184v5wym5llf4iw";
+ sha256 = "16bav6hf80l21gnhdjll82hpjqi7kr3w74jcq7mnf24acmcn70qm";
};
srcIcon = fetchurl {
diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index 90b1b367a7c4..b3777528ecda 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -1,14 +1,13 @@
-{ stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapack
+{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, liblapack
, gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk, nauty
, readline, gettext, libpng, libao, gfortran, perl
-, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
+, enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null
}:
-assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null;
+assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null;
stdenv.mkDerivation rec {
- name = "${attr}-${version}";
- attr = if enableGUI then "giac-with-xcas" else "giac";
+ pname = "giac${lib.optionalString enableGUI "-with-xcas"}";
version = "1.5.0-21"; # TODO try to remove preCheck phase on upgrade
src = fetchurl {
@@ -44,7 +43,7 @@ stdenv.mkDerivation rec {
(stdenv.lib.getLib gfortran.cc)
liblapack
] ++ stdenv.lib.optionals enableGUI [
- libGLU_combined fltk xorg.libX11
+ libGL libGLU fltk xorg.libX11
];
/* fixes:
@@ -104,7 +103,7 @@ stdenv.mkDerivation rec {
description = "A free computer algebra system (CAS)";
homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html";
license = licenses.gpl3Plus;
- platforms = platforms.unix;
+ platforms = platforms.linux ++ (optionals (!enableGUI) platforms.darwin);
maintainers = [ maintainers.symphorien ];
};
}
diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index 1cd5e364208a..c11110e4bc49 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut
+{ stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut
, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib
}:
@@ -6,11 +6,11 @@ stdenv.mkDerivation {
name = "glsurf-3.3.1";
src = fetchurl {
- url = "https://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz";
+ url = "https://raffalli.eu/~christophe/glsurf/glsurf-3.3.1.tar.gz";
sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
};
- buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp
+ buildInputs = [ freeglut libGLU libGL libmysqlclient mpfr gmp
libtiff libjpeg libpng giflib ]
++ (with ocamlPackages; [
ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
'';
meta = {
- homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf;
+ homepage = https://raffalli.eu/~christophe/glsurf/;
description = "A program to draw implicit surfaces and curves";
license = stdenv.lib.licenses.lgpl21;
};
diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 1d96c0039ad1..66c41bb073af 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg
-, zlib, libGLU_combined, libGLU, xorg, opencascade-occt }:
+, zlib, libGL, libGLU, xorg, opencascade-occt }:
stdenv.mkDerivation rec {
pname = "gmsh";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1p7hibmsgv961lfkzdxlgcvmcb0q155m2sp60r97cjsfzhw68g45";
};
- buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU_combined
+ buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL
libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
opencascade-occt
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index ca9a87abe13b..7cd1b2eb99fa 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -93,13 +93,16 @@ stdenv.mkDerivation rec {
# Fix library paths
cd $out/libexec/Mathematica/Executables
for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do
- sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path
+ sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}\n" $path
done
# Fix xkeyboard config path for Qt
for path in mathematica Mathematica; do
sed -i -e "2iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"\n" $path
done
+
+ # Remove some broken libraries
+ rm $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so*
'';
preFixup = ''
diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix
index c53e87caa9ad..3c263916a0eb 100644
--- a/pkgs/applications/science/math/pspp/default.nix
+++ b/pkgs/applications/science/math/pspp/default.nix
@@ -1,7 +1,6 @@
{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl
-, pkgconfig, gtksourceview, pango, gettext
+, pkgconfig, gtksourceview, pango, gettext, dconf
, makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme
-, gnome3
}:
stdenv.mkDerivation rec {
@@ -26,7 +25,7 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$out/share" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
- --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
'';
meta = {
diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index fccd83aa86fa..0a300a15d014 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qalculate-gtk";
- version = "3.5.0";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "qalculate-gtk";
rev = "v${version}";
- sha256 = "0vknp52zyp2c4pxr12pryflyin1hl2dwhkrn5y0r4qh4ndf3ms1m";
+ sha256 = "1b20sjkv853lqii0dpqg10rgcka3cs57zriihyd463n7dq3hsim5";
};
patchPhase = ''
diff --git a/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch b/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
index 5c1073e13e96..11ca74819615 100644
--- a/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
+++ b/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
@@ -1,13 +1,24 @@
diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py
-index bd6b76ab82..f8340a8c66 100644
+index bd6b76ab82..ccf1203dec 100644
--- a/src/sage/tests/cmdline.py
+++ b/src/sage/tests/cmdline.py
-@@ -872,7 +872,7 @@ def test_executable(args, input="", timeout=100.0, **kwds):
+@@ -837,8 +837,6 @@ def test_executable(args, input="", timeout=100.0, **kwds):
+ ///
+ 4
+ }}}
+- sage: err # py2
+- ''
+ sage: ret
+ 0
+
+@@ -871,8 +869,8 @@ def test_executable(args, input="", timeout=100.0, **kwds):
+ sage: output = tmp_filename(ext='.sws')
sage: with open(input, 'w') as F:
....: _ = F.write(s)
- sage: test_executable(["sage", "--rst2sws", input, output]) # py2
+- sage: test_executable(["sage", "--rst2sws", input, output]) # py2
- ('', '', 0)
-+ ('', '...', 0)
++ sage: test_executable(["sage", "--rst2sws", input, output])[2] # py2
++ 0
sage: import tarfile # py2
sage: f = tarfile.open(output, 'r') # py2
sage: print(f.extractfile('sage_worksheet/worksheet.html').read()) # py2
diff --git a/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch b/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch
new file mode 100644
index 000000000000..c5f95b498d53
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch
@@ -0,0 +1,12 @@
+diff --git a/src/sage/all.py b/src/sage/all.py
+index c87c9372e9..862fca4fcc 100644
+--- a/src/sage/all.py
++++ b/src/sage/all.py
+@@ -306,6 +306,7 @@ warnings.filters.remove(('ignore', None, DeprecationWarning, None, 0))
+ # Ignore all deprecations from IPython etc.
+ warnings.filterwarnings('ignore', category=DeprecationWarning,
+ module='.*(IPython|ipykernel|jupyter_client|jupyter_core|nbformat|notebook|ipywidgets|storemagic)')
++warnings.filterwarnings('ignore', category=DeprecationWarning, message=r".*The import 'werkzeug.ImmutableDict' is deprecated")
+ # Ignore collections.abc warnings, there are a lot of them but they are
+ # harmless.
+ warnings.filterwarnings('ignore', category=DeprecationWarning,
diff --git a/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch b/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch
new file mode 100644
index 000000000000..9f502a669517
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch
@@ -0,0 +1,13 @@
+diff --git a/sagenb/__init__.py b/sagenb/__init__.py
+index 4db0d2cb..2fc5f01e 100644
+--- a/sagenb/__init__.py
++++ b/sagenb/__init__.py
+@@ -1,3 +1,8 @@
+ # -*- coding: utf-8 -*
+ # init
++import warnings
+ from . import storage
++
++# deprecation in attrs, needs to be fixed in twisted
++warnings.filterwarnings('ignore', category=DeprecationWarning,
++ message=r'The usage of `cmp` is deprecated and will be removed.*')
diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/pkgs/applications/science/math/sage/pybrial.nix
index 092a340bb5b5..718414126ae8 100644
--- a/pkgs/applications/science/math/sage/pybrial.nix
+++ b/pkgs/applications/science/math/sage/pybrial.nix
@@ -1,6 +1,7 @@
{ stdenv
, fetchFromGitHub
, buildPythonPackage
+, brial
}:
# This has a cyclic dependency with sage. I don't include sage in the
# buildInputs and let python figure it out at runtime. Because of this,
@@ -9,15 +10,10 @@
# it).
buildPythonPackage rec {
pname = "pyBRiAl";
- version = "1.2.3";
+ version = brial.version;
# included with BRiAl source
- src = fetchFromGitHub {
- owner = "BRiAl";
- repo = "BRiAl";
- rev = version;
- sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg";
- };
+ src = brial.src;
sourceRoot = "source/sage-brial";
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index 0b67b3cff12b..00397239876b 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -18,6 +18,12 @@
, ecl
, maxima-ecl
, singular
+, fflas-ffpack
+, givaro
+, gd
+, libpng
+, linbox
+, m4ri
, giac
, palp
, rWrapper
@@ -101,14 +107,21 @@ writeTextFile rec {
name = "sage-env";
destination = "/${name}";
text = ''
- export PKG_CONFIG_PATH='${lib.concatStringsSep ":" (map (pkg: "${pkg}/lib/pkgconfig") [
- # This is only needed in the src/sage/misc/cython.py test and I'm not
- # sure if there's really a usecase for it outside of the tests. However
- # since singular and openblas are runtime dependencies anyways, it doesn't
- # really hurt to include.
+ export PKG_CONFIG_PATH='${lib.makeSearchPathOutput "dev" "lib/pkgconfig" [
+ # This should only be needed during build. However, since the doctests
+ # also test the cython build (for example in src/sage/misc/cython.py),
+ # it is also needed for the testsuite to pass. We could fix the
+ # testsuite instead, but since all the packages are also runtime
+ # dependencies it doesn't really hurt to include them here.
singular
openblasCompat
- ])
+ fflas-ffpack givaro
+ gd
+ libpng zlib
+ gsl
+ linbox
+ m4ri
+ ]
}'
export SAGE_ROOT='${sagelib.src}'
export SAGE_LOCAL='@sage-local@'
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index c7a3da68b15e..4530cbf69f4c 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -107,6 +107,24 @@ stdenv.mkDerivation rec {
# ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests
./patches/ignore-cmp-deprecation.patch
+
+ # Werkzeug has deprecated ImmutableDict, but it is still used in legacy
+ # sagenb. That's no big issue since sagenb will be removed soon anyways.
+ ./patches/ignore-werkzeug-immutable-dict-deprecation.patch
+
+ # threejs r109 (#28560)
+ (fetchpatch {
+ name = "threejs-r109.patch";
+ url = "https://git.sagemath.org/sage.git/patch?id=fcc11d6effa39f375bc5f4ea5831fb7a2f2767da";
+ sha256 = "0hnmc8ld3bblks0hcjvjjaydkgwdr1cs3dbl2ys4gfq964pjgqwc";
+ })
+
+ # https://trac.sagemath.org/ticket/28911
+ (fetchpatch {
+ name = "sympy-1.5.patch";
+ url = "https://git.sagemath.org/sage.git/patch/?h=c6d0308db15efd611211d26cfcbefbd180fc0831";
+ sha256 = "0nwai2jr22h49km4hx3kwafs3mzsc5kwsv7mqwjf6ibwfx2bbgyq";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix
index 93ec1e33cf69..451edb8f085e 100644
--- a/pkgs/applications/science/math/sage/sage-tests.nix
+++ b/pkgs/applications/science/math/sage/sage-tests.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation {
export GLIBC_TUNABLES=glibc.malloc.arena_max=4
echo "Running sage tests with arguments ${timeSpecifier} ${patienceSpecifier} ${testArgs}"
- "sage" -t --nthreads "$NIX_BUILD_CORES" --optional=sage ${timeSpecifier} ${patienceSpecifier} ${testArgs}
+ "sage" -t --timeout=0 --nthreads "$NIX_BUILD_CORES" --optional=sage ${timeSpecifier} ${patienceSpecifier} ${testArgs}
'';
}
diff --git a/pkgs/applications/science/math/sage/sagenb.nix b/pkgs/applications/science/math/sage/sagenb.nix
index 03b5b7a3bbf9..77b2168ad974 100644
--- a/pkgs/applications/science/math/sage/sagenb.nix
+++ b/pkgs/applications/science/math/sage/sagenb.nix
@@ -26,6 +26,11 @@ buildPythonPackage rec {
sha256 = "0bxvhr03qh2nsjdfc4pyfiqrn9jhp3vf7irsc9gqx0185jlblbxs";
};
+ patches = [
+ # cmp deprecation in attrs needs to be handled in twisted
+ ./patches/sagenb-cmp-deprecation.patch
+ ];
+
propagatedBuildInputs = [
twisted
flask
diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix
index bae0d9a18c67..ed680b1b4cde 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/applications/science/math/yacas/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "yacas";
- version = "1.6.1";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "grzegorzmazur";
repo = "yacas";
rev = "v${version}";
- sha256 = "0awvlvf607r4hwl1vkhs6jq2s6ig46c66pmr4vspj2cdnypx99cc";
+ sha256 = "0fwd98dwq6g0md3yhgyl30i377593b8rw6gsvffzvs11g3aqf1ga";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix
index 2633f4c8db1b..e135534d1acf 100644
--- a/pkgs/applications/science/medicine/aliza/default.nix
+++ b/pkgs/applications/science/medicine/aliza/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU_combined }:
+{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU, libGL }:
with stdenv.lib;
stdenv.mkDerivation {
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
'';
postInstall = let
- libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU_combined ];
+ libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU libGL ];
in ''
${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
meta = {
description = "Medical imaging software with 2D, 3D and 4D capabilities";
- homepage = http://www.aliza-dicom-viewer.com;
+ homepage = https://www.aliza-dicom-viewer.com;
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ mounium ];
platforms = platforms.linux;
diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index c806b558da0e..38b9b8ec66d1 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -1,5 +1,5 @@
{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl,
-libGLU_combined, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil,
+libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil,
sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
let
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ];
buildInputs = [
- curl libGLU_combined libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver
+ curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver
libnotify patchelf libX11 libxcb xcbutil
];
diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix
index 99159fba5b43..36de6a1d4c50 100644
--- a/pkgs/applications/science/misc/golly/beta.nix
+++ b/pkgs/applications/science/misc/golly/beta.nix
@@ -1,5 +1,5 @@
{stdenv, fetchgit
-, wxGTK, perl, python2, zlib, libGLU_combined, libX11
+, wxGTK, perl, python2, zlib, libGLU, libGL, libX11
, automake, autoconf
}:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [autoconf automake];
buildInputs = [
- wxGTK perl python2 zlib libGLU_combined libX11
+ wxGTK perl python2 zlib libGLU libGL libX11
];
# Link against Python explicitly as it is needed for scripts
diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index 4af233a6d55f..1478bb643181 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}:
+{stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU, libGL, libX11}:
stdenv.mkDerivation rec {
pname = "golly";
version = "3.3";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- wxGTK perl python2 zlib libGLU_combined libX11
+ wxGTK perl python2 zlib libGLU libGL libX11
];
setSourceRoot = ''
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index b394639fd0cc..9b510d432fb3 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU_combined, glew, gdal_1_11, cgal
+{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU, libGL, glew, gdal_1_11, cgal
, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- qt4 qwt6_qt4 libGLU_combined glew gdal_1_11 cgal proj boost cmake python2
+ qt4 qwt6_qt4 libGLU libGL glew gdal_1_11 cgal proj boost cmake python2
doxygen graphviz gmp
];
diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix
index b412c4ef81a7..9b0279bd4d09 100644
--- a/pkgs/applications/science/misc/netlogo/default.nix
+++ b/pkgs/applications/science/misc/netlogo/default.nix
@@ -15,11 +15,11 @@ in
stdenv.mkDerivation rec {
pname = "netlogo";
- version = "6.0.4";
+ version = "6.1.1";
src = fetchurl {
url = "https://ccl.northwestern.edu/netlogo/${version}/NetLogo-${version}-64.tgz";
- sha256 = "0dcd9df4dfb218826a74f9df42163fa588908a1dfe58864106936f8dfb76acec";
+ sha256 = "1j08df68pgggxqkmpzd369w4h97q0pivmmljdb48hjghx7hacblp";
};
src1 = fetchurl {
diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix
index 1a1ae3df9425..ed4101bdb47c 100644
--- a/pkgs/applications/science/misc/openmodelica/default.nix
+++ b/pkgs/applications/science/misc/openmodelica/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,
hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which,
lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,
-doxygen, boost, openscenegraph, gnome2, pangox_compat, xorg, git, bash, gtk2, makeWrapper }:
+doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }:
let
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
buildInputs = [autoconf cmake automake libtool gfortran clang gnumake
hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkitgtk which
lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison
- doxygen boost openscenegraph gnome2.gtkglext pangox_compat xorg.libXmu
+ doxygen boost openscenegraph gnome2.gtkglext xorg.libXmu
git gtk2 makeWrapper];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix
index 2145d7e71d33..8422eb8752b1 100644
--- a/pkgs/applications/science/misc/root/5.nix
+++ b/pkgs/applications/science/misc/root/5.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
-, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lzma, gsl_1
+, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lzma, gsl_1
, Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake pcre python2 zlib libxml2 lzma gsl_1 ]
- ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ]
+ ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
;
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix
index 690dc920d5c8..7a03369febeb 100644
--- a/pkgs/applications/science/misc/root/default.nix
+++ b/pkgs/applications/science/misc/root/default.nix
@@ -1,27 +1,32 @@
-{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2
-, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash
+{ stdenv, fetchurl, cmake, gl2ps, gsl, libX11, libXpm, libXft, libXext
+, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig, python, xxHash, zlib
, Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec {
pname = "root";
- version = "6.12.06";
+ version = "6.18.04";
src = fetchurl {
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
- sha256 = "1557b9sdragsx9i15qh6lq7fn056bgi87d31kxdl4vl0awigvp5f";
+ sha256 = "196ghma6g5a7sqz52wyjkgvmh4hj4vqwppm0zwdypy33hgy8anii";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ]
- ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ]
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ gl2ps pcre python zlib libxml2 lz4 lzma gsl xxHash ]
+ ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
;
+ propagatedBuildInputs = [ python.pkgs.numpy ];
patches = [
./sw_vers.patch
];
preConfigure = ''
+ rm -rf builtins/*
+ substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
+ --replace 'set(lcgpackages ' '#set(lcgpackages '
+
patchShebangs build/unix/
'' + stdenv.lib.optionalString noSplash ''
substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true"
@@ -35,8 +40,10 @@ stdenv.mkDerivation rec {
"-Dbonjour=OFF"
"-Dcastor=OFF"
"-Dchirp=OFF"
+ "-Dclad=OFF"
"-Ddavix=OFF"
"-Ddcache=OFF"
+ "-Dfail-on-missing=ON"
"-Dfftw3=OFF"
"-Dfitsio=OFF"
"-Dfortran=OFF"
@@ -57,6 +64,7 @@ stdenv.mkDerivation rec {
"-Drfio=OFF"
"-Dsqlite=OFF"
"-Dssl=OFF"
+ "-Dvdt=OFF"
"-Dxml=ON"
"-Dxrootd=OFF"
]
diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh
index fc2b697d8a82..b26cf9b779f8 100644
--- a/pkgs/applications/science/misc/root/setup-hook.sh
+++ b/pkgs/applications/science/misc/root/setup-hook.sh
@@ -1,9 +1,13 @@
thisroot () {
# Workaround thisroot.sh dependency on man
- if [ -z "${MANPATH}" ]; then
+ if [ -z "${MANPATH-}" ]; then
MANPATH=:
fi
+ local oldOpts="-u"
+ shopt -qo nounset || oldOpts="+u"
+ set +u
source @out@/bin/thisroot.sh
+ set "$oldOpts"
}
postHooks+=(thisroot)
diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch
index df0ef79d0a0f..34af132c11f8 100644
--- a/pkgs/applications/science/misc/root/sw_vers.patch
+++ b/pkgs/applications/science/misc/root/sw_vers.patch
@@ -1,54 +1,46 @@
-diff --git a/build/unix/compiledata.sh b/build/unix/compiledata.sh
+diff a/build/unix/compiledata.sh b/build/unix/compiledata.sh
--- a/build/unix/compiledata.sh
+++ b/build/unix/compiledata.sh
-@@ -49,7 +49,7 @@ fi
+@@ -47,7 +47,7 @@ fi
if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \
[ "$ARCH" = "macosxicc" ]; then
- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
-+ macosx_minor=7
++ macosx_minor=12
SOEXT="so"
if [ $macosx_minor -ge 5 ]; then
if [ "x`echo $SOFLAGS | grep -- '-install_name'`" != "x" ]; then
-diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
+diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
--- a/cmake/modules/SetUpMacOS.cmake
+++ b/cmake/modules/SetUpMacOS.cmake
-@@ -12,25 +12,11 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6)
- #---------------------------------------------------------------------------------------------------------
+@@ -2,17 +2,8 @@ set(ROOT_ARCHITECTURE macosx)
+ set(ROOT_PLATFORM macosx)
if (CMAKE_SYSTEM_NAME MATCHES Darwin)
- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
- COMMAND cut -d . -f 1-2
- OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
- MESSAGE(STATUS "Found a Mac OS X System ${MACOSX_VERSION}")
-- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
-- COMMAND cut -d . -f 2
-- OUTPUT_VARIABLE MACOSX_MINOR OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
set(libcxx ON CACHE BOOL "Build using libc++" FORCE)
- endif()
-- if(${MACOSX_MINOR} GREATER 4)
+- if(MACOSX_VERSION VERSION_GREATER 10.4)
#TODO: check haveconfig and rpath -> set rpath true
#TODO: check Thread, define link command
#TODO: more stuff check configure script
-- execute_process(COMMAND /usr/sbin/sysctl machdep.cpu.extfeatures OUTPUT_VARIABLE SYSCTL_OUTPUT)
-- if(${SYSCTL_OUTPUT} MATCHES 64)
-- MESSAGE(STATUS "Found a 64bit system")
- set(ROOT_ARCHITECTURE macosx64)
- SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
- SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -m64")
-@@ -38,27 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
+@@ -25,23 +16,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
-- else(${SYSCTL_OUTPUT} MATCHES 64)
+- else()
- MESSAGE(STATUS "Found a 32bit system")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
-- endif(${SYSCTL_OUTPUT} MATCHES 64)
+- endif()
- endif()
-
- if(MACOSX_VERSION VERSION_GREATER 10.6)
@@ -59,32 +51,51 @@ diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
- endif()
- if(MACOSX_VERSION VERSION_GREATER 10.8)
- set(MACOSX_GLU_DEPRECATED ON)
-- set(MACOSX_KRB5_DEPRECATED ON)
-- endif()
-- if(MACOSX_VERSION VERSION_GREATER 10.9)
-- set(MACOSX_LDAP_DEPRECATED ON)
- endif()
++ endif()
if (CMAKE_COMPILER_IS_GNUCXX)
message(STATUS "Found GNU compiler collection")
-@@ -135,7 +100,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
+@@ -104,7 +79,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
endif()
#---Set Linker flags----------------------------------------------------------------------
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION} -Wl,-rpath,@loader_path/../lib")
-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/../lib")
-
-
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION}")
else (CMAKE_SYSTEM_NAME MATCHES Darwin)
-diff --git a/config/root-config.in b/config/root-config.in
+ MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know waht to do. Stop cmake at this point.")
+ endif (CMAKE_SYSTEM_NAME MATCHES Darwin)
+diff a/config/root-config.in b/config/root-config.in
--- a/config/root-config.in
+++ b/config/root-config.in
-@@ -304,7 +304,7 @@ macosxicc)
+@@ -306,12 +306,6 @@ macosxicc)
+ auxlibs="-lm -ldl"
;;
macosx64)
- # MacOS X with gcc (GNU cc v4.x) in 64 bit mode
+- # MacOS X with gcc (GNU cc v4.x) in 64 bit mode
- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
-+ macosx_minor=7
- # cannot find the one linked to libGraf if relocated after built
- if [ $macosx_minor -le 4 ]; then
- rootlibs="$rootlibs -lfreetype"
+- # cannot find the one linked to libGraf if relocated after built
+- if [ $macosx_minor -le 4 ]; then
+- rootlibs="$rootlibs -lfreetype"
+- fi
+ auxcflags="${cxxversionflag} -m64"
+ auxldflags="-m64"
+ auxlibs="-lm -ldl"
+@@ -375,18 +369,11 @@ freebsd* | openbsd* | linux*)
+ macosx*)
+ for f in $features ; do
+ if test "x$f" = "xthread" ; then
+- if [ $macosx_minor -ge 5 ]; then
+ auxcflags="-pthread $auxcflags"
+ auxlibs="-lpthread $auxlibs"
+- else
+- auxcflags="-D_REENTRANT $auxcflags"
+- auxlibs="-lpthread $auxlibs"
+- fi
+ fi
+ if test "x$f" = "xrpath" ; then
+- if [ $macosx_minor -ge 5 ]; then
+ auxlibs="-Wl,-rpath,$libdir $auxlibs"
+- fi
+ fi
+ if test "x$f" = "xlibcxx" ; then
+ auxcflags="-stdlib=libc++ $auxcflags"
diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix
index 751f3c3aebe3..13eae15ce7f5 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@@ -1,28 +1,26 @@
-{
- stdenv
-, python
-}:
+{ stdenv, python3Packages }:
-python.buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
pname = "snakemake";
- version = "5.4.4";
+ version = "5.8.1";
- propagatedBuildInputs = with python; [
+ propagatedBuildInputs = with python3Packages; [
appdirs
ConfigArgParse
datrie
docutils
GitPython
jsonschema
+ psutil
pyyaml
ratelimiter
requests
wrapt
];
- src = python.fetchPypi {
+ src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "157323e0e1be34302edbbf399b2acbe25a4291bceffd47a0469963a970c9375f";
+ sha256 = "1r1qi14klmxmmw7vcivp45jrjka5rcwlcfggj5npnfb378fx3hb0";
};
doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index 509cdeaee611..3f83f2f30a67 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libxml2, freetype, libGLU_combined, glew, qt4
+{ fetchurl, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4
, cmake, makeWrapper, libjpeg, python }:
let version = "5.2.1"; in
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky";
};
- buildInputs = [ libxml2 freetype glew libGLU_combined qt4 libjpeg python ];
+ buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python ];
nativeBuildInputs = [ cmake makeWrapper ];
diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix
index 64482ddd74bc..3e7c7a42eb82 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -1,4 +1,4 @@
-{ fetchsvn, stdenv, cmake, qt4, libGLU_combined }:
+{ fetchsvn, stdenv, cmake, qt4, libGLU, libGL }:
# ViTE 1.1 has several bugs, so use the SVN version.
let
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
ln -sv "${externals}" externals
'';
- buildInputs = [ cmake qt4 libGLU_combined ];
+ buildInputs = [ cmake qt4 libGLU libGL ];
NIX_LDFLAGS = "-lGLU";
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
homepage = http://vite.gforge.inria.fr/;
license = stdenv.lib.licenses.cecill20;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix
new file mode 100644
index 000000000000..890e824cf2ef
--- /dev/null
+++ b/pkgs/applications/science/robotics/mavproxy/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonApplication, fetchPypi, matplotlib, numpy, pymavlink, pyserial
+, setuptools, wxPython_4_0 }:
+
+buildPythonApplication rec {
+ pname = "MAVProxy";
+ version = "1.8.17";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "193hjilsmbljbgj7v6icy3b4hzm14l0z6v05v7ycx6larij5xj2r";
+ };
+
+ propagatedBuildInputs = [
+ matplotlib
+ numpy
+ pymavlink
+ pyserial
+ setuptools
+ wxPython_4_0
+ ];
+
+ # No tests
+ doCheck = false;
+
+ meta = with lib; {
+ description = "MAVLink proxy and command line ground station";
+ homepage = "https://github.com/ArduPilot/MAVProxy";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ lopsided98 ];
+ };
+}
diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix
new file mode 100644
index 000000000000..139a49d95053
--- /dev/null
+++ b/pkgs/applications/system/monitor/default.nix
@@ -0,0 +1,69 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, vala
+, pkg-config
+, pantheon
+, python3
+, gettext
+, glib
+, gtk3
+, bamf
+, libwnck3
+, libgee
+, libgtop
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "monitor";
+ version = "0.6.2";
+
+ src = fetchFromGitHub {
+ owner = "stsdc";
+ repo = "monitor";
+ rev = version;
+ sha256 = "0cqzxlzdbij26qgbbngqx6njcpcymkgvm29b7ipldgkssxp1mkkg";
+ };
+
+ nativeBuildInputs = [
+ gettext
+ meson
+ ninja
+ vala
+ pkg-config
+ python3
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ bamf
+ glib
+ gtk3
+ pantheon.granite
+ pantheon.wingpanel
+ libgee
+ libgtop
+ libwnck3
+ ];
+
+ postPatch = ''
+ chmod +x meson/post_install.py
+ patchShebangs meson/post_install.py
+ '';
+
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
+ meta = with stdenv.lib; {
+ description = "Manage processes and monitor system resources";
+ homepage = "https://github.com/stsdc/monitor";
+ maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
+ platforms = platforms.linux;
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix
index 8c82ed1d4510..d8a6ec058448 100644
--- a/pkgs/applications/version-management/bcompare/default.nix
+++ b/pkgs/applications/version-management/bcompare/default.nix
@@ -1,12 +1,12 @@
-{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qt511, qtbase, stdenv, runtimeShell }:
+{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }:
stdenv.mkDerivation rec {
pname = "bcompare";
- version = "4.3.1.24438";
+ version = "4.3.2.24472";
src = fetchurl {
url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb";
- sha256 = "19rbcl0l49qbzn4bisdl9ibj0qm83kjkclva4qcy7jaqna9g7qrh";
+ sha256 = "1msygg01yi0n8lpk8sl226p09ls7wvd3z3k067mdgrss8rjy5va5";
};
unpackPhase = ''
diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix
deleted file mode 100644
index 7d1de378f53d..000000000000
--- a/pkgs/applications/version-management/bugseverywhere/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, pythonPackages, fetchurl }:
-
-#
-# Upstream stopped development of this package. If this package does not build
-# anymore, feel free to remove it by reverting the appropriate patch
-# (git log --grep bugseverywhere)
-#
-pythonPackages.buildPythonApplication rec {
- version = "1.1.1";
- pname = "bugseverywhere";
-
- src = fetchurl {
- url =
- "mirror://pypi/b/bugs-everywhere/bugs-everywhere-${version}.tar.gz";
- sha256 = "1ikm3ckwpimwcvx32vy7gh5gbp7q750j3327m17nvrj99g3daz2d";
- };
-
- # There are no tests in the repository.
- doCheck = false;
-
- buildInputs = with pythonPackages; [
- jinja2
- cherrypy
- ];
-
- meta = with stdenv.lib; {
- description = "Bugtracker supporting distributed revision control";
- homepage = http://www.bugseverywhere.org/;
- license = licenses.gpl2Plus;
- platforms = platforms.all;
- maintainers = [ maintainers.matthiasbeyer ];
- };
-}
-
diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix
index 0a1ecbb65327..176e42bbd8ac 100644
--- a/pkgs/applications/version-management/cvs-fast-export/default.nix
+++ b/pkgs/applications/version-management/cvs-fast-export/default.nix
@@ -7,7 +7,7 @@ with stdenv; with lib;
mkDerivation rec {
name = "cvs-fast-export-${meta.version}";
meta = {
- version = "1.48";
+ version = "1.49";
description = "Export an RCS or CVS history as a fast-import stream";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dfoxfranke ];
@@ -16,8 +16,8 @@ mkDerivation rec {
};
src = fetchurl {
- url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.48.tar.gz";
- sha256 = "16gw24y5x96mx6zby8cys0f03x1bqw4r7g1390qlpg75pbydqlf9";
+ url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.49.tar.gz";
+ sha256 = "1d75aq6inmd6yvc3rpxw1al95lvbl7wq64v3wygq69prrnzg8b6i";
};
buildInputs = [
diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix
deleted file mode 100644
index fc591dd710ee..000000000000
--- a/pkgs/applications/version-management/diffuse/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, python27Packages, makeWrapper }:
-
-let
- inherit (python27Packages) pygtk python;
-in stdenv.mkDerivation rec {
- version = "0.4.8";
- pname = "diffuse";
-
- src = fetchurl {
- url = "mirror://sourceforge/project/diffuse/diffuse/${version}/${pname}-${version}.tar.bz2";
- sha256 = "0ayz8bywmk1z3zicb0a7hbxliqpc7xym60s0mawzqllkpadvgly1";
- };
-
- buildInputs = [ python pygtk makeWrapper ];
-
- buildPhase = ''
- python ./install.py --prefix="$out" --sysconfdir="$out/etc" --pythonbin="${python}/bin/python"
- wrapProgram "$out/bin/diffuse" --prefix PYTHONPATH : $PYTHONPATH:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0
- '';
-
- # no-op, everything is done in buildPhase
- installPhase = "true";
-
- # NOTE: diffuse installs a .desktop file itself
-
- meta = with stdenv.lib; {
- description = "Graphical diff and merge tool";
- homepage = http://diffuse.sourceforge.net/;
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.bjornfor ];
- };
-}
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 5c46879e319b..8a41221a2671 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd2;
platforms = with stdenv.lib.platforms; all;
maintainers = [ #Add your name here!
- stdenv.lib.maintainers.z77z
+ stdenv.lib.maintainers.maggesi
stdenv.lib.maintainers.viric
];
};
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index db82cc541351..d57ffd75d7f2 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -103,6 +103,8 @@ let
git-imerge = callPackage ./git-imerge { };
+ git-machete = python3Packages.callPackage ./git-machete { };
+
git-octopus = callPackage ./git-octopus { };
git-open = callPackage ./git-open { };
@@ -127,6 +129,8 @@ let
git-subrepo = callPackage ./git-subrepo { };
+ git-subtrac = callPackage ./git-subtrac { };
+
git-sync = callPackage ./git-sync { };
git-test = callPackage ./git-test { };
diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix
index 023b9f6d9671..2551c980fa81 100644
--- a/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "delta";
- version = "0.0.14";
+ version = "0.0.15";
src = fetchFromGitHub {
owner = "dandavison";
repo = pname;
rev = version;
- sha256 = "11kjxa39mqdd9jh969ibxd0nlp9bacj2fm4cj6sk4gp6xf7gv90h";
+ sha256 = "1c2zqvkzkrj8rcz226vfk43yw113b1fdcz2gx0xh8fs72arqx6wh";
};
cargoSha256 = "1888bvkpalfcw9bc9zmf9bmil6x35l9ia31x6mx1h2dvrfpw3bb1";
@@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; {
homepage = "https://github.com/dandavison/delta";
description = "A syntax-highlighting pager for git";
+ changelog = "https://github.com/dandavison/delta/releases/tag/${version}";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};
diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index 09c9169e434e..cfdcd80f38b7 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -1,19 +1,26 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip, unixtools, which }:
stdenv.mkDerivation rec {
pname = "git-extras";
- version = "4.7.0";
+ version = "5.1.0";
- src = fetchurl {
+ src = fetchzip {
url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
- sha256 = "0pab4f5kmmcn333aswkgndf1fgilc41h8h0rk3lviz0yi8j59vaq";
+ sha256 = "0ja8ds9gpibrnwcf8n6cpbggwkbks0ik3z9vfx5h1yf3ln1nycky";
};
+ nativeBuildInputs = [ unixtools.column which ];
+
dontBuild = true;
- installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ];
+ preInstall = ''
+ patchShebangs .
+ '';
+
+ installFlags = [ "PREFIX=${placeholder "out"}" ];
postInstall = ''
+ # bash completion is already handled by make install
install -D etc/git-extras-completion.zsh $out/share/zsh/site-functions/_git_extras
'';
diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
index d445e0181f43..618526843870 100644
--- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, curl, libiconv, Security }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security }:
rustPlatform.buildRustPackage rec {
pname = "git-gone";
- version = "0.1.2";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "lunaryorn";
repo = pname;
rev = "v${version}";
- sha256 = "0vgkx227wpg9l2zza6446wzshjhnrhba3qhabibn4gg8wwcqmmxf";
+ sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh";
};
- cargoSha256 = "11h2whlgjhg3j98a9w9k29njj89wx93w0dcyf981985flin709sx";
+ cargoSha256 = "1s3v5p6qgz74sh34gvajf453fsgl13sds4v8hz8c6ivipz4hpby2";
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ openssl ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ curl libiconv Security ];
+ ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
+
+ postFixup = ''
+ wrapProgram $out/bin/git-gone --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}"
+ '';
meta = with stdenv.lib; {
description = "Cleanup stale Git branches of pull requests";
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index 193133d6d3e6..33b3d0bc167c 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "git-hub";
- version = "1.0.3";
+ version = "1.1.0";
src = fetchFromGitHub {
- sha256 = "03mz64lzicbxxz9b202kqs5ysf82sgb7lw967wkjdy2wbpqk8j0z";
- rev = "v${version}";
- repo = "git-hub";
owner = "sociomantic-tsunami";
+ repo = "git-hub";
+ rev = "v${version}";
+ sha256 = "0jkzg7vjvgb952qncndhki7n70714w61flbzf4mdcjc286lqjvwb";
};
buildInputs = [ python2Packages.python ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
new file mode 100644
index 000000000000..92c54dcac6b3
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -0,0 +1,33 @@
+{ lib, buildPythonApplication, fetchPypi
+, installShellFiles, pbr
+, flake8, mock, pycodestyle, pylint, tox }:
+
+buildPythonApplication rec {
+ pname = "git-machete";
+ version = "2.12.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1m4j8nhdkr28xs2xbnyy3ric9i99swb4d5drj4wpkqd2xqln5wlq";
+ };
+
+ nativeBuildInputs = [ installShellFiles pbr ];
+
+ # TODO: Add missing check inputs (2019-11-22):
+ # - stestr
+ doCheck = false;
+ checkInputs = [ flake8 mock pycodestyle pylint tox ];
+
+ postInstall = ''
+ installShellCompletion --bash --name git-machete completion/git-machete.completion.bash
+ installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh
+ '';
+
+ meta = with lib; {
+ homepage = https://github.com/VirtusLab/git-machete;
+ description = "Git repository organizer and rebase workflow automation tool";
+ license = licenses.mit;
+ platforms = platforms.all;
+ maintainers = [ maintainers.blitz ];
+ };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
index b196d39b46f6..969ea7cc2fa6 100644
--- a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/ingydotnet/git-subrepo;
description = "Git submodule alternative";
license = licenses.mit;
- platforms = platforms.linux;
+ platforms = platforms.unix ++ platforms.darwin;
maintainers = [ maintainers.ryantrinkle ];
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
new file mode 100644
index 000000000000..07c63ea0119b
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "git-subtrac";
+ version = "0.01";
+
+ src = fetchFromGitHub {
+ owner = "apenwarr";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1w6gd0x1902lzpqr74gsdrnxq36f6v14bv8h0vhlrfhbwbsih7n6";
+ };
+
+ modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs";
+
+ meta = with lib; {
+ description = "Keep the content for your git submodules all in one place: the parent repo";
+ homepage = "https://github.com/apenwarr/git-subtrac";
+ license = licenses.asl20;
+ maintainers = [ maintainers.marsam ];
+ };
+}
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 46bbc72fb3bd..312879a49e86 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, buildPackages
-, curl, openssl, zlib, expat, perlPackages, python, gettext, cpio
+, curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
, openssh, pcre2
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
@@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
- version = "2.23.0";
+ version = "2.24.1";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
- sha256 = "0rv0y45gcd3h191isppn77acih695v4pipdj031jvs9rd1ds0kr3";
+ sha256 = "0ql5z31vgl7b785gwrf00m129mg7zi9pa65n12ij3mpxx3f28gvj";
};
outputs = [ "out" ];
@@ -91,9 +91,9 @@ stdenv.mkDerivation {
"SHELL_PATH=${stdenv.shell}"
]
++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"])
- ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"])
+ ++ (if pythonSupport then ["PYTHON_PATH=${python3}/bin/python"] else ["NO_PYTHON=1"])
++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="]
- ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc/"])
+ ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"])
++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"]
++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1";
@@ -230,6 +230,7 @@ stdenv.mkDerivation {
-e "s|exec wish|exec '${tk}/bin/wish'|g" \
"$out/$prog"
done
+ ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk
'' else ''
# Don't wrap Tcl/Tk, replace them by notification scripts
for prog in bin/gitk libexec/git-core/git-gui; do
@@ -253,7 +254,10 @@ stdenv.mkDerivation {
installCheckTarget = "test";
# see also installCheckFlagsArray
- installCheckFlags = "DEFAULT_TEST_TARGET=prove";
+ installCheckFlags = [
+ "DEFAULT_TEST_TARGET=prove"
+ "PERL_PATH=${buildPackages.perl}/bin/perl"
+ ];
preInstallCheck = ''
installCheckFlagsArray+=(
@@ -289,15 +293,19 @@ stdenv.mkDerivation {
# Tested to fail: 2.18.0 and 2.19.0
disable_test t1700-split-index "null sha1"
- # Tested to fail: 2.18.0
- disable_test t7005-editor "editor with a space"
- disable_test t7005-editor "core.editor with a space"
-
# 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 (!perlSupport) ''
+ # request-pull is a Bash script that invokes Perl, so it is not available
+ # when NO_PERL=1, and the test should be skipped, but the test suite does
+ # not check for the Perl prerequisite.
+ disable_test t5150-request-pull
+ ''}
+ '' + stdenv.lib.optionalString stdenv.isDarwin ''
+ # XXX: Some tests added in 2.24.0 fail.
+ # Please try to re-enable on the next release.
+ disable_test t7816-grep-binary-pattern
'' + 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/git/update.sh b/pkgs/applications/version-management/git-and-tools/git/update.sh
index 05944014743f..a9fa18be1558 100755
--- a/pkgs/applications/version-management/git-and-tools/git/update.sh
+++ b/pkgs/applications/version-management/git-and-tools/git/update.sh
@@ -1,9 +1,9 @@
#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl common-updater-scripts jq
+#!nix-shell -i bash -p curl common-updater-scripts jq git
set -eu -o pipefail
-oldVersion="$(nix-instantiate --eval -E "with import ./. {}; git.version or (builtins.parseDrvName git.name).version" | tr -d '"')"
+oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')"
latestTag="$(git ls-remote --tags --sort="v:refname" git://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')"
if [ ! "${oldVersion}" = "${latestTag}" ]; then
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index e40bfc9961b7..ee21a2158ac6 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "hub";
- version = "2.12.8";
+ version = "2.13.0";
goPackagePath = "github.com/github/hub";
@@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "github";
repo = pname;
rev = "v${version}";
- sha256 = "0a2dpg0w29nblk1dba9a35bpwwyf0zbqcgrwn4a8diyx27b77x3x";
+ sha256 = "18b0r16fk5wahvysqvg6vzjr7smyc2sdxp9sf55viby3kkwjfbkh";
};
nativeBuildInputs = [ groff utillinux ];
diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix
index a1ef489b0073..3e47631caf69 100644
--- a/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -2,18 +2,20 @@
buildGoModule rec {
pname = "lab";
- version = "0.16.0";
+ version = "0.17.2";
src = fetchFromGitHub {
owner = "zaquestion";
repo = "lab";
rev = "v${version}";
- sha256 = "0f1gi4mlcxjvz2sgh0hzzsqxg5gfvq2ay7xjd0y1kz3pp8kxja7i";
+ sha256 = "0zkwvmzgj7h8lc8jkg2a81392b28c8hkwqzj6dds6q4asbmymx5c";
};
subPackages = [ "." ];
- modSha256 = "0bw47dd1b46ywsian2b957a4ipm77ncidipzri9ra39paqlv7abb";
+ modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd";
+
+ buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
postInstall = ''
mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions"
diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix
index 03933788551c..3636ad11fb6e 100644
--- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, unzip, makeWrapper, jre }:
stdenv.mkDerivation rec {
- name = "subgit-3.3.8";
+ name = "subgit-3.3.9";
meta = {
description = "A tool for a smooth, stress-free SVN to Git migration";
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://subgit.com/download/${name}.zip";
- sha256 = "0gvyyr4prx1v06f9j9fmmr8br1gjd45bnncl40c9agiqsyy0q06n";
+ sha256 = "0dwd2kymmprci3b61ayr6axzlkc8zgbc40jqxvvyzschfxw9y0v5";
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 59354598d008..424694d7262b 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
+{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, fetchpatch
, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig
}:
stdenv.mkDerivation rec {
pname = "tig";
- version = "2.4.1";
+ version = "2.5.0";
src = fetchFromGitHub {
owner = "jonas";
repo = pname;
rev = "${pname}-${version}";
- sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd";
+ sha256 = "1lrzgnq8ywq28qd4xyd0y5qfv3j25ra81lcbdqqfywasl8lwz3lf";
};
nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];
@@ -25,6 +25,14 @@ stdenv.mkDerivation rec {
rm -f contrib/config.make-*
'';
+ patches = [
+ # Fix memory leak. Remove with the next release
+ (fetchpatch {
+ url = "https://github.com/jonas/tig/commit/6202c6032f17438a2facb23f02e330b9d0566d9d.patch";
+ sha256 = "15zn8hw9y7bqa1np4mj0qnm2z86nif7qwh7wc4vgy2rwxdil85bd";
+ })
+ ];
+
enableParallelBuilding = true;
installPhase = ''
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index b4fee1c90fac..d5abb6d004b0 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
- version = "1.13.7.1";
+ version = "1.13.8";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
- sha256 = "0acsvrc45kdwpj5mi5i61mibr1fdx4g4835c3b8x0fdgrya4n37c";
+ sha256 = "1wmzgijmssgwkkw8g4zgmc4x64xkvz6nq1b3szcvawgv1ndwnb2j";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/git-sizer/default.nix b/pkgs/applications/version-management/git-sizer/default.nix
index 7a92679583b6..6d41098ee1aa 100644
--- a/pkgs/applications/version-management/git-sizer/default.nix
+++ b/pkgs/applications/version-management/git-sizer/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "git-sizer";
- version = "1.0.0";
+ version = "1.3.0";
goPackagePath = "github.com/github/git-sizer";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "github";
repo = pname;
rev = "v${version}";
- sha256 = "11rvqpsyl41ph0fgm62k5q2p33zgnwj1jd91rd4lkaarpcd1sg5h";
+ sha256 = "0kmyvai5xfalm56ywa6mhdvvjnacdzwcyz28bw0pz9a4gyf1mgvh";
};
meta = with lib; {
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 6a7a42bacc11..99e660d92765 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
buildGoPackage rec {
pname = "gitea";
- version = "1.9.5";
+ version = "1.10.1";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
- sha256 = "07isawbasshkgij2mh7pmp6h3ns758ysflngr18z0k2m38ny9h31";
+ sha256 = "1b1vmixc94kzfnd266r3hx25lcm3h4ywqg7d9kif83ixm612cj3g";
# Required to generate the same checksum on MacOS due to unicode encoding differences
# More information: https://github.com/NixOS/nixpkgs/pull/48128
extraPostFetch = ''
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 01a73e6c2129..2272e66faf58 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
- version = "6.3.0";
+ version = "6.4.1";
src = fetchurl {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
- sha256 = "06hjzkkrg2f9lb72ik16zgv813cxsv679szfdzrfygbb6wxnkjyp";
+ sha256 = "1w8iwpbr6nwzhhf63fvr7pd66yjx3jgjy4gx5y02qxa3ip5psq5b";
};
libPath = makeLibraryPath [
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index a0e62271373a..76c681f71060 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
{
- "version": "12.4.1",
- "repo_hash": "0dmb8ds6c5paxg35nricaywfhsgmp5rr46kk21hy2hsddgwkyb4k",
+ "version": "12.5.5",
+ "repo_hash": "1vafy31s2sbs6xc2cp457k535yyawz630i8ks22ypyg2m2gy5n5m",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v12.4.1-ee",
+ "rev": "v12.5.5-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "1.67.0",
- "GITLAB_PAGES_VERSION": "1.11.0",
+ "GITALY_SERVER_VERSION": "1.72.1",
+ "GITLAB_PAGES_VERSION": "1.12.0",
"GITLAB_SHELL_VERSION": "10.2.0",
- "GITLAB_WORKHORSE_VERSION": "8.14.0"
+ "GITLAB_WORKHORSE_VERSION": "8.14.1"
}
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index e6ed0ef53a22..60035990ed02 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
, ruby, tzdata, git, nettools, nixosTests, nodejs
, gitlabEnterprise ? false, callPackage, yarn
-, yarn2nix-moretea, replace
+, fixup_yarn_lock, replace
}:
let
@@ -62,7 +62,12 @@ let
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
# Fixup "resolved"-entries in yarn.lock to match our offline cache
- ${yarn2nix-moretea.fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
+ ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock
+
+ # fixup_yarn_lock currently doesn't correctly fix the dagre-d3
+ # url, so we have to do it manually
+ ${replace}/bin/replace-literal -f -e '"https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b"' \
+ '"https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b"' yarn.lock
yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive
@@ -76,7 +81,7 @@ let
bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production
bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production
- bundle exec rake webpack:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096"
+ bundle exec rake webpack:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=2048"
bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production
runHook postBuild
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index 9478dc9a84b4..841f6bfdefc5 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -4,13 +4,13 @@ source 'https://rubygems.org'
gem 'bundler', '>= 1.17.3'
gem 'rugged', '~> 0.28'
-gem 'github-linguist', '~> 6.1', require: 'linguist'
+gem 'github-linguist', '~> 7.5', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.0'
gem 'activesupport', '~> 5.2.3'
-gem 'rdoc', '~> 4.2'
+gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
-gem 'grpc', '~> 1.19.0'
+gem 'grpc', '~> 1.24.0'
gem 'sentry-raven', '~> 2.9.0', require: false
gem 'faraday', '~> 0.12'
gem 'rbtrace', require: false
@@ -22,7 +22,7 @@ gem 'gitlab-labkit', '~> 0.5.0'
# This version needs to be in sync with GitLab CE/EE
gem 'licensee', '~> 8.9.0'
-gem 'google-protobuf', '~> 3.7.1'
+gem 'google-protobuf', '~> 3.8.0'
group :development, :test do
gem 'rubocop', '~> 0.69', require: false
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index cb292af8cc3f..90c4e1bccea6 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -49,10 +49,10 @@ GEM
ffi (1.11.1)
gemojione (3.3.0)
json
- github-linguist (6.4.1)
+ github-linguist (7.5.1)
charlock_holmes (~> 0.7.6)
escape_utils (~> 1.2.0)
- mime-types (>= 1.19)
+ mini_mime (~> 1.0)
rugged (>= 0.25.1)
github-markup (1.7.0)
gitlab-gollum-lib (4.2.7.7)
@@ -81,12 +81,12 @@ GEM
gitlab-markup (1.7.0)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
- google-protobuf (3.7.1)
+ google-protobuf (3.8.0)
googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
- grpc (1.19.0)
- google-protobuf (~> 3.1)
- googleapis-common-protos-types (~> 1.0.0)
+ grpc (1.24.0)
+ google-protobuf (~> 3.8)
+ googleapis-common-protos-types (~> 1.0)
hashdiff (0.3.9)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
@@ -99,7 +99,7 @@ GEM
licensee (8.9.2)
rugged (~> 0.24)
listen (0.5.3)
- loofah (2.2.3)
+ loofah (2.3.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
memoizable (0.4.2)
@@ -108,12 +108,13 @@ GEM
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
+ mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
msgpack (1.3.0)
multi_json (1.13.1)
multipart-post (2.0.0)
- nokogiri (1.10.4)
+ nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
@@ -138,14 +139,14 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
- rails-html-sanitizer (1.2.0)
- loofah (~> 2.2, >= 2.2.2)
+ rails-html-sanitizer (1.3.0)
+ loofah (~> 2.3)
rainbow (3.0.0)
rbtrace (0.4.11)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
- rdoc (4.3.0)
+ rdoc (6.2.0)
redis (4.1.2)
rouge (3.11.0)
rspec (3.8.0)
@@ -217,18 +218,18 @@ DEPENDENCIES
bundler (>= 1.17.3)
factory_bot
faraday (~> 0.12)
- github-linguist (~> 6.1)
+ github-linguist (~> 7.5)
gitlab-gollum-lib (~> 4.2.7.7)
gitlab-gollum-rugged_adapter (~> 0.4.4.2)
gitlab-labkit (~> 0.5.0)
gitlab-markup (~> 1.7.0)
- google-protobuf (~> 3.7.1)
- grpc (~> 1.19.0)
+ google-protobuf (~> 3.8.0)
+ grpc (~> 1.24.0)
licensee (~> 8.9.0)
listen (~> 0.5.0)
pry (~> 0.12.2)
rbtrace
- rdoc (~> 4.2)
+ rdoc (~> 6.0)
rspec
rspec-parameterized
rubocop (~> 0.69)
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index b07c3590d3d8..2c7641622306 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -17,14 +17,14 @@ let
};
};
in buildGoPackage rec {
- version = "1.67.0";
+ version = "1.72.1";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "1mj2l15hnxwqmyc8xn79d6qpmpqbqw2ishalr8qvn83nzdsbk8l3";
+ sha256 = "0gnhw7p8fgy3w15828qjgkkxcd4dg7gf1hpanc3xqawb8jqpfc91";
};
goPackagePath = "gitlab.com/gitlab-org/gitaly";
@@ -55,7 +55,7 @@ in buildGoPackage rec {
meta = with stdenv.lib; {
homepage = https://gitlab.com/gitlab-org/gitaly;
description = "A Git RPC service for handling all the git calls made by GitLab";
- platforms = platforms.unix;
+ platforms = platforms.linux;
maintainers = with maintainers; [ roblabla globin fpletz ];
license = licenses.mit;
};
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
index 34c30f710540..951ea39e5be7 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@@ -18,6 +18,42 @@
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
+ {
+ goPackagePath = "github.com/Joker/hpp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Joker/hpp";
+ rev = "6893e659854a";
+ sha256 = "0lsx63c28rzqigv3lwzznqacpk7nr0dn6ig37v023x8lzc728ix5";
+ };
+ }
+ {
+ goPackagePath = "github.com/Joker/jade";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Joker/jade";
+ rev = "v1.0.0";
+ sha256 = "0k9b8dcwwhajw6rzjmakqwmhw9z192pzzdhppcvam6dy63yl4zjf";
+ };
+ }
+ {
+ goPackagePath = "github.com/Shopify/goreferrer";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Shopify/goreferrer";
+ rev = "ec9c9a553398";
+ sha256 = "0d740psj8czks1hl0nr6nlrwfbwq3nc51jj2p91d1wyhhmgn6jmn";
+ };
+ }
+ {
+ goPackagePath = "github.com/ajg/form";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ajg/form";
+ rev = "v1.5.1";
+ sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a";
+ };
+ }
{
goPackagePath = "github.com/alecthomas/template";
fetch = {
@@ -36,6 +72,15 @@
sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
};
}
+ {
+ goPackagePath = "github.com/aymerick/raymond";
+ fetch = {
+ type = "git";
+ url = "https://github.com/aymerick/raymond";
+ rev = "v2.0.2";
+ sha256 = "1w6am4142k8lyjnwwcgx94c2d8zviflzi0a9c81gn2j0gyx475i3";
+ };
+ }
{
goPackagePath = "github.com/beorn7/perks";
fetch = {
@@ -81,6 +126,15 @@
sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57";
};
}
+ {
+ goPackagePath = "github.com/codegangsta/inject";
+ fetch = {
+ type = "git";
+ url = "https://github.com/codegangsta/inject";
+ rev = "33e0aa1cb7c0";
+ sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj";
+ };
+ }
{
goPackagePath = "github.com/davecgh/go-spew";
fetch = {
@@ -90,6 +144,42 @@
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
};
}
+ {
+ goPackagePath = "github.com/dgrijalva/jwt-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dgrijalva/jwt-go";
+ rev = "v3.2.0";
+ sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
+ };
+ }
+ {
+ goPackagePath = "github.com/eknkc/amber";
+ fetch = {
+ type = "git";
+ url = "https://github.com/eknkc/amber";
+ rev = "cdade1c07385";
+ sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9";
+ };
+ }
+ {
+ goPackagePath = "github.com/fatih/structs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/structs";
+ rev = "v1.1.0";
+ sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q";
+ };
+ }
+ {
+ goPackagePath = "github.com/flosch/pongo2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/flosch/pongo2";
+ rev = "bbf5a6c351f4";
+ sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq";
+ };
+ }
{
goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
@@ -99,15 +189,69 @@
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
+ {
+ goPackagePath = "github.com/gavv/monotime";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gavv/monotime";
+ rev = "30dba4353424";
+ sha256 = "0w67yyc9y11dp7lp4b712dkcgbiln1qmgfx1nbbrw3mfkzr61d7g";
+ };
+ }
{
goPackagePath = "github.com/getsentry/raven-go";
fetch = {
type = "git";
url = "https://github.com/getsentry/raven-go";
- rev = "v0.1.2";
+ rev = "v0.1.0";
sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
};
}
+ {
+ goPackagePath = "github.com/getsentry/sentry-go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/getsentry/sentry-go";
+ rev = "v0.3.0";
+ sha256 = "1919lhvg1swcqyfa6mck6nz53c7n4df21jsz46f7x4wncb6f5il1";
+ };
+ }
+ {
+ goPackagePath = "github.com/gin-contrib/sse";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gin-contrib/sse";
+ rev = "5545eab6dad3";
+ sha256 = "0jhcvi66rn7c1wg3rf7q7sylrvlk7c40yk79c5lypnz1dpsdcrb5";
+ };
+ }
+ {
+ goPackagePath = "github.com/gin-gonic/gin";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gin-gonic/gin";
+ rev = "v1.4.0";
+ sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-check/check";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-check/check";
+ rev = "788fd7840127";
+ sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-errors/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-errors/errors";
+ rev = "v1.0.1";
+ sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
+ };
+ }
{
goPackagePath = "github.com/go-kit/kit";
fetch = {
@@ -126,6 +270,15 @@
sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
};
}
+ {
+ goPackagePath = "github.com/go-martini/martini";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-martini/martini";
+ rev = "22fa46961aab";
+ sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh";
+ };
+ }
{
goPackagePath = "github.com/go-stack/stack";
fetch = {
@@ -176,8 +329,26 @@
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
- rev = "v1.3.1";
- sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
+ rev = "v1.3.2";
+ sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-cmp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cmp";
+ rev = "v0.2.0";
+ sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
+ };
+ }
+ {
+ goPackagePath = "github.com/google/go-querystring";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-querystring";
+ rev = "v1.0.0";
+ sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
};
}
{
@@ -189,6 +360,24 @@
sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
};
}
+ {
+ goPackagePath = "github.com/gopherjs/gopherjs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gopherjs/gopherjs";
+ rev = "0766667cb4d1";
+ sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/schema";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/schema";
+ rev = "v1.1.0";
+ sha256 = "14d31i3h6bg83r7ncmwm2pirab66z9hza38in18l89pbazxyh2n9";
+ };
+ }
{
goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware";
fetch = {
@@ -216,6 +405,51 @@
sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0";
};
}
+ {
+ goPackagePath = "github.com/imkira/go-interpol";
+ fetch = {
+ type = "git";
+ url = "https://github.com/imkira/go-interpol";
+ rev = "v1.1.0";
+ sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph";
+ };
+ }
+ {
+ goPackagePath = "github.com/iris-contrib/blackfriday";
+ fetch = {
+ type = "git";
+ url = "https://github.com/iris-contrib/blackfriday";
+ rev = "v2.0.0";
+ sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im";
+ };
+ }
+ {
+ goPackagePath = "github.com/iris-contrib/formBinder";
+ fetch = {
+ type = "git";
+ url = "https://github.com/iris-contrib/formBinder";
+ rev = "v5.0.0";
+ sha256 = "0mqk6j7a9d3y28ad4ylqc7z5w4hmn1ws5wwnyll918xn1wkzr5rg";
+ };
+ }
+ {
+ goPackagePath = "github.com/iris-contrib/go.uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/iris-contrib/go.uuid";
+ rev = "v2.0.0";
+ sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35";
+ };
+ }
+ {
+ goPackagePath = "github.com/iris-contrib/httpexpect";
+ fetch = {
+ type = "git";
+ url = "https://github.com/iris-contrib/httpexpect";
+ rev = "ebe99fcebbce";
+ sha256 = "126c50c6r5l2gdn60jirpb54pqwswxag3wgrv6wcn998h9w9gv8c";
+ };
+ }
{
goPackagePath = "github.com/json-iterator/go";
fetch = {
@@ -225,6 +459,42 @@
sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
};
}
+ {
+ goPackagePath = "github.com/jtolds/gls";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jtolds/gls";
+ rev = "v4.20.0";
+ sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6";
+ };
+ }
+ {
+ goPackagePath = "github.com/juju/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/juju/errors";
+ rev = "089d3ea4e4d5";
+ sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r";
+ };
+ }
+ {
+ goPackagePath = "github.com/juju/loggo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/juju/loggo";
+ rev = "584905176618";
+ sha256 = "0hzi0652y74jf62wwyi9gf8bzrs7ynvhjfqc8rwr4l799d7i5gd4";
+ };
+ }
+ {
+ goPackagePath = "github.com/juju/testing";
+ fetch = {
+ type = "git";
+ url = "https://github.com/juju/testing";
+ rev = "472a3e8b2073";
+ sha256 = "05wjc2k0kwbam7anaxwnj30pl03dcdbrsz32icd70zl70ipsqsw4";
+ };
+ }
{
goPackagePath = "github.com/julienschmidt/httprouter";
fetch = {
@@ -234,6 +504,42 @@
sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
};
}
+ {
+ goPackagePath = "github.com/k0kubun/colorstring";
+ fetch = {
+ type = "git";
+ url = "https://github.com/k0kubun/colorstring";
+ rev = "9440f1994b88";
+ sha256 = "0isskya7ky4k9znrh85crfc2pxwyfz2s8j1a5cbjb8b8zf2v0qbj";
+ };
+ }
+ {
+ goPackagePath = "github.com/kataras/golog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kataras/golog";
+ rev = "99c81de45f40";
+ sha256 = "1dgrsvhzymgj7da54ldv8plkxk3n8zh3kc995qxl6mrpz65j801p";
+ };
+ }
+ {
+ goPackagePath = "github.com/kataras/iris";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kataras/iris";
+ rev = "v11.1.1";
+ sha256 = "1rxpr5hdj9mji26mlfp4zic0pc6nh93akzccw24a5kynj07g68wg";
+ };
+ }
+ {
+ goPackagePath = "github.com/kataras/pio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kataras/pio";
+ rev = "ea782b38602d";
+ sha256 = "0ca29wmkpx19qwnvi4fja3avkxkzz14x9wyzmg1l9074bxbj8cgj";
+ };
+ }
{
goPackagePath = "github.com/kelseyhightower/envconfig";
fetch = {
@@ -252,6 +558,24 @@
sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
};
}
+ {
+ goPackagePath = "github.com/klauspost/compress";
+ fetch = {
+ type = "git";
+ url = "https://github.com/klauspost/compress";
+ rev = "v1.4.0";
+ sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s";
+ };
+ }
+ {
+ goPackagePath = "github.com/klauspost/cpuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/klauspost/cpuid";
+ rev = "e7e905edc00e";
+ sha256 = "0cmyv3rwv5r5iqvvfhbiwp3jsfa40c6xfm42nxbngd5lygjcwwgf";
+ };
+ }
{
goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
fetch = {
@@ -270,6 +594,51 @@
sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
};
}
+ {
+ goPackagePath = "github.com/kr/pretty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pretty";
+ rev = "v0.1.0";
+ sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/pty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/pty";
+ rev = "v1.1.1";
+ sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+ };
+ }
+ {
+ goPackagePath = "github.com/kr/text";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kr/text";
+ rev = "v0.1.0";
+ sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+ };
+ }
+ {
+ goPackagePath = "github.com/labstack/echo";
+ fetch = {
+ type = "git";
+ url = "https://github.com/labstack/echo";
+ rev = "v4.1.10";
+ sha256 = "0qg9ykmhgldiv2v1w8sz8x0j0bgqf11ghzrim59fb6pxz8qgg25h";
+ };
+ }
+ {
+ goPackagePath = "github.com/labstack/gommon";
+ fetch = {
+ type = "git";
+ url = "https://github.com/labstack/gommon";
+ rev = "v0.3.0";
+ sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0";
+ };
+ }
{
goPackagePath = "github.com/libgit2/git2go";
fetch = {
@@ -288,6 +657,33 @@
sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb";
};
}
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "v0.1.2";
+ sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "v0.0.9";
+ sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/goveralls";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/goveralls";
+ rev = "v0.0.2";
+ sha256 = "13ffdikvc594g1mryhi94m87skr7irwkjnpxp8ad2kprn6syfslp";
+ };
+ }
{
goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
fetch = {
@@ -297,6 +693,15 @@
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
};
}
+ {
+ goPackagePath = "github.com/microcosm-cc/bluemonday";
+ fetch = {
+ type = "git";
+ url = "https://github.com/microcosm-cc/bluemonday";
+ rev = "v1.0.2";
+ sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2";
+ };
+ }
{
goPackagePath = "github.com/modern-go/concurrent";
fetch = {
@@ -315,6 +720,15 @@
sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
};
}
+ {
+ goPackagePath = "github.com/moul/http2curl";
+ fetch = {
+ type = "git";
+ url = "https://github.com/moul/http2curl";
+ rev = "v1.0.0";
+ sha256 = "15bpx33d3ygya8dg8hbsn24h7acpajl27006pj8lw1c0bfvbnrl0";
+ };
+ }
{
goPackagePath = "github.com/mwitkow/go-conntrack";
fetch = {
@@ -329,8 +743,8 @@
fetch = {
type = "git";
url = "https://github.com/onsi/ginkgo";
- rev = "v1.7.0";
- sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg";
+ rev = "v1.10.1";
+ sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d";
};
}
{
@@ -338,8 +752,8 @@
fetch = {
type = "git";
url = "https://github.com/onsi/gomega";
- rev = "v1.4.3";
- sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v";
+ rev = "v1.7.0";
+ sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y";
};
}
{
@@ -360,13 +774,22 @@
sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
};
}
+ {
+ goPackagePath = "github.com/pingcap/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pingcap/errors";
+ rev = "v0.11.1";
+ sha256 = "00wr0l4cwq0qx8jw51j0n7pbh9l7hdq2874x9rf1mz5svz1wbmcp";
+ };
+ }
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
- rev = "v0.8.0";
- sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+ rev = "v0.8.1";
+ sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
};
}
{
@@ -414,6 +837,33 @@
sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
};
}
+ {
+ goPackagePath = "github.com/ryanuber/columnize";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ryanuber/columnize";
+ rev = "v2.1.0";
+ sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6";
+ };
+ }
+ {
+ goPackagePath = "github.com/sergi/go-diff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sergi/go-diff";
+ rev = "v1.0.0";
+ sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/sanitized_anchor_name";
+ rev = "v1.0.0";
+ sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
+ };
+ }
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
@@ -423,6 +873,24 @@
sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg";
};
}
+ {
+ goPackagePath = "github.com/smartystreets/assertions";
+ fetch = {
+ type = "git";
+ url = "https://github.com/smartystreets/assertions";
+ rev = "b2de0cb4f26d";
+ sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y";
+ };
+ }
+ {
+ goPackagePath = "github.com/smartystreets/goconvey";
+ fetch = {
+ type = "git";
+ url = "https://github.com/smartystreets/goconvey";
+ rev = "505e41936337";
+ sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m";
+ };
+ }
{
goPackagePath = "github.com/stretchr/objx";
fetch = {
@@ -437,8 +905,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "v1.3.0";
- sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
+ rev = "v1.4.0";
+ sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
};
}
{
@@ -477,6 +945,123 @@
sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q";
};
}
+ {
+ goPackagePath = "github.com/ugorji/go";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ugorji/go";
+ rev = "v1.1.4";
+ sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
+ };
+ }
+ {
+ goPackagePath = "github.com/urfave/negroni";
+ fetch = {
+ type = "git";
+ url = "https://github.com/urfave/negroni";
+ rev = "v1.0.0";
+ sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp";
+ };
+ }
+ {
+ goPackagePath = "github.com/valyala/bytebufferpool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/valyala/bytebufferpool";
+ rev = "v1.0.0";
+ sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
+ };
+ }
+ {
+ goPackagePath = "github.com/valyala/fasthttp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/valyala/fasthttp";
+ rev = "v1.4.0";
+ sha256 = "0kypc7r91n61fm6qsadza1aiy9n6byghvcxzvx7agi6yzrllk956";
+ };
+ }
+ {
+ goPackagePath = "github.com/valyala/fasttemplate";
+ fetch = {
+ type = "git";
+ url = "https://github.com/valyala/fasttemplate";
+ rev = "v1.0.1";
+ sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq";
+ };
+ }
+ {
+ goPackagePath = "github.com/valyala/tcplisten";
+ fetch = {
+ type = "git";
+ url = "https://github.com/valyala/tcplisten";
+ rev = "ceec8f93295a";
+ sha256 = "0ksbj1gsdqanbnhly5w1wcc107bib4w0zpnyl00prr89zch3imnf";
+ };
+ }
+ {
+ goPackagePath = "github.com/xeipuuv/gojsonpointer";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xeipuuv/gojsonpointer";
+ rev = "df4f5c81cb3b";
+ sha256 = "0dfwc66z5gq75m3z7va80c10c22ijiq99bahq86l26ki71g286xn";
+ };
+ }
+ {
+ goPackagePath = "github.com/xeipuuv/gojsonreference";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xeipuuv/gojsonreference";
+ rev = "bd5ef7bd5415";
+ sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5";
+ };
+ }
+ {
+ goPackagePath = "github.com/xeipuuv/gojsonschema";
+ fetch = {
+ type = "git";
+ url = "https://github.com/xeipuuv/gojsonschema";
+ rev = "v1.1.0";
+ sha256 = "10gn5y4l72zknj21mff29d9vnk4pz7jnw39xnlsb373lsiih91xg";
+ };
+ }
+ {
+ goPackagePath = "github.com/yalp/jsonpath";
+ fetch = {
+ type = "git";
+ url = "https://github.com/yalp/jsonpath";
+ rev = "5cc68e5049a0";
+ sha256 = "0kkyxp1cg3kfxy5hhwzxg132jin4xb492z5jpqq94ix15v6rdf4b";
+ };
+ }
+ {
+ goPackagePath = "github.com/yudai/gojsondiff";
+ fetch = {
+ type = "git";
+ url = "https://github.com/yudai/gojsondiff";
+ rev = "v1.0.0";
+ sha256 = "0qnymi0027mb8kxm24mmd22bvjrdkc56c7f4q3lbdf93x1vxbbc2";
+ };
+ }
+ {
+ goPackagePath = "github.com/yudai/golcs";
+ fetch = {
+ type = "git";
+ url = "https://github.com/yudai/golcs";
+ rev = "ecda9a501e82";
+ sha256 = "0mx6wc5fz05yhvg03vvps93bc5mw4vnng98fhmixd47385qb29pq";
+ };
+ }
+ {
+ goPackagePath = "github.com/yudai/pp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/yudai/pp";
+ rev = "v2.0.1";
+ sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk";
+ };
+ }
{
goPackagePath = "gitlab.com/gitlab-org/labkit";
fetch = {
@@ -500,8 +1085,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
- rev = "20be4c3c3ed5";
- sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb";
+ rev = "4def268fd1a4";
+ sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6";
};
}
{
@@ -509,8 +1094,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/lint";
- rev = "06c8688daad7";
- sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+ rev = "d0100b6bd8b3";
+ sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7";
};
}
{
@@ -536,8 +1121,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sync";
- rev = "37e7f081c4d4";
- sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm";
+ rev = "112230192c58";
+ sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
};
}
{
@@ -545,8 +1130,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "953cdadca894";
- sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1";
+ rev = "fde4db37ae7a";
+ sha256 = "16k4w4pzziq1kln18k5fg01qgk4hpzb5xsm7175kaky6d6gwyhg3";
};
}
{
@@ -563,8 +1148,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/tools";
- rev = "6cd1fcedba52";
- sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d";
+ rev = "2c0ae7006135";
+ sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk";
};
}
{
@@ -590,8 +1175,8 @@
fetch = {
type = "git";
url = "https://github.com/grpc/grpc-go";
- rev = "v1.16.0";
- sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg";
+ rev = "v1.24.0";
+ sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6";
};
}
{
@@ -630,6 +1215,33 @@
sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
};
}
+ {
+ goPackagePath = "gopkg.in/go-playground/assert.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/go-playground/assert.v1";
+ rev = "v1.2.1";
+ sha256 = "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/go-playground/validator.v8";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/go-playground/validator.v8";
+ rev = "v8.18.2";
+ sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/mgo.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/mgo.v2";
+ rev = "9856a29383ce";
+ sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw";
+ };
+ }
{
goPackagePath = "gopkg.in/tomb.v1";
fetch = {
@@ -653,8 +1265,8 @@
fetch = {
type = "git";
url = "https://github.com/dominikh/go-tools";
- rev = "88497007e858";
- sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc";
+ rev = "ea95bdfd59fc";
+ sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic";
};
}
]
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index a5140972ef0f..47e1c3b35684 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -224,15 +224,15 @@
version = "3.3.0";
};
github-linguist = {
- dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
+ dependencies = ["charlock_holmes" "escape_utils" "mini_mime" "rugged"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nqsprsy4xd6yxzk3b54815hv0gk2r1xn0vsm81pkyy61bbm35hf";
+ sha256 = "092bq7bjfj2yvss2ig6jb71j0h04cigq79xxfis37j315iixl12j";
type = "gem";
};
- version = "6.4.1";
+ version = "7.5.1";
};
github-markup = {
source = {
@@ -308,10 +308,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
+ sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4";
type = "gem";
};
- version = "3.7.1";
+ version = "3.8.0";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@@ -330,10 +330,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs";
+ sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf";
type = "gem";
};
- version = "1.19.0";
+ version = "1.24.0";
};
hashdiff = {
groups = ["default" "development" "test"];
@@ -418,10 +418,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
+ sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x";
type = "gem";
};
- version = "2.2.3";
+ version = "2.3.0";
};
memoizable = {
dependencies = ["thread_safe"];
@@ -459,6 +459,16 @@
};
version = "3.2019.0331";
};
+ mini_mime = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
+ type = "gem";
+ };
+ version = "1.0.2";
+ };
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
@@ -507,10 +517,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
+ sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
type = "gem";
};
- version = "1.10.4";
+ version = "1.10.5";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -640,10 +650,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq";
+ sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
type = "gem";
};
- version = "1.2.0";
+ version = "1.3.0";
};
rainbow = {
source = {
@@ -663,12 +673,14 @@
version = "0.4.11";
};
rdoc = {
+ groups = ["default"];
+ platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c";
+ sha256 = "1gh7sc3xd4rgl9z90181cq580r1xqn063mmv51wdrhhsrkkw2bi9";
type = "gem";
};
- version = "4.3.0";
+ version = "6.2.0";
};
redis = {
groups = ["default"];
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index 03aad8c02c32..2a83cbe5f3cb 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -25,7 +25,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
description = "SSH access and repository management app for GitLab";
homepage = http://www.gitlab.com/;
- platforms = platforms.unix;
+ platforms = platforms.linux;
maintainers = with maintainers; [ fpletz globin talyz ];
license = licenses.mit;
};
diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
index 5b5d0b99bcfe..d5ea22f960bb 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
@@ -162,6 +162,15 @@
sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
};
}
+ {
+ goPackagePath = "github.com/golang/lint";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/lint";
+ rev = "06c8688daad7";
+ sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47";
+ };
+ }
{
goPackagePath = "github.com/golang/mock";
fetch = {
@@ -252,6 +261,15 @@
sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw";
};
}
+ {
+ goPackagePath = "github.com/kisielk/gotool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kisielk/gotool";
+ rev = "v1.0.0";
+ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn";
+ };
+ }
{
goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
fetch = {
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index b8364c1efeba..4f3322f3d0fc 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
buildGoPackage rec {
pname = "gitlab-workhorse";
- version = "8.14.0";
+ version = "8.14.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
- sha256 = "1cqx75h4x4chjvp72kzbln8qkm5p7p2w7x8bdd99g38kf21wxxaq";
+ sha256 = "19flb9b9l9214ykwgjphcqrinncnfvhis7nrvcr4ns6rlpxnc9dl";
};
goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";
@@ -29,7 +29,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
homepage = http://www.gitlab.com/;
- platforms = platforms.unix;
+ platforms = platforms.linux;
maintainers = with maintainers; [ fpletz globin talyz ];
license = licenses.mit;
};
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 920f778c053f..bdfae5a24ec8 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -8,12 +8,12 @@ gem 'bootsnap', '~> 1.4'
gem 'nakayoshi_fork', '~> 0.0.4'
# Responders respond_to and respond_with
-gem 'responders', '~> 2.0'
+gem 'responders', '~> 3.0'
gem 'sprockets', '~> 3.7.0'
# Default values for AR models
-gem 'default_value_for', '~> 3.2.0'
+gem 'default_value_for', '~> 3.3.0'
# Supported DBs
gem 'pg', '~> 1.1'
@@ -42,7 +42,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'omniauth_openid_connect', '~> 0.3.1'
+gem 'omniauth_openid_connect', '~> 0.3.3'
gem "omniauth-ultraauth", '~> 0.0.2'
gem 'omniauth-salesforce', '~> 1.0.5'
gem 'rack-oauth2', '~> 1.9.3'
@@ -53,7 +53,7 @@ gem 'gssapi', group: :kerberos
# Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
-gem 'akismet', '~> 2.0'
+gem 'akismet', '~> 3.0'
gem 'invisible_captcha', '~> 0.12.1'
# Two-factor authentication
@@ -64,7 +64,7 @@ gem 'u2f', '~> 0.2.1'
# GitLab Pages
gem 'validates_hostname', '~> 1.0.6'
-gem 'rubyzip', '~> 1.2.2', require: 'zip'
+gem 'rubyzip', '~> 1.3.0', require: 'zip'
# GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0.2'
@@ -72,7 +72,7 @@ gem 'acme-client', '~> 2.0.2'
gem 'browser', '~> 2.5'
# GPG
-gem 'gpgme', '~> 2.0.18'
+gem 'gpgme', '~> 2.0.19'
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
@@ -136,7 +136,7 @@ gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
-gem 'deckar01-task_list', '2.2.0'
+gem 'deckar01-task_list', '2.2.1'
gem 'gitlab-markup', '~> 1.7.0'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'commonmarker', '~> 0.17'
@@ -151,7 +151,7 @@ gem 'asciidoctor-plantuml', '0.0.9'
gem 'rouge', '~> 3.11.0'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
-gem 'nokogiri', '~> 1.10.4'
+gem 'nokogiri', '~> 1.10.5'
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@@ -159,6 +159,7 @@ gem 'icalendar'
# Diffs
gem 'diffy', '~> 3.1.0'
+gem 'diff_match_patch', '~> 0.1.0'
# Application server
gem 'rack', '~> 2.0.7'
@@ -175,7 +176,7 @@ group :puma do
end
# State machine
-gem 'state_machines-activerecord', '~> 0.5.1'
+gem 'state_machines-activerecord', '~> 0.6.0'
# Issue tags
gem 'acts-as-taggable-on', '~> 6.0'
@@ -241,7 +242,7 @@ gem 'slack-notifier', '~> 1.5.1'
gem 'hangouts-chat', '~> 0.0.5'
# Asana integration
-gem 'asana', '~> 0.8.1'
+gem 'asana', '~> 0.9'
# FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1'
@@ -259,9 +260,6 @@ gem 'loofah', '~> 2.2'
# Working with license
gem 'licensee', '~> 8.9'
-# Protect against bruteforcing
-gem 'rack-attack', '~> 4.4.1'
-
# Ace editor
gem 'ace-rails-ap', '~> 4.1.0'
@@ -293,10 +291,13 @@ gem 'base32', '~> 0.3.0'
gem "gitlab-license", "~> 1.0"
+# Protect against bruteforcing
+gem 'rack-attack', '~> 6.2.0'
+
# Sentry integration
gem 'sentry-raven', '~> 2.9'
-gem 'premailer-rails', '~> 1.9.7'
+gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.5'
@@ -331,7 +332,6 @@ group :metrics do
end
group :development do
- gem 'foreman', '~> 0.84.0'
gem 'brakeman', '~> 4.2', require: false
gem 'danger', '~> 6.0', require: false
@@ -388,7 +388,6 @@ group :development, :test do
gem 'benchmark-ips', '~> 2.3.0', require: false
- gem 'license_finder', '~> 5.4', require: false
gem 'knapsack', '~> 1.17'
gem 'stackprof', '~> 0.2.10', require: false
@@ -398,6 +397,11 @@ group :development, :test do
gem 'timecop', '~> 0.8.0'
end
+# Gems required in omnibus-gitlab pipeline
+group :development, :test, :omnibus do
+ gem 'license_finder', '~> 5.4', require: false
+end
+
group :test do
gem 'shoulda-matchers', '~> 4.0.1', require: false
gem 'email_spec', '~> 2.2.0'
@@ -407,6 +411,7 @@ group :test do
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.10.0'
gem 'rspec_junit_formatter'
+ gem 'guard-rspec'
end
gem 'octokit', '~> 4.9'
@@ -446,18 +451,18 @@ group :ed25519 do
end
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 1.65.0'
+gem 'gitaly', '~> 1.70.0'
-gem 'grpc', '~> 1.19.0'
+gem 'grpc', '~> 1.24.0'
-gem 'google-protobuf', '~> 3.7.1'
+gem 'google-protobuf', '~> 3.8.0'
gem 'toml-rb', '~> 1.0.0', require: false
# Feature toggles
-gem 'flipper', '~> 0.13.0'
-gem 'flipper-active_record', '~> 0.13.0'
-gem 'flipper-active_support_cache_store', '~> 0.13.0'
+gem 'flipper', '~> 0.17.1'
+gem 'flipper-active_record', '~> 0.17.1'
+gem 'flipper-active_support_cache_store', '~> 0.17.1'
gem 'unleash', '~> 0.1.5'
# Structured logging
@@ -469,3 +474,5 @@ gem 'gitlab-net-dns', '~> 0.9.1'
# Countries list
gem 'countries', '~> 3.0'
+
+gem 'retriable', '~> 3.1.2'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index 18160932c56f..469bea9d4fbf 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -50,24 +50,24 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
- acts-as-taggable-on (6.0.0)
- activerecord (~> 5.0)
+ acts-as-taggable-on (6.5.0)
+ activerecord (>= 5.0, < 6.1)
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
aes_key_wrap (1.0.1)
- akismet (2.0.0)
+ akismet (3.0.0)
apollo_upload_server (2.0.0.beta.3)
graphql (>= 1.8)
rails (>= 4.2)
arel (9.0.0)
- asana (0.8.1)
+ asana (0.9.3)
faraday (~> 0.9)
faraday_middleware (~> 0.9)
faraday_middleware-multi_json (~> 0.0)
- oauth2 (~> 1.0)
+ oauth2 (~> 1.4)
asciidoctor (2.0.10)
asciidoctor-include-ext (0.3.1)
asciidoctor (>= 1.5.6, < 3.0.0)
@@ -80,14 +80,16 @@ GEM
encryptor (~> 3.0.0)
attr_required (1.0.1)
awesome_print (1.8.0)
- aws-sdk (2.9.32)
- aws-sdk-resources (= 2.9.32)
- aws-sdk-core (2.9.32)
+ aws-eventstream (1.0.3)
+ aws-sdk (2.11.374)
+ aws-sdk-resources (= 2.11.374)
+ aws-sdk-core (2.11.374)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.9.32)
- aws-sdk-core (= 2.9.32)
- aws-sigv4 (1.0.0)
+ aws-sdk-resources (2.11.374)
+ aws-sdk-core (= 2.11.374)
+ aws-sigv4 (1.1.0)
+ aws-eventstream (~> 1.0, >= 1.0.2)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
@@ -171,9 +173,9 @@ GEM
unicode_utils (~> 1.4)
crack (0.4.3)
safe_yaml (~> 1.0.0)
- crass (1.0.4)
+ crass (1.0.5)
creole (0.5.0)
- css_parser (1.5.0)
+ css_parser (1.7.0)
addressable
daemons (1.2.6)
danger (6.0.9)
@@ -192,12 +194,12 @@ GEM
database_cleaner (1.7.0)
debug_inspector (0.0.3)
debugger-ruby_core_source (1.3.8)
- deckar01-task_list (2.2.0)
+ deckar01-task_list (2.2.1)
html-pipeline
declarative (0.0.10)
declarative-option (0.1.0)
- default_value_for (3.2.0)
- activerecord (>= 3.2.0, < 6.0)
+ default_value_for (3.3.0)
+ activerecord (>= 3.2.0, < 6.1)
derailed_benchmarks (1.3.5)
benchmark-ips (~> 2)
get_process_mem (~> 0)
@@ -222,6 +224,7 @@ GEM
railties
rotp (~> 2.0)
diff-lcs (1.3)
+ diff_match_patch (0.1.0)
diffy (3.1.0)
discordrb-webhooks-blackst0ne (3.3.0)
rest-client (~> 2.0)
@@ -285,13 +288,13 @@ GEM
fast_gettext (1.6.0)
ffaker (2.10.0)
ffi (1.11.1)
- flipper (0.13.0)
- flipper-active_record (0.13.0)
- activerecord (>= 3.2, < 6)
- flipper (~> 0.13.0)
- flipper-active_support_cache_store (0.13.0)
- activesupport (>= 3.2, < 6)
- flipper (~> 0.13.0)
+ flipper (0.17.1)
+ flipper-active_record (0.17.1)
+ activerecord (>= 4.2, < 7)
+ flipper (~> 0.17.1)
+ flipper-active_support_cache_store (0.17.1)
+ activesupport (>= 4.2, < 7)
+ flipper (~> 0.17.1)
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
@@ -332,10 +335,8 @@ GEM
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
- font-awesome-rails (4.7.0.4)
- railties (>= 3.2, < 6.0)
- foreman (0.84.0)
- thor (~> 0.19.1)
+ font-awesome-rails (4.7.0.5)
+ railties (>= 3.2, < 6.1)
formatador (0.2.5)
fugit (1.2.1)
et-orbi (~> 1.1, >= 1.1.8)
@@ -358,12 +359,12 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
git (1.5.0)
- gitaly (1.65.0)
+ gitaly (1.70.0)
grpc (~> 1.0)
github-markup (1.7.0)
- gitlab-labkit (0.5.2)
- actionpack (~> 5)
- activesupport (~> 5)
+ gitlab-labkit (0.7.0)
+ actionpack (>= 5.0.0, < 6.1.0)
+ activesupport (>= 5.0.0, < 6.1.0)
grpc (~> 1.19)
jaeger-client (~> 0.10)
opentracing (~> 0.4)
@@ -400,7 +401,7 @@ GEM
mime-types (~> 3.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- google-protobuf (3.7.1)
+ google-protobuf (3.8.0)
googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
googleauth (0.6.6)
@@ -410,7 +411,7 @@ GEM
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
- gpgme (2.0.18)
+ gpgme (2.0.19)
mini_portile2 (~> 2.3)
grape (1.1.0)
activesupport
@@ -440,11 +441,25 @@ GEM
graphql (~> 1.6)
html-pipeline (~> 2.8)
sass (~> 3.4)
- grpc (1.19.0)
- google-protobuf (~> 3.1)
- googleapis-common-protos-types (~> 1.0.0)
+ grpc (1.24.0)
+ google-protobuf (~> 3.8)
+ googleapis-common-protos-types (~> 1.0)
gssapi (1.2.0)
ffi (>= 1.0.1)
+ guard (2.15.1)
+ formatador (>= 0.2.4)
+ listen (>= 2.7, < 4.0)
+ lumberjack (>= 1.0.12, < 2.0)
+ nenv (~> 0.1)
+ notiffany (~> 0.0)
+ pry (>= 0.9.12)
+ shellany (~> 0.0)
+ thor (>= 0.18.1)
+ guard-compat (1.2.1)
+ guard-rspec (4.7.3)
+ guard (~> 2.1)
+ guard-compat (~> 1.1)
+ rspec (>= 2.99.0, < 4.0)
haml (5.0.4)
temple (>= 0.8.0)
tilt
@@ -508,7 +523,7 @@ GEM
atlassian-jwt
multipart-post
oauth (~> 0.5, >= 0.5.0)
- jmespath (1.3.1)
+ jmespath (1.4.0)
js_regex (3.1.1)
character_set (~> 1.1)
regexp_parser (~> 1.1)
@@ -560,15 +575,20 @@ GEM
xml-simple
licensee (8.9.2)
rugged (~> 0.24)
+ listen (3.1.5)
+ rb-fsevent (~> 0.9, >= 0.9.4)
+ rb-inotify (~> 0.9, >= 0.9.7)
+ ruby_dep (~> 1.2)
locale (2.1.2)
lograge (0.10.0)
actionpack (>= 4)
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
- loofah (2.3.0)
+ loofah (2.3.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
+ lumberjack (1.0.13)
mail (2.7.1)
mini_mime (>= 0.1.1)
mail_room (0.9.1)
@@ -584,7 +604,7 @@ GEM
mime-types-data (3.2019.0331)
mimemagic (0.3.2)
mini_magick (4.9.5)
- mini_mime (1.0.1)
+ mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
msgpack (1.3.1)
@@ -597,16 +617,20 @@ GEM
mustermann (~> 1.0.0)
nakayoshi_fork (0.0.4)
nap (1.1.0)
+ nenv (0.3.0)
net-ldap (0.16.0)
net-ntp (2.1.3)
net-ssh (5.2.0)
netrc (0.11.0)
nio4r (2.3.1)
no_proxy_fix (0.1.2)
- nokogiri (1.10.4)
+ nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
+ notiffany (0.1.3)
+ nenv (~> 0.1)
+ shellany (~> 0.0)
numerizer (0.1.1)
oauth (0.5.4)
oauth2 (1.4.1)
@@ -675,12 +699,12 @@ GEM
activesupport
nokogiri (>= 1.4.4)
omniauth (~> 1.0)
- omniauth_openid_connect (0.3.1)
+ omniauth_openid_connect (0.3.3)
addressable (~> 2.5)
- omniauth (~> 1.3)
+ omniauth (~> 1.9)
openid_connect (~> 1.1)
open4 (1.3.4)
- openid_connect (1.1.6)
+ openid_connect (1.1.8)
activemodel
attr_required (>= 1.0.0)
json-jwt (>= 1.5.0)
@@ -703,12 +727,12 @@ GEM
pg (1.1.4)
po_to_json (1.0.1)
json (>= 1.6.0)
- premailer (1.10.4)
+ premailer (1.11.1)
addressable
- css_parser (>= 1.4.10)
+ css_parser (>= 1.6.0)
htmlentities (>= 4.0.0)
- premailer-rails (1.9.7)
- actionmailer (>= 3, < 6)
+ premailer-rails (1.10.3)
+ actionmailer (>= 3)
premailer (~> 1.7, >= 1.7.9)
proc_to_ast (0.1.0)
coderay
@@ -724,7 +748,7 @@ GEM
pry (~> 0.10)
pry-rails (0.3.6)
pry (>= 0.10.4)
- public_suffix (3.1.0)
+ public_suffix (3.1.1)
puma (3.12.0)
puma_worker_killer (0.1.0)
get_process_mem (~> 0.2)
@@ -734,8 +758,8 @@ GEM
rack (2.0.7)
rack-accept (0.4.5)
rack (>= 0.4)
- rack-attack (4.4.1)
- rack
+ rack-attack (6.2.0)
+ rack (>= 1.0, < 3)
rack-cors (1.0.2)
rack-oauth2 (1.9.3)
activesupport
@@ -763,10 +787,10 @@ GEM
bundler (>= 1.3.0)
railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
- rails-controller-testing (1.0.2)
- actionpack (~> 5.x, >= 5.0.1)
- actionview (~> 5.x, >= 5.0.1)
- activesupport (~> 5.x)
+ rails-controller-testing (1.0.4)
+ actionpack (>= 5.0.1.x)
+ actionview (>= 5.0.1.x)
+ activesupport (>= 5.0.1.x)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
@@ -798,25 +822,25 @@ GEM
recaptcha (4.13.1)
json
recursive-open-struct (1.1.0)
- redis (4.1.2)
- redis-actionpack (5.0.2)
- actionpack (>= 4.0, < 6)
+ redis (4.1.3)
+ redis-actionpack (5.1.0)
+ actionpack (>= 4.0, < 7)
redis-rack (>= 1, < 3)
redis-store (>= 1.1.0, < 2)
- redis-activesupport (5.0.7)
- activesupport (>= 3, < 6)
+ redis-activesupport (5.2.0)
+ activesupport (>= 3, < 7)
redis-store (>= 1.3, < 2)
redis-namespace (1.6.0)
redis (>= 3.0.4)
- redis-rack (2.0.5)
+ redis-rack (2.0.6)
rack (>= 1.5, < 3)
redis-store (>= 1.2, < 2)
redis-rails (5.0.2)
redis-actionpack (>= 5.0, < 6)
redis-activesupport (>= 5.0, < 6)
redis-store (>= 1.2, < 2)
- redis-store (1.6.0)
- redis (>= 2.2, < 5)
+ redis-store (1.8.1)
+ redis (>= 4, < 5)
regexp_parser (1.5.1)
regexp_property_values (0.3.4)
representable (3.0.4)
@@ -824,9 +848,9 @@ GEM
declarative-option (< 0.2.0)
uber (< 0.2.0)
request_store (1.3.1)
- responders (2.4.1)
- actionpack (>= 4.2.0, < 6.0)
- railties (>= 4.2.0, < 6.0)
+ responders (3.0.0)
+ actionpack (>= 5.0)
+ railties (>= 5.0)
rest-client (2.0.2)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
@@ -897,11 +921,12 @@ GEM
ruby-progressbar (1.10.1)
ruby-saml (1.7.2)
nokogiri (>= 1.5.10)
+ ruby_dep (1.5.0)
ruby_parser (3.13.1)
sexp_processor (~> 4.9)
rubyntlm (0.6.2)
rubypants (0.2.0)
- rubyzip (1.2.2)
+ rubyzip (1.3.0)
rugged (0.28.3.1)
safe_yaml (1.0.4)
sanitize (4.6.6)
@@ -938,6 +963,7 @@ GEM
faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9)
sexp_processor (4.12.0)
+ shellany (0.0.1)
shoulda-matchers (4.0.1)
activesupport (>= 4.2.0)
sidekiq (5.2.7)
@@ -978,11 +1004,11 @@ GEM
sshkey (2.0.0)
stackprof (0.2.10)
state_machines (0.5.0)
- state_machines-activemodel (0.5.1)
- activemodel (>= 4.1, < 6.0)
+ state_machines-activemodel (0.7.1)
+ activemodel (>= 4.1)
state_machines (>= 0.5.0)
- state_machines-activerecord (0.5.1)
- activerecord (>= 4.1, < 6.0)
+ state_machines-activerecord (0.6.0)
+ activerecord (>= 4.1)
state_machines-activemodel (>= 0.5.0)
swd (1.1.2)
activesupport (>= 3)
@@ -1091,9 +1117,9 @@ DEPENDENCIES
activerecord-explain-analyze (~> 0.1)
acts-as-taggable-on (~> 6.0)
addressable (~> 2.5.2)
- akismet (~> 2.0)
+ akismet (~> 3.0)
apollo_upload_server (~> 2.0.0.beta3)
- asana (~> 0.8.1)
+ asana (~> 0.9)
asciidoctor (~> 2.0.10)
asciidoctor-include-ext (~> 0.3.1)
asciidoctor-plantuml (= 0.0.9)
@@ -1127,12 +1153,13 @@ DEPENDENCIES
creole (~> 0.5.0)
danger (~> 6.0)
database_cleaner (~> 1.7.0)
- deckar01-task_list (= 2.2.0)
- default_value_for (~> 3.2.0)
+ deckar01-task_list (= 2.2.1)
+ default_value_for (~> 3.3.0)
derailed_benchmarks
device_detector
devise (~> 4.6)
devise-two-factor (~> 3.0.0)
+ diff_match_patch (~> 0.1.0)
diffy (~> 3.1.0)
discordrb-webhooks-blackst0ne (~> 3.3)
doorkeeper (~> 4.3)
@@ -1149,9 +1176,9 @@ DEPENDENCIES
faraday_middleware-aws-signers-v4
fast_blank
ffaker (~> 2.10)
- flipper (~> 0.13.0)
- flipper-active_record (~> 0.13.0)
- flipper-active_support_cache_store (~> 0.13.0)
+ flipper (~> 0.17.1)
+ flipper-active_record (~> 0.17.1)
+ flipper-active_support_cache_store (~> 0.17.1)
flowdock (~> 0.7)
fog-aliyun (~> 0.3)
fog-aws (~> 3.5)
@@ -1161,14 +1188,13 @@ DEPENDENCIES
fog-openstack (~> 1.0)
fog-rackspace (~> 0.1.1)
font-awesome-rails (~> 4.7)
- foreman (~> 0.84.0)
fugit (~> 1.2.1)
fuubar (~> 2.2.0)
gemojione (~> 3.3)
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.3)
- gitaly (~> 1.65.0)
+ gitaly (~> 1.70.0)
github-markup (~> 1.7.0)
gitlab-labkit (~> 0.5)
gitlab-license (~> 1.0)
@@ -1181,8 +1207,8 @@ DEPENDENCIES
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
- google-protobuf (~> 3.7.1)
- gpgme (~> 2.0.18)
+ google-protobuf (~> 3.8.0)
+ gpgme (~> 2.0.19)
grape (~> 1.1.0)
grape-entity (~> 0.7.1)
grape-path-helpers (~> 1.1)
@@ -1190,8 +1216,9 @@ DEPENDENCIES
graphiql-rails (~> 1.4.10)
graphql (~> 1.9.11)
graphql-docs (~> 1.6.0)
- grpc (~> 1.19.0)
+ grpc (~> 1.24.0)
gssapi
+ guard-rspec
haml_lint (~> 0.31.0)
hamlit (~> 2.8.8)
hangouts-chat (~> 0.0.5)
@@ -1226,7 +1253,7 @@ DEPENDENCIES
net-ldap
net-ntp
net-ssh (~> 5.2)
- nokogiri (~> 1.10.4)
+ nokogiri (~> 1.10.5)
oauth2 (~> 1.4)
octokit (~> 4.9)
omniauth (~> 1.8)
@@ -1246,17 +1273,17 @@ DEPENDENCIES
omniauth-twitter (~> 1.4)
omniauth-ultraauth (~> 0.0.2)
omniauth_crowd (~> 2.2.0)
- omniauth_openid_connect (~> 0.3.1)
+ omniauth_openid_connect (~> 0.3.3)
org-ruby (~> 0.9.12)
pg (~> 1.1)
- premailer-rails (~> 1.9.7)
+ premailer-rails (~> 1.10.3)
prometheus-client-mmap (~> 0.9.10)
pry-byebug (~> 3.5.1)
pry-rails (~> 0.3.4)
puma (~> 3.12)
puma_worker_killer
rack (~> 2.0.7)
- rack-attack (~> 4.4.1)
+ rack-attack (~> 6.2.0)
rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.9.3)
rack-proxy (~> 0.6.0)
@@ -1275,7 +1302,8 @@ DEPENDENCIES
redis-namespace (~> 1.6.0)
redis-rails (~> 5.0.2)
request_store (~> 1.3)
- responders (~> 2.0)
+ responders (~> 3.0)
+ retriable (~> 3.1.2)
rouge (~> 3.11.0)
rqrcode-rails3 (~> 0.1.7)
rspec-parameterized
@@ -1291,7 +1319,7 @@ DEPENDENCIES
ruby-prof (~> 1.0.0)
ruby-progressbar
ruby_parser (~> 3.8)
- rubyzip (~> 1.2.2)
+ rubyzip (~> 1.3.0)
rugged (~> 0.28)
sanitize (~> 4.6)
sassc-rails (~> 2.1.0)
@@ -1312,7 +1340,7 @@ DEPENDENCIES
sprockets (~> 3.7.0)
sshkey (~> 2.0)
stackprof (~> 0.2.10)
- state_machines-activerecord (~> 0.5.1)
+ state_machines-activerecord (~> 0.6.0)
sys-filesystem (~> 1.1.6)
test-prof (~> 0.10.0)
thin (~> 1.7.0)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index 84a984ea2b35..73a64a62d4b3 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -146,10 +146,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl";
+ sha256 = "1nvhd986xa6llyjnhikq4h1nrcf5b9r9s11if25qsj8358inrpga";
type = "gem";
};
- version = "6.0.0";
+ version = "6.5.0";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
@@ -188,10 +188,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w";
+ sha256 = "0c5jhqfgvpz84d8jai51hin018ldpfd0civbk7mfwmrj7n71p6bl";
type = "gem";
};
- version = "2.0.0";
+ version = "3.0.0";
};
apollo_upload_server = {
dependencies = ["graphql" "rails"];
@@ -220,10 +220,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1h0qiywvjjc9iyzq9nz5iaqyh6qsrix4ip0w86j5c4v5g940z6qx";
+ sha256 = "19yr6ibz481jizvx0cjfvql142v8izi474c4vmwy9qzksyq2xhdj";
type = "gem";
};
- version = "0.8.1";
+ version = "0.9.3";
};
asciidoctor = {
groups = ["default"];
@@ -309,16 +309,26 @@
};
version = "1.8.0";
};
+ aws-eventstream = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6";
+ type = "gem";
+ };
+ version = "1.0.3";
+ };
aws-sdk = {
dependencies = ["aws-sdk-resources"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03r754cqa0jayf1nxpcmp1anaypxwpcjyjaq5cz7i04l9jdxvsnn";
+ sha256 = "1yvl9bxzaxgcyzix2yw46cgll9nl0xfg5qx1j6y3xc1i78rk7vy0";
type = "gem";
};
- version = "2.9.32";
+ version = "2.11.374";
};
aws-sdk-core = {
dependencies = ["aws-sigv4" "jmespath"];
@@ -326,10 +336,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pq09wwb74y4m5adk4hi4zlz05q6sxjxij6g71v6nkd0z83hi34x";
+ sha256 = "1d7nw1jihv7rglcmkd3hhidjflbzq5ik63n43q27pmx8ki108rd9";
type = "gem";
};
- version = "2.9.32";
+ version = "2.11.374";
};
aws-sdk-resources = {
dependencies = ["aws-sdk-core"];
@@ -337,20 +347,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15m56k12x9gzkcyhwrab1qhi3wqla0qmv84dkqcjwp44d7c2xjyi";
+ sha256 = "0qx2a67vsw8rz1y0m04f97p1q4zx7miy06a5ck78hm77nvsigjj4";
type = "gem";
};
- version = "2.9.32";
+ version = "2.11.374";
};
aws-sigv4 = {
+ dependencies = ["aws-eventstream"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz";
+ sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs";
type = "gem";
};
- version = "1.0.0";
+ version = "1.1.0";
};
axiom-types = {
dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
@@ -814,10 +825,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
+ sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f";
type = "gem";
};
- version = "1.0.4";
+ version = "1.0.5";
};
creole = {
groups = ["default"];
@@ -835,10 +846,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jlr17cn044yaq4l3d9p42g3bghnamwsprq9c39xn6pxjrn5k1hy";
+ sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
type = "gem";
};
- version = "1.5.0";
+ version = "1.7.0";
};
daemons = {
groups = ["default" "development"];
@@ -901,10 +912,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964";
+ sha256 = "09k7rlxsl7pd5kn3wyswgqi0hhbmlj40b66l4mf8v9mqf3c7v0yk";
type = "gem";
};
- version = "2.2.0";
+ version = "2.2.1";
};
declarative = {
groups = ["default"];
@@ -932,10 +943,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xj9d1y2fk3kxfm1kyiwasjpw6r1w7c1xjx26sm3c33xhmz57fla";
+ sha256 = "08hwnnqm3bxd4n627isliq79zysdlmfkf813403v0b4mkhika5my";
type = "gem";
};
- version = "3.2.0";
+ version = "3.3.0";
};
derailed_benchmarks = {
dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"];
@@ -1001,6 +1012,16 @@
};
version = "1.3";
};
+ diff_match_patch = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "03n4g4w2pwiygmqq5lfhqrpbs9g6kv0jhb3vrffz3vgaryzmfq5k";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
diffy = {
groups = ["default"];
platforms = [];
@@ -1374,10 +1395,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw";
+ sha256 = "01gbn1qmcvn49gjcbvd5fga57qc8l3915kb04ikkffvb6n09q7f7";
type = "gem";
};
- version = "0.13.0";
+ version = "0.17.1";
};
flipper-active_record = {
dependencies = ["activerecord" "flipper"];
@@ -1385,10 +1406,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1";
+ sha256 = "154q9xajqs64gxa9fv4hwpad44x3rmwgpldrb941i8wi37dpzskg";
type = "gem";
};
- version = "0.13.0";
+ version = "0.17.1";
};
flipper-active_support_cache_store = {
dependencies = ["activesupport" "flipper"];
@@ -1396,10 +1417,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk";
+ sha256 = "0mkbyn3mx3f411x4z1l1djc9vix3wrfzd5rhrmxb83iqp60r42hg";
type = "gem";
};
- version = "0.13.0";
+ version = "0.17.1";
};
flowdock = {
dependencies = ["httparty" "multi_json"];
@@ -1517,21 +1538,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "11mf7bk2737pyxjwba3a9lpgcxzbp0vgq01n2dn30774zysc90hj";
+ sha256 = "0a32q69rdsdw9zhmf2cflvvnikg20amidhn40sv2afw2qk91fcrz";
type = "gem";
};
- version = "4.7.0.4";
- };
- foreman = {
- dependencies = ["thor"];
- groups = ["development"];
- platforms = [];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0";
- type = "gem";
- };
- version = "0.84.0";
+ version = "4.7.0.5";
};
formatador = {
groups = ["default"];
@@ -1645,10 +1655,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h8jzwifqgkrgh9d05g0vsdkyrnk75i53lmm3pfp9rj47gvn1z1j";
+ sha256 = "0b705d2fmdisirf3hydakswdr8jq786wbqn053gvxgssrwcdlrq3";
type = "gem";
};
- version = "1.65.0";
+ version = "1.70.0";
};
github-markup = {
groups = ["default"];
@@ -1666,10 +1676,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h";
+ sha256 = "0r2zkxkj2l78c6qgr6k9lgcp7w6x7r703259rbsbrg7cfnjm43b7";
type = "gem";
};
- version = "0.5.2";
+ version = "0.7.0";
};
gitlab-license = {
groups = ["default"];
@@ -1794,10 +1804,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2";
+ sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4";
type = "gem";
};
- version = "3.7.1";
+ version = "3.8.0";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@@ -1827,10 +1837,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m";
+ sha256 = "0jbqajngi5ndqfarw9dxkhbphva0j71jav5wfym3fsiisvk5gg6p";
type = "gem";
};
- version = "2.0.18";
+ version = "2.0.19";
};
grape = {
dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
@@ -1914,10 +1924,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs";
+ sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf";
type = "gem";
};
- version = "1.19.0";
+ version = "1.24.0";
};
gssapi = {
dependencies = ["ffi"];
@@ -1930,6 +1940,38 @@
};
version = "1.2.0";
};
+ guard = {
+ dependencies = ["formatador" "listen" "lumberjack" "nenv" "notiffany" "pry" "shellany" "thor"];
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "000hn5cdqz3wl99b245q958c5byi2dlsqi814q5gmyljv7i47zwf";
+ type = "gem";
+ };
+ version = "2.15.1";
+ };
+ guard-compat = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1zj6sr1k8w59mmi27rsii0v8xyy2rnsi09nqvwpgj1q10yq1mlis";
+ type = "gem";
+ };
+ version = "1.2.1";
+ };
+ guard-rspec = {
+ dependencies = ["guard" "guard-compat" "rspec"];
+ groups = ["test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1jkm5xp90gm4c5s51pmf92i9hc10gslwwic6mvk72g0yplya0yx4";
+ type = "gem";
+ };
+ version = "4.7.3";
+ };
haml = {
dependencies = ["temple" "tilt"];
groups = ["default" "development" "test"];
@@ -2241,10 +2283,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y";
+ sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
type = "gem";
};
- version = "1.3.1";
+ version = "1.4.0";
};
js_regex = {
dependencies = ["character_set" "regexp_parser" "regexp_property_values"];
@@ -2450,6 +2492,17 @@
};
version = "8.9.2";
};
+ listen = {
+ dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx";
+ type = "gem";
+ };
+ version = "3.1.5";
+ };
locale = {
groups = ["default" "development"];
platforms = [];
@@ -2477,10 +2530,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06kfq90vi38gv6i128f4zg462kj32szs5vsgm25hxgw9zd12pj9x";
+ sha256 = "0npqav026zd7r4qdidq9x5nxcp2dzg71bnp421xxx7sngbxf2xbd";
type = "gem";
};
- version = "2.3.0";
+ version = "2.3.1";
+ };
+ lumberjack = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "06im7gcg42x77yhz2w5da2ly9xz0n0c36y5ks7xs53v0l9g0vf5n";
+ type = "gem";
+ };
+ version = "1.0.13";
};
mail = {
dependencies = ["mini_mime"];
@@ -2605,10 +2668,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
+ sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
type = "gem";
};
- version = "1.0.1";
+ version = "1.0.2";
};
mini_portile2 = {
groups = ["default" "development" "test"];
@@ -2721,6 +2784,16 @@
};
version = "1.1.0";
};
+ nenv = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0r97jzknll9bhd8yyg2bngnnkj8rjhal667n7d32h8h7ny7nvpnr";
+ type = "gem";
+ };
+ version = "0.3.0";
+ };
net-ldap = {
groups = ["default"];
platforms = [];
@@ -2787,10 +2860,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
+ sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
type = "gem";
};
- version = "1.10.4";
+ version = "1.10.5";
};
nokogumbo = {
dependencies = ["nokogiri"];
@@ -2803,6 +2876,17 @@
};
version = "1.5.0";
};
+ notiffany = {
+ dependencies = ["nenv" "shellany"];
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0f47h3bmg1apr4x51szqfv3rh2vq58z3grh4w02cp3bzbdh6jxnk";
+ type = "gem";
+ };
+ version = "0.1.3";
+ };
numerizer = {
groups = ["default"];
platforms = [];
@@ -3071,10 +3155,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ja7cjlm4z0k0pwwy64djl58pay3lzkw7im565fybs4a8q4wmacb";
+ sha256 = "0awybp2jnai0w2qfgqnr3f478g3nbg5r0vcm6pa5g8k5f4rs19qr";
type = "gem";
};
- version = "0.3.1";
+ version = "0.3.3";
};
open4 = {
groups = ["default" "development"];
@@ -3092,10 +3176,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1r13bv18nyvw0g1nw3fzffvv2si99zj24w0k5zgawf4q6nn5f7vd";
+ sha256 = "0r50vwf9hsf6r8gx5mwqs3w3w92l864ikiz9d0fcibqsr1489pbg";
type = "gem";
};
- version = "1.1.6";
+ version = "1.1.8";
};
opentracing = {
groups = ["default"];
@@ -3206,10 +3290,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10w6f7r6snpkcnv3byxma9b08lyqzcfxkm083scb2dr2ly4xkzyf";
+ sha256 = "1xrhmialxn5vlp1nmf40a4db9gji4h2wbzd7f43sz64z8lvrjj6h";
type = "gem";
};
- version = "1.10.4";
+ version = "1.11.1";
};
premailer-rails = {
dependencies = ["actionmailer" "premailer"];
@@ -3217,10 +3301,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "05czxmx6hnykg6g23hy2ww2bf86a69njbi02sv7lrds4w776jhim";
+ sha256 = "0bqi7d4f15vy3f1g0xb3bxmncfbzv9dd3ilhqj0plvw64xqbkp3w";
type = "gem";
};
- version = "1.9.7";
+ version = "1.10.3";
};
proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"];
@@ -3299,10 +3383,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
+ sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
type = "gem";
};
- version = "3.1.0";
+ version = "3.1.1";
};
puma = {
groups = ["puma"];
@@ -3372,10 +3456,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1";
+ sha256 = "1sqjqwa18c0l59zdymcvvvnh5nk3pjggnzaydb2q1qbrk3rypcnq";
type = "gem";
};
- version = "4.4.1";
+ version = "6.2.0";
};
rack-cors = {
groups = ["default"];
@@ -3458,10 +3542,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "16kdkk73mhhs73iz3i1i0ryjm84dadiyh817b3nh8acdi490jyhy";
+ sha256 = "1m1rklj6pvzi4fydxcmcv4q0xd7913hhhw1hw530nfz1wkl7vjlf";
type = "gem";
};
- version = "1.0.2";
+ version = "1.0.4";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@@ -3640,10 +3724,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3";
+ sha256 = "08v2y91q1pmv12g9zsvwj66w3s8j9d82yrmxgyv4y4gz380j3wyh";
type = "gem";
};
- version = "4.1.2";
+ version = "4.1.3";
};
redis-actionpack = {
dependencies = ["actionpack" "redis-rack" "redis-store"];
@@ -3651,10 +3735,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63";
+ sha256 = "1hvai5ygkyii9wq8h98wim8shgrm7vkv0js62zpm85vdl1xzvphz";
type = "gem";
};
- version = "5.0.2";
+ version = "5.1.0";
};
redis-activesupport = {
dependencies = ["activesupport" "redis-store"];
@@ -3662,10 +3746,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0y1df62gpqgy0yrlmgl05rp4kb0xvn0kylprhv1k32bs33dgpv62";
+ sha256 = "14a3z8810j02ysvg53f3mvcfb4rw34m91yfd19zy9y5lb3yv2g59";
type = "gem";
};
- version = "5.0.7";
+ version = "5.2.0";
};
redis-namespace = {
dependencies = ["redis"];
@@ -3684,10 +3768,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03xgdmq4fh187aqlh8z05idbxrmgddcarlb8x1kw4wjfcsf5afqi";
+ sha256 = "1pa19ydbk0l6wilwbxcjn6knfs4ffgj0rhaaldrlhf76pjgkaiqb";
type = "gem";
};
- version = "2.0.5";
+ version = "2.0.6";
};
redis-rails = {
dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
@@ -3706,10 +3790,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1mrcnjgkbmx1zf569mly82agdizqayjvnp2k6055k1iy07in3j8b";
+ sha256 = "1isqzzds9kszc2nn8jiy8ikry01qspn7637ba9z2k6sk7vky46d9";
type = "gem";
};
- version = "1.6.0";
+ version = "1.8.1";
};
regexp_parser = {
groups = ["default" "development" "test"];
@@ -3758,10 +3842,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18lqbiyc7234vd6iwxia5yvvzg6bdvdwl2nm4a5y7ia5fxjl3kqm";
+ sha256 = "1p7pqcfq33q1z4xlp4qm94w4h3fzc1yvr3cny16d00i8b20v4rx2";
type = "gem";
};
- version = "2.4.1";
+ version = "3.0.0";
};
rest-client = {
dependencies = ["http-cookie" "mime-types" "netrc"];
@@ -4052,6 +4136,16 @@
};
version = "1.7.2";
};
+ ruby_dep = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5";
+ type = "gem";
+ };
+ version = "1.5.0";
+ };
ruby_parser = {
dependencies = ["sexp_processor"];
groups = ["default"];
@@ -4084,14 +4178,14 @@
version = "0.2.0";
};
rubyzip = {
- groups = ["default" "development" "test"];
+ groups = ["default" "development" "omnibus" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj";
+ sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l";
type = "gem";
};
- version = "1.2.2";
+ version = "1.3.0";
};
rugged = {
groups = ["default"];
@@ -4243,6 +4337,16 @@
};
version = "4.12.0";
};
+ shellany = {
+ groups = ["default" "test"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1ryyzrj1kxmnpdzhlv4ys3dnl2r5r3d2rs2jwzbnd1v96a8pl4hf";
+ type = "gem";
+ };
+ version = "0.0.1";
+ };
shoulda-matchers = {
dependencies = ["activesupport"];
groups = ["test"];
@@ -4439,10 +4543,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l";
+ sha256 = "05c2dw3115zj3pmyyqh2iypc7afj8ibhrghisg0d61z7gzmir1rd";
type = "gem";
};
- version = "0.5.1";
+ version = "0.7.1";
};
state_machines-activerecord = {
dependencies = ["activerecord" "state_machines-activemodel"];
@@ -4450,10 +4554,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3";
+ sha256 = "12g7yqy11fpfiprzc86pwa9jjky1h3haxj37kg47467fgg43p511";
type = "gem";
};
- version = "0.5.1";
+ version = "0.6.0";
};
swd = {
dependencies = ["activesupport" "attr_required" "httpclient"];
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index 1aeb459f64c9..a2231f813e82 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
-#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix-moretea.yarn2nix
+#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix
import click
import click_log
diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
index cff2603129d5..04c0b44f4ac5 100644
--- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
@@ -41,14 +41,6 @@
sha1 = "6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f";
};
}
- {
- name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz";
- path = fetchurl {
- name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz";
- sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4";
- };
- }
{
name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz";
path = fetchurl {
@@ -209,14 +201,6 @@
sha1 = "56d11312bd9248fa619591d02472be6e8cb32540";
};
}
- {
- name = "_babel_parser___parser_7.1.3.tgz";
- path = fetchurl {
- name = "_babel_parser___parser_7.1.3.tgz";
- url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz";
- sha1 = "2c92469bac2b7fbff810b67fca07bd138b48af77";
- };
- }
{
name = "_babel_parser___parser_7.6.2.tgz";
path = fetchurl {
@@ -241,22 +225,6 @@
sha1 = "a974cfae1e37c3110e71f3c6a2e48b8e71958cd4";
};
}
- {
- name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz";
- sha1 = "de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0";
- };
- }
- {
- name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.5.0.tgz";
- sha1 = "ceb594d4a618545b00aa0b5cd61cad4aaaeb7a5a";
- };
- }
{
name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz";
path = fetchurl {
@@ -265,38 +233,6 @@
sha1 = "e532202db4838723691b10a67b8ce509e397c506";
};
}
- {
- name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.5.2.tgz";
- sha1 = "2c0ac2dcc36e3b2443fead2c3c5fc796fb1b5145";
- };
- }
- {
- name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.5.2.tgz";
- sha1 = "ccd5ed05b06d700688ff1db01a9dd27155e0d2a0";
- };
- }
- {
- name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.2.0.tgz";
- sha1 = "94dc2cdc505cafc4e225c0014335a01648056bf7";
- };
- }
- {
- name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.5.0.tgz";
- sha1 = "39233aa801145e7d8072077cdb2d25f781c1ffd7";
- };
- }
{
name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz";
path = fetchurl {
@@ -305,30 +241,6 @@
sha1 = "568ecc446c6148ae6b267f02551130891e29f317";
};
}
- {
- name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.2.0.tgz";
- sha1 = "8a5cea6c42a7c87446959e02fff5fad012c56f57";
- };
- }
- {
- name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz";
- sha1 = "41c360d59481d88e0ce3a3f837df10121a769b39";
- };
- }
- {
- name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.2.0.tgz";
- sha1 = "646854daf4cd22fd6733f6076013a936310443ac";
- };
- }
{
name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz";
path = fetchurl {
@@ -345,22 +257,6 @@
sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5";
};
}
- {
- name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz";
- sha1 = "ae454f4c21c6c2ce8cb2397dc332ae8b420c5441";
- };
- }
- {
- name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-pipeline-operator/-/plugin-proposal-pipeline-operator-7.5.0.tgz";
- sha1 = "4100ec55ef4f6a4c2490b5f5a4f2a22dfa272c06";
- };
- }
{
name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.6.0.tgz";
path = fetchurl {
@@ -369,14 +265,6 @@
sha1 = "19ddc493c7b5d47afdd4291e740c609a83c9fae4";
};
}
- {
- name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.2.0.tgz";
- sha1 = "2d9e452d370f139000e51db65d0a85dc60c64739";
- };
- }
{
name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz";
path = fetchurl {
@@ -393,22 +281,6 @@
sha1 = "69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f";
};
}
- {
- name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz";
- sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b";
- };
- }
- {
- name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.2.0.tgz";
- sha1 = "f3d4b01be05ecde2892086d7cfd5f1fa1ead5a2a";
- };
- }
{
name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz";
path = fetchurl {
@@ -417,46 +289,6 @@
sha1 = "69c159ffaf4998122161ad8ebc5e6d1f55df8612";
};
}
- {
- name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.2.0.tgz";
- sha1 = "edd83b7adc2e0d059e2467ca96c650ab6d2f3820";
- };
- }
- {
- name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.2.0.tgz";
- sha1 = "8d257838c6b3b779db52c0224443459bd27fb039";
- };
- }
- {
- name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz";
- sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c";
- };
- }
- {
- name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-bind/-/plugin-syntax-function-bind-7.2.0.tgz";
- sha1 = "68fe85b0c0da67125f87bf239c68051b06c66309";
- };
- }
- {
- name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.2.0.tgz";
- sha1 = "91474d4d400604e4c6cbd4d77cd6cb3b8565576c";
- };
- }
{
name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz";
path = fetchurl {
@@ -473,38 +305,6 @@
sha1 = "72bd13f6ffe1d25938129d2a186b11fd62951470";
};
}
- {
- name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz";
- sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7";
- };
- }
- {
- name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.2.0.tgz";
- sha1 = "fcab7388530e96c6f277ce494c55caa6c141fcfb";
- };
- }
- {
- name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz";
- sha1 = "f75083dfd5ade73e783db729bbd87e7b9efb7624";
- };
- }
- {
- name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.2.0.tgz";
- sha1 = "7470fe070c2944469a756752a69a6963135018be";
- };
- }
{
name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz";
path = fetchurl {
@@ -521,30 +321,6 @@
sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c";
};
}
- {
- name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz";
- sha1 = "a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff";
- };
- }
- {
- name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-pipeline-operator/-/plugin-syntax-pipeline-operator-7.5.0.tgz";
- sha1 = "8ea7c2c22847c797748bf07752722a317079dc1e";
- };
- }
- {
- name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.2.0.tgz";
- sha1 = "79001ee2afe1b174b1733cdc2fc69c9a46a0f1f8";
- };
- }
{
name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz";
path = fetchurl {
@@ -625,14 +401,6 @@
sha1 = "a63868289e5b4007f7054d46491af51435766008";
};
}
- {
- name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz";
- path = fetchurl {
- name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz";
- sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7";
- };
- }
{
name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz";
path = fetchurl {
@@ -737,38 +505,6 @@
sha1 = "03e33f653f5b25c4eb572c98b9485055b389e905";
};
}
- {
- name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz";
- sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0";
- };
- }
- {
- name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz";
- sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba";
- };
- }
- {
- name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz";
- sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b";
- };
- }
- {
- name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz";
- path = fetchurl {
- name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz";
- sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290";
- };
- }
{
name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz";
path = fetchurl {
@@ -841,30 +577,6 @@
sha1 = "abbb3ed785c7fe4220d4c82a53621d71fc0c75d3";
};
}
- {
- name = "_babel_preset_flow___preset_flow_7.0.0.tgz";
- path = fetchurl {
- name = "_babel_preset_flow___preset_flow_7.0.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz";
- sha1 = "afd764835d9535ec63d8c7d4caf1c06457263da2";
- };
- }
- {
- name = "_babel_preset_react___preset_react_7.0.0.tgz";
- path = fetchurl {
- name = "_babel_preset_react___preset_react_7.0.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz";
- sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0";
- };
- }
- {
- name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz";
- path = fetchurl {
- name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz";
- url = "https://registry.yarnpkg.com/@babel/preset-stage-0/-/preset-stage-0-7.0.0.tgz";
- sha1 = "999aaec79ee8f0a763042c68c06539c97c6e0646";
- };
- }
{
name = "_babel_standalone___standalone_7.5.5.tgz";
path = fetchurl {
@@ -938,27 +650,27 @@
};
}
{
- name = "_gitlab_svgs___svgs_1.78.0.tgz";
+ name = "_gitlab_svgs___svgs_1.82.0.tgz";
path = fetchurl {
- name = "_gitlab_svgs___svgs_1.78.0.tgz";
- url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.78.0.tgz";
- sha1 = "469493bd6cdd254eb5d1271edeab22bbbee2f4c4";
+ name = "_gitlab_svgs___svgs_1.82.0.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.82.0.tgz";
+ sha1 = "c059c460afc13ebfe9df370521ca8963fa5afb80";
};
}
{
- name = "_gitlab_ui___ui_5.36.0.tgz";
+ name = "_gitlab_ui___ui_7.11.0.tgz";
path = fetchurl {
- name = "_gitlab_ui___ui_5.36.0.tgz";
- url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.36.0.tgz";
- sha1 = "3087b23c138ad1c222f6b047e533f253371bc618";
+ name = "_gitlab_ui___ui_7.11.0.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-7.11.0.tgz";
+ sha1 = "b5c981f3b1edbf0ad75bcca8fa1cd81017676b3b";
};
}
{
- name = "_gitlab_visual_review_tools___visual_review_tools_1.0.3.tgz";
+ name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz";
path = fetchurl {
- name = "_gitlab_visual_review_tools___visual_review_tools_1.0.3.tgz";
- url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.0.3.tgz";
- sha1 = "b49c4a6fd8af3a1517d7e7d04096562f8bcb5d14";
+ name = "_gitlab_visual_review_tools___visual_review_tools_1.2.0.tgz";
+ url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.2.0.tgz";
+ sha1 = "8d6757917193c1023012bb4a316dc1a97309a27a";
};
}
{
@@ -1073,6 +785,62 @@
sha1 = "17adc7d380457379cd14cbb64a435ea196cc4a6e";
};
}
+ {
+ name = "_sentry_browser___browser_5.7.1.tgz";
+ path = fetchurl {
+ name = "_sentry_browser___browser_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.7.1.tgz";
+ sha1 = "1f8435e2a325d7a09f830065ebce40a2b3c708a4";
+ };
+ }
+ {
+ name = "_sentry_core___core_5.7.1.tgz";
+ path = fetchurl {
+ name = "_sentry_core___core_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.7.1.tgz";
+ sha1 = "3eb2b7662cac68245931ee939ec809bf7a639d0e";
+ };
+ }
+ {
+ name = "_sentry_hub___hub_5.7.1.tgz";
+ path = fetchurl {
+ name = "_sentry_hub___hub_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.7.1.tgz";
+ sha1 = "a52acd9fead7f3779d96e9965c6978aecc8b9cad";
+ };
+ }
+ {
+ name = "_sentry_minimal___minimal_5.7.1.tgz";
+ path = fetchurl {
+ name = "_sentry_minimal___minimal_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.7.1.tgz";
+ sha1 = "56afc537737586929e25349765e37a367958c1e1";
+ };
+ }
+ {
+ name = "_sentry_types___types_5.7.1.tgz";
+ path = fetchurl {
+ name = "_sentry_types___types_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.7.1.tgz";
+ sha1 = "4c4c1d4d891b6b8c2c3c7b367d306a8b1350f090";
+ };
+ }
+ {
+ name = "_sentry_utils___utils_5.7.1.tgz";
+ path = fetchurl {
+ name = "_sentry_utils___utils_5.7.1.tgz";
+ url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.7.1.tgz";
+ sha1 = "cf37ad55f78e317665cd8680f202d307fa77f1d0";
+ };
+ }
+ {
+ name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz";
+ path = fetchurl {
+ name = "_sourcegraph_code_host_integration___code_host_integration_0.0.13.tgz";
+ url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.13.tgz";
+ sha1 = "4fd5fe1e0088c63b2a26be231c5a2a4ca79b1596";
+ };
+ }
{
name = "_types_anymatch___anymatch_1.3.0.tgz";
path = fetchurl {
@@ -1433,6 +1201,22 @@
sha1 = "114bbc481fd10ca0e23b3560fa812748b0bae5bc";
};
}
+ {
+ name = "_wry_context___context_0.4.4.tgz";
+ path = fetchurl {
+ name = "_wry_context___context_0.4.4.tgz";
+ url = "https://registry.yarnpkg.com/@wry/context/-/context-0.4.4.tgz";
+ sha1 = "e50f5fa1d6cfaabf2977d1fda5ae91717f8815f8";
+ };
+ }
+ {
+ name = "_wry_equality___equality_0.1.9.tgz";
+ path = fetchurl {
+ name = "_wry_equality___equality_0.1.9.tgz";
+ url = "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.9.tgz";
+ sha1 = "b13e18b7a8053c6858aa6c85b54911fb31e3a909";
+ };
+ }
{
name = "_xtuc_ieee754___ieee754_1.2.0.tgz";
path = fetchurl {
@@ -1457,14 +1241,6 @@
sha1 = "e77a97fbd345b76d83245edcd17d393b1b41fb31";
};
}
- {
- name = "JSONStream___JSONStream_1.3.5.tgz";
- path = fetchurl {
- name = "JSONStream___JSONStream_1.3.5.tgz";
- url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz";
- sha1 = "3208c1f08d3a4d99261ab64f92302bc15e111ca0";
- };
- }
{
name = "abab___abab_2.0.0.tgz";
path = fetchurl {
@@ -1658,27 +1434,27 @@
};
}
{
- name = "apollo_cache_inmemory___apollo_cache_inmemory_1.5.1.tgz";
+ name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.3.tgz";
path = fetchurl {
- name = "apollo_cache_inmemory___apollo_cache_inmemory_1.5.1.tgz";
- url = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz";
- sha1 = "265d1ee67b0bf0aca9c37629d410bfae44e62953";
+ name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.3.tgz";
+ url = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz";
+ sha1 = "826861d20baca4abc45f7ca7a874105905b8525d";
};
}
{
- name = "apollo_cache___apollo_cache_1.2.1.tgz";
+ name = "apollo_cache___apollo_cache_1.3.2.tgz";
path = fetchurl {
- name = "apollo_cache___apollo_cache_1.2.1.tgz";
- url = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz";
- sha1 = "aae71eb4a11f1f7322adc343f84b1a39b0693644";
+ name = "apollo_cache___apollo_cache_1.3.2.tgz";
+ url = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz";
+ sha1 = "df4dce56240d6c95c613510d7e409f7214e6d26a";
};
}
{
- name = "apollo_client___apollo_client_2.5.1.tgz";
+ name = "apollo_client___apollo_client_2.6.4.tgz";
path = fetchurl {
- name = "apollo_client___apollo_client_2.5.1.tgz";
- url = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz";
- sha1 = "36126ed1d32edd79c3713c6684546a3bea80e6d1";
+ name = "apollo_client___apollo_client_2.6.4.tgz";
+ url = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.4.tgz";
+ sha1 = "872c32927263a0d34655c5ef8a8949fbb20b6140";
};
}
{
@@ -1697,14 +1473,6 @@
sha1 = "64eb231082f182b0395ef7ab903600627f6c7fe8";
};
}
- {
- name = "apollo_link_dedup___apollo_link_dedup_1.0.10.tgz";
- path = fetchurl {
- name = "apollo_link_dedup___apollo_link_dedup_1.0.10.tgz";
- url = "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.10.tgz";
- sha1 = "7b94589fe7f969777efd18a129043c78430800ae";
- };
- }
{
name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz";
path = fetchurl {
@@ -1730,19 +1498,11 @@
};
}
{
- name = "apollo_utilities___apollo_utilities_1.2.1.tgz";
+ name = "apollo_utilities___apollo_utilities_1.3.2.tgz";
path = fetchurl {
- name = "apollo_utilities___apollo_utilities_1.2.1.tgz";
- url = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz";
- sha1 = "1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c";
- };
- }
- {
- name = "append_buffer___append_buffer_1.0.2.tgz";
- path = fetchurl {
- name = "append_buffer___append_buffer_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz";
- sha1 = "d8220cf466081525efea50614f3de6514dfa58f1";
+ name = "apollo_utilities___apollo_utilities_1.3.2.tgz";
+ url = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz";
+ sha1 = "8cbdcf8b012f664cd6cb5767f6130f5aed9115c9";
};
}
{
@@ -2121,14 +1881,6 @@
sha1 = "66f06136eefce87797539c0d63f1769cc3915984";
};
}
- {
- name = "babelify___babelify_10.0.0.tgz";
- path = fetchurl {
- name = "babelify___babelify_10.0.0.tgz";
- url = "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz";
- sha1 = "fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5";
- };
- }
{
name = "babylon___babylon_7.0.0_beta.19.tgz";
path = fetchurl {
@@ -2297,14 +2049,6 @@
sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a";
};
}
- {
- name = "body___body_5.1.0.tgz";
- path = fetchurl {
- name = "body___body_5.1.0.tgz";
- url = "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz";
- sha1 = "e4ba0ce410a46936323367609ecb4e6553125069";
- };
- }
{
name = "bonjour___bonjour_3.5.0.tgz";
path = fetchurl {
@@ -2457,14 +2201,6 @@
sha1 = "9ac78d3ed5d915804fd87acb158bc797147a1719";
};
}
- {
- name = "buffer_equal___buffer_equal_1.0.0.tgz";
- path = fetchurl {
- name = "buffer_equal___buffer_equal_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz";
- sha1 = "59616b498304d556abd466966b22eeda3eca5fbe";
- };
- }
{
name = "buffer_from___buffer_from_1.1.1.tgz";
path = fetchurl {
@@ -2489,14 +2225,6 @@
sha1 = "f73e13b1e42f196fe2fd67d001c7d7107edd7c23";
};
}
- {
- name = "buffer_shims___buffer_shims_1.0.0.tgz";
- path = fetchurl {
- name = "buffer_shims___buffer_shims_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz";
- sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
- };
- }
{
name = "buffer_xor___buffer_xor_1.0.3.tgz";
path = fetchurl {
@@ -2521,14 +2249,6 @@
sha1 = "85982878e21b98e1c66425e03d0174788f569ee8";
};
}
- {
- name = "bytes___bytes_1.0.0.tgz";
- path = fetchurl {
- name = "bytes___bytes_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz";
- sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
- };
- }
{
name = "bytes___bytes_3.0.0.tgz";
path = fetchurl {
@@ -2577,14 +2297,6 @@
sha1 = "9948cae353aec0a1fcb1eafda2300816ec85387e";
};
}
- {
- name = "cached_path_relative___cached_path_relative_1.0.2.tgz";
- path = fetchurl {
- name = "cached_path_relative___cached_path_relative_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz";
- sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db";
- };
- }
{
name = "call_me_maybe___call_me_maybe_1.0.1.tgz";
path = fetchurl {
@@ -2993,14 +2705,6 @@
sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5";
};
}
- {
- name = "clone_buffer___clone_buffer_1.0.0.tgz";
- path = fetchurl {
- name = "clone_buffer___clone_buffer_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz";
- sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58";
- };
- }
{
name = "clone_deep___clone_deep_4.0.1.tgz";
path = fetchurl {
@@ -3017,30 +2721,6 @@
sha1 = "7d65e00885cd8796405c35a737e7a86b7429e36f";
};
}
- {
- name = "clone_stats___clone_stats_1.0.0.tgz";
- path = fetchurl {
- name = "clone_stats___clone_stats_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz";
- sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680";
- };
- }
- {
- name = "clone___clone_2.1.2.tgz";
- path = fetchurl {
- name = "clone___clone_2.1.2.tgz";
- url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz";
- sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
- };
- }
- {
- name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
- path = fetchurl {
- name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz";
- sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec";
- };
- }
{
name = "co___co_4.6.0.tgz";
path = fetchurl {
@@ -3137,14 +2817,6 @@
sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828";
};
}
- {
- name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz";
- path = fetchurl {
- name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz";
- url = "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz";
- sha1 = "419cd7fb3258b1ed838dc0953167a25e152f5b59";
- };
- }
{
name = "commander___commander_2.20.0.tgz";
path = fetchurl {
@@ -3241,14 +2913,6 @@
sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34";
};
}
- {
- name = "concat_stream___concat_stream_1.5.2.tgz";
- path = fetchurl {
- name = "concat_stream___concat_stream_1.5.2.tgz";
- url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz";
- sha1 = "708978624d856af41a5a741defdd261da752c266";
- };
- }
{
name = "config_chain___config_chain_1.1.12.tgz";
path = fetchurl {
@@ -3345,14 +3009,6 @@
sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b";
};
}
- {
- name = "continuable_cache___continuable_cache_0.3.1.tgz";
- path = fetchurl {
- name = "continuable_cache___continuable_cache_0.3.1.tgz";
- url = "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz";
- sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f";
- };
- }
{
name = "convert_source_map___convert_source_map_1.6.0.tgz";
path = fetchurl {
@@ -3553,6 +3209,14 @@
sha1 = "a230f64f568310e1498009940790ec99545bca7e";
};
}
+ {
+ name = "crypto_random_string___crypto_random_string_3.0.1.tgz";
+ path = fetchurl {
+ name = "crypto_random_string___crypto_random_string_3.0.1.tgz";
+ url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.0.1.tgz";
+ sha1 = "29d7dc759d577a768afb3b7b2765dd9bd7ffe36a";
+ };
+ }
{
name = "css_b64_images___css_b64_images_0.2.5.tgz";
path = fetchurl {
@@ -3617,6 +3281,14 @@
sha1 = "37741919903b868565e1c09ea747445cd18983ee";
};
}
+ {
+ name = "cssfontparser___cssfontparser_1.2.1.tgz";
+ path = fetchurl {
+ name = "cssfontparser___cssfontparser_1.2.1.tgz";
+ url = "https://registry.yarnpkg.com/cssfontparser/-/cssfontparser-1.2.1.tgz";
+ sha1 = "f4022fc8f9700c68029d542084afbaf425a3f3e3";
+ };
+ }
{
name = "cssom___cssom_0.3.4.tgz";
path = fetchurl {
@@ -3946,27 +3618,27 @@
};
}
{
- name = "d3___d3_5.9.2.tgz";
+ name = "d3___d3_5.12.0.tgz";
path = fetchurl {
- name = "d3___d3_5.9.2.tgz";
- url = "https://registry.yarnpkg.com/d3/-/d3-5.9.2.tgz";
- sha1 = "64e8a7e9c3d96d9e6e4999d2c8a2c829767e67f5";
+ name = "d3___d3_5.12.0.tgz";
+ url = "https://registry.yarnpkg.com/d3/-/d3-5.12.0.tgz";
+ sha1 = "0ddeac879c28c882317cd439b495290acd59ab61";
};
}
{
- name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz";
+ name = "https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b";
path = fetchurl {
- name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz";
- url = "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.5.8.tgz";
- sha1 = "aa071bb71d3c4d67426925906f3f6ddead49c1a3";
+ name = "https___codeload.github.com_dagrejs_dagre_d3_tar.gz_e1a00e5cb518f5d2304a35647e024f31d178e55b";
+ url = "https://codeload.github.com/dagrejs/dagre-d3/tar.gz/e1a00e5cb518f5d2304a35647e024f31d178e55b";
+ sha1 = "7400df3f5fe80538fde43d0201e1570e1d689004";
};
}
{
- name = "dagre_layout___dagre_layout_0.8.8.tgz";
+ name = "dagre___dagre_0.8.4.tgz";
path = fetchurl {
- name = "dagre_layout___dagre_layout_0.8.8.tgz";
- url = "https://registry.yarnpkg.com/dagre-layout/-/dagre-layout-0.8.8.tgz";
- sha1 = "9b6792f24229f402441c14162c1049e3f261f6d9";
+ name = "dagre___dagre_0.8.4.tgz";
+ url = "https://registry.yarnpkg.com/dagre/-/dagre-0.8.4.tgz";
+ sha1 = "26b9fb8f7bdc60c6110a0458c375261836786061";
};
}
{
@@ -4066,11 +3738,11 @@
};
}
{
- name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz";
+ name = "deckar01_task_list___deckar01_task_list_2.2.1.tgz";
path = fetchurl {
- name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.0.tgz";
- sha1 = "5cc3ea06f01d3d786b1a667064a462eb5d069bd3";
+ name = "deckar01_task_list___deckar01_task_list_2.2.1.tgz";
+ url = "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.1.tgz";
+ sha1 = "e1e8a16c4fd6e153e51fd9258fdbee067ebcd86b";
};
}
{
@@ -4161,14 +3833,6 @@
sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d";
};
}
- {
- name = "defined___defined_1.0.0.tgz";
- path = fetchurl {
- name = "defined___defined_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz";
- sha1 = "c98d9bcef75674188e110969151199e39b1fa693";
- };
- }
{
name = "del___del_2.2.2.tgz";
path = fetchurl {
@@ -4241,14 +3905,6 @@
sha1 = "978857442c44749e4206613e37946205826abd80";
};
}
- {
- name = "detab___detab_2.0.2.tgz";
- path = fetchurl {
- name = "detab___detab_2.0.2.tgz";
- url = "https://registry.yarnpkg.com/detab/-/detab-2.0.2.tgz";
- sha1 = "074970d1a807b045d0258a4235df5928dd683561";
- };
- }
{
name = "detect_file___detect_file_1.0.0.tgz";
path = fetchurl {
@@ -4281,14 +3937,6 @@
sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c";
};
}
- {
- name = "detective___detective_4.7.1.tgz";
- path = fetchurl {
- name = "detective___detective_4.7.1.tgz";
- url = "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz";
- sha1 = "0eca7314338442febb6d65da54c10bb1c82b246e";
- };
- }
{
name = "di___di_0.0.1.tgz";
path = fetchurl {
@@ -4313,14 +3961,6 @@
sha1 = "800c0dd1e0a8bfbc95835c202ad220fe317e5a12";
};
}
- {
- name = "diff___diff_4.0.1.tgz";
- path = fetchurl {
- name = "diff___diff_4.0.1.tgz";
- url = "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz";
- sha1 = "0c667cb467ebbb5cea7f14f135cc2dba7780a8ff";
- };
- }
{
name = "diffie_hellman___diffie_hellman_5.0.2.tgz";
path = fetchurl {
@@ -4369,14 +4009,6 @@
sha1 = "0449a8f6bb247f563020b78a5485dea95ae2e094";
};
}
- {
- name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz";
- path = fetchurl {
- name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz";
- sha1 = "36f2154f556ee4f1e60311d391cd23de5187ed57";
- };
- }
{
name = "doctrine___doctrine_1.5.0.tgz";
path = fetchurl {
@@ -4401,14 +4033,6 @@
sha1 = "dad8cb7be38e04ee3f56842e6cf81af46c1249ba";
};
}
- {
- name = "documentation___documentation_12.0.3.tgz";
- path = fetchurl {
- name = "documentation___documentation_12.0.3.tgz";
- url = "https://registry.yarnpkg.com/documentation/-/documentation-12.0.3.tgz";
- sha1 = "32f91da8e5cb4104f69db9fd32c87773a1ad6240";
- };
- }
{
name = "dom_serialize___dom_serialize_2.2.1.tgz";
path = fetchurl {
@@ -4489,14 +4113,6 @@
sha1 = "fbe7acbb9918e0706489072ef663effeef8a79f3";
};
}
- {
- name = "duplexer2___duplexer2_0.1.4.tgz";
- path = fetchurl {
- name = "duplexer2___duplexer2_0.1.4.tgz";
- url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz";
- sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
- };
- }
{
name = "duplexer3___duplexer3_0.1.4.tgz";
path = fetchurl {
@@ -4585,14 +4201,6 @@
sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
};
}
- {
- name = "emoji_regex___emoji_regex_6.1.1.tgz";
- path = fetchurl {
- name = "emoji_regex___emoji_regex_6.1.1.tgz";
- url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz";
- sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e";
- };
- }
{
name = "emoji_regex___emoji_regex_7.0.3.tgz";
path = fetchurl {
@@ -4713,14 +4321,6 @@
sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf";
};
}
- {
- name = "error___error_7.0.2.tgz";
- path = fetchurl {
- name = "error___error_7.0.2.tgz";
- url = "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz";
- sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02";
- };
- }
{
name = "es_abstract___es_abstract_1.13.0.tgz";
path = fetchurl {
@@ -5545,14 +5145,6 @@
sha1 = "2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07";
};
}
- {
- name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz";
- path = fetchurl {
- name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz";
- sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb";
- };
- }
{
name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz";
path = fetchurl {
@@ -5649,14 +5241,6 @@
sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e";
};
}
- {
- name = "get_port___get_port_4.2.0.tgz";
- path = fetchurl {
- name = "get_port___get_port_4.2.0.tgz";
- url = "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz";
- sha1 = "e37368b1e863b7629c43c5a323625f95cf24b119";
- };
- }
{
name = "get_stdin___get_stdin_4.0.1.tgz";
path = fetchurl {
@@ -5737,38 +5321,6 @@
sha1 = "882679cefc71888eb6e69297e6b2dc14c0384fef";
};
}
- {
- name = "git_up___git_up_2.1.0.tgz";
- path = fetchurl {
- name = "git_up___git_up_2.1.0.tgz";
- url = "https://registry.yarnpkg.com/git-up/-/git-up-2.1.0.tgz";
- sha1 = "2f14cfe78327e7c4a2b92fcac7bfc674fdfad40c";
- };
- }
- {
- name = "git_url_parse___git_url_parse_10.1.0.tgz";
- path = fetchurl {
- name = "git_url_parse___git_url_parse_10.1.0.tgz";
- url = "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-10.1.0.tgz";
- sha1 = "a27813218f8777e91d15f1c121b83bf14721b67e";
- };
- }
- {
- name = "github_slugger___github_slugger_1.2.0.tgz";
- path = fetchurl {
- name = "github_slugger___github_slugger_1.2.0.tgz";
- url = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.0.tgz";
- sha1 = "8ada3286fd046d8951c3c952a8d7854cfd90fd9a";
- };
- }
- {
- name = "github_slugger___github_slugger_1.2.1.tgz";
- path = fetchurl {
- name = "github_slugger___github_slugger_1.2.1.tgz";
- url = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.1.tgz";
- sha1 = "47e904e70bf2dccd0014748142d31126cfd49508";
- };
- }
{
name = "glob_parent___glob_parent_3.1.0.tgz";
path = fetchurl {
@@ -5785,14 +5337,6 @@
sha1 = "1dc99f0f39b006d3e92c2c284068382f0c20e954";
};
}
- {
- name = "glob_stream___glob_stream_6.1.0.tgz";
- path = fetchurl {
- name = "glob_stream___glob_stream_6.1.0.tgz";
- url = "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz";
- sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4";
- };
- }
{
name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz";
path = fetchurl {
@@ -5857,14 +5401,6 @@
sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97";
};
}
- {
- name = "globals_docs___globals_docs_2.4.0.tgz";
- path = fetchurl {
- name = "globals_docs___globals_docs_2.4.0.tgz";
- url = "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.4.0.tgz";
- sha1 = "f2c647544eb6161c7c38452808e16e693c2dafbb";
- };
- }
{
name = "globals___globals_11.12.0.tgz";
path = fetchurl {
@@ -5962,11 +5498,11 @@
};
}
{
- name = "graphlibrary___graphlibrary_2.2.0.tgz";
+ name = "graphlib___graphlib_2.1.7.tgz";
path = fetchurl {
- name = "graphlibrary___graphlibrary_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/graphlibrary/-/graphlibrary-2.2.0.tgz";
- sha1 = "017a14899775228dec4497a39babfdd6bf56eac6";
+ name = "graphlib___graphlib_2.1.7.tgz";
+ url = "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.7.tgz";
+ sha1 = "b6a69f9f44bd9de3963ce6804a2fc9e73d86aecc";
};
}
{
@@ -6153,38 +5689,6 @@
sha1 = "340dedbe6290187151c1ea1d777a3448935df846";
};
}
- {
- name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz";
- path = fetchurl {
- name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz";
- url = "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.3.tgz";
- sha1 = "423b4b26fe8bf1f25950fe052e9ce8f83fd5f6a4";
- };
- }
- {
- name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz";
- path = fetchurl {
- name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz";
- url = "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.3.1.tgz";
- sha1 = "4e60d66336bd67e52354d581967467029a933f2e";
- };
- }
- {
- name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz";
- path = fetchurl {
- name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz";
- url = "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-4.0.1.tgz";
- sha1 = "3666b05afb62bd69f8f5e6c94db04dea19438e2a";
- };
- }
- {
- name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz";
- path = fetchurl {
- name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz";
- url = "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.3.tgz";
- sha1 = "6d161b307bd0693b5ec000c7c7e8b5445109ee34";
- };
- }
{
name = "he___he_1.2.0.tgz";
path = fetchurl {
@@ -6193,14 +5697,6 @@
sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f";
};
}
- {
- name = "highlight.js___highlight.js_9.15.8.tgz";
- path = fetchurl {
- name = "highlight.js___highlight.js_9.15.8.tgz";
- url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.8.tgz";
- sha1 = "f344fda123f36f1a65490e932cf90569e4999971";
- };
- }
{
name = "highlight.js___highlight.js_9.13.1.tgz";
path = fetchurl {
@@ -6281,14 +5777,6 @@
sha1 = "41f57708c9e6b7b46a00a22317d614c4a2bab166";
};
}
- {
- name = "html_void_elements___html_void_elements_1.0.4.tgz";
- path = fetchurl {
- name = "html_void_elements___html_void_elements_1.0.4.tgz";
- url = "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.4.tgz";
- sha1 = "95e8bb5ecd6b88766569c2645f2b5f1591db9ba5";
- };
- }
{
name = "htmlparser2___htmlparser2_3.10.0.tgz";
path = fetchurl {
@@ -6441,14 +5929,6 @@
sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b";
};
}
- {
- name = "immutable_tuple___immutable_tuple_0.4.9.tgz";
- path = fetchurl {
- name = "immutable_tuple___immutable_tuple_0.4.9.tgz";
- url = "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.9.tgz";
- sha1 = "473ebdd6c169c461913a454bf87ef8f601a20ff0";
- };
- }
{
name = "import_fresh___import_fresh_2.0.0.tgz";
path = fetchurl {
@@ -6657,14 +6137,6 @@
sha1 = "554f2933e7385cc46e94351977ca2081170a206e";
};
}
- {
- name = "is_absolute___is_absolute_1.0.0.tgz";
- path = fetchurl {
- name = "is_absolute___is_absolute_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz";
- sha1 = "395e1ae84b11f26ad1795e73c17378e48a301576";
- };
- }
{
name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz";
path = fetchurl {
@@ -6921,14 +6393,6 @@
sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80";
};
}
- {
- name = "is_negated_glob___is_negated_glob_1.0.0.tgz";
- path = fetchurl {
- name = "is_negated_glob___is_negated_glob_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz";
- sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2";
- };
- }
{
name = "is_npm___is_npm_1.0.0.tgz";
path = fetchurl {
@@ -7065,14 +6529,6 @@
sha1 = "cd734a56864e23b956bf4e7c66c396a4c0b22c2d";
};
}
- {
- name = "is_relative___is_relative_1.0.0.tgz";
- path = fetchurl {
- name = "is_relative___is_relative_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz";
- sha1 = "a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d";
- };
- }
{
name = "is_resolvable___is_resolvable_1.1.0.tgz";
path = fetchurl {
@@ -7089,14 +6545,6 @@
sha1 = "11a060568b67339444033d0125a61a20d564fb34";
};
}
- {
- name = "is_ssh___is_ssh_1.3.1.tgz";
- path = fetchurl {
- name = "is_ssh___is_ssh_1.3.1.tgz";
- url = "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz";
- sha1 = "f349a8cadd24e65298037a522cf7520f2e81a0f3";
- };
- }
{
name = "is_stream___is_stream_1.1.0.tgz";
path = fetchurl {
@@ -7121,14 +6569,6 @@
sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
};
}
- {
- name = "is_unc_path___is_unc_path_1.0.0.tgz";
- path = fetchurl {
- name = "is_unc_path___is_unc_path_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz";
- sha1 = "d731e8898ed090a12c352ad2eaed5095ad322c9d";
- };
- }
{
name = "is_utf8___is_utf8_0.2.1.tgz";
path = fetchurl {
@@ -7137,14 +6577,6 @@
sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
};
}
- {
- name = "is_valid_glob___is_valid_glob_1.0.0.tgz";
- path = fetchurl {
- name = "is_valid_glob___is_valid_glob_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz";
- sha1 = "29bf3eff701be2d4d315dbacc39bc39fe8f601aa";
- };
- }
{
name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz";
path = fetchurl {
@@ -7337,6 +6769,14 @@
sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4";
};
}
+ {
+ name = "jest_canvas_mock___jest_canvas_mock_2.1.2.tgz";
+ path = fetchurl {
+ name = "jest_canvas_mock___jest_canvas_mock_2.1.2.tgz";
+ url = "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.1.2.tgz";
+ sha1 = "0d16c9f91534f773fd132fc289f2e6b6db8faa28";
+ };
+ }
{
name = "jest_changed_files___jest_changed_files_24.8.0.tgz";
path = fetchurl {
@@ -7801,14 +7241,6 @@
sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
};
}
- {
- name = "jsonparse___jsonparse_1.3.1.tgz";
- path = fetchurl {
- name = "jsonparse___jsonparse_1.3.1.tgz";
- url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz";
- sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
- };
- }
{
name = "jsprim___jsprim_1.4.1.tgz";
path = fetchurl {
@@ -7977,14 +7409,6 @@
sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15";
};
}
- {
- name = "lazystream___lazystream_1.0.0.tgz";
- path = fetchurl {
- name = "lazystream___lazystream_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz";
- sha1 = "f6995fe0f820392f61396be89462407bb77168e4";
- };
- }
{
name = "lcid___lcid_1.0.0.tgz";
path = fetchurl {
@@ -8001,14 +7425,6 @@
sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf";
};
}
- {
- name = "lead___lead_1.0.0.tgz";
- path = fetchurl {
- name = "lead___lead_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz";
- sha1 = "6f14f99a37be3a9dd784f5495690e5903466ee42";
- };
- }
{
name = "left_pad___left_pad_1.3.0.tgz";
path = fetchurl {
@@ -8065,14 +7481,6 @@
sha1 = "c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db";
};
}
- {
- name = "livereload_js___livereload_js_2.4.0.tgz";
- path = fetchurl {
- name = "livereload_js___livereload_js_2.4.0.tgz";
- url = "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz";
- sha1 = "447c31cf1ea9ab52fc20db615c5ddf678f78009c";
- };
- }
{
name = "load_json_file___load_json_file_1.1.0.tgz";
path = fetchurl {
@@ -8185,6 +7593,22 @@
sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0";
};
}
+ {
+ name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
+ path = fetchurl {
+ name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz";
+ url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz";
+ sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb";
+ };
+ }
+ {
+ name = "lodash.isstring___lodash.isstring_4.0.1.tgz";
+ path = fetchurl {
+ name = "lodash.isstring___lodash.isstring_4.0.1.tgz";
+ url = "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz";
+ sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451";
+ };
+ }
{
name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz";
path = fetchurl {
@@ -8513,46 +7937,6 @@
sha1 = "c12ebe16fffc84573d3e19767726de226e95f649";
};
}
- {
- name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz";
- path = fetchurl {
- name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz";
- url = "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-1.2.4.tgz";
- sha1 = "2b54ad4eecaff9d9fcb6bf6f9f6b68b232d77ca7";
- };
- }
- {
- name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz";
- path = fetchurl {
- name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz";
- sha1 = "db06b8b585be959a2dcd2f87f472ba9b756f3675";
- };
- }
- {
- name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz";
- path = fetchurl {
- name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz";
- url = "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-3.0.4.tgz";
- sha1 = "132001b266031192348d3366a6b011f28e54dc40";
- };
- }
- {
- name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz";
- path = fetchurl {
- name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz";
- url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.0.6.tgz";
- sha1 = "7d85421021343b33de1552fc71cb8e5b4ae7536d";
- };
- }
- {
- name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz";
- path = fetchurl {
- name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz";
- url = "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-3.1.0.tgz";
- sha1 = "395eeb877f067f9d2165d990d77c7eea6f740934";
- };
- }
{
name = "mdurl___mdurl_1.0.1.tgz";
path = fetchurl {
@@ -8642,11 +8026,11 @@
};
}
{
- name = "mermaid___mermaid_8.2.6.tgz";
+ name = "mermaid___mermaid_8.4.2.tgz";
path = fetchurl {
- name = "mermaid___mermaid_8.2.6.tgz";
- url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.2.6.tgz";
- sha1 = "e73f396461a435c39a998819171c2114f59e46e1";
+ name = "mermaid___mermaid_8.4.2.tgz";
+ url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.2.tgz";
+ sha1 = "91d3d8e9541e72eed7a78d0e882db11564fab3bb";
};
}
{
@@ -8833,14 +8217,6 @@
sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
};
}
- {
- name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz";
- path = fetchurl {
- name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz";
- url = "https://registry.yarnpkg.com/module-deps-sortable/-/module-deps-sortable-5.0.0.tgz";
- sha1 = "99db5bb08f7eab55e4c31f6b7c722c6a2144ba74";
- };
- }
{
name = "moment_mini___moment_mini_2.22.1.tgz";
path = fetchurl {
@@ -9153,22 +8529,6 @@
sha1 = "d0b145eb691189c63a78d201dc4fdb1293ef0c03";
};
}
- {
- name = "normalize_url___normalize_url_1.9.1.tgz";
- path = fetchurl {
- name = "normalize_url___normalize_url_1.9.1.tgz";
- url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz";
- sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c";
- };
- }
- {
- name = "now_and_later___now_and_later_2.0.1.tgz";
- path = fetchurl {
- name = "now_and_later___now_and_later_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz";
- sha1 = "8e579c8685764a7cc02cb680380e94f43ccb1f7c";
- };
- }
{
name = "npm_bundled___npm_bundled_1.0.6.tgz";
path = fetchurl {
@@ -9362,11 +8722,11 @@
};
}
{
- name = "optimism___optimism_0.6.9.tgz";
+ name = "optimism___optimism_0.10.3.tgz";
path = fetchurl {
- name = "optimism___optimism_0.6.9.tgz";
- url = "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz";
- sha1 = "19258ff8b3be0cea29ac35f06bff818e026e30bb";
+ name = "optimism___optimism_0.10.3.tgz";
+ url = "https://registry.yarnpkg.com/optimism/-/optimism-0.10.3.tgz";
+ sha1 = "163268fdc741dea2fb50f300bedda80356445fd7";
};
}
{
@@ -9385,14 +8745,6 @@
sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
};
}
- {
- name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz";
- path = fetchurl {
- name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz";
- sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e";
- };
- }
{
name = "orderedmap___orderedmap_1.0.0.tgz";
path = fetchurl {
@@ -9609,6 +8961,14 @@
sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712";
};
}
+ {
+ name = "parse_color___parse_color_1.0.0.tgz";
+ path = fetchurl {
+ name = "parse_color___parse_color_1.0.0.tgz";
+ url = "https://registry.yarnpkg.com/parse-color/-/parse-color-1.0.0.tgz";
+ sha1 = "7b748b95a83f03f16a94f535e52d7f3d94658619";
+ };
+ }
{
name = "parse_entities___parse_entities_1.2.0.tgz";
path = fetchurl {
@@ -9617,22 +8977,6 @@
sha1 = "9deac087661b2e36814153cb78d7e54a4c5fd6f4";
};
}
- {
- name = "parse_filepath___parse_filepath_1.0.2.tgz";
- path = fetchurl {
- name = "parse_filepath___parse_filepath_1.0.2.tgz";
- url = "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz";
- sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891";
- };
- }
- {
- name = "parse_git_config___parse_git_config_0.2.0.tgz";
- path = fetchurl {
- name = "parse_git_config___parse_git_config_0.2.0.tgz";
- url = "https://registry.yarnpkg.com/parse-git-config/-/parse-git-config-0.2.0.tgz";
- sha1 = "272833fdd15fea146fb75d336d236b963b6ff706";
- };
- }
{
name = "parse_json___parse_json_2.2.0.tgz";
path = fetchurl {
@@ -9657,22 +9001,6 @@
sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
};
}
- {
- name = "parse_path___parse_path_3.0.4.tgz";
- path = fetchurl {
- name = "parse_path___parse_path_3.0.4.tgz";
- url = "https://registry.yarnpkg.com/parse-path/-/parse-path-3.0.4.tgz";
- sha1 = "a48b7b529da41f34d9d1428602a39b29fc7180e4";
- };
- }
- {
- name = "parse_url___parse_url_3.0.2.tgz";
- path = fetchurl {
- name = "parse_url___parse_url_3.0.2.tgz";
- url = "https://registry.yarnpkg.com/parse-url/-/parse-url-3.0.2.tgz";
- sha1 = "602787a7063a795d72b8673197505e72f60610be";
- };
- }
{
name = "parse5___parse5_4.0.0.tgz";
path = fetchurl {
@@ -9793,22 +9121,6 @@
sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c";
};
}
- {
- name = "path_root_regex___path_root_regex_0.1.2.tgz";
- path = fetchurl {
- name = "path_root_regex___path_root_regex_0.1.2.tgz";
- url = "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz";
- sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d";
- };
- }
- {
- name = "path_root___path_root_0.1.1.tgz";
- path = fetchurl {
- name = "path_root___path_root_0.1.1.tgz";
- url = "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz";
- sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7";
- };
- }
{
name = "path_to_regexp___path_to_regexp_0.1.7.tgz";
path = fetchurl {
@@ -10194,11 +9506,11 @@
};
}
{
- name = "postcss___postcss_7.0.18.tgz";
+ name = "postcss___postcss_7.0.21.tgz";
path = fetchurl {
- name = "postcss___postcss_7.0.18.tgz";
- url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz";
- sha1 = "4b9cda95ae6c069c67a4d933029eddd4838ac233";
+ name = "postcss___postcss_7.0.21.tgz";
+ url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz";
+ sha1 = "06bb07824c19c2021c5d056d5b10c35b989f7e17";
};
}
{
@@ -10257,14 +9569,6 @@
sha1 = "2381edb3689f7a53d653190060fcf822d2f368ff";
};
}
- {
- name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
- path = fetchurl {
- name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
- sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2";
- };
- }
{
name = "process_nextick_args___process_nextick_args_1.0.7.tgz";
path = fetchurl {
@@ -10273,6 +9577,14 @@
sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3";
};
}
+ {
+ name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+ path = fetchurl {
+ name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+ url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
+ sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2";
+ };
+ }
{
name = "process___process_0.11.10.tgz";
path = fetchurl {
@@ -10305,14 +9617,6 @@
sha1 = "bf90bc71f6065d255ea2bdc0fe6520485c1b45db";
};
}
- {
- name = "property_information___property_information_4.2.0.tgz";
- path = fetchurl {
- name = "property_information___property_information_4.2.0.tgz";
- url = "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz";
- sha1 = "f0e66e07cbd6fed31d96844d958d153ad3eb486e";
- };
- }
{
name = "prosemirror_commands___prosemirror_commands_1.0.7.tgz";
path = fetchurl {
@@ -10433,14 +9737,6 @@
sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
};
}
- {
- name = "protocols___protocols_1.4.7.tgz";
- path = fetchurl {
- name = "protocols___protocols_1.4.7.tgz";
- url = "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz";
- sha1 = "95f788a4f0e979b291ffefcf5636ad113d037d32";
- };
- }
{
name = "proxy_addr___proxy_addr_2.0.5.tgz";
path = fetchurl {
@@ -10561,14 +9857,6 @@
sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36";
};
}
- {
- name = "query_string___query_string_4.3.4.tgz";
- path = fetchurl {
- name = "query_string___query_string_4.3.4.tgz";
- url = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz";
- sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb";
- };
- }
{
name = "querystring_es3___querystring_es3_0.2.1.tgz";
path = fetchurl {
@@ -10633,14 +9921,6 @@
sha1 = "231b19141f8d086986d8faceb66f8b562ee2c810";
};
}
- {
- name = "raven_js___raven_js_3.22.1.tgz";
- path = fetchurl {
- name = "raven_js___raven_js_3.22.1.tgz";
- url = "https://registry.yarnpkg.com/raven-js/-/raven-js-3.22.1.tgz";
- sha1 = "1117f00dfefaa427ef6e1a7d50bbb1fb998a24da";
- };
- }
{
name = "raw_body___raw_body_2.4.0.tgz";
path = fetchurl {
@@ -10649,14 +9929,6 @@
sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332";
};
}
- {
- name = "raw_body___raw_body_1.1.7.tgz";
- path = fetchurl {
- name = "raw_body___raw_body_1.1.7.tgz";
- url = "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz";
- sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425";
- };
- }
{
name = "raw_loader___raw_loader_3.1.0.tgz";
path = fetchurl {
@@ -10761,14 +10033,6 @@
sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
};
}
- {
- name = "readable_stream___readable_stream_2.1.5.tgz";
- path = fetchurl {
- name = "readable_stream___readable_stream_2.1.5.tgz";
- url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz";
- sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
- };
- }
{
name = "readdir_enhanced___readdir_enhanced_2.2.4.tgz";
path = fetchurl {
@@ -10929,22 +10193,6 @@
sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9";
};
}
- {
- name = "remark_html___remark_html_8.0.0.tgz";
- path = fetchurl {
- name = "remark_html___remark_html_8.0.0.tgz";
- url = "https://registry.yarnpkg.com/remark-html/-/remark-html-8.0.0.tgz";
- sha1 = "9fcb859a6f3cb40f3ef15402950f1a62ec301b3a";
- };
- }
- {
- name = "remark_parse___remark_parse_5.0.0.tgz";
- path = fetchurl {
- name = "remark_parse___remark_parse_5.0.0.tgz";
- url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz";
- sha1 = "4c077f9e499044d1d5c13f80d7a98cf7b9285d95";
- };
- }
{
name = "remark_parse___remark_parse_6.0.3.tgz";
path = fetchurl {
@@ -10953,30 +10201,6 @@
sha1 = "c99131052809da482108413f87b0ee7f52180a3a";
};
}
- {
- name = "remark_reference_links___remark_reference_links_4.0.4.tgz";
- path = fetchurl {
- name = "remark_reference_links___remark_reference_links_4.0.4.tgz";
- url = "https://registry.yarnpkg.com/remark-reference-links/-/remark-reference-links-4.0.4.tgz";
- sha1 = "190579a0d6b002859d6cdbdc5aeb8bbdae4e06ab";
- };
- }
- {
- name = "remark_slug___remark_slug_5.1.2.tgz";
- path = fetchurl {
- name = "remark_slug___remark_slug_5.1.2.tgz";
- url = "https://registry.yarnpkg.com/remark-slug/-/remark-slug-5.1.2.tgz";
- sha1 = "715ecdef8df1226786204b1887d31ab16aa24609";
- };
- }
- {
- name = "remark_stringify___remark_stringify_5.0.0.tgz";
- path = fetchurl {
- name = "remark_stringify___remark_stringify_5.0.0.tgz";
- url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz";
- sha1 = "336d3a4d4a6a3390d933eeba62e8de4bd280afba";
- };
- }
{
name = "remark_stringify___remark_stringify_6.0.4.tgz";
path = fetchurl {
@@ -10985,14 +10209,6 @@
sha1 = "16ac229d4d1593249018663c7bddf28aafc4e088";
};
}
- {
- name = "remark_toc___remark_toc_5.1.1.tgz";
- path = fetchurl {
- name = "remark_toc___remark_toc_5.1.1.tgz";
- url = "https://registry.yarnpkg.com/remark-toc/-/remark-toc-5.1.1.tgz";
- sha1 = "8c229d6f834cdb43fde6685e2d43248d3fc82d78";
- };
- }
{
name = "remark___remark_10.0.1.tgz";
path = fetchurl {
@@ -11001,38 +10217,6 @@
sha1 = "3058076dc41781bf505d8978c291485fe47667df";
};
}
- {
- name = "remark___remark_9.0.0.tgz";
- path = fetchurl {
- name = "remark___remark_9.0.0.tgz";
- url = "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz";
- sha1 = "c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60";
- };
- }
- {
- name = "remote_origin_url___remote_origin_url_0.4.0.tgz";
- path = fetchurl {
- name = "remote_origin_url___remote_origin_url_0.4.0.tgz";
- url = "https://registry.yarnpkg.com/remote-origin-url/-/remote-origin-url-0.4.0.tgz";
- sha1 = "4d3e2902f34e2d37d1c263d87710b77eb4086a30";
- };
- }
- {
- name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz";
- path = fetchurl {
- name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz";
- sha1 = "c2bf1e377520d324f623892e33c10cac2c252b53";
- };
- }
- {
- name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz";
- path = fetchurl {
- name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz";
- url = "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz";
- sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523";
- };
- }
{
name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz";
path = fetchurl {
@@ -11201,14 +10385,6 @@
sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69";
};
}
- {
- name = "resolve_options___resolve_options_1.1.0.tgz";
- path = fetchurl {
- name = "resolve_options___resolve_options_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz";
- sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131";
- };
- }
{
name = "resolve_url___resolve_url_0.2.1.tgz";
path = fetchurl {
@@ -11337,14 +10513,6 @@
sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
};
}
- {
- name = "safe_json_parse___safe_json_parse_1.0.1.tgz";
- path = fetchurl {
- name = "safe_json_parse___safe_json_parse_1.0.1.tgz";
- url = "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz";
- sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57";
- };
- }
{
name = "safe_regex___safe_regex_1.1.0.tgz";
path = fetchurl {
@@ -11370,11 +10538,11 @@
};
}
{
- name = "sanitize_html___sanitize_html_1.16.3.tgz";
+ name = "sanitize_html___sanitize_html_1.20.1.tgz";
path = fetchurl {
- name = "sanitize_html___sanitize_html_1.16.3.tgz";
- url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.16.3.tgz";
- sha1 = "96c1b44a36ff7312e1c22a14b05274370ac8bd56";
+ name = "sanitize_html___sanitize_html_1.20.1.tgz";
+ url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.20.1.tgz";
+ sha1 = "f6effdf55dd398807171215a62bfc21811bacf85";
};
}
{
@@ -11777,14 +10945,6 @@
sha1 = "d976bbe800af7bd20ae08598d582393508993c0d";
};
}
- {
- name = "sort_keys___sort_keys_1.1.2.tgz";
- path = fetchurl {
- name = "sort_keys___sort_keys_1.1.2.tgz";
- url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz";
- sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad";
- };
- }
{
name = "sortablejs___sortablejs_1.10.0.tgz";
path = fetchurl {
@@ -11865,14 +11025,6 @@
sha1 = "5302f8169031735226544092e64981f751750383";
};
}
- {
- name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz";
- path = fetchurl {
- name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz";
- url = "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz";
- sha1 = "27910835ae00d0adfcdbd0ad7e611fb9544351fa";
- };
- }
{
name = "spdx_correct___spdx_correct_1.0.2.tgz";
path = fetchurl {
@@ -12033,14 +11185,6 @@
sha1 = "d229e372d2199ddf5d283bbe34ac1f7d2529c2fc";
};
}
- {
- name = "stream_array___stream_array_1.1.2.tgz";
- path = fetchurl {
- name = "stream_array___stream_array_1.1.2.tgz";
- url = "https://registry.yarnpkg.com/stream-array/-/stream-array-1.1.2.tgz";
- sha1 = "9e5f7345f2137c30ee3b498b9114e80b52bb7eb5";
- };
- }
{
name = "stream_browserify___stream_browserify_2.0.1.tgz";
path = fetchurl {
@@ -12049,14 +11193,6 @@
sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
};
}
- {
- name = "stream_combiner2___stream_combiner2_1.1.1.tgz";
- path = fetchurl {
- name = "stream_combiner2___stream_combiner2_1.1.1.tgz";
- url = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz";
- sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
- };
- }
{
name = "stream_each___stream_each_1.2.2.tgz";
path = fetchurl {
@@ -12089,14 +11225,6 @@
sha1 = "8167d8496ed9f19f05ee4b158d9611321b8cacd9";
};
}
- {
- name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz";
- path = fetchurl {
- name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
- sha1 = "279b225df1d582b1f54e65addd4352e18faa0713";
- };
- }
{
name = "string_length___string_length_2.0.0.tgz";
path = fetchurl {
@@ -12105,14 +11233,6 @@
sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed";
};
}
- {
- name = "string_template___string_template_0.2.1.tgz";
- path = fetchurl {
- name = "string_template___string_template_0.2.1.tgz";
- url = "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz";
- sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add";
- };
- }
{
name = "string_width___string_width_1.0.2.tgz";
path = fetchurl {
@@ -12145,14 +11265,6 @@
sha1 = "ba846d1daa97c3c596155308063e075ed1c99aff";
};
}
- {
- name = "string_decoder___string_decoder_0.10.31.tgz";
- path = fetchurl {
- name = "string_decoder___string_decoder_0.10.31.tgz";
- url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz";
- sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
- };
- }
{
name = "string_decoder___string_decoder_1.1.1.tgz";
path = fetchurl {
@@ -12161,6 +11273,14 @@
sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8";
};
}
+ {
+ name = "string_decoder___string_decoder_0.10.31.tgz";
+ path = fetchurl {
+ name = "string_decoder___string_decoder_0.10.31.tgz";
+ url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz";
+ sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+ };
+ }
{
name = "stringify_entities___stringify_entities_1.3.2.tgz";
path = fetchurl {
@@ -12289,14 +11409,6 @@
sha1 = "1bc4c4ce878107e7c396b19226d91ba28268911a";
};
}
- {
- name = "subarg___subarg_1.0.0.tgz";
- path = fetchurl {
- name = "subarg___subarg_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz";
- sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
- };
- }
{
name = "sugarss___sugarss_2.0.0.tgz";
path = fetchurl {
@@ -12497,14 +11609,6 @@
sha1 = "7307ddd6cd9acadb349132fbf6c18d78c88a5e62";
};
}
- {
- name = "through2_filter___through2_filter_3.0.0.tgz";
- path = fetchurl {
- name = "through2_filter___through2_filter_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz";
- sha1 = "700e786df2367c2c88cd8aa5be4cf9c1e7831254";
- };
- }
{
name = "through2___through2_2.0.5.tgz";
path = fetchurl {
@@ -12569,14 +11673,6 @@
sha1 = "82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c";
};
}
- {
- name = "tiny_lr___tiny_lr_1.1.1.tgz";
- path = fetchurl {
- name = "tiny_lr___tiny_lr_1.1.1.tgz";
- url = "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz";
- sha1 = "9fa547412f238fedb068ee295af8b682c98b2aab";
- };
- }
{
name = "tiptap_commands___tiptap_commands_1.4.0.tgz";
path = fetchurl {
@@ -12625,14 +11721,6 @@
sha1 = "23640dd7b42d00433911140820e5cf440e521dd1";
};
}
- {
- name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz";
- path = fetchurl {
- name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz";
- url = "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz";
- sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b";
- };
- }
{
name = "to_array___to_array_0.1.4.tgz";
path = fetchurl {
@@ -12689,14 +11777,6 @@
sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce";
};
}
- {
- name = "to_through___to_through_2.0.0.tgz";
- path = fetchurl {
- name = "to_through___to_through_2.0.0.tgz";
- url = "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz";
- sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6";
- };
- }
{
name = "toggle_selection___toggle_selection_1.0.6.tgz";
path = fetchurl {
@@ -12737,14 +11817,6 @@
sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09";
};
}
- {
- name = "trim_lines___trim_lines_1.1.2.tgz";
- path = fetchurl {
- name = "trim_lines___trim_lines_1.1.2.tgz";
- url = "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.2.tgz";
- sha1 = "c8adbdbdae21bb5c2766240a661f693afe23e59b";
- };
- }
{
name = "trim_newlines___trim_newlines_1.0.0.tgz";
path = fetchurl {
@@ -12817,14 +11889,6 @@
sha1 = "027b69fa823225e551cace3ef03b11f6ab37c1d7";
};
}
- {
- name = "ts_invariant___ts_invariant_0.2.1.tgz";
- path = fetchurl {
- name = "ts_invariant___ts_invariant_0.2.1.tgz";
- url = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.2.1.tgz";
- sha1 = "3d587f9d6e3bded97bf9ec17951dd9814d5a9d3f";
- };
- }
{
name = "ts_invariant___ts_invariant_0.3.2.tgz";
path = fetchurl {
@@ -12833,6 +11897,14 @@
sha1 = "89a2ffeb70879b777258df1df1c59383c35209b0";
};
}
+ {
+ name = "ts_invariant___ts_invariant_0.4.4.tgz";
+ path = fetchurl {
+ name = "ts_invariant___ts_invariant_0.4.4.tgz";
+ url = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz";
+ sha1 = "97a523518688f93aafad01b0e80eb803eb2abd86";
+ };
+ }
{
name = "ts_jest___ts_jest_24.0.0.tgz";
path = fetchurl {
@@ -12881,6 +11953,14 @@
sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
};
}
+ {
+ name = "type_fest___type_fest_0.5.2.tgz";
+ path = fetchurl {
+ name = "type_fest___type_fest_0.5.2.tgz";
+ url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz";
+ sha1 = "d6ef42a0356c6cd45f49485c3b6281fc148e48a2";
+ };
+ }
{
name = "type_is___type_is_1.6.18.tgz";
path = fetchurl {
@@ -12929,14 +12009,6 @@
sha1 = "9fe1536a10a664a65266a1e3ccf85fd36302bc9c";
};
}
- {
- name = "unc_path_regex___unc_path_regex_0.1.2.tgz";
- path = fetchurl {
- name = "unc_path_regex___unc_path_regex_0.1.2.tgz";
- url = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz";
- sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
- };
- }
{
name = "undefsafe___undefsafe_2.0.2.tgz";
path = fetchurl {
@@ -13017,14 +12089,6 @@
sha1 = "5a533f31b4317ea76f17d807fa0d116546111dd0";
};
}
- {
- name = "unified___unified_6.2.0.tgz";
- path = fetchurl {
- name = "unified___unified_6.2.0.tgz";
- url = "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz";
- sha1 = "7fbd630f719126d67d40c644b7e3f617035f6dba";
- };
- }
{
name = "unified___unified_7.1.0.tgz";
path = fetchurl {
@@ -13065,14 +12129,6 @@
sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
};
}
- {
- name = "unique_stream___unique_stream_2.3.1.tgz";
- path = fetchurl {
- name = "unique_stream___unique_stream_2.3.1.tgz";
- url = "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz";
- sha1 = "c65d110e9a4adf9a6c5948b28053d9a8d04cbeac";
- };
- }
{
name = "unique_string___unique_string_1.0.0.tgz";
path = fetchurl {
@@ -13081,14 +12137,6 @@
sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
};
}
- {
- name = "unist_builder___unist_builder_1.0.4.tgz";
- path = fetchurl {
- name = "unist_builder___unist_builder_1.0.4.tgz";
- url = "https://registry.yarnpkg.com/unist-builder/-/unist-builder-1.0.4.tgz";
- sha1 = "e1808aed30bd72adc3607f25afecebef4dd59e17";
- };
- }
{
name = "unist_util_find_all_after___unist_util_find_all_after_1.0.2.tgz";
path = fetchurl {
@@ -13097,14 +12145,6 @@
sha1 = "9be49cfbae5ca1566b27536670a92836bf2f8d6d";
};
}
- {
- name = "unist_util_generated___unist_util_generated_1.1.4.tgz";
- path = fetchurl {
- name = "unist_util_generated___unist_util_generated_1.1.4.tgz";
- url = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.4.tgz";
- sha1 = "2261c033d9fc23fae41872cdb7663746e972c1a7";
- };
- }
{
name = "unist_util_is___unist_util_is_2.1.2.tgz";
path = fetchurl {
@@ -13113,14 +12153,6 @@
sha1 = "1193fa8f2bfbbb82150633f3a8d2eb9a1c1d55db";
};
}
- {
- name = "unist_util_position___unist_util_position_3.0.3.tgz";
- path = fetchurl {
- name = "unist_util_position___unist_util_position_3.0.3.tgz";
- url = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.0.3.tgz";
- sha1 = "fff942b879538b242096c148153826664b1ca373";
- };
- }
{
name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz";
path = fetchurl {
@@ -13137,14 +12169,6 @@
sha1 = "3f37fcf351279dcbca7480ab5889bb8a832ee1c6";
};
}
- {
- name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz";
- path = fetchurl {
- name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz";
- sha1 = "de2a2bc8d3febfa606652673a91455b6a36fb9f3";
- };
- }
{
name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz";
path = fetchurl {
@@ -13361,14 +12385,6 @@
sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc";
};
}
- {
- name = "value_or_function___value_or_function_3.0.0.tgz";
- path = fetchurl {
- name = "value_or_function___value_or_function_3.0.0.tgz";
- url = "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz";
- sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813";
- };
- }
{
name = "vary___vary_1.1.2.tgz";
path = fetchurl {
@@ -13401,46 +12417,6 @@
sha1 = "5833ae078a1dfa2d96e9647886cd32993ab313e1";
};
}
- {
- name = "vfile_message___vfile_message_2.0.1.tgz";
- path = fetchurl {
- name = "vfile_message___vfile_message_2.0.1.tgz";
- url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.1.tgz";
- sha1 = "951881861c22fc1eb39f873c0b93e336a64e8f6d";
- };
- }
- {
- name = "vfile_reporter___vfile_reporter_6.0.0.tgz";
- path = fetchurl {
- name = "vfile_reporter___vfile_reporter_6.0.0.tgz";
- url = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.0.tgz";
- sha1 = "753119f51dec9289b7508b457afc0cddf5e07f2e";
- };
- }
- {
- name = "vfile_sort___vfile_sort_2.2.1.tgz";
- path = fetchurl {
- name = "vfile_sort___vfile_sort_2.2.1.tgz";
- url = "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.1.tgz";
- sha1 = "74e714f9175618cdae96bcaedf1a3dc711d87567";
- };
- }
- {
- name = "vfile_statistics___vfile_statistics_1.1.3.tgz";
- path = fetchurl {
- name = "vfile_statistics___vfile_statistics_1.1.3.tgz";
- url = "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.3.tgz";
- sha1 = "e9c87071997fbcb4243764d2c3805e0bb0820c60";
- };
- }
- {
- name = "vfile___vfile_2.3.0.tgz";
- path = fetchurl {
- name = "vfile___vfile_2.3.0.tgz";
- url = "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz";
- sha1 = "e62d8e72b20e83c324bc6c67278ee272488bf84a";
- };
- }
{
name = "vfile___vfile_3.0.1.tgz";
path = fetchurl {
@@ -13449,38 +12425,6 @@
sha1 = "47331d2abe3282424f4a4bb6acd20a44c4121803";
};
}
- {
- name = "vfile___vfile_4.0.1.tgz";
- path = fetchurl {
- name = "vfile___vfile_4.0.1.tgz";
- url = "https://registry.yarnpkg.com/vfile/-/vfile-4.0.1.tgz";
- sha1 = "fc3d43a1c71916034216bf65926d5ee3c64ed60c";
- };
- }
- {
- name = "vinyl_fs___vinyl_fs_3.0.3.tgz";
- path = fetchurl {
- name = "vinyl_fs___vinyl_fs_3.0.3.tgz";
- url = "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz";
- sha1 = "c85849405f67428feabbbd5c5dbdd64f47d31bc7";
- };
- }
- {
- name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz";
- path = fetchurl {
- name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz";
- url = "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz";
- sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16";
- };
- }
- {
- name = "vinyl___vinyl_2.2.0.tgz";
- path = fetchurl {
- name = "vinyl___vinyl_2.2.0.tgz";
- url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz";
- sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86";
- };
- }
{
name = "visibilityjs___visibilityjs_1.2.4.tgz";
path = fetchurl {
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 7c157191ab97..9f298e0129ed 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, git, nettools, perl }:
+{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl }:
stdenv.mkDerivation rec {
pname = "gitolite";
@@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1rkj7gknwjlc5ij9w39zf5mr647bm45la57yjczydmvrb8c56yrh";
};
- buildInputs = [ git nettools perl ];
+ buildInputs = [ nettools perl ];
+ nativeBuildInputs = [ makeWrapper ];
+ propagatedBuildInputs = [ git ];
dontBuild = true;
@@ -25,6 +27,11 @@ stdenv.mkDerivation rec {
--replace hostname "${nettools}/bin/hostname"
'';
+ postFixup = ''
+ wrapProgram $out/bin/gitolite-shell \
+ --prefix PATH : "${git}/bin"
+ '';
+
installPhase = ''
mkdir -p $out/bin
perl ./install -to $out/bin
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 0a24cfbb3a0d..2ce855d3a7f8 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre
-, SDL2_image, freetype, glew, libGLU_combined, boost, glm
+, SDL2_image, freetype, glew, libGLU, libGL, boost, glm
}:
stdenv.mkDerivation rec {
- version = "0.49";
+ version = "0.51";
pname = "gource";
src = fetchurl {
url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
- sha256 = "12hf5ipcsp9dxsqn84n4kr63xaiskrnf5a084wr29qk171lj7pd9";
+ sha256 = "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined
+ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL
boost glm freetype
];
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index ee0ab3756663..792e647324ae 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchurl, python2Packages, makeWrapper, unzip
+{ stdenv, fetchurl, python3Packages, makeWrapper, unzip
, guiSupport ? false, tk ? null
, ApplicationServices
-, mercurialSrc ? fetchurl rec {
- meta.name = "mercurial-${meta.version}";
- meta.version = "4.9.1";
- url = "https://mercurial-scm.org/release/${meta.name}.tar.gz";
- sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v";
- }
}:
let
- inherit (python2Packages) docutils hg-git dulwich python;
+ inherit (python3Packages) docutils dulwich python;
-in python2Packages.buildPythonApplication {
+in python3Packages.buildPythonApplication rec {
+ pname = "mercurial";
+ version = "5.2.1";
- inherit (mercurialSrc.meta) name version;
- src = mercurialSrc;
+ src = fetchurl {
+ url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
+ sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q";
+ };
format = "other";
@@ -24,41 +22,39 @@ in python2Packages.buildPythonApplication {
buildInputs = [ makeWrapper docutils unzip ]
++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ];
- propagatedBuildInputs = [ hg-git dulwich ];
+ propagatedBuildInputs = [ dulwich ];
makeFlags = [ "PREFIX=$(out)" ];
- postInstall = (stdenv.lib.optionalString guiSupport
- ''
- mkdir -p $out/etc/mercurial
- cp contrib/hgk $out/bin
- cat >> $out/etc/mercurial/hgrc << EOF
- [extensions]
- hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py
- EOF
- # setting HG so that hgk can be run itself as well (not only hg view)
- WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}
- --set HG $out/bin/hg
- --prefix PATH : ${tk}/bin "
- '') +
- ''
- for i in $(cd $out/bin && ls); do
- wrapProgram $out/bin/$i \
- $WRAP_TK
- done
+ postInstall = (stdenv.lib.optionalString guiSupport ''
+ mkdir -p $out/etc/mercurial
+ cp contrib/hgk $out/bin
+ cat >> $out/etc/mercurial/hgrc << EOF
+ [extensions]
+ hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py
+ EOF
+ # setting HG so that hgk can be run itself as well (not only hg view)
+ WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}
+ --set HG $out/bin/hg
+ --prefix PATH : ${tk}/bin "
+ '') + ''
+ for i in $(cd $out/bin && ls); do
+ wrapProgram $out/bin/$i \
+ $WRAP_TK
+ done
- # copy hgweb.cgi to allow use in apache
- mkdir -p $out/share/cgi-bin
- cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin
- chmod u+x $out/share/cgi-bin/hgweb.cgi
+ # copy hgweb.cgi to allow use in apache
+ mkdir -p $out/share/cgi-bin
+ cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin
+ chmod u+x $out/share/cgi-bin/hgweb.cgi
- # install bash/zsh completions
- install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg
- install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg
- '';
+ # install bash/zsh completions
+ install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg
+ install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg
+ '';
meta = {
- inherit (mercurialSrc.meta) version;
+ inherit version;
description = "A fast, lightweight SCM system for very large distributed projects";
homepage = https://www.mercurial-scm.org;
downloadPage = https://www.mercurial-scm.org/release/;
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index 7081e1a08996..bf8e5652d99c 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -5,7 +5,7 @@
let
version = "1.1";
- perlVersion = (builtins.parseDrvName perl.name).version;
+ perlVersion = stdenv.lib.getVersion perl;
in
assert perlVersion != "";
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 6d0e39d47bf4..3c5539189252 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,6 +1,17 @@
{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, nettle, clang, libclang, pkgconfig }:
-rustPlatform.buildRustPackage rec {
+let
+ # nettle-sys=1.0.1 requires the des-compat.h header, but it was removed in
+ # nettle 3.5. See https://nest.pijul.com/pijul_org/pijul/discussions/416
+ # Remove with the next release
+ nettle_34 = nettle.overrideAttrs (_oldAttrs: rec {
+ version = "3.4.1";
+ src = fetchurl {
+ url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
+ sha256 = "1bcji95n1iz9p9vsgdgr26v6s7zhpsxfbjjwpqcihpfd6lawyhgr";
+ };
+ });
+in rustPlatform.buildRustPackage rec {
pname = "pijul";
version = "0.12.0";
@@ -20,7 +31,7 @@ rustPlatform.buildRustPackage rec {
LIBCLANG_PATH = libclang + "/lib";
- buildInputs = [ openssl libsodium nettle libclang ] ++ stdenv.lib.optionals stdenv.isDarwin
+ buildInputs = [ openssl libsodium nettle_34 libclang ] ++ stdenv.lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ CoreServices Security ]);
doCheck = false;
diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile b/pkgs/applications/version-management/redmine/4.x/Gemfile
deleted file mode 100644
index 343c7b3a5470..000000000000
--- a/pkgs/applications/version-management/redmine/4.x/Gemfile
+++ /dev/null
@@ -1,72 +0,0 @@
-source 'https://rubygems.org'
-
-gem "bundler", ">= 1.5.0"
-
-gem "rails", "5.2.3"
-gem "rouge", "~> 3.3.0"
-gem "request_store", "1.0.5"
-gem "mini_mime", "~> 1.0.1"
-gem "actionpack-xml_parser"
-gem "roadie-rails", "~> 1.3.0"
-gem "mimemagic"
-gem "mail", "~> 2.7.1"
-gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6"
-
-gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1")
-gem "i18n", "~> 0.7.0"
-gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
-gem "rbpdf", "~> 1.19.6"
-
-# Optional gem for LDAP authentication
-group :ldap do
- gem "net-ldap", "~> 0.16.0"
-end
-
-# Optional gem for OpenID authentication
-group :openid do
- gem "ruby-openid", "~> 2.3.0", :require => "openid"
- gem "rack-openid"
-end
-
-platforms :mri, :mingw, :x64_mingw do
- # Optional gem for exporting the gantt to a PNG file, not supported with jruby
- group :rmagick do
- gem "rmagick", "~> 2.16.0"
- end
-
- # Optional Markdown support, not for JRuby
- group :markdown do
- gem "redcarpet", "~> 3.4.0"
- end
-end
-
-# Include database gems for the database adapters NixOS supports
-gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
-gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw]
-
-group :development do
- gem "yard"
-end
-
-group :test do
- gem "rails-dom-testing"
- gem "mocha"
- gem "simplecov", "~> 0.14.1", :require => false
- # For running system tests
- gem 'puma', '~> 3.7'
- gem "capybara", '~> 2.13'
- gem "selenium-webdriver"
-end
-
-local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
-if File.exists?(local_gemfile)
- eval_gemfile local_gemfile
-end
-
-# Load plugins' Gemfiles
-Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file|
- eval_gemfile file
-end
diff --git a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock b/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
deleted file mode 100644
index 671d2bb4ac1f..000000000000
--- a/pkgs/applications/version-management/redmine/4.x/Gemfile.lock
+++ /dev/null
@@ -1,203 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- actioncable (5.2.3)
- actionpack (= 5.2.3)
- nio4r (~> 2.0)
- websocket-driver (>= 0.6.1)
- actionmailer (5.2.3)
- actionpack (= 5.2.3)
- actionview (= 5.2.3)
- activejob (= 5.2.3)
- mail (~> 2.5, >= 2.5.4)
- rails-dom-testing (~> 2.0)
- actionpack (5.2.3)
- actionview (= 5.2.3)
- activesupport (= 5.2.3)
- rack (~> 2.0)
- rack-test (>= 0.6.3)
- rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionpack-xml_parser (2.0.1)
- actionpack (>= 5.0)
- railties (>= 5.0)
- actionview (5.2.3)
- activesupport (= 5.2.3)
- builder (~> 3.1)
- erubi (~> 1.4)
- rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.2.3)
- activesupport (= 5.2.3)
- globalid (>= 0.3.6)
- activemodel (5.2.3)
- activesupport (= 5.2.3)
- activerecord (5.2.3)
- activemodel (= 5.2.3)
- activesupport (= 5.2.3)
- arel (>= 9.0)
- activestorage (5.2.3)
- actionpack (= 5.2.3)
- activerecord (= 5.2.3)
- marcel (~> 0.3.1)
- activesupport (5.2.3)
- concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 0.7, < 2)
- minitest (~> 5.1)
- tzinfo (~> 1.1)
- addressable (2.6.0)
- public_suffix (>= 2.0.2, < 4.0)
- arel (9.0.0)
- builder (3.2.3)
- capybara (2.18.0)
- addressable
- mini_mime (>= 0.1.3)
- nokogiri (>= 1.3.3)
- rack (>= 1.0.0)
- rack-test (>= 0.5.4)
- xpath (>= 2.0, < 4.0)
- childprocess (1.0.1)
- rake (< 13.0)
- concurrent-ruby (1.1.5)
- crass (1.0.4)
- css_parser (1.7.0)
- addressable
- csv (3.0.9)
- docile (1.1.5)
- erubi (1.8.0)
- globalid (0.4.2)
- activesupport (>= 4.2.0)
- htmlentities (4.3.4)
- i18n (0.7.0)
- json (2.2.0)
- loofah (2.2.3)
- crass (~> 1.0.2)
- nokogiri (>= 1.5.9)
- mail (2.7.1)
- mini_mime (>= 0.1.1)
- marcel (0.3.3)
- mimemagic (~> 0.3.2)
- metaclass (0.0.4)
- method_source (0.9.2)
- mimemagic (0.3.3)
- mini_mime (1.0.1)
- mini_portile2 (2.4.0)
- minitest (5.11.3)
- mocha (1.8.0)
- metaclass (~> 0.0.1)
- mysql2 (0.5.2)
- net-ldap (0.16.1)
- nio4r (2.3.1)
- nokogiri (1.10.3)
- mini_portile2 (~> 2.4.0)
- pg (1.1.4)
- public_suffix (3.1.0)
- puma (3.12.1)
- rack (2.0.7)
- rack-openid (1.4.2)
- rack (>= 1.1.0)
- ruby-openid (>= 2.1.8)
- rack-test (1.1.0)
- rack (>= 1.0, < 3)
- rails (5.2.3)
- actioncable (= 5.2.3)
- actionmailer (= 5.2.3)
- actionpack (= 5.2.3)
- actionview (= 5.2.3)
- activejob (= 5.2.3)
- activemodel (= 5.2.3)
- activerecord (= 5.2.3)
- activestorage (= 5.2.3)
- activesupport (= 5.2.3)
- bundler (>= 1.3.0)
- railties (= 5.2.3)
- sprockets-rails (>= 2.0.0)
- rails-dom-testing (2.0.3)
- activesupport (>= 4.2.0)
- nokogiri (>= 1.6)
- rails-html-sanitizer (1.0.4)
- loofah (~> 2.2, >= 2.2.2)
- railties (5.2.3)
- actionpack (= 5.2.3)
- activesupport (= 5.2.3)
- method_source
- rake (>= 0.8.7)
- thor (>= 0.19.0, < 2.0)
- rake (12.3.2)
- rbpdf (1.19.8)
- htmlentities
- rbpdf-font (~> 1.19.0)
- rbpdf-font (1.19.1)
- redcarpet (3.4.0)
- request_store (1.0.5)
- rmagick (2.16.0)
- roadie (3.5.0)
- css_parser (~> 1.4)
- nokogiri (~> 1.8)
- roadie-rails (1.3.0)
- railties (>= 3.0, < 5.3)
- roadie (~> 3.1)
- rouge (3.3.0)
- ruby-openid (2.3.0)
- rubyzip (1.2.3)
- selenium-webdriver (3.142.3)
- childprocess (>= 0.5, < 2.0)
- rubyzip (~> 1.2, >= 1.2.2)
- simplecov (0.14.1)
- docile (~> 1.1.0)
- json (>= 1.8, < 3)
- simplecov-html (~> 0.10.0)
- simplecov-html (0.10.2)
- sprockets (3.7.2)
- concurrent-ruby (~> 1.0)
- rack (> 1, < 3)
- sprockets-rails (3.2.1)
- actionpack (>= 4.0)
- activesupport (>= 4.0)
- sprockets (>= 3.0.0)
- thor (0.20.3)
- thread_safe (0.3.6)
- tzinfo (1.2.5)
- thread_safe (~> 0.1)
- websocket-driver (0.7.1)
- websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.4)
- xpath (3.2.0)
- nokogiri (~> 1.8)
- yard (0.9.19)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- actionpack-xml_parser
- bundler (>= 1.5.0)
- capybara (~> 2.13)
- csv (~> 3.0.1)
- i18n (~> 0.7.0)
- mail (~> 2.7.1)
- mimemagic
- mini_mime (~> 1.0.1)
- mocha
- mysql2 (~> 0.5.0)
- net-ldap (~> 0.16.0)
- nokogiri (~> 1.10.0)
- pg (~> 1.1.4)
- puma (~> 3.7)
- rack-openid
- rails (= 5.2.3)
- rails-dom-testing
- rbpdf (~> 1.19.6)
- redcarpet (~> 3.4.0)
- request_store (= 1.0.5)
- rmagick (~> 2.16.0)
- roadie-rails (~> 1.3.0)
- rouge (~> 3.3.0)
- ruby-openid (~> 2.3.0)
- selenium-webdriver
- simplecov (~> 0.14.1)
- tzinfo-data
- yard
-
-BUNDLED WITH
- 1.16.3
diff --git a/pkgs/applications/version-management/redmine/4.x/default.nix b/pkgs/applications/version-management/redmine/4.x/default.nix
deleted file mode 100644
index a3ba418a1463..000000000000
--- a/pkgs/applications/version-management/redmine/4.x/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, bundlerEnv, ruby }:
-
-let
- version = "4.0.4";
- rubyEnv = bundlerEnv {
- name = "redmine-env-${version}";
-
- inherit ruby;
- gemdir = ./.;
- groups = [ "ldap" "openid" ];
- };
-in
- stdenv.mkDerivation rec {
- pname = "redmine";
- inherit version;
-
- src = fetchurl {
- url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
- sha256 = "0i5bmgdi3mahbis9hn0hk53rnz4ihp9yij4b4i07ny9vf3n4kp1a";
- };
-
- buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
-
- buildPhase = ''
- mv config config.dist
- mv public/themes public/themes.dist
- '';
-
- installPhase = ''
- mkdir -p $out/share
- cp -r . $out/share/redmine
- for i in config files log plugins public/plugin_assets public/themes tmp; do
- rm -rf $out/share/redmine/$i
- ln -fs /run/redmine/$i $out/share/redmine/$i
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = http://www.redmine.org/;
- platforms = platforms.linux;
- maintainers = [ maintainers.aanderse ];
- license = licenses.gpl2;
- };
- }
diff --git a/pkgs/applications/version-management/redmine/4.x/gemset.nix b/pkgs/applications/version-management/redmine/4.x/gemset.nix
deleted file mode 100644
index 34e459111f8a..000000000000
--- a/pkgs/applications/version-management/redmine/4.x/gemset.nix
+++ /dev/null
@@ -1,614 +0,0 @@
-{
- actioncable = {
- dependencies = ["actionpack" "nio4r" "websocket-driver"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm";
- type = "gem";
- };
- version = "5.2.3";
- };
- actionmailer = {
- dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa";
- type = "gem";
- };
- version = "5.2.3";
- };
- actionpack = {
- dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1";
- type = "gem";
- };
- version = "5.2.3";
- };
- actionpack-xml_parser = {
- dependencies = ["actionpack" "railties"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1rnm6jrw3mzcf2g3q498igmhsn0kfkxq79w0nm532iclx4g4djs0";
- type = "gem";
- };
- version = "2.0.1";
- };
- actionview = {
- dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h";
- type = "gem";
- };
- version = "5.2.3";
- };
- activejob = {
- dependencies = ["activesupport" "globalid"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s";
- type = "gem";
- };
- version = "5.2.3";
- };
- activemodel = {
- dependencies = ["activesupport"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h";
- type = "gem";
- };
- version = "5.2.3";
- };
- activerecord = {
- dependencies = ["activemodel" "activesupport" "arel"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw";
- type = "gem";
- };
- version = "5.2.3";
- };
- activestorage = {
- dependencies = ["actionpack" "activerecord" "marcel"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk";
- type = "gem";
- };
- version = "5.2.3";
- };
- activesupport = {
- dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
- type = "gem";
- };
- version = "5.2.3";
- };
- addressable = {
- dependencies = ["public_suffix"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
- type = "gem";
- };
- version = "2.6.0";
- };
- arel = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0";
- type = "gem";
- };
- version = "9.0.0";
- };
- builder = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
- type = "gem";
- };
- version = "3.2.3";
- };
- capybara = {
- dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0yv77rnsjlvs8qpfn9n5vf1h6b9agxwhxw09gssbiw9zn9j20jh8";
- type = "gem";
- };
- version = "2.18.0";
- };
- childprocess = {
- dependencies = ["rake"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1d2gasf988jh2k3fjb7i54c68rq6ni6jf9w0gnsfhrq94a6mprkz";
- type = "gem";
- };
- version = "1.0.1";
- };
- concurrent-ruby = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
- type = "gem";
- };
- version = "1.1.5";
- };
- crass = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
- type = "gem";
- };
- version = "1.0.4";
- };
- css_parser = {
- dependencies = ["addressable"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
- type = "gem";
- };
- version = "1.7.0";
- };
- csv = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "097rl10ivzlya5640530ayls2f1vid2mfgjy9ngd789qmp0j6x4b";
- type = "gem";
- };
- version = "3.0.9";
- };
- docile = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
- type = "gem";
- };
- version = "1.1.5";
- };
- erubi = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1";
- type = "gem";
- };
- version = "1.8.0";
- };
- globalid = {
- dependencies = ["activesupport"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1";
- type = "gem";
- };
- version = "0.4.2";
- };
- htmlentities = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
- type = "gem";
- };
- version = "4.3.4";
- };
- i18n = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
- type = "gem";
- };
- version = "0.7.0";
- };
- json = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
- type = "gem";
- };
- version = "2.2.0";
- };
- loofah = {
- dependencies = ["crass" "nokogiri"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
- type = "gem";
- };
- version = "2.2.3";
- };
- mail = {
- dependencies = ["mini_mime"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
- type = "gem";
- };
- version = "2.7.1";
- };
- marcel = {
- dependencies = ["mimemagic"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx";
- type = "gem";
- };
- version = "0.3.3";
- };
- metaclass = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5";
- type = "gem";
- };
- version = "0.0.4";
- };
- method_source = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
- type = "gem";
- };
- version = "0.9.2";
- };
- mimemagic = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw";
- type = "gem";
- };
- version = "0.3.3";
- };
- mini_mime = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
- type = "gem";
- };
- version = "1.0.1";
- };
- mini_portile2 = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
- type = "gem";
- };
- version = "2.4.0";
- };
- minitest = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
- type = "gem";
- };
- version = "5.11.3";
- };
- mocha = {
- dependencies = ["metaclass"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "12aglpiq1h18j5a4rlwvnsvnsi2f3407v5xm59lgcg3ymlyak4al";
- type = "gem";
- };
- version = "1.8.0";
- };
- mysql2 = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1a2kdjgzwh1p2rkcmxaawy6ibi32b04wbdd5d4wr8i342pq76di4";
- type = "gem";
- };
- version = "0.5.2";
- };
- net-ldap = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "016igqz81a8zcwqzp5bbhryqmb2skmyf57ij3nb5z8sxwhw22jgh";
- type = "gem";
- };
- version = "0.16.1";
- };
- nio4r = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr";
- type = "gem";
- };
- version = "2.3.1";
- };
- nokogiri = {
- dependencies = ["mini_portile2"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4";
- type = "gem";
- };
- version = "1.10.3";
- };
- pg = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
- type = "gem";
- };
- version = "1.1.4";
- };
- public_suffix = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
- type = "gem";
- };
- version = "3.1.0";
- };
- puma = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1pkrbvak6rlf147qpd4zss031qrwwh53g8s6017037iwg0436kv3";
- type = "gem";
- };
- version = "3.12.1";
- };
- rack = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
- type = "gem";
- };
- version = "2.0.7";
- };
- rack-openid = {
- dependencies = ["rack" "ruby-openid"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0sg85yn981j3a0iri3ch4znzdwscvz29l7vrk3dafqw4fdg31llc";
- type = "gem";
- };
- version = "1.4.2";
- };
- rack-test = {
- dependencies = ["rack"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m";
- type = "gem";
- };
- version = "1.1.0";
- };
- rails = {
- dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr";
- type = "gem";
- };
- version = "5.2.3";
- };
- rails-dom-testing = {
- dependencies = ["activesupport" "nokogiri"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i";
- type = "gem";
- };
- version = "2.0.3";
- };
- rails-html-sanitizer = {
- dependencies = ["loofah"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr";
- type = "gem";
- };
- version = "1.0.4";
- };
- railties = {
- dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4";
- type = "gem";
- };
- version = "5.2.3";
- };
- rake = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
- type = "gem";
- };
- version = "12.3.2";
- };
- rbpdf = {
- dependencies = ["htmlentities" "rbpdf-font"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0fnhcn4z2zz6ic1yvl5hmhwmkdnybh8f8fnk1ni7bvl2s4ig5195";
- type = "gem";
- };
- version = "1.19.8";
- };
- rbpdf-font = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0pxlr0l4vf785qpy55m439dyii63a26l0sd0yyhbwwcy9zm9hd1v";
- type = "gem";
- };
- version = "1.19.1";
- };
- redcarpet = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
- type = "gem";
- };
- version = "3.4.0";
- };
- request_store = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1ky19wb6mpq6dxb81a0h4hnzx7a4ka99n9ay2syi68djbr4bkbbh";
- type = "gem";
- };
- version = "1.0.5";
- };
- rmagick = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0m9x15cdlkcb9826s3s2jd97hxf50hln22p94x8hcccxi1lwklq6";
- type = "gem";
- };
- version = "2.16.0";
- };
- roadie = {
- dependencies = ["css_parser" "nokogiri"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0b2qgr725hnscz3ldb607gwgjkr47ncs1jjnk6zh0h70p5dxrk2d";
- type = "gem";
- };
- version = "3.5.0";
- };
- roadie-rails = {
- dependencies = ["railties" "roadie"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "02km0ama85mkw7kkn6qif86b781pglfdmqrwx5s6hwjlzk16qih3";
- type = "gem";
- };
- version = "1.3.0";
- };
- rouge = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1digsi2s8wyzx8vsqcxasw205lg6s7izx8jypl8rrpjwshmv83ql";
- type = "gem";
- };
- version = "3.3.0";
- };
- ruby-openid = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0yzaf2c1i88757554wk38rxqmj0xzgmwk2zx7gi98w2zx42d17pn";
- type = "gem";
- };
- version = "2.3.0";
- };
- rubyzip = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
- type = "gem";
- };
- version = "1.2.3";
- };
- selenium-webdriver = {
- dependencies = ["childprocess" "rubyzip"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0i0jr4qrcvg5isc11ivjw7f9gywbimnz613k82bfcrnlzdf90mxy";
- type = "gem";
- };
- version = "3.142.3";
- };
- simplecov = {
- dependencies = ["docile" "json" "simplecov-html"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1r9fnsnsqj432cmrpafryn8nif3x0qg9mdnvrcf0wr01prkdlnww";
- type = "gem";
- };
- version = "0.14.1";
- };
- simplecov-html = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn";
- type = "gem";
- };
- version = "0.10.2";
- };
- sprockets = {
- dependencies = ["concurrent-ruby" "rack"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
- type = "gem";
- };
- version = "3.7.2";
- };
- sprockets-rails = {
- dependencies = ["actionpack" "activesupport" "sprockets"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1";
- type = "gem";
- };
- version = "3.2.1";
- };
- thor = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
- type = "gem";
- };
- version = "0.20.3";
- };
- thread_safe = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
- type = "gem";
- };
- version = "0.3.6";
- };
- tzinfo = {
- dependencies = ["thread_safe"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
- type = "gem";
- };
- version = "1.2.5";
- };
- websocket-driver = {
- dependencies = ["websocket-extensions"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
- type = "gem";
- };
- version = "0.7.1";
- };
- websocket-extensions = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
- type = "gem";
- };
- version = "0.1.4";
- };
- xpath = {
- dependencies = ["nokogiri"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd";
- type = "gem";
- };
- version = "3.2.0";
- };
- yard = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
- type = "gem";
- };
- version = "0.9.19";
- };
-}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile
index 5a0283e20ed5..b1c651695c79 100644
--- a/pkgs/applications/version-management/redmine/Gemfile
+++ b/pkgs/applications/version-management/redmine/Gemfile
@@ -1,77 +1,65 @@
source 'https://rubygems.org'
-gem "bundler", ">= 1.5.0", "< 2.0.0"
+gem "bundler", ">= 1.5.0"
-gem "rails", "4.2.11.1"
-gem "addressable", "2.4.0" if RUBY_VERSION < "2.0"
-if RUBY_VERSION < "2.1"
- gem "public_suffix", (RUBY_VERSION < "2.0" ? "~> 1.4" : "~> 2.0.5")
-end
-gem "jquery-rails", "~> 3.1.4"
-gem "coderay", "~> 1.1.1"
-gem "request_store", "1.0.5"
-gem "mime-types", (RUBY_VERSION >= "2.0" ? "~> 3.0" : "~> 2.99")
-gem "protected_attributes"
+gem "rails", "5.2.4.1"
+gem "rouge", "~> 3.12.0"
+gem "request_store", "~> 1.4.1"
+gem "mini_mime", "~> 1.0.1"
gem "actionpack-xml_parser"
-gem "roadie-rails", "~> 1.1.1"
-gem "roadie", "~> 3.2.1"
+gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0")
gem "mimemagic"
-gem "mail", "~> 2.6.4"
-
-gem "nokogiri", (RUBY_VERSION >= "2.1" ? "~> 1.8.1" : "~> 1.6.8")
-gem "i18n", "~> 0.7.0"
-gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0"
-gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3"
-
-# Request at least rails-html-sanitizer 1.0.3 because of security advisories
-gem "rails-html-sanitizer", ">= 1.0.3"
+gem "mail", "~> 2.7.1"
+gem "csv", "~> 3.1.1"
+gem "nokogiri", "~> 1.10.0"
+gem "i18n", "~> 1.6.0"
+gem "rbpdf", "~> 1.20.0"
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin]
-gem "rbpdf", "~> 1.19.6"
# Optional gem for LDAP authentication
group :ldap do
- gem "net-ldap", "~> 0.12.0"
+ gem "net-ldap", "~> 0.16.0"
end
# Optional gem for OpenID authentication
group :openid do
- gem "ruby-openid", "~> 2.3.0", :require => "openid"
+ gem "ruby-openid", "~> 2.9.2", :require => "openid"
gem "rack-openid"
end
-platforms :mri, :mingw, :x64_mingw do
- # Optional gem for exporting the gantt to a PNG file, not supported with jruby
- group :rmagick do
- gem "rmagick", "~> 2.16.0"
- end
+# Optional gem for exporting the gantt to a PNG file
+group :minimagick do
+ gem "mini_magick", "~> 4.9.5"
+end
- # Optional Markdown support, not for JRuby
- group :markdown do
- gem "redcarpet", "~> 3.4.0"
- end
+# Optional Markdown support, not for JRuby
+group :markdown do
+ gem "redcarpet", "~> 3.5.0"
end
# Include database gems for the database adapters NixOS supports
-gem "mysql2", "~> 0.4.6", :platforms => [:mri, :mingw, :x64_mingw]
-gem "pg", "~> 0.18.1", :platforms => [:mri, :mingw, :x64_mingw]
+gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]
+gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw]
group :development do
- gem "rdoc", "~> 4.3"
gem "yard"
end
group :test do
- gem "minitest"
gem "rails-dom-testing"
- gem "mocha"
- gem "simplecov", "~> 0.9.1", :require => false
- # TODO: remove this after upgrading to Rails 5
- gem "test_after_commit", "~> 0.4.2"
- # For running UI tests
- gem "capybara", '~> 2.13'
- gem "selenium-webdriver", "~> 2.53.4"
+ gem 'mocha', '>= 1.4.0'
+ gem "simplecov", "~> 0.17.0", :require => false
+ gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
+ # For running system tests
+ gem 'puma', '~> 3.7'
+ gem "capybara", (RUBY_VERSION < "2.4" ? "~> 3.15.1" : "~> 3.25.0")
+ gem "selenium-webdriver"
+ # RuboCop
+ gem 'rubocop', '~> 0.76.0'
+ gem 'rubocop-performance', '~> 1.5.0'
+ gem 'rubocop-rails', '~> 2.3.0'
end
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock
index 21296d343b44..806847a298e9 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/Gemfile.lock
@@ -1,203 +1,226 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.2.11.1)
- actionpack (= 4.2.11.1)
- actionview (= 4.2.11.1)
- activejob (= 4.2.11.1)
+ actioncable (5.2.4.1)
+ actionpack (= 5.2.4.1)
+ nio4r (~> 2.0)
+ websocket-driver (>= 0.6.1)
+ actionmailer (5.2.4.1)
+ actionpack (= 5.2.4.1)
+ actionview (= 5.2.4.1)
+ activejob (= 5.2.4.1)
mail (~> 2.5, >= 2.5.4)
- rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.11.1)
- actionview (= 4.2.11.1)
- activesupport (= 4.2.11.1)
- rack (~> 1.6)
- rack-test (~> 0.6.2)
- rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-dom-testing (~> 2.0)
+ actionpack (5.2.4.1)
+ actionview (= 5.2.4.1)
+ activesupport (= 5.2.4.1)
+ rack (~> 2.0, >= 2.0.8)
+ rack-test (>= 0.6.3)
+ rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionpack-xml_parser (1.0.2)
- actionpack (>= 4.0.0, < 5)
- actionview (4.2.11.1)
- activesupport (= 4.2.11.1)
+ actionpack-xml_parser (2.0.1)
+ actionpack (>= 5.0)
+ railties (>= 5.0)
+ actionview (5.2.4.1)
+ activesupport (= 5.2.4.1)
builder (~> 3.1)
- erubis (~> 2.7.0)
- rails-dom-testing (~> 1.0, >= 1.0.5)
+ erubi (~> 1.4)
+ rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (4.2.11.1)
- activesupport (= 4.2.11.1)
- globalid (>= 0.3.0)
- activemodel (4.2.11.1)
- activesupport (= 4.2.11.1)
- builder (~> 3.1)
- activerecord (4.2.11.1)
- activemodel (= 4.2.11.1)
- activesupport (= 4.2.11.1)
- arel (~> 6.0)
- activesupport (4.2.11.1)
- i18n (~> 0.7)
+ activejob (5.2.4.1)
+ activesupport (= 5.2.4.1)
+ globalid (>= 0.3.6)
+ activemodel (5.2.4.1)
+ activesupport (= 5.2.4.1)
+ activerecord (5.2.4.1)
+ activemodel (= 5.2.4.1)
+ activesupport (= 5.2.4.1)
+ arel (>= 9.0)
+ activestorage (5.2.4.1)
+ actionpack (= 5.2.4.1)
+ activerecord (= 5.2.4.1)
+ marcel (~> 0.3.1)
+ activesupport (5.2.4.1)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (>= 0.7, < 2)
minitest (~> 5.1)
- thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.6.0)
- public_suffix (>= 2.0.2, < 4.0)
- arel (6.0.4)
- builder (3.2.3)
- capybara (2.18.0)
+ addressable (2.7.0)
+ public_suffix (>= 2.0.2, < 5.0)
+ arel (9.0.0)
+ ast (2.4.0)
+ builder (3.2.4)
+ capybara (3.25.0)
addressable
mini_mime (>= 0.1.3)
- nokogiri (>= 1.3.3)
- rack (>= 1.0.0)
- rack-test (>= 0.5.4)
- xpath (>= 2.0, < 4.0)
- childprocess (0.9.0)
- ffi (~> 1.0, >= 1.0.11)
- coderay (1.1.2)
+ nokogiri (~> 1.8)
+ rack (>= 1.6.0)
+ rack-test (>= 0.6.3)
+ regexp_parser (~> 1.5)
+ xpath (~> 3.2)
+ childprocess (3.0.0)
concurrent-ruby (1.1.5)
- crass (1.0.4)
- css_parser (1.7.0)
+ crass (1.0.5)
+ css_parser (1.7.1)
addressable
- docile (1.1.5)
- erubis (2.7.0)
- ffi (1.11.1)
+ csv (3.1.2)
+ docile (1.3.2)
+ erubi (1.9.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
htmlentities (4.3.4)
- i18n (0.7.0)
- jquery-rails (3.1.5)
- railties (>= 3.0, < 5.0)
- thor (>= 0.14, < 2.0)
- loofah (2.2.3)
+ i18n (1.6.0)
+ concurrent-ruby (~> 1.0)
+ jaro_winkler (1.5.4)
+ json (2.3.0)
+ loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
- mail (2.6.6)
- mime-types (>= 1.16, < 4)
- metaclass (0.0.4)
- mime-types (3.2.2)
- mime-types-data (~> 3.2015)
- mime-types-data (3.2019.0331)
+ mail (2.7.1)
+ mini_mime (>= 0.1.1)
+ marcel (0.3.3)
+ mimemagic (~> 0.3.2)
+ method_source (0.9.2)
mimemagic (0.3.3)
- mini_mime (1.0.1)
- mini_portile2 (2.3.0)
- minitest (5.11.3)
- mocha (1.8.0)
- metaclass (~> 0.0.1)
- multi_json (1.13.1)
- mysql2 (0.4.10)
- net-ldap (0.12.1)
- nokogiri (1.8.5)
- mini_portile2 (~> 2.3.0)
- pg (0.18.4)
- protected_attributes (1.1.4)
- activemodel (>= 4.0.1, < 5.0)
- public_suffix (3.1.0)
- rack (1.6.11)
+ mini_magick (4.9.5)
+ mini_mime (1.0.2)
+ mini_portile2 (2.4.0)
+ minitest (5.13.0)
+ mocha (1.11.1)
+ mysql2 (0.5.3)
+ net-ldap (0.16.2)
+ nio4r (2.5.2)
+ nokogiri (1.10.7)
+ mini_portile2 (~> 2.4.0)
+ parallel (1.19.1)
+ parser (2.6.5.0)
+ ast (~> 2.4.0)
+ pg (1.1.4)
+ public_suffix (4.0.1)
+ puma (3.12.2)
+ rack (2.0.8)
rack-openid (1.4.2)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
- rack-test (0.6.3)
- rack (>= 1.0)
- rails (4.2.11.1)
- actionmailer (= 4.2.11.1)
- actionpack (= 4.2.11.1)
- actionview (= 4.2.11.1)
- activejob (= 4.2.11.1)
- activemodel (= 4.2.11.1)
- activerecord (= 4.2.11.1)
- activesupport (= 4.2.11.1)
- bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.11.1)
- sprockets-rails
- rails-deprecated_sanitizer (1.0.3)
- activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.9)
- activesupport (>= 4.2.0, < 5.0)
- nokogiri (~> 1.6)
- rails-deprecated_sanitizer (>= 1.0.1)
- rails-html-sanitizer (1.0.4)
- loofah (~> 2.2, >= 2.2.2)
- railties (4.2.11.1)
- actionpack (= 4.2.11.1)
- activesupport (= 4.2.11.1)
+ rack-test (1.1.0)
+ rack (>= 1.0, < 3)
+ rails (5.2.4.1)
+ actioncable (= 5.2.4.1)
+ actionmailer (= 5.2.4.1)
+ actionpack (= 5.2.4.1)
+ actionview (= 5.2.4.1)
+ activejob (= 5.2.4.1)
+ activemodel (= 5.2.4.1)
+ activerecord (= 5.2.4.1)
+ activestorage (= 5.2.4.1)
+ activesupport (= 5.2.4.1)
+ bundler (>= 1.3.0)
+ railties (= 5.2.4.1)
+ sprockets-rails (>= 2.0.0)
+ rails-dom-testing (2.0.3)
+ activesupport (>= 4.2.0)
+ nokogiri (>= 1.6)
+ rails-html-sanitizer (1.3.0)
+ loofah (~> 2.3)
+ railties (5.2.4.1)
+ actionpack (= 5.2.4.1)
+ activesupport (= 5.2.4.1)
+ method_source
rake (>= 0.8.7)
- thor (>= 0.18.1, < 2.0)
- rake (12.3.2)
- rbpdf (1.19.8)
+ thor (>= 0.19.0, < 2.0)
+ rainbow (3.0.0)
+ rake (13.0.1)
+ rbpdf (1.20.1)
htmlentities
rbpdf-font (~> 1.19.0)
rbpdf-font (1.19.1)
- rdoc (4.3.0)
- redcarpet (3.4.0)
- request_store (1.0.5)
- rmagick (2.16.0)
- roadie (3.2.2)
+ redcarpet (3.5.0)
+ regexp_parser (1.6.0)
+ request_store (1.4.1)
+ rack (>= 1.4)
+ roadie (3.5.1)
css_parser (~> 1.4)
- nokogiri (~> 1.5)
- roadie-rails (1.1.1)
- railties (>= 3.0, < 5.1)
+ nokogiri (~> 1.8)
+ roadie-rails (2.1.0)
+ railties (>= 5.1, < 6.1)
roadie (~> 3.1)
- ruby-openid (2.3.0)
- rubyzip (1.2.3)
- selenium-webdriver (2.53.4)
- childprocess (~> 0.5)
- rubyzip (~> 1.0)
- websocket (~> 1.0)
- simplecov (0.9.2)
- docile (~> 1.1.0)
- multi_json (~> 1.0)
- simplecov-html (~> 0.9.0)
- simplecov-html (0.9.0)
- sprockets (3.7.2)
+ rouge (3.12.0)
+ rubocop (0.76.0)
+ jaro_winkler (~> 1.5.1)
+ parallel (~> 1.10)
+ parser (>= 2.6)
+ rainbow (>= 2.2.2, < 4.0)
+ ruby-progressbar (~> 1.7)
+ unicode-display_width (>= 1.4.0, < 1.7)
+ rubocop-performance (1.5.1)
+ rubocop (>= 0.71.0)
+ rubocop-rails (2.3.2)
+ rack (>= 1.1)
+ rubocop (>= 0.72.0)
+ ruby-openid (2.9.2)
+ ruby-progressbar (1.10.1)
+ rubyzip (2.0.0)
+ selenium-webdriver (3.142.6)
+ childprocess (>= 0.5, < 4.0)
+ rubyzip (>= 1.2.2)
+ simplecov (0.17.1)
+ docile (~> 1.1)
+ json (>= 1.8, < 3)
+ simplecov-html (~> 0.10.0)
+ simplecov-html (0.10.2)
+ sprockets (4.0.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
- test_after_commit (0.4.2)
- activerecord (>= 3.2)
- thor (0.20.3)
+ thor (1.0.1)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
- websocket (1.2.8)
+ unicode-display_width (1.6.0)
+ websocket-driver (0.7.1)
+ websocket-extensions (>= 0.1.0)
+ websocket-extensions (0.1.4)
xpath (3.2.0)
nokogiri (~> 1.8)
- yard (0.9.19)
+ yard (0.9.20)
PLATFORMS
ruby
DEPENDENCIES
actionpack-xml_parser
- bundler (>= 1.5.0, < 2.0.0)
- capybara (~> 2.13)
- coderay (~> 1.1.1)
- i18n (~> 0.7.0)
- jquery-rails (~> 3.1.4)
- mail (~> 2.6.4)
- mime-types (~> 3.0)
+ bundler (>= 1.5.0)
+ capybara (~> 3.25.0)
+ csv (~> 3.1.1)
+ ffi
+ i18n (~> 1.6.0)
+ mail (~> 2.7.1)
mimemagic
- minitest
- mocha
- mysql2 (~> 0.4.6)
- net-ldap (~> 0.12.0)
- nokogiri (~> 1.8.1)
- pg (~> 0.18.1)
- protected_attributes
+ mini_magick (~> 4.9.5)
+ mini_mime (~> 1.0.1)
+ mocha (>= 1.4.0)
+ mysql2 (~> 0.5.0)
+ net-ldap (~> 0.16.0)
+ nokogiri (~> 1.10.0)
+ pg (~> 1.1.4)
+ puma (~> 3.7)
rack-openid
- rails (= 4.2.11.1)
+ rails (= 5.2.4.1)
rails-dom-testing
- rails-html-sanitizer (>= 1.0.3)
- rbpdf (~> 1.19.6)
- rdoc (~> 4.3)
- redcarpet (~> 3.4.0)
- request_store (= 1.0.5)
- rmagick (~> 2.16.0)
- roadie (~> 3.2.1)
- roadie-rails (~> 1.1.1)
- ruby-openid (~> 2.3.0)
- selenium-webdriver (~> 2.53.4)
- simplecov (~> 0.9.1)
- test_after_commit (~> 0.4.2)
+ rbpdf (~> 1.20.0)
+ redcarpet (~> 3.5.0)
+ request_store (~> 1.4.1)
+ roadie-rails (~> 2.1.0)
+ rouge (~> 3.12.0)
+ rubocop (~> 0.76.0)
+ rubocop-performance (~> 1.5.0)
+ rubocop-rails (~> 2.3.0)
+ ruby-openid (~> 2.9.2)
+ selenium-webdriver
+ simplecov (~> 0.17.0)
tzinfo-data
yard
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix
index 0b1f64b58a17..e25cde11af06 100644
--- a/pkgs/applications/version-management/redmine/default.nix
+++ b/pkgs/applications/version-management/redmine/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, bundlerEnv, ruby }:
let
- version = "3.4.11";
+ version = "4.1.0";
rubyEnv = bundlerEnv {
name = "redmine-env-${version}";
@@ -16,7 +16,7 @@ in
src = fetchurl {
url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz";
- sha256 = "14987sd9ff2n3982qlfwd4m0g1m10w8jyv791nica3wppvnrxh0r";
+ sha256 = "1fxc0xql54cfvj4g8v31vsv19jbij326qkgdz2h5xlp09r821wli";
};
buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ];
diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix
index 4ef4bd404270..e69cbb0e1c23 100644
--- a/pkgs/applications/version-management/redmine/gemset.nix
+++ b/pkgs/applications/version-management/redmine/gemset.nix
@@ -1,126 +1,143 @@
{
+ actioncable = {
+ dependencies = ["actionpack" "nio4r" "websocket-driver"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1yz5mcjl4is99650vq6rkv539xccq8mp5zsbvzh43wqzfga1llwm";
+ type = "gem";
+ };
+ version = "5.2.4.1";
+ };
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "18wwlj4f7jffv3vxm80d2z36nwza95l5xfcqc401hvvrls4xzhsy";
+ sha256 = "1dbw3q3yyh7m7wgc4196hc3v86v123z0xz40llmic8iwx3d9vnda";
type = "gem";
};
- version = "4.2.11.1";
+ version = "5.2.4.1";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rmldsk3a4lwxk0lrp6x1nz1v1r2xmbm3300l4ghgfygv3grdwjh";
+ sha256 = "0f5pm62y08j679k3vhcml8436f92kripd6j3v5dyvn760kwzz72z";
type = "gem";
};
- version = "4.2.11.1";
+ version = "5.2.4.1";
};
actionpack-xml_parser = {
- dependencies = ["actionpack"];
+ dependencies = ["actionpack" "railties"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17am4nd7x6g8x7f8i35rzzv2qrxlkc230rbgzg98af0yf50j8gka";
+ sha256 = "1rnm6jrw3mzcf2g3q498igmhsn0kfkxq79w0nm532iclx4g4djs0";
type = "gem";
};
- version = "1.0.2";
+ version = "2.0.1";
};
actionview = {
- dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
+ dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x7vjn8q6blzyf7j3kwg0ciy7vnfh28bjdkd1mp9k4ghp9jn0g9p";
+ sha256 = "0hnkyx268czfb6ljv6ipcnz9dbgsb1z9n1gcr6279z9wx9550zij";
type = "gem";
};
- version = "4.2.11.1";
+ version = "5.2.4.1";
};
activejob = {
dependencies = ["activesupport" "globalid"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jy1c1r6syjqpa0sh9f1p4iaxzvp6qg4n6zs774j9z27q7h407mj";
+ sha256 = "0k4j3fcfc8m4hxwhs8xnbxazra760j3amn5r2zm2d5r1a1nqfh91";
type = "gem";
};
- version = "4.2.11.1";
+ version = "5.2.4.1";
};
activemodel = {
- dependencies = ["activesupport" "builder"];
+ dependencies = ["activesupport"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1c1x0rd6wnk1f0gsmxs6x3gx7yf6fs9qqkdv7r4hlbcdd849in33";
+ sha256 = "0sg1yyz710pxhq9z0jsbpbgn666y8iv4aj7pywglydipp4i0bpx1";
type = "gem";
};
- version = "4.2.11.1";
+ version = "5.2.4.1";
};
activerecord = {
dependencies = ["activemodel" "activesupport" "arel"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07ixiwi0zzs9skqarvpfamsnay7npfswymrn28ngxaf8hi279q5p";
+ sha256 = "1p35d6pj1370mnlppqq9lhr7m1ck82xvv621wq6hy12v41qfdnrg";
type = "gem";
};
- version = "4.2.11.1";
+ version = "5.2.4.1";
};
- activesupport = {
- dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
+ activestorage = {
+ dependencies = ["actionpack" "activerecord" "marcel"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vbq7a805bfvyik2q3kl9s3r418f5qzvysqbz2cwy4hr7m2q4ir6";
+ sha256 = "0dd8k91b88b875mypwqific2jilgzj5bx1637cwmzi4c0cy1v17f";
type = "gem";
};
- version = "4.2.11.1";
+ version = "5.2.4.1";
+ };
+ activesupport = {
+ dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0lmlnx79sv18xv1ddm4vq7z3mwdfa4468mq5186av0k8n1k471sp";
+ type = "gem";
+ };
+ version = "5.2.4.1";
};
addressable = {
dependencies = ["public_suffix"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
+ sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
type = "gem";
};
- version = "2.6.0";
+ version = "2.7.0";
};
arel = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4";
+ sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0";
type = "gem";
};
- version = "6.0.4";
+ version = "9.0.0";
+ };
+ ast = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
+ type = "gem";
+ };
+ version = "2.4.0";
};
builder = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
+ sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
type = "gem";
};
- version = "3.2.3";
+ version = "3.2.4";
};
capybara = {
- dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "xpath"];
+ dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yv77rnsjlvs8qpfn9n5vf1h6b9agxwhxw09gssbiw9zn9j20jh8";
+ sha256 = "1bq1y3gy98rqgw8z69b42isc2klb75fvlwvpi36vycf1yk0sfmmx";
type = "gem";
};
- version = "2.18.0";
+ version = "3.25.0";
};
childprocess = {
- dependencies = ["ffi"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";
+ sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5";
type = "gem";
};
- version = "0.9.0";
- };
- coderay = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
- type = "gem";
- };
- version = "1.1.2";
+ version = "3.0.0";
};
concurrent-ruby = {
source = {
@@ -133,43 +150,43 @@
crass = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
+ sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f";
type = "gem";
};
- version = "1.0.4";
+ version = "1.0.5";
};
css_parser = {
dependencies = ["addressable"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd";
+ sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw";
type = "gem";
};
- version = "1.7.0";
+ version = "1.7.1";
+ };
+ csv = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00szzw96bqz59r0kaab4p75qb0wq54iahmq37wpdg96bxc8y80f5";
+ type = "gem";
+ };
+ version = "3.1.2";
};
docile = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+ sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif";
type = "gem";
};
- version = "1.1.5";
+ version = "1.3.2";
};
- erubis = {
+ erubi = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+ sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
type = "gem";
};
- version = "2.7.0";
- };
- ffi = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh";
- type = "gem";
- };
- version = "1.11.1";
+ version = "1.9.0";
};
globalid = {
dependencies = ["activesupport"];
@@ -189,64 +206,64 @@
version = "4.3.4";
};
i18n = {
+ dependencies = ["concurrent-ruby"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
+ sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
type = "gem";
};
- version = "0.7.0";
+ version = "1.6.0";
};
- jquery-rails = {
- dependencies = ["railties" "thor"];
+ jaro_winkler = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1lk7xqmms45czylxs22kv5khlbm7a0yqcchqijxb9m10zsqc6lp5";
+ sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
type = "gem";
};
- version = "3.1.5";
+ version = "1.5.4";
+ };
+ json = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
+ type = "gem";
+ };
+ version = "2.3.0";
};
loofah = {
dependencies = ["crass" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
+ sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn";
type = "gem";
};
- version = "2.2.3";
+ version = "2.4.0";
};
mail = {
- dependencies = ["mime-types"];
+ dependencies = ["mini_mime"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9";
+ sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc";
type = "gem";
};
- version = "2.6.6";
+ version = "2.7.1";
};
- metaclass = {
+ marcel = {
+ dependencies = ["mimemagic"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5";
+ sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx";
type = "gem";
};
- version = "0.0.4";
+ version = "0.3.3";
};
- mime-types = {
- dependencies = ["mime-types-data"];
+ method_source = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
+ sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
type = "gem";
};
- version = "3.2.2";
- };
- mime-types-data = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
- type = "gem";
- };
- version = "3.2019.0331";
+ version = "0.9.2";
};
mimemagic = {
source = {
@@ -256,85 +273,100 @@
};
version = "0.3.3";
};
+ mini_magick = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4";
+ type = "gem";
+ };
+ version = "4.9.5";
+ };
mini_mime = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3";
+ sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
type = "gem";
};
- version = "1.0.1";
+ version = "1.0.2";
};
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+ sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
type = "gem";
};
- version = "2.3.0";
+ version = "2.4.0";
};
minitest = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+ sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi";
type = "gem";
};
- version = "5.11.3";
+ version = "5.13.0";
};
mocha = {
- dependencies = ["metaclass"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "12aglpiq1h18j5a4rlwvnsvnsi2f3407v5xm59lgcg3ymlyak4al";
+ sha256 = "06i2q5qjr9mvjgjc8w41pdf3qalw340y33wjvzc0rp4a1cbbb7pp";
type = "gem";
};
- version = "1.8.0";
- };
- multi_json = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
- type = "gem";
- };
- version = "1.13.1";
+ version = "1.11.1";
};
mysql2 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq";
+ sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw";
type = "gem";
};
- version = "0.4.10";
+ version = "0.5.3";
};
net-ldap = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0z1j0zklbbx3vi91zcd2v0fnkfgkvq3plisa6hxaid8sqndyak46";
+ sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg";
type = "gem";
};
- version = "0.12.1";
+ version = "0.16.2";
+ };
+ nio4r = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c";
+ type = "gem";
+ };
+ version = "2.5.2";
};
nokogiri = {
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
+ sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln";
type = "gem";
};
- version = "1.8.5";
+ version = "1.10.7";
+ };
+ parallel = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";
+ type = "gem";
+ };
+ version = "1.19.1";
+ };
+ parser = {
+ dependencies = ["ast"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw";
+ type = "gem";
+ };
+ version = "2.6.5.0";
};
pg = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32";
- type = "gem";
- };
- version = "0.18.4";
- };
- protected_attributes = {
- dependencies = ["activemodel"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "18lvrvmcwjvjr2mrn20vaf68a0q6mg4cy9f0m1i7x83p0ljhhyar";
+ sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
type = "gem";
};
version = "1.1.4";
@@ -342,18 +374,26 @@
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l";
+ sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
type = "gem";
};
- version = "3.1.0";
+ version = "4.0.1";
+ };
+ puma = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07sb9xqc9bn5lvl9ia25w8x1fwzk52p5vgysnvjlc3hvn0r00ysj";
+ type = "gem";
+ };
+ version = "3.12.2";
};
rack = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
+ sha256 = "1id0jsslx1ipv0pbqjfn7mjbb2vx2xybk7qypq59a17163xp30gr";
type = "gem";
};
- version = "1.6.11";
+ version = "2.0.8";
};
rack-openid = {
dependencies = ["rack" "ruby-openid"];
@@ -368,72 +408,71 @@
dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
+ sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m";
type = "gem";
};
- version = "0.6.3";
+ version = "1.1.0";
};
rails = {
- dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
+ dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ywvis59dd3v8qapi9ix6743zgk07l21x1cd6nb1ddpahxhm7dml";
+ sha256 = "1198azwbhlhq2n9xmpb19709d6smkanimip9cagvnlihagw80b20";
type = "gem";
};
- version = "4.2.11.1";
- };
- rails-deprecated_sanitizer = {
- dependencies = ["activesupport"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
- type = "gem";
- };
- version = "1.0.3";
+ version = "5.2.4.1";
};
rails-dom-testing = {
- dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"];
+ dependencies = ["activesupport" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6";
+ sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i";
type = "gem";
};
- version = "1.0.9";
+ version = "2.0.3";
};
rails-html-sanitizer = {
dependencies = ["loofah"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr";
+ sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
type = "gem";
};
- version = "1.0.4";
+ version = "1.3.0";
};
railties = {
- dependencies = ["actionpack" "activesupport" "rake" "thor"];
+ dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bjf21z9maiiazc1if56nnh9xmgbkcqlpznv34f40a1hsvgk1d1m";
+ sha256 = "1iqsqyyjscwnj2d3i0zl2k9apgsm7bb92l5h4wv1zbpdbb30wsqb";
type = "gem";
};
- version = "4.2.11.1";
+ version = "5.2.4.1";
+ };
+ rainbow = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
+ type = "gem";
+ };
+ version = "3.0.0";
};
rake = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
+ sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
type = "gem";
};
- version = "12.3.2";
+ version = "13.0.1";
};
rbpdf = {
dependencies = ["htmlentities" "rbpdf-font"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0fnhcn4z2zz6ic1yvl5hmhwmkdnybh8f8fnk1ni7bvl2s4ig5195";
+ sha256 = "0sdj8frakpdms820rwlil38h9bh3p24xmwnjrxsjc1p9irc3za71";
type = "gem";
};
- version = "1.19.8";
+ version = "1.20.1";
};
rbpdf-font = {
source = {
@@ -443,106 +482,142 @@
};
version = "1.19.1";
};
- rdoc = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "13ba2mhqqcsp3k97x3iz9x29xk26rv4561lfzzzibcy41vvj1n4c";
- type = "gem";
- };
- version = "4.3.0";
- };
redcarpet = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7";
+ sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k";
type = "gem";
};
- version = "3.4.0";
+ version = "3.5.0";
+ };
+ regexp_parser = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1l44ml30jvqpdi3707x1n1dinq7fx9887pv3q2ywyfmi4kja7yf2";
+ type = "gem";
+ };
+ version = "1.6.0";
};
request_store = {
+ dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ky19wb6mpq6dxb81a0h4hnzx7a4ka99n9ay2syi68djbr4bkbbh";
+ sha256 = "1963330z03fk382fi8y231ygcbnh86m91dqlp5rh1mwy9ihzzl6d";
type = "gem";
};
- version = "1.0.5";
- };
- rmagick = {
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "0m9x15cdlkcb9826s3s2jd97hxf50hln22p94x8hcccxi1lwklq6";
- type = "gem";
- };
- version = "2.16.0";
+ version = "1.4.1";
};
roadie = {
dependencies = ["css_parser" "nokogiri"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0frp5yb07ib9y1k43shd4xjkb9a6wavhqq892l8yi9y73qi2cqbc";
+ sha256 = "1zihd316bkbnrinz5s1s7pg7s0cadhhj6qs7wmc713j0g6ai1k9r";
type = "gem";
};
- version = "3.2.2";
+ version = "3.5.1";
};
roadie-rails = {
dependencies = ["railties" "roadie"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1hxgl5marq2hi6lcc73f7g6afd7dz4w893rrgrbh7m3k8zrwjyk1";
+ sha256 = "0hdkmnxrmw31dn9jq43xiypz2v6rbvg4x2yd2hgl2xbl3lm1ln7i";
type = "gem";
};
- version = "1.1.1";
+ version = "2.1.0";
+ };
+ rouge = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08fpnxbhqv5sqpnfjasl1ysxafssyq4q1yhcqamqqzmb9czj1czw";
+ type = "gem";
+ };
+ version = "3.12.0";
+ };
+ rubocop = {
+ dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "07x51ixlx76y194xsszh5lbkaqakz44ykbrjxg3qaggbs18790q0";
+ type = "gem";
+ };
+ version = "0.76.0";
+ };
+ rubocop-performance = {
+ dependencies = ["rubocop"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1kn6rb0ma32gjp5qdvrbbb9ckh66rm6xpfrw8h3kr7svirsww2h8";
+ type = "gem";
+ };
+ version = "1.5.1";
+ };
+ rubocop-rails = {
+ dependencies = ["rack" "rubocop"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1q7ffsq1cjm4m949nh935kjzv4zf1pacnrl00siwh8flhcn3mmjf";
+ type = "gem";
+ };
+ version = "2.3.2";
};
ruby-openid = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yzaf2c1i88757554wk38rxqmj0xzgmwk2zx7gi98w2zx42d17pn";
+ sha256 = "190p1m0bxd9xkfk1j6cpcv3x5c367g36nsglg4m1fcwqdd13k3kz";
type = "gem";
};
- version = "2.3.0";
+ version = "2.9.2";
+ };
+ ruby-progressbar = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
+ type = "gem";
+ };
+ version = "1.10.1";
};
rubyzip = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
+ sha256 = "1gz0ri0pa2xr7b6bf66yjc2wfvk51f4gi6yk7bklwl1nr65zc4gz";
type = "gem";
};
- version = "1.2.3";
+ version = "2.0.0";
};
selenium-webdriver = {
- dependencies = ["childprocess" "rubyzip" "websocket"];
+ dependencies = ["childprocess" "rubyzip"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15qyf7b9fa2nxhhwp551b9fjj82kb3wmy65559yrrcwpdadqvcs4";
+ sha256 = "11abil34dr8p1kw7hlaqd6kr430v4srmhzf72zzqvhcimlfvm4yb";
type = "gem";
};
- version = "2.53.4";
+ version = "3.142.6";
};
simplecov = {
- dependencies = ["docile" "multi_json" "simplecov-html"];
+ dependencies = ["docile" "json" "simplecov-html"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12";
+ sha256 = "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw";
type = "gem";
};
- version = "0.9.2";
+ version = "0.17.1";
};
simplecov-html = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc";
+ sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn";
type = "gem";
};
- version = "0.9.0";
+ version = "0.10.2";
};
sprockets = {
dependencies = ["concurrent-ruby" "rack"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay";
+ sha256 = "0jm37zpvvm1arxjwrd6am0wrdbfhrhc5y0l4p2i3p11z04bsvgap";
type = "gem";
};
- version = "3.7.2";
+ version = "4.0.0";
};
sprockets-rails = {
dependencies = ["actionpack" "activesupport" "sprockets"];
@@ -553,22 +628,13 @@
};
version = "3.2.1";
};
- test_after_commit = {
- dependencies = ["activerecord"];
- source = {
- remotes = ["https://rubygems.org"];
- sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb";
- type = "gem";
- };
- version = "0.4.2";
- };
thor = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+ sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
type = "gem";
};
- version = "0.20.3";
+ version = "1.0.1";
};
thread_safe = {
source = {
@@ -587,13 +653,30 @@
};
version = "1.2.5";
};
- websocket = {
+ unicode-display_width = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0f11rcn4qgffb1rq4kjfwi7di79w8840x9l74pkyif5arp0mb08x";
+ sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
type = "gem";
};
- version = "1.2.8";
+ version = "1.6.0";
+ };
+ websocket-driver = {
+ dependencies = ["websocket-extensions"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
+ type = "gem";
+ };
+ version = "0.7.1";
+ };
+ websocket-extensions = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
+ type = "gem";
+ };
+ version = "0.1.4";
};
xpath = {
dependencies = ["nokogiri"];
@@ -607,9 +690,9 @@
yard = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1w0i13a0vsw4jmlj59xn64rdsqcsl9r3rmjjgdca5i51m1q4ix6v";
+ sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny";
type = "gem";
};
- version = "0.9.19";
+ version = "0.9.20";
};
}
\ No newline at end of file
diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix
index 8aa6128819f1..d050895ca237 100644
--- a/pkgs/applications/version-management/sourcehut/lists.nix
+++ b/pkgs/applications/version-management/sourcehut/lists.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchgit, buildPythonPackage
, python
-, srht, asyncpg, unidiff, aiosmtpd, emailthreads }:
+, srht, asyncpg, unidiff, aiosmtpd, pygit2, emailthreads }:
buildPythonPackage rec {
pname = "listssrht";
@@ -20,6 +20,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
srht
+ pygit2
asyncpg
unidiff
aiosmtpd
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 779c33627e8f..653db11ab5d3 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -1,43 +1,38 @@
-{ lib, fetchurl, python2Packages
-, mercurial
+{ lib, fetchurl, python3Packages
+, mercurial, qt5
}@args:
let
tortoisehgSrc = fetchurl rec {
meta.name = "tortoisehg-${meta.version}";
- meta.version = "5.0.2";
- url = "https://bitbucket.org/tortoisehg/targz/downloads/${meta.name}.tar.gz";
- sha256 = "1fkawx4ymaacah2wpv2w7rxmv1mx08mg4x4r4fxh41jz1njjb8sz";
+ meta.version = "5.2.1";
+ url = "https://bitbucket.org/tortoisehg/thg/get/14221e991a5b623e0072d3bd340b759dbe9072ca.tar.gz";
+ sha256 = "01rpzf5z99izcdda1ps9bhqvhw6qghagd8c1y7x19rv223zi05dv";
};
- mercurial =
- if args.mercurial.meta.version == tortoisehgSrc.meta.version
- then args.mercurial
- else args.mercurial.override {
- mercurialSrc = fetchurl rec {
- meta.name = "mercurial-${meta.version}";
- meta.version = tortoisehgSrc.meta.version;
- url = "https://mercurial-scm.org/release/${meta.name}.tar.gz";
- sha256 = "1y60hfc8gh4ha9sw650qs7hndqmvbn0qxpmqwpn4q18z5xwm1f19";
- };
- };
-
-in python2Packages.buildPythonApplication {
+ tortoiseMercurial = mercurial.overridePythonAttrs (old: rec {
+ inherit (tortoisehgSrc.meta) version;
+ src = fetchurl {
+ url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
+ sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q";
+ };
+ });
+in python3Packages.buildPythonApplication {
inherit (tortoisehgSrc.meta) name version;
src = tortoisehgSrc;
- pythonPath = with python2Packages; [ pyqt4 mercurial qscintilla iniparse ];
-
- propagatedBuildInputs = with python2Packages; [ qscintilla iniparse ];
+ propagatedBuildInputs = with python3Packages; [
+ tortoiseMercurial qscintilla-qt5 iniparse
+ ];
+ nativeBuildInputs = [ qt5.wrapQtAppsHook ];
doCheck = false; # tests fail with "thg: cannot connect to X server"
- dontStrip = true;
- buildPhase = "";
- installPhase = ''
- ${python2Packages.python.executable} setup.py install --prefix=$out
+ postInstall = ''
mkdir -p $out/share/doc/tortoisehg
- cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt.gz
- ln -s $out/bin/thg $out/bin/tortoisehg #convenient alias
+ cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt
+ # convenient alias
+ ln -s $out/bin/thg $out/bin/tortoisehg
+ wrapQtApp $out/bin/thg
'';
checkPhase = ''
@@ -45,7 +40,7 @@ in python2Packages.buildPythonApplication {
$out/bin/thg version
'';
- passthru.mercurial = mercurial;
+ passthru.mercurial = tortoiseMercurial;
meta = {
description = "Qt based graphical tool for working with Mercurial";
diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index 66b785e43b17..f3ddf8059b29 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -1,37 +1,39 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, git, gnupg }:
-let version = "1.12.0"; in
+let version = "2.3.0"; in
stdenv.mkDerivation {
pname = "yadm";
inherit version;
+ buildInputs = [ git gnupg ];
+
src = fetchFromGitHub {
owner = "TheLocehiliosan";
repo = "yadm";
rev = version;
- sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6";
+ sha256 = "1by21dh48qbi33wlyyvdwz7ac1lxrblzcr5v7hlnc4cbcgvgs1a0";
};
- buildCommand = ''
- mkdir -p $out/bin
- mkdir -p $out/share/man/man1
- mkdir -p $out/share/zsh/site-functions
- mkdir -p $out/share/bash-completion/completions
- sed -e 's:/bin/bash:/usr/bin/env bash:' $src/yadm > $out/bin/yadm
- chmod 755 $out/bin/yadm
- install -m 644 $src/yadm.1 $out/share/man/man1/yadm.1
- install -m644 $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm
- install -m644 $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash
+ dontConfigure = true;
+ dontBuild = true;
+
+ installPhase = ''
+ runHook preInstall
+ install -Dt $out/bin $src/yadm
+ install -Dt $out/share/man/man1 $src/yadm.1
+ install -D $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm
+ install -D $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash
+ runHook postInstall
'';
meta = {
homepage = https://github.com/TheLocehiliosan/yadm;
description = "Yet Another Dotfiles Manager";
longDescription = ''
- yadm is a dotfile management tool with 3 main features: Manages files across
- systems using a single Git repository. Provides a way to use alternate files on
- a specific OS or host. Supplies a method of encrypting confidential data so it
- can safely be stored in your repository.
+ yadm is a dotfile management tool with 3 main features:
+ * Manages files across systems using a single Git repository.
+ * Provides a way to use alternate files on a specific OS or host.
+ * Supplies a method of encrypting confidential data so it can safely be stored in your repository.
'';
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index 2734035b6de9..83f7ebc29d19 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -1,16 +1,42 @@
-{ config, stdenv, fetchurl
-, libX11, wxGTK
-, libiconv, fontconfig, freetype
-, libGLU_combined
-, libass, fftw, ffms
-, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
-, icu, boost, intltool # New dependencies
-, spellcheckSupport ? true, hunspell ? null
-, automationSupport ? true, lua ? null
-, openalSupport ? false, openal ? null
-, alsaSupport ? stdenv.isLinux, alsaLib ? null
-, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
-, portaudioSupport ? false, portaudio ? null }:
+{ config
+, stdenv
+, fetchurl
+, fetchpatch
+, libX11
+, wxGTK
+, libiconv
+, fontconfig
+, freetype
+, libGLU
+, libGL
+, libass
+, fftw
+, ffms
+, ffmpeg
+, pkg-config
+, zlib
+, icu
+, boost
+, intltool
+
+, spellcheckSupport ? true
+, hunspell ? null
+
+, automationSupport ? true
+, lua ? null
+
+, openalSupport ? false
+, openal ? null
+
+, alsaSupport ? stdenv.isLinux
+, alsaLib ? null
+
+, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux
+, libpulseaudio ? null
+
+, portaudioSupport ? false
+, portaudio ? null
+}:
assert spellcheckSupport -> (hunspell != null);
assert automationSupport -> (lua != null);
@@ -20,7 +46,8 @@ assert pulseaudioSupport -> (libpulseaudio != null);
assert portaudioSupport -> (portaudio != null);
with stdenv.lib;
-stdenv.mkDerivation rec {
+stdenv.mkDerivation
+ rec {
pname = "aegisub";
version = "3.2.2";
@@ -29,12 +56,40 @@ stdenv.mkDerivation rec {
sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5";
};
- # Fixup build with icu-59
- postPatch = "sed '1i#include ' -i src/utils.cpp";
+ patches = [
+ # Compatibility with ICU 59
+ (fetchpatch {
+ url = "https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721f6ff16a49.patch";
+ sha256 = "07qqlckiyy64lz8zk1as0vflk9kqnjb340420lp9f0xj93ncssj7";
+ })
- buildInputs = with stdenv.lib;
- [ pkgconfig intltool libX11 wxGTK fontconfig freetype libGLU_combined
- libass fftw ffms ffmpeg zlib icu boost boost.out libiconv
+ # Compatbility with Boost 1.69
+ (fetchpatch {
+ url = "https://github.com/Aegisub/Aegisub/commit/c3c446a8d6abc5127c9432387f50c5ad50012561.patch";
+ sha256 = "1n8wmjka480j43b1pr30i665z8hdy6n3wdiz1ls81wyv7ai5yygf";
+ })
+ ];
+
+ nativeBuildInputs = [
+ pkg-config
+ intltool
+ ];
+
+ buildInputs = with stdenv.lib; [
+ libX11
+ wxGTK
+ fontconfig
+ freetype
+ libGLU
+ libGL
+ libass
+ fftw
+ ffms
+ ffmpeg
+ zlib
+ icu
+ boost
+ libiconv
]
++ optional spellcheckSupport hunspell
++ optional automationSupport lua
@@ -67,11 +122,11 @@ stdenv.mkDerivation rec {
audio, and features many powerful tools for styling them, including a
built-in real-time video preview.
'';
- homepage = http://www.aegisub.org/;
+ homepage = "http://www.aegisub.org/";
+ # The Aegisub sources are itself BSD/ISC,
+ # but they are linked against GPL'd softwares
+ # - so the resulting program will be GPL
license = licenses.bsd3;
- # The Aegisub sources are itself BSD/ISC,
- # but they are linked against GPL'd softwares
- # - so the resulting program will be GPL
maintainers = [ maintainers.AndersonTorres ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index 9ff65483f261..a9d98a9a2a44 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -1,6 +1,6 @@
{ config, stdenv, fetchFromGitHub
, fetchpatch, pkgconfig, perl, python, which
-, libX11, libxcb, libGLU_combined
+, libX11, libxcb, libGLU, libGL
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper
, libchardet
, ffmpeg
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib;
[ libX11
libxcb
- libGLU_combined
+ libGLU libGL
qtbase
qtx11extras
qtdeclarative
diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix
index 47a82470137e..22fac11b0182 100644
--- a/pkgs/applications/video/celluloid/default.nix
+++ b/pkgs/applications/video/celluloid/default.nix
@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "celluloid";
- version = "0.17";
+ version = "0.18";
src = fetchFromGitHub {
owner = "celluloid-player";
repo = "celluloid";
rev = "v${version}";
- sha256 = "0pnxjv6n2q6igxdr8wzbahcj7vccw4nfjdk8fjdnaivf2lyrpv2d";
+ sha256 = "1j8z75y98liirr41rlcn89cshvp1xp71cspcclm6wx455i7q2cg1";
};
nativeBuildInputs = [
@@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs meson-post-install.py src/generate-authors.py
- sed -i '/gtk-update-icon-cache/s/^/#/' meson-post-install.py
'';
doCheck = true;
@@ -59,6 +58,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/celluloid-player/celluloid";
license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ worldofpeace ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index 145b7cc06c2d..ad175b246766 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -5,10 +5,10 @@
mkDerivation rec {
pname = "clipgrab";
- version = "3.8.5";
+ version = "3.8.6";
src = fetchurl {
- sha256 = "0jfjnzwvz4ynlld0ih7f7d575s5w2dag0hvb02c6qan7xm5jdhv9";
+ sha256 = "1w2j1wk9sf22nnschlraxdbxabqblrxyb8kq0lkyk7dkfa5d0hdq";
# The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
};
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index e8a81a192b5a..4341055d084b 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -9,9 +9,10 @@
{ stdenv, lib, fetchurl, fetchpatch,
# Main build tools
- python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, lzma,
+ python2, pkgconfig, autoconf, automake, libtool, m4, lzma,
+ numactl,
# Processing, video codecs, containers
- ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora,
+ ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d,
# Codecs, audio
libopus, lame, libvorbis, a52dec, speex, libsamplerate,
# Text processing
@@ -48,22 +49,22 @@ assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null
stdenv.mkDerivation rec {
pname = "handbrake";
- version = "1.2.2";
+ version = "1.3.0";
src = fetchurl {
url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2'';
- sha256 = "0k2yaqy7zi06k8mkp9az2mn9dlgj3a1339vacakfh2nn2zsics6z";
+ sha256 = "15hxncswmaj62hb40fxixsa6d519zb712z9xbdq979q4rasjxa59";
};
nativeBuildInputs = [
- python2 pkgconfig autoconf automake cmake nasm libtool m4
+ python2 pkgconfig autoconf automake libtool m4
] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
buildInputs = [
- ffmpeg-full libogg libtheora x264 x265 libvpx
+ ffmpeg-full libogg libtheora x264 x265 libvpx dav1d
libopus lame libvorbis a52dec speex libsamplerate
libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz
- libdvdread libdvdnav libdvdcss libbluray lzma
+ libdvdread libdvdnav libdvdcss libbluray lzma numactl
] ++ lib.optionals useGtk [
glib gtk3 libappindicator-gtk3 libnotify
gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev
@@ -74,20 +75,6 @@ stdenv.mkDerivation rec {
# look at ./make/configure.py search "enable_nvenc"
++ lib.optional stdenv.isLinux nv-codec-headers;
- # NOTE: 2018-12-25: v1.2.0 now requires cmake dep
- # (default distribution bundles&builds 3rd party libs),
- # don't trigger cmake build
- dontUseCmakeConfigure = true;
- # cp: cannot create regular file './internal_defaults.json': File exists
- enableParallelBuilding = false;
-
- # The samplerate patch should be removed when HandBrake 1.3.0 is released
- patches = [(fetchpatch {
- name = "set-ffmpeg-samplerate.patch";
- url = "https://patch-diff.githubusercontent.com/raw/HandBrake/HandBrake/pull/2126.patch";
- sha256 = "00lds9h27cvyr53qpvv8gbv01hfxdxd8gphxcwbwg8akqrvk9gbf";
- })];
-
preConfigure = ''
patchShebangs scripts
@@ -99,6 +86,9 @@ stdenv.mkDerivation rec {
# Force using nixpkgs dependencies
sed -i '/MODULES += contrib/d' make/include/main.defs
sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules
+ sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \
+ -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \
+ -i make/configure.py
'';
configureFlags = [
@@ -112,6 +102,8 @@ stdenv.mkDerivation rec {
# NOTE: 2018-12-27: Check NixOS HandBrake test if changing
NIX_LDFLAGS = [
"-lx265"
+ # NOTE: The -ldl flag was fixed upstream for a release after 1.3.0
+ "-ldl"
];
preBuild = ''
diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix
deleted file mode 100644
index 7dc350da6475..000000000000
--- a/pkgs/applications/video/key-mon/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, gnome2, librsvg, pythonPackages }:
-
-pythonPackages.buildPythonApplication rec {
- pname = "key-mon";
- version = "1.17";
- namePrefix = "";
-
- src = fetchurl {
- url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/key-mon/${pname}-${version}.tar.gz";
- sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q";
- };
-
- propagatedBuildInputs =
- [ gnome2.python_rsvg librsvg pythonPackages.pygtk pythonPackages.xlib ];
-
- doCheck = false;
-
- preFixup = ''
- export makeWrapperArgs="--set GDK_PIXBUF_MODULE_FILE $GDK_PIXBUF_MODULE_FILE"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://code.google.com/archive/p/key-mon;
- description = "Utility to show live keyboard and mouse status for teaching and screencasts";
- license = licenses.asl20;
- maintainers = [ maintainers.goibhniu ];
- };
-}
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 7953cde24139..d47797a30463 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -8,8 +8,8 @@
, libXt, libXmu, libXext
, libXinerama, libXrandr
, libXtst, libXfixes, systemd
-, alsaLib, libGLU_combined, glew, fontconfig, freetype, ftgl
-, libjpeg, jasper, libpng, libtiff
+, alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl
+, libjpeg, libpng, libtiff
, libmpeg2, libsamplerate, libmad
, libogg, libvorbis, flac, libxslt
, lzo, libcdio, libmodplug, libass, libbluray
@@ -43,15 +43,15 @@ assert vdpauSupport -> libvdpau != null;
assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null;
let
- kodiReleaseDate = "20190901";
- kodiVersion = "18.4";
+ kodiReleaseDate = "20191116";
+ kodiVersion = "18.5";
rel = "Leia";
kodi_src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${kodiVersion}-${rel}";
- sha256 = "1m0295czxabdcqyqf5m94av9d88pzhnzjvyfs1q07xqq82h313p7";
+ sha256 = "0pcrraj1ddzrd296br10yjnaxgb3iym74xzixcakaqhhp00f5hf6";
};
cmakeProto = fetchurl {
@@ -156,8 +156,8 @@ in stdenv.mkDerivation {
openssl gperf tinyxml2 taglib libssh swig jre
libX11 xorgproto libXt libXmu libXext
libXinerama libXrandr libXtst libXfixes
- alsaLib libGLU_combined glew fontconfig freetype ftgl
- libjpeg jasper libpng libtiff
+ alsaLib libGL libGLU glew fontconfig freetype ftgl
+ libjpeg libpng libtiff
libmpeg2 libsamplerate libmad
libogg libvorbis flac libxslt systemd
lzo libcdio libmodplug libass libbluray
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 77aa2779b5d9..ca202c5ce603 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -3,21 +3,21 @@
}:
let
- version = "1.14.5";
+ version = "1.14.7";
# Using two URLs as the first one will break as soon as a new version is released
src_bin = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
];
- sha256 = "1rnkx0h149n3pawmk8d234x5w1xw4kady9pgrcc5aw6krbx38nis";
+ sha256 = "19j62vyk8havv38lh35108f7jmrqiqzikl3aqlsncxxa69m6fv5n";
};
src_oss = fetchurl {
urls = [
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
];
- sha256 = "1jg10mslcl0sfwdd9p7hy9zfvk0xc7qhdakiv1kbilsl42bgaxyi";
+ sha256 = "1w6b4cvhfg1dv2claam0l6slhjqzy0n2lvwk1ggkh4c561qbfp59";
};
in mkDerivation {
pname = "makemkv";
diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix
index a5de209854b3..586779252b63 100644
--- a/pkgs/applications/video/mediathekview/default.nix
+++ b/pkgs/applications/video/mediathekview/default.nix
@@ -1,25 +1,29 @@
{ stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec {
- version = "13.2.1";
+ version = "13.5.0";
pname = "mediathekview";
src = fetchurl {
- url = "https://download.mediathekview.de/stabil/MediathekView-${version}.tar.gz";
- sha256 = "11wg6klviig0h7pprfaygamsgqr7drqra2s4yxgfak6665033l2a";
+ url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz";
+ sha256 = "0n05w2d6sh03rjms7m9b5nj84cl16gkrc9nsn53kvldglmqmmrac";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
- mkdir -p $out/{lib,bin,share/mediathekview}
+ mkdir -p $out/{bin,lib}
- install -m644 MediathekView.jar $out/
- install -m644 -t $out/lib lib/*
- install -m755 bin/flv.sh $out/share/mediathekview
+ install -m644 MediathekView.jar $out/lib
makeWrapper ${jre}/bin/java $out/bin/mediathek \
- --add-flags "-cp '$out/lib/*' -jar $out/MediathekView.jar"
- '';
+ --add-flags "-Xmx1G -jar $out/lib/MediathekView.jar"
+
+ makeWrapper ${jre}/bin/java $out/bin/MediathekView \
+ --add-flags "-Xmx1G -jar $out/lib/MediathekView.jar"
+
+ makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \
+ --add-flags "-Xmx1G -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar"
+ '';
meta = with stdenv.lib; {
description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 153d0a20b6e6..2d332a862c62 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -13,13 +13,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mkvtoolnix";
- version = "38.0.0";
+ version = "40.0.0";
src = fetchFromGitLab {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
- sha256 = "0874rfslglywpa8ilhqv59zvn2hisdsbwd7r61psf5rd64v72ym4";
+ sha256 = "103rvj6f6nlzybzbkqix7q5f2017bmzsn9z5g7bwnjjwgih5mrpq";
};
nativeBuildInputs = [
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
description = "Cross-platform tools for Matroska";
homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
license = licenses.gpl2;
- maintainers = with maintainers; [ codyopel fuuzetsu rnhmjoj ];
+ maintainers = with maintainers; [ codyopel rnhmjoj ];
platforms = platforms.linux
++ optionals (!withGUI) platforms.darwin;
};
diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix
index 2afb7d1c68a5..a75a7a11d67a 100644
--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@@ -2,7 +2,7 @@
, aalibSupport ? true, aalib ? null
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
, fribidiSupport ? true, fribidi ? null
-, x11Support ? true, libX11 ? null, libXext ? null, libGLU_combined ? null
+, x11Support ? true, libX11 ? null, libXext ? null, libGLU, libGL ? null
, xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null
, alsaSupport ? stdenv.isLinux, alsaLib ? null
@@ -32,7 +32,7 @@
assert fontconfigSupport -> (fontconfig != null);
assert (!fontconfigSupport) -> (freefont_ttf != null);
assert fribidiSupport -> (fribidi != null);
-assert x11Support -> (libX11 != null && libXext != null && libGLU_combined != null);
+assert x11Support -> (libX11 != null && libXext != null && libGLU != null && libGL != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support);
assert alsaSupport -> alsaLib != null;
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
++ optional aalibSupport aalib
++ optional fontconfigSupport fontconfig
++ optional fribidiSupport fribidi
- ++ optionals x11Support [ libX11 libXext libGLU_combined ]
+ ++ optionals x11Support [ libX11 libXext libGLU libGL ]
++ optional alsaSupport alsaLib
++ optional xvSupport libXv
++ optional theoraSupport libtheora
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 7aedce98d56f..91a9f4a7d010 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -9,7 +9,7 @@
, libxkbcommon ? null
, x11Support ? stdenv.isLinux
- , libGLU_combined ? null
+ , libGLU, libGL ? null
, libX11 ? null
, libXext ? null
, libXxf86vm ? null
@@ -39,7 +39,7 @@
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
, rubberbandSupport ? stdenv.isLinux, rubberband ? null
, screenSaverSupport ? true, libXScrnSaver ? null
-, sambaSupport ? true, samba ? null
+, sambaSupport ? stdenv.isLinux, samba ? null
, sdl2Support ? true, SDL2 ? null
, sndioSupport ? true, sndio ? null
, speexSupport ? true, speex ? null
@@ -52,7 +52,7 @@
, zimgSupport ? true, zimg ? null
, archiveSupport ? false, libarchive ? null
, jackaudioSupport ? false, libjack2 ? null
-, openalSupport ? false, openalSoft ? null
+, openalSupport ? true, openalSoft ? null
, vapoursynthSupport ? false, vapoursynth ? null
}:
@@ -86,7 +86,7 @@ assert vapoursynthSupport -> available vapoursynth;
assert vdpauSupport -> available libvdpau;
assert vulkanSupport -> all available [ libplacebo shaderc vulkan-headers vulkan-loader ];
assert waylandSupport -> all available [ wayland wayland-protocols libxkbcommon ];
-assert x11Support -> all available [ libGLU_combined libX11 libXext libXxf86vm libXrandr ];
+assert x11Support -> all available [ libGLU libGL libX11 libXext libXxf86vm libXrandr ];
assert xineramaSupport -> x11Support && available libXinerama;
assert xvSupport -> x11Support && available libXv;
assert youtubeSupport -> available youtube-dl;
@@ -181,7 +181,7 @@ in stdenv.mkDerivation rec {
++ optionals drmSupport [ libdrm mesa ]
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ]
- ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ]
+ ++ optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ]
++ optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ]
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreFoundation Cocoa CoreAudio
@@ -235,7 +235,7 @@ in stdenv.mkDerivation rec {
description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
homepage = https://mpv.io;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz globin ivan ];
+ maintainers = with maintainers; [ AndersonTorres fpletz globin ivan ];
platforms = platforms.darwin ++ platforms.linux;
longDescription = ''
diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix
index 7914bb84c428..2c73d3e734cc 100644
--- a/pkgs/applications/video/mythtv/default.nix
+++ b/pkgs/applications/video/mythtv/default.nix
@@ -1,5 +1,5 @@
{ stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper
-, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype
+, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype
, perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm
, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders
, libXNVCtrl, enableXnvctrl ? false
@@ -26,7 +26,7 @@ mkDerivation rec {
setSourceRoot = ''sourceRoot=$(echo */mythtv)'';
buildInputs = [
- freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU_combined
+ freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU libGL
perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC
libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2
] ++ stdenv.lib.optional enableXnvctrl libXNVCtrl;
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index e5022242ef88..fdcfd7e0bec3 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -37,13 +37,13 @@ let
optional = stdenv.lib.optional;
in mkDerivation rec {
pname = "obs-studio";
- version = "24.0.3";
+ version = "24.0.4";
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
rev = version;
- sha256 = "0g8nzs696f3myz4hvygav85b0jgjmn6dicy50axmapdv8miff9xa";
+ sha256 = "0m15ch2ix9qrdf1a9mj7wcpl72z3h13zx60c9q72sb1435id2g1q";
};
nativeBuildInputs = [ cmake
diff --git a/pkgs/applications/video/obs-studio/fix-search-path.patch b/pkgs/applications/video/obs-studio/fix-search-path.patch
new file mode 100644
index 000000000000..4503447ff5dc
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/fix-search-path.patch
@@ -0,0 +1,13 @@
+diff --git a/external/FindLibObs.cmake b/external/FindLibObs.cmake
+index ab0a3de..19c63ee 100644
+--- a/external/FindLibObs.cmake
++++ b/external/FindLibObs.cmake
+@@ -95,7 +95,7 @@ if(LIBOBS_FOUND)
+
+ set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR})
+ set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB})
+- include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake)
++ include(external/ObsPluginHelpers.cmake)
+
+ # allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg)
+ if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES)
diff --git a/pkgs/applications/video/obs-studio/hardcode-ndi-path.patch b/pkgs/applications/video/obs-studio/hardcode-ndi-path.patch
new file mode 100644
index 000000000000..caef96c381f2
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/hardcode-ndi-path.patch
@@ -0,0 +1,17 @@
+diff --git a/src/obs-ndi.cpp b/src/obs-ndi.cpp
+index 493831c..7b0f8db 100644
+--- a/src/obs-ndi.cpp
++++ b/src/obs-ndi.cpp
+@@ -197,11 +197,7 @@ const char* obs_module_description()
+ const NDIlib_v4* load_ndilib()
+ {
+ QStringList locations;
+- locations << QString(qgetenv(NDILIB_REDIST_FOLDER));
+-#if defined(__linux__) || defined(__APPLE__)
+- locations << "/usr/lib";
+- locations << "/usr/local/lib";
+-#endif
++ locations << "@NDI@/lib";
+
+ for (QString path : locations) {
+ blog(LOG_INFO, "Trying '%s'", path.toUtf8().constData());
diff --git a/pkgs/applications/video/obs-studio/obs-ndi.nix b/pkgs/applications/video/obs-studio/obs-ndi.nix
new file mode 100644
index 000000000000..452793f442ee
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/obs-ndi.nix
@@ -0,0 +1,41 @@
+# We don't have a wrapper which can supply obs-studio plugins so you have to
+# somewhat manually install this:
+
+# nix-env -f "" -iA obs-ndi
+# mkdir -p ~/.config/obs-studio/plugins/bin
+# ln -s ~/.nix-profile/lib/obs-plugins/obs-ndi.so ~/.config/obs-studio/plugins/bin/
+
+{ stdenv, fetchFromGitHub, obs-studio, cmake, qt5, ndi }:
+
+stdenv.mkDerivation rec {
+ pname = "obs-ndi";
+ version = "4.7.1";
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ obs-studio qt5.qtbase ndi ];
+
+ src = fetchFromGitHub {
+ owner = "Palakis";
+ repo = "obs-ndi";
+ rev = version;
+ sha256 = "040fkbf3f3qgqcrd3072y3zrjb4fwga8zr10jym744xd7bgyylqh";
+ };
+
+ patches = [ ./fix-search-path.patch ./hardcode-ndi-path.patch ];
+
+ postPatch = "sed -i -e s,@NDI@,${ndi},g src/obs-ndi.cpp";
+
+ cmakeFlags = [
+ "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs"
+ "-DLIBOBS_LIB=${obs-studio}/lib"
+ "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Network A/V plugin for OBS Studio";
+ homepage = https://github.com/Palakis/obs-ndi;
+ maintainers = with maintainers; [ peti ];
+ license = licenses.gpl2;
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/video/recordmydesktop/default.nix b/pkgs/applications/video/recordmydesktop/default.nix
deleted file mode 100644
index e4d6e14d098d..000000000000
--- a/pkgs/applications/video/recordmydesktop/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchsvn, autoreconfHook, zlib, popt, alsaLib, libvorbis, libtheora
-, libICE, libSM, libX11, libXext, libXfixes, libXdamage }:
-
-stdenv.mkDerivation rec {
- pname = "recordmydesktop";
- version = "0.3.8.1-svn${rev}";
- rev = "602";
-
- src = fetchsvn {
- url = https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk/recordmydesktop;
- inherit rev;
- sha256 = "1avirkc4ymrd575m616pi6wpgq1i0r5sb3qahps1g18sjpxks0lf";
- };
-
- nativeBuildInputs = [ autoreconfHook ];
-
- buildInputs = [
- zlib popt alsaLib libICE libSM libX11 libXext
- libXfixes libXdamage libvorbis libtheora
- ];
-
- meta = with stdenv.lib; {
- description = "Desktop session recorder";
- homepage = http://recordmydesktop.sourceforge.net/;
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/applications/video/recordmydesktop/gtk.nix b/pkgs/applications/video/recordmydesktop/gtk.nix
deleted file mode 100644
index cf02825501f5..000000000000
--- a/pkgs/applications/video/recordmydesktop/gtk.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, lib, fetchsvn, recordmydesktop, autoreconfHook, pkgconfig
-, pythonPackages, jack2, xwininfo }:
-
-let
- binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
-
-in stdenv.mkDerivation {
- pname = "gtk-recordmydesktop";
- version = "0.3.8-svn${recordmydesktop.rev}";
-
- src = fetchsvn {
- url = https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk/gtk-recordmydesktop;
- inherit (recordmydesktop) rev;
- sha256 = "010aykgjfxhyiixq9a9fg3p1a1ixz59m1vkn16hpy0lybgf4dsby";
- };
-
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
- buildInputs = with pythonPackages; [
- python pygtk wrapPython
- ];
-
- pythonPath = with pythonPackages; [ pygtk ];
-
- postInstall = ''
- makeWrapperArgs="--prefix PATH : ${binPath}"
- wrapPythonPrograms
- '';
-
- meta = with stdenv.lib; {
- description = "GTK frontend for recordmydesktop";
- homepage = http://recordmydesktop.sourceforge.net/;
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/applications/video/recordmydesktop/qt.nix b/pkgs/applications/video/recordmydesktop/qt.nix
deleted file mode 100644
index 573a18f62ce9..000000000000
--- a/pkgs/applications/video/recordmydesktop/qt.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, lib, fetchsvn, recordmydesktop, autoreconfHook, pkgconfig
-, glib, pythonPackages, qt4, jack2, xwininfo }:
-
-let
- binPath = lib.makeBinPath [ recordmydesktop jack2 xwininfo ];
-
-in stdenv.mkDerivation {
- pname = "qt-recordmydesktop";
- version = "0.3.8-svn${recordmydesktop.rev}";
-
- src = fetchsvn {
- url = https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk/qt-recordmydesktop;
- inherit (recordmydesktop) rev;
- sha256 = "0vz7amrmz317sbx2cv2186d0r57as4l26xa9rpim5gbvzk20caqc";
- };
-
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
- buildInputs = [ glib qt4 ] ++ (with pythonPackages; [
- python wrapPython pyqt4
- ]);
-
- pythonPath = with pythonPackages; [ pyqt4 ];
-
- postInstall = ''
- makeWrapperArgs="--prefix PATH : ${binPath}"
- wrapPythonPrograms
- '';
-
- meta = with stdenv.lib; {
- description = "GTK frontend for recordmydesktop";
- homepage = http://recordmydesktop.sourceforge.net/;
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 29ad928e27cd..6191fd0f18ad 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -1,5 +1,5 @@
{ stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras
-, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qtbase, cmake, ninja
+, libXfixes, libGLU, libGL, pkgconfig, libpulseaudio, qtbase, cmake, ninja
}:
mkDerivation rec {
@@ -25,7 +25,7 @@ mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ninja ];
buildInputs = [
- alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined
+ alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU libGL
libpulseaudio qtbase qtx11extras
];
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index facb8fabe265..65a7f358d6fa 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -2,11 +2,11 @@
mkDerivation rec {
pname = "smplayer";
- version = "19.10.0";
+ version = "19.10.2";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "0sq7hr10b4pbbi0y1q4mxs24h2lb042nv4rqr03r72bp57353xsl";
+ sha256 = "0i2c15yxk4by2zyjhb7n08larz9pmpa6zw383aybjxqh0nd9zv9p";
};
buildInputs = [ qtscript ];
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index b5ffdb018ffe..ce22d8bed279 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,14 +1,14 @@
{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
pythonPackages.buildPythonApplication rec {
- version = "1.2.0";
+ version = "1.3.0";
pname = "streamlink";
src = fetchFromGitHub {
owner = "streamlink";
repo = "streamlink";
rev = version;
- sha256 = "0l8b9ipfmd6dic07ajqqml26jdydz0k046hvx32mqp64jl5jpznh";
+ sha256 = "0f4qwwa5pxd4igvxq1qadqpphazlbs3c3cr29ybks2x5wajrvwah";
};
checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ];
diff --git a/pkgs/applications/video/vdr/wrapper.nix b/pkgs/applications/video/vdr/wrapper.nix
index 497ad7c77a08..50d3b9d65a8d 100644
--- a/pkgs/applications/video/vdr/wrapper.nix
+++ b/pkgs/applications/video/vdr/wrapper.nix
@@ -8,7 +8,7 @@
in symlinkJoin {
- name = "vdr-with-plugins-${(builtins.parseDrvName vdr.name).version}";
+ name = "vdr-with-plugins-${lib.getVersion vdr}";
paths = [ vdr ] ++ plugins;
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 4d3d88d5be8d..e92d73845911 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -2,11 +2,11 @@
, lirc, shared-mime-info, libjpeg }:
stdenv.mkDerivation rec {
- name = "xine-ui-0.99.10";
+ name = "xine-ui-0.99.12";
src = fetchurl {
url = "mirror://sourceforge/xine/${name}.tar.xz";
- sha256 = "0i3jzhiipfs5p1jbxviwh42zcfzag6iqc6yycaan0vrqm90an86a";
+ sha256 = "10zmmss3hm8gjjyra20qhdc0lb1m6sym2nb2w62bmfk8isfw9gsl";
};
nativeBuildInputs = [ pkgconfig shared-mime-info ];
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index c0080329487f..e475c4ed78af 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -16,7 +16,7 @@ let
else
throw "Unsupported architecture";
- version = (builtins.parseDrvName edk2.name).version;
+ version = lib.getVersion edk2;
in
edk2.mkDerivation projectDscPath {
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index 72db4f1e5aa5..770154f1918b 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, pkgconfig, libtool
-, gtk2, libGLU_combined, readline, libX11, libXpm
+, gtk2, libGLU, libGL, readline, libX11, libXpm
, docbook_xml_dtd_45, docbook_xsl
, sdlSupport ? true, SDL2 ? null
, termSupport ? true, ncurses ? null
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
patches = [ ./bochs-2.6.9-glibc-2.26.patch ];
buildInputs = with stdenv.lib;
- [ pkgconfig libtool gtk2 libGLU_combined readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
+ [ pkgconfig libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
++ optionals termSupport [ ncurses ]
++ optionals sdlSupport [ SDL2 ]
++ optionals wxSupport [ wxGTK ]
diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix
index 35c78dfd50a4..a0694b7efbe8 100644
--- a/pkgs/applications/virtualization/charliecloud/default.nix
+++ b/pkgs/applications/virtualization/charliecloud/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
- version = "0.11";
+ version = "0.12";
pname = "charliecloud";
src = fetchFromGitHub {
owner = "hpc";
repo = "charliecloud";
rev = "v${version}";
- sha256 = "10dzas5fyh2lpa0kf1xv8z9c4g4cf0zlmnpilyvpcyccyfjf6cp2";
+ sha256 = "177rcf1klcxsp6x9cw75cmz3y2izgd1hvi1rb9vc6iz9qx1nmk3v";
};
buildInputs = [ python ];
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix
index 13afe0a42619..698f6df0673a 100644
--- a/pkgs/applications/virtualization/cntr/default.nix
+++ b/pkgs/applications/virtualization/cntr/default.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cntr";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "Mic92";
repo = "cntr";
rev = version;
- sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg";
+ sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0";
};
cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx";
diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index 89df7dae4a47..77f3d271b594 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
project = "conmon";
name = "${project}-${version}";
- version = "2.0.2";
+ version = "2.0.8";
src = fetchFromGitHub {
owner = "containers";
repo = project;
rev = "v${version}";
- sha256 = "1ha5vhjlb12kshh0j1vpl1vjk8ym9w2j1x762y6zdspkdha1w3dv";
+ sha256 = "17pv80ba79wh4nwxy3wl0vl1m8054s346hgcp87iy3mpnrvq2cv2";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 07b6d0249904..29111399ae96 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -17,7 +17,7 @@
buildGoPackage rec {
project = "cri-o";
- version = "1.15.2";
+ version = "1.16.1";
name = "${project}-${version}${flavor}";
goPackagePath = "github.com/${project}/${project}";
@@ -26,7 +26,7 @@ buildGoPackage rec {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
- sha256 = "0fiizxwxdq87h943421ivgw49jndk23yjz3saf1rzmn7g3xh2pn4";
+ sha256 = "0w690zhc55gdqzc31jc34nrzwd253pfb3rq23z51q22nqwmlsh9p";
};
outputs = [ "bin" "out" ];
@@ -42,17 +42,23 @@ buildGoPackage rec {
pushd go/src/${goPackagePath}
# Build pause
- go build -tags ${makeFlags} -o bin/crio-config -buildmode=pie \
- -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio-config
-
make -C pause
- # Build the crio binary
- go build -tags ${makeFlags} -o bin/crio -buildmode=pie \
- -ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio
+ # Build the crio binaries
+ function build() {
+ go build \
+ -tags ${makeFlags} \
+ -o bin/"$1" \
+ -buildmode=pie \
+ -ldflags '-s -w ${ldflags}' \
+ ${goPackagePath}/cmd/"$1"
+ }
+ build crio
+ build crio-status
'';
installPhase = ''
install -Dm755 bin/crio $bin/bin/crio${flavor}
+ install -Dm755 bin/crio-status $bin/bin/crio-status${flavor}
mkdir -p $bin/libexec/crio
install -Dm755 bin/pause $bin/libexec/crio/pause${flavor}
diff --git a/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff b/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff
new file mode 100644
index 000000000000..f1aa50ee102c
--- /dev/null
+++ b/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff
@@ -0,0 +1,15 @@
+diff --git a/src/crosvm.rs b/src/crosvm.rs
+index b7055df..5989c87 100644
+--- a/src/crosvm.rs
++++ b/src/crosvm.rs
+@@ -141,7 +141,9 @@ impl Default for Config {
+ x_display: None,
+ shared_dirs: Vec::new(),
+ sandbox: !cfg!(feature = "default-no-sandbox"),
+- seccomp_policy_dir: PathBuf::from(SECCOMP_POLICY_DIR),
++ seccomp_policy_dir: PathBuf::from(
++ option_env!("DEFAULT_SECCOMP_POLICY_DIR").unwrap_or(SECCOMP_POLICY_DIR),
++ ),
+ seccomp_log_failures: false,
+ cras_audio: false,
+ cras_capture: false,
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
new file mode 100644
index 000000000000..5035b65f9818
--- /dev/null
+++ b/pkgs/applications/virtualization/crosvm/default.nix
@@ -0,0 +1,89 @@
+{ stdenv, rustPlatform, fetchgit, runCommand, symlinkJoin
+, pkgconfig, minijail, dtc, libusb1, libcap
+}:
+
+let
+
+ upstreamInfo = with builtins; fromJSON (readFile ./upstream-info.json);
+
+ arch = with stdenv.hostPlatform;
+ if isAarch64 then "arm"
+ else if isx86_64 then "x86_64"
+ else throw "no seccomp policy files available for host platform";
+
+ crosvmSrc = fetchgit {
+ inherit (upstreamInfo.components."chromiumos/platform/crosvm")
+ url rev sha256 fetchSubmodules;
+ };
+
+ adhdSrc = fetchgit {
+ inherit (upstreamInfo.components."chromiumos/third_party/adhd")
+ url rev sha256 fetchSubmodules;
+ };
+
+in
+
+ rustPlatform.buildRustPackage rec {
+ pname = "crosvm";
+ inherit (upstreamInfo) version;
+
+ unpackPhase = ''
+ runHook preUnpack
+
+ mkdir -p chromiumos/platform chromiumos/third_party
+
+ pushd chromiumos/platform
+ unpackFile ${crosvmSrc}
+ mv ${crosvmSrc.name} crosvm
+ popd
+
+ pushd chromiumos/third_party
+ unpackFile ${adhdSrc}
+ mv ${adhdSrc.name} adhd
+ popd
+
+ chmod -R u+w -- "$sourceRoot"
+
+ runHook postUnpack
+ '';
+
+ sourceRoot = "chromiumos/platform/crosvm";
+
+ patches = [
+ ./default-seccomp-policy-dir.diff
+ ];
+
+ cargoSha256 = "1d7y07wkliy5qnlyx5zj6ni39avhs3s48sqgvwxm5g5zrahg2a85";
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ dtc libcap libusb1 minijail ];
+
+ postPatch = ''
+ sed -i "s|/usr/share/policy/crosvm/|$out/share/policy/|g" \
+ seccomp/*/*.policy
+ '';
+
+ preBuild = ''
+ export DEFAULT_SECCOMP_POLICY_DIR=$out/share/policy
+ '';
+
+ postInstall = ''
+ mkdir -p $out/share/policy/
+ cp seccomp/${arch}/* $out/share/policy/
+ '';
+
+ passthru = {
+ inherit adhdSrc;
+ src = crosvmSrc;
+ updateScript = ./update.py;
+ };
+
+ meta = with stdenv.lib; {
+ description = "A secure virtual machine monitor for KVM";
+ homepage = "https://chromium.googlesource.com/chromiumos/platform/crosvm/";
+ maintainers = with maintainers; [ qyliss ];
+ license = licenses.bsd3;
+ platforms = [ "aarch64-linux" "x86_64-linux" ];
+ };
+ }
diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py
new file mode 100755
index 000000000000..280d6ec18119
--- /dev/null
+++ b/pkgs/applications/virtualization/crosvm/update.py
@@ -0,0 +1,91 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -p nix-prefetch-git "python3.withPackages (ps: with ps; [ lxml ])"
+#! nix-shell -i python
+
+import base64
+import json
+import re
+import subprocess
+from codecs import iterdecode
+from os.path import dirname, splitext
+from lxml import etree
+from lxml.etree import HTMLParser
+from urllib.request import urlopen
+
+# ChromiumOS components required to build crosvm.
+components = ['chromiumos/platform/crosvm', 'chromiumos/third_party/adhd']
+
+git_root = 'https://chromium.googlesource.com/'
+manifest_versions = f'{git_root}chromiumos/manifest-versions'
+buildspecs_url = f'{manifest_versions}/+/refs/heads/master/paladin/buildspecs/'
+
+# CrOS version numbers look like this:
+# [.]..
+#
+# As far as I can tell, branches are where internal Google
+# modifications are added to turn Chromium OS into Chrome OS, and
+# branch branches are used for fixes for specific devices. So for
+# Chromium OS they will always be 0. This is a best guess, and is not
+# documented.
+with urlopen('https://cros-updates-serving.appspot.com/') as resp:
+ document = etree.parse(resp, HTMLParser())
+ # bgcolor="lightgreen" is set on the most up-to-date version for
+ # each channel, so find a lightgreen cell in the "Stable" column.
+ (platform_version, chrome_version) = document.xpath("""
+ (//table[@id="cros-updates"]/tr/td[1 + count(
+ //table[@id="cros-updates"]/thead/tr[1]/th[text() = "Stable"]
+ /preceding-sibling::*)
+ ][@bgcolor="lightgreen"])[1]/text()
+ """)
+
+chrome_major_version = re.match(r'\d+', chrome_version)[0]
+chromeos_tip_build = re.match(r'\d+', platform_version)[0]
+
+# Find the most recent buildspec for the stable Chrome version and
+# Chromium OS build number. Its branch build and branch branch build
+# numbers will (almost?) certainly be 0. It will then end with an rc
+# number -- presumably these are release candidates, one of which
+# becomes the final release. Presumably the one with the highest rc
+# number.
+with urlopen(f'{buildspecs_url}{chrome_major_version}/?format=TEXT') as resp:
+ listing = base64.decodebytes(resp.read()).decode('utf-8')
+ buildspecs = [(line.split('\t', 1)[1]) for line in listing.splitlines()]
+ buildspecs = [s for s in buildspecs if s.startswith(chromeos_tip_build)]
+ buildspecs.sort(reverse=True)
+ buildspec = splitext(buildspecs[0])[0]
+
+revisions = {}
+
+# Read the buildspec, and extract the git revisions for each component.
+with urlopen(f'{buildspecs_url}{chrome_major_version}/{buildspec}.xml?format=TEXT') as resp:
+ xml = base64.decodebytes(resp.read())
+ root = etree.fromstring(xml)
+ for project in root.findall('project'):
+ revisions[project.get('name')] = project.get('revision')
+
+# Initialize the data that will be output from this script. Leave the
+# rc number in buildspec so nobody else is subject to the same level
+# of confusion I have been.
+data = {'version': f'{chrome_major_version}.{buildspec}', 'components': {}}
+
+# Fill in the 'components' dictionary with the output from
+# nix-prefetch-git, which can be passed straight to fetchGit when
+# imported by Nix.
+for component in components:
+ argv = ['nix-prefetch-git',
+ '--url', git_root + component,
+ '--rev', revisions[component]]
+
+ output = subprocess.check_output(argv)
+ data['components'][component] = json.loads(output.decode('utf-8'))
+
+# Find the path to crosvm's default.nix, so the srcs data can be
+# written into the same directory.
+argv = ['nix-instantiate', '--eval', '--json', '-A', 'crosvm.meta.position']
+position = json.loads(subprocess.check_output(argv).decode('utf-8'))
+filename = re.match(r'[^:]*', position)[0]
+
+# Finally, write the output.
+with open(dirname(filename) + '/upstream-info.json', 'w') as out:
+ json.dump(data, out, indent=2)
+ out.write('\n')
diff --git a/pkgs/applications/virtualization/crosvm/upstream-info.json b/pkgs/applications/virtualization/crosvm/upstream-info.json
new file mode 100644
index 000000000000..690eca38bffb
--- /dev/null
+++ b/pkgs/applications/virtualization/crosvm/upstream-info.json
@@ -0,0 +1,19 @@
+{
+ "version": "79.12607.0.0-rc4",
+ "components": {
+ "chromiumos/platform/crosvm": {
+ "url": "https://chromium.googlesource.com/chromiumos/platform/crosvm",
+ "rev": "cfb7db44eb9e5a0bca9a22bfb985252ef74ab251",
+ "date": "2019-10-17T23:22:08+00:00",
+ "sha256": "0gm1ggyzh9qfizm36jmh71c3anygxj1840cm94h71kzg9kiw0330",
+ "fetchSubmodules": false
+ },
+ "chromiumos/third_party/adhd": {
+ "url": "https://chromium.googlesource.com/chromiumos/third_party/adhd",
+ "rev": "a8df1c52bde3bfd2aebc1d7adcd6f195eb212cb1",
+ "date": "2019-10-17T18:53:18+00:00",
+ "sha256": "1hyvnvwr5ka9zw4h7hhl6fpsfl2acp3zy4wr5qrw8s1cn8ljr9vy",
+ "fetchSubmodules": false
+ }
+ }
+}
diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index 7dddc3b533b4..9376adf8d6a8 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "crun";
- version = "0.8";
+ version = "0.10.6";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = version;
- sha256 = "1anvlgw373031w0pp0b28l10yrnyhbj192n60bbbjahw487dk2fi";
+ sha256 = "0v1hrlpnln0c976fb0k2ig4jv11qbyzf95z0wy92fd8r8in16rc1";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix
index b1c42b099b67..7e8dbf33a7b0 100644
--- a/pkgs/applications/virtualization/docker-compose/default.nix
+++ b/pkgs/applications/virtualization/docker-compose/default.nix
@@ -7,12 +7,12 @@
}:
buildPythonApplication rec {
- version = "1.24.1";
+ version = "1.25.0";
pname = "docker-compose";
src = fetchPypi {
inherit pname version;
- sha256 = "0lx7bx6jvhydbab8vwry0bclhdf0dfj6jrns1m5y45yp9ybqxmd5";
+ sha256 = "0zlprmsgmj4z627snsl0qmq8y7ggcyqrqm5vxvrvcigl7zywnprc";
};
# lots of networking and other fails
diff --git a/pkgs/applications/virtualization/docker/distribution.nix b/pkgs/applications/virtualization/docker/distribution.nix
index ed4db853c389..a408d20f3ba0 100644
--- a/pkgs/applications/virtualization/docker/distribution.nix
+++ b/pkgs/applications/virtualization/docker/distribution.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "distribution";
- version = "2.6.2";
+ version = "2.7.1";
rev = "v${version}";
goPackagePath = "github.com/docker/distribution";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "docker";
repo = "distribution";
inherit rev;
- sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b";
+ sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/virtualization/gvisor/containerd-shim.nix b/pkgs/applications/virtualization/gvisor/containerd-shim.nix
new file mode 100644
index 000000000000..0161a117def3
--- /dev/null
+++ b/pkgs/applications/virtualization/gvisor/containerd-shim.nix
@@ -0,0 +1,36 @@
+{ lib, fetchFromGitHub, buildGoModule, go-bindata }:
+
+buildGoModule rec {
+ name = "gvisor-containerd-shim-${version}";
+ version = "2019-10-09";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "gvisor-containerd-shim";
+ rev = "f299b553afdd8455a0057862004061ea12e660f5";
+ sha256 = "077bhrmjrpcxv1z020yxhx2c4asn66j21gxlpa6hz0av3lfck9lm";
+ };
+
+ modSha256 = "1jdhgbrn59ahnabwnig99i21f6kimmqx9f3dg10ffwfs3dx0gzlg";
+
+ buildPhase = ''
+ make
+ '';
+
+ doCheck = true;
+ checkPhase = ''
+ make test
+ '';
+
+ installPhase = ''
+ make install DESTDIR="$out"
+ '';
+
+ meta = with lib; {
+ description = "containerd shim for gVisor";
+ homepage = https://github.com/google/gvisor-containerd-shim;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ andrew-d ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix
new file mode 100644
index 000000000000..2d99fb3bf573
--- /dev/null
+++ b/pkgs/applications/virtualization/gvisor/default.nix
@@ -0,0 +1,101 @@
+{ stdenv
+, buildBazelPackage
+, fetchFromGitHub
+, cacert
+, git
+, glibcLocales
+, go
+, iproute
+, iptables
+, makeWrapper
+, procps
+, python3
+}:
+
+let
+ preBuild = ''
+ patchShebangs .
+
+ # Tell rules_go to use the Go binary found in the PATH
+ sed -E -i \
+ -e 's|go_version\s*=\s*"[^"]+",|go_version = "host",|g' \
+ WORKSPACE
+
+ # The gazelle Go tooling needs CA certs
+ export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
+
+ # If we don't reset our GOPATH, the rules_go stdlib builder tries to
+ # install something into it. Ideally that wouldn't happen, but for now we
+ # can also get around it by unsetting GOPATH entirely, since rules_go
+ # doesn't need it.
+ export GOPATH=
+ '';
+
+in buildBazelPackage rec {
+ name = "gvisor-${version}";
+ version = "2019-11-14";
+
+ src = fetchFromGitHub {
+ owner = "google";
+ repo = "gvisor";
+ rev = "release-20191114.0";
+ sha256 = "0kyixjjlws9iz2r2srgpdd4rrq94vpxkmh2rmmzxd9mcqy2i9bg1";
+ };
+
+ nativeBuildInputs = [ git glibcLocales go makeWrapper python3 ];
+
+ bazelTarget = "//runsc:runsc";
+
+ # gvisor uses the Starlark implementation of rules_cc, not the built-in one,
+ # so we shouldn't delete it from our dependencies.
+ removeRulesCC = false;
+
+ fetchAttrs = {
+ inherit preBuild;
+
+ 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}
+
+ # Remove the gazelle tools, they contain go binaries that are built
+ # non-deterministically. As long as the gazelle version matches the tools
+ # should be equivalent.
+ rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker}
+
+ # Remove the gazelle repository cache
+ chmod -R +w $bazelOut/external/bazel_gazelle_go_repository_cache
+ rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,\@bazel_gazelle_go_repository_cache.marker}
+
+ # Remove log file(s)
+ rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
+ '';
+
+ sha256 = "122qk6iv8hd7g2a84y9aqqhij4r0m47vpxzbqhhh6k5livc73qd6";
+ };
+
+ buildAttrs = {
+ inherit preBuild;
+
+ installPhase = ''
+ install -Dm755 bazel-bin/runsc/*_pure_stripped/runsc $out/bin/runsc
+
+ # Needed for the 'runsc do' subcomand
+ wrapProgram $out/bin/runsc \
+ --prefix PATH : ${stdenv.lib.makeBinPath [ iproute iptables procps ]}
+ '';
+ };
+
+ meta = with stdenv.lib; {
+ description = "Container Runtime Sandbox";
+ homepage = https://github.com/google/gvisor;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ andrew-d ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix
new file mode 100644
index 000000000000..31755f87f63c
--- /dev/null
+++ b/pkgs/applications/virtualization/podman-compose/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonApplication, fetchPypi, podman, pyyaml }:
+
+buildPythonApplication rec {
+ version = "0.1.5";
+ pname = "podman-compose";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1sgbc889zq127qhxa9frhswa1mid19fs5qnyzfihx648y5i968pv";
+ };
+
+ propagatedBuildInputs = [ pyyaml podman ];
+
+ meta = with lib; {
+ description = "An implementation of docker-compose with podman backend";
+ homepage = "https://github.com/containers/podman-compose";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ sikmir ];
+ };
+}
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index fa48c8b5e5ed..9d94ced0bf21 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -5,13 +5,13 @@
buildGoPackage rec {
pname = "podman";
- version = "1.6.2";
+ version = "1.6.3";
src = fetchFromGitHub {
owner = "containers";
repo = "libpod";
rev = "v${version}";
- sha256 = "0cwyrzjjgxclnzc1yx6vm2bvq73mldwxfwalkprzlg8vpqbxji8y";
+ sha256 = "0y87pylpff2xl796n5s2vrm90pspzqfw8h4a5gndn1mx18s09s69";
};
goPackagePath = "github.com/containers/libpod";
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 5aa1f2e1f553..f90873c6e336 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -36,11 +36,10 @@ in
stdenv.mkDerivation rec {
version = "4.1.0";
- name = "qemu-"
- + stdenv.lib.optionalString xenSupport "xen-"
- + stdenv.lib.optionalString hostCpuOnly "host-cpu-only-"
- + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-"
- + version;
+ pname = "qemu"
+ + stdenv.lib.optionalString xenSupport "-xen"
+ + stdenv.lib.optionalString hostCpuOnly "-host-cpu-only"
+ + stdenv.lib.optionalString nixosTestRunner "-for-vm-tests";
src = fetchurl {
url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2";
diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix
new file mode 100644
index 000000000000..4dbb7fbe4a52
--- /dev/null
+++ b/pkgs/applications/virtualization/spike/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchgit, dtc }:
+
+stdenv.mkDerivation rec {
+ pname = "spike";
+ version = "1.0.0";
+
+ src = fetchgit {
+ url = "https://github.com/riscv/riscv-isa-sim.git";
+ rev = "v${version}";
+ sha256 = "1hcl01nj96s3rkz4mrq747s5lkw81lgdjdimb8b1b9h8qnida7ww";
+ };
+
+ nativeBuildInputs = [ dtc ];
+ enableParallelBuilding = true;
+
+ patchPhase = ''
+ patchShebangs scripts/*.sh
+ patchShebangs tests/ebreak.py
+ '';
+
+ doCheck = true;
+
+ meta = with stdenv.lib; {
+ description = "A RISC-V ISA Simulator";
+ homepage = "https://github.com/riscv/riscv-isa-sim";
+ license = licenses.bsd3;
+ platforms = [ "x86_64-linux" "aarch64-linux" ];
+ maintainers = with maintainers; [ blitz ];
+ };
+}
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 42860966fe11..99d20477a125 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -9,17 +9,12 @@
with stdenv.lib;
-# TODO: remove after there's support for setupPyDistFlags
-let
- setuppy = ../../../development/interpreters/python/run_setup.py;
-in
python3Packages.buildPythonApplication rec {
- name = "virt-manager-${version}";
+ pname = "virt-manager";
version = "2.2.1";
- namePrefix = "";
src = fetchurl {
- url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
+ url = "http://virt-manager.org/download/sources/virt-manager/${pname}-${version}.tar.gz";
sha256 = "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g";
};
@@ -49,13 +44,7 @@ python3Packages.buildPythonApplication rec {
${python3Packages.python.interpreter} setup.py configure --prefix=$out
'';
- # TODO: remove after there's support for setupPyDistFlags
- buildPhase = ''
- runHook preBuild
- cp ${setuppy} nix_run_setup
- ${python3Packages.python.pythonForBuild.interpreter} nix_run_setup --no-update-icon-cache build_ext bdist_wheel
- runHook postBuild
- '';
+ setupPyGlobalFlags = [ "--no-update-icon-cache" ];
preFixup = ''
gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH")
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index addcf125e27e..6ecdf1d29bc1 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -2,7 +2,7 @@
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
, qttools, qtsvg, qtwayland, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
-, alsaLib, curl, libvpx, nettools, dbus, substituteAll
+, alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch
, makeself, perl
, javaBindings ? true, jdk ? null # Almost doesn't affect closure size
, pythonBindings ? false, python3 ? null
@@ -21,8 +21,8 @@ let
buildType = "release";
# Remember to change the extpackRev and version in extpack.nix and
# guest-additions/default.nix as well.
- main = "1hxbvr78b0fddcn7npz72ki89lpmbgqj4b5qvxm1wik7v0d8v1y8";
- version = "6.0.12";
+ main = "036x2mvkk22lbg72cz6pik9z538j1ag6mmwjjmfikgrq1i7v24jy";
+ version = "6.0.14";
in stdenv.mkDerivation {
pname = "virtualbox";
inherit version;
@@ -92,9 +92,26 @@ in stdenv.mkDerivation {
})
++ [
./qtx11extras.patch
- # Kernel 5.3 fix, should be fixed with VirtualBox 6.0.14
- # https://www.virtualbox.org/ticket/18911
- ./kernel-5.3-fix.patch
+ # Kernel 5.4 fix, should be fixed with next upstream release
+ # https://www.virtualbox.org/ticket/18945
+ (fetchpatch {
+ name = "kernel-5.4-fix-1.patch";
+ url = "https://www.virtualbox.org/changeset/81586/vbox?format=diff";
+ sha256 = "0zbkc9v65pkdmjik53x29g39qyf7narkhpwpx5n1n1bfqnhf0k1r";
+ stripLen = 1;
+ })
+ (fetchpatch {
+ name = "kernel-5.4-fix-2.patch";
+ url = "https://www.virtualbox.org/changeset/81587/vbox?format=diff";
+ sha256 = "1j98cqxj8qlqwaqr4mvwwbkmchw8jmygjwgzz82gix7fj76j2y9c";
+ stripLen = 1;
+ })
+ (fetchpatch {
+ name = "kernel-5.4-fix-3.patch";
+ url = "https://www.virtualbox.org/changeset/81649/vbox?format=diff";
+ sha256 = "1d6p5k5dgzmjglqfkbcbvpn1x3wxila30q4gcbb7pxwfgclaw2hk";
+ stripLen = 1;
+ })
];
postPatch = ''
@@ -214,7 +231,7 @@ in stdenv.mkDerivation {
description = "PC emulator";
license = licenses.gpl2;
homepage = https://www.virtualbox.org/;
- maintainers = with maintainers; [ flokli sander ];
+ maintainers = with maintainers; [ sander ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 56400a759457..c935a40c5400 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -2,7 +2,7 @@
with lib;
-let version = "6.0.12";
+let version = "6.0.14";
in
fetchurl rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
@@ -11,14 +11,14 @@ fetchurl rec {
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
# Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
- let value = "27a0956940654b0accf4d79692078bd496d9f062e4ed3da69e5421cba8d1e444";
+ let value = "c8a5cc980c9c94cdac3d94e23cf159c2433aae76b416dbfb5b1a918758f21e63";
in assert (builtins.stringLength value) == 64; value;
meta = {
description = "Oracle Extension pack for VirtualBox";
license = licenses.virtualbox-puel;
homepage = https://www.virtualbox.org/;
- maintainers = with maintainers; [ flokli sander cdepillabout ];
+ maintainers = with maintainers; [ sander cdepillabout ];
platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index af247af0051e..690b72f3eeb0 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
-, zlib, xorg, dbus, virtualbox, dos2unix }:
+, zlib, xorg, dbus, virtualbox, dos2unix, fetchpatch, findutils, patchutils }:
let
version = virtualbox.version;
@@ -21,12 +21,12 @@ let
{ name = "libXfixes.so"; pkg = xorg.libXfixes; }
];
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
name = "VirtualBox-GuestAdditions-${version}-${kernel.version}";
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
- sha256 = "0hflsbx70dli34mpx94vd33p55ycfs3ahzwcdzqxdiwiiskjpykq";
+ sha256 = "1c9ysx0fhxxginmp607b4fk74dvlr32n6w52gawm06prf4xg90nb";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
@@ -43,13 +43,67 @@ in stdenv.mkDerivation {
prePatch = ''
substituteInPlace src/vboxguest-${version}/vboxvideo/vbox_ttm.c \
--replace " 1)
- {
- /* Fire the function on all other CPUs without waiting for completion. */
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
-+ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
- int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
-+ Assert(!rc); NOREF(rc);
- # else
- int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
--# endif
- Assert(!rc); NOREF(rc);
-+# endif
- }
- #endif
-
-@@ -326,7 +329,6 @@
- {
- #ifdef CONFIG_SMP
- IPRT_LINUX_SAVE_EFL_AC();
-- int rc;
- RTMPARGS Args;
-
- RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
-@@ -337,14 +339,17 @@
- Args.cHits = 0;
-
- RTThreadPreemptDisable(&PreemptState);
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
-+ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-+ Assert(rc == 0); NOREF(rc);
- # else /* older kernels */
-- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
-+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
-+ Assert(rc == 0); NOREF(rc);
- # endif /* older kernels */
- RTThreadPreemptRestore(&PreemptState);
-
-- Assert(rc == 0); NOREF(rc);
- IPRT_LINUX_RESTORE_EFL_AC();
- #else
- RT_NOREF(pfnWorker, pvUser1, pvUser2);
diff --git a/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch b/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch
deleted file mode 100644
index ba9c7c941db9..000000000000
--- a/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-@@ -2123,7 +2123,9 @@
- #endif
- if (in_dev != NULL)
- {
-- for_ifa(in_dev) {
-+ struct in_ifaddr *ifa;
-+
-+ for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) {
- if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address))
- return NOTIFY_OK;
-
-@@ -2137,7 +2139,7 @@
-
- pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
- /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address);
-- } endfor_ifa(in_dev);
-+ }
- }
-
- /*
---- a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c
-+++ a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c
-@@ -283,12 +283,15 @@
- if (RTCpuSetCount(&OnlineSet) > 1)
- {
- /* Fire the function on all other CPUs without waiting for completion. */
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
-+ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
- int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
-+ Assert(!rc); NOREF(rc);
- # else
- int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
--# endif
- Assert(!rc); NOREF(rc);
-+# endif
- }
- #endif
-
-@@ -326,7 +329,6 @@
- {
- #ifdef CONFIG_SMP
- IPRT_LINUX_SAVE_EFL_AC();
-- int rc;
- RTMPARGS Args;
-
- RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
-@@ -337,14 +339,17 @@
- Args.cHits = 0;
-
- RTThreadPreemptDisable(&PreemptState);
--# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)
-+ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
-+ Assert(rc == 0); NOREF(rc);
- # else /* older kernels */
-- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
-+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
-+ Assert(rc == 0); NOREF(rc);
- # endif /* older kernels */
- RTThreadPreemptRestore(&PreemptState);
-
-- Assert(rc == 0); NOREF(rc);
- IPRT_LINUX_RESTORE_EFL_AC();
- #else
- RT_NOREF(pfnWorker, pvUser1, pvUser2);
diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix
index c57a7f6e7714..0d6b3632bc76 100644
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/pkgs/applications/virtualization/x11docker/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }:
stdenv.mkDerivation rec {
pname = "x11docker";
- version = "6.3.0";
+ version = "6.5.0";
src = fetchFromGitHub {
owner = "mviereck";
repo = "x11docker";
rev = "v${version}";
- sha256 = "0x2sx41y3ylzg511x52k3wh8mfbzp4ialpas6sn4ccagqxh2hc4y";
+ sha256 = "1lh45cxzpdwvhahlcayzqwq1q5hra25mszs13j0dswklcjvjqw8b";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix
index be45d68dc5df..ce4031b92f56 100644
--- a/pkgs/applications/window-managers/cage/default.nix
+++ b/pkgs/applications/window-managers/cage/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, makeWrapper
, wlroots, wayland, wayland-protocols, pixman, libxkbcommon
-, systemd, mesa, libX11
+, systemd, libGL, libX11
, xwayland ? null
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [
wlroots wayland wayland-protocols pixman libxkbcommon
# TODO: Not specified but required:
- systemd mesa libX11
+ systemd libGL libX11
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index 15bd5e74cdc8..8c3101f8eb9e 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -1,16 +1,16 @@
-{ fetchFromGitHub, fetchpatch, stdenv, autoreconfHook }:
+{ fetchFromGitHub, fetchpatch, stdenv, autoreconfHook, pkg-config }:
with stdenv.lib;
stdenv.mkDerivation {
pname = "i3blocks";
- version = "unstable-2019-02-07";
+ version = "1.5";
src = fetchFromGitHub {
owner = "vivien";
repo = "i3blocks";
- rev = "ec050e79ad8489a6f8deb37d4c20ab10729c25c3";
- sha256 = "1fx4230lmqa5rpzph68dwnpcjfaaqv5gfkradcr85hd1z8d1qp1b";
+ rev = "3417602a2d8322bc866861297f535e1ef80b8cb0";
+ sha256 = "0v8mwnm8qzpv6xnqvrk43s4b9iyld4naqzbaxk4ldq1qkhai0wsv";
};
patches = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
})
];
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
meta = {
description = "A flexible scheduler for your i3bar blocks";
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index c87314089515..80750ab61be4 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "i3status-rust";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "greshake";
repo = pname;
rev = "v${version}";
- sha256 = "15083nagd0kzpkay5jxcq5i16yvybd4sh03g9x4q9xq4cy0qwj11";
+ sha256 = "1banaiqj4gdsg886kb7l1fxhmf33vxnwwha46397s7gwfxkvxz4n";
};
cargoSha256 = "1cbx2jll0bj547dvwzjprzidndbqn1c4c6hmbfgjgdkxmmrpb0r1";
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index f388c2d99db2..58fa0d194e11 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "icewm";
- version = "1.6.0";
+ version = "1.6.3";
src = fetchFromGitHub {
owner = "bbidulock";
repo = "icewm";
rev = version;
- sha256 = "1l8hjmb19d7ds7z21cx207h86wkjcmmmamcnalgkwh4alvbawc2p";
+ sha256 = "0h3w718x28fd4sz36ka9wpgcb98scna6qpycxzls4cjji3rjgm0l";
};
nativeBuildInputs = [ cmake pkgconfig perl asciidoc ];
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 215a576a578c..6b4c33dc0771 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -3,11 +3,11 @@
, pkgconfig, scdoc
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev
, pango, cairo, libinput, libcap, pam, gdk-pixbuf
-, wlroots, wayland-protocols, swaybg
+, wlroots, wayland-protocols
}:
stdenv.mkDerivation rec {
- pname = "sway";
+ pname = "sway-unwrapped";
version = "1.2";
src = fetchFromGitHub {
@@ -22,7 +22,9 @@ stdenv.mkDerivation rec {
./load-configuration-from-etc.patch
];
- nativeBuildInputs = [ pkgconfig meson ninja scdoc makeWrapper ];
+ nativeBuildInputs = [
+ pkgconfig meson ninja scdoc
+ ];
buildInputs = [
wayland libxkbcommon pcre json_c dbus libevdev
@@ -37,10 +39,6 @@ stdenv.mkDerivation rec {
"-Dtray=enabled" "-Dman-pages=enabled"
];
- postInstall = ''
- wrapProgram $out/bin/sway --prefix PATH : "${swaybg}/bin"
- '';
-
meta = with stdenv.lib; {
description = "i3-compatible tiling Wayland compositor";
homepage = https://swaywm.org;
diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix
new file mode 100644
index 000000000000..bd59ac5fa459
--- /dev/null
+++ b/pkgs/applications/window-managers/sway/wrapper.nix
@@ -0,0 +1,50 @@
+{ lib, stdenv
+, sway-unwrapped, swaybg
+, makeWrapper, symlinkJoin, writeShellScriptBin
+, withBaseWrapper ? true, extraSessionCommands ? "", dbus
+, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf
+}:
+
+assert extraSessionCommands != "" -> withBaseWrapper;
+
+with lib;
+
+let
+ baseWrapper = writeShellScriptBin "sway" ''
+ set -o errexit
+ if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
+ export _SWAY_WRAPPER_ALREADY_EXECUTED=1
+ ${extraSessionCommands}
+ fi
+ if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
+ export DBUS_SESSION_BUS_ADDRESS
+ exec ${sway-unwrapped}/bin/sway "$@"
+ else
+ exec ${dbus}/bin/dbus-run-session ${sway-unwrapped}/bin/sway "$@"
+ fi
+ '';
+in symlinkJoin {
+ name = "sway-${sway-unwrapped.version}";
+
+ paths = (optional withBaseWrapper baseWrapper)
+ ++ [ sway-unwrapped ];
+
+ nativeBuildInputs = [ makeWrapper ]
+ ++ (optional withGtkWrapper wrapGAppsHook);
+
+ buildInputs = optional withGtkWrapper gdk-pixbuf;
+
+ postBuild = ''
+ # We want to run wrapProgram manually to only wrap sway and add swaybg:
+ export dontWrapGApps=true
+ ${optionalString withGtkWrapper "wrapGAppsHook"}
+ wrapProgram $out/bin/sway \
+ --prefix PATH : "${swaybg}/bin" ${optionalString withGtkWrapper ''\
+ "''${gappsWrapperArgs[@]}"
+ ''}
+ '';
+
+ passthru.providedSessions = [ "sway" ];
+
+ inherit (sway-unwrapped) meta;
+}
diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 16fe748c3e5c..3e5d8e6c384c 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -1,6 +1,4 @@
# Builder for Agda packages. Mostly inspired by the cabal builder.
-#
-# Contact: stdenv.lib.maintainers.fuuzetsu
{ stdenv, Agda, glibcLocales
, writeShellScriptBin
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 7e2b2b347d90..c871df787b7e 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -185,7 +185,7 @@ rec {
keyutils.lib
libjack2
fribidi
- p11_kit
+ p11-kit
# libraries not on the upstream include list, but nevertheless expected
# by at least one appimage
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index e02e77de45e4..c60abdd03e81 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -34,8 +34,8 @@ let
targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)
(targetPlatform.config + "-");
- bintoolsVersion = (builtins.parseDrvName bintools.name).version;
- bintoolsName = (builtins.parseDrvName bintools.name).name;
+ bintoolsVersion = stdenv.lib.getVersion bintools;
+ bintoolsName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName bintools);
libc_bin = if libc == null then null else getBin libc;
libc_dev = if libc == null then null else getDev libc;
@@ -73,9 +73,9 @@ let
in
stdenv.mkDerivation {
- name = targetPrefix
- + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${bintoolsName}-wrapper")
- + (stdenv.lib.optionalString (bintools != null && bintoolsVersion != "") "-${bintoolsVersion}");
+ pname = targetPrefix
+ + (if name != "" then name else "${bintoolsName}-wrapper");
+ version = if bintools == null then null else bintoolsVersion;
preferLocalBuild = true;
@@ -111,17 +111,13 @@ stdenv.mkDerivation {
installPhase =
''
- set -u
-
mkdir -p $out/bin $out/nix-support
wrap() {
local dst="$1"
local wrapper="$2"
export prog="$3"
- set +u
substituteAll "$wrapper" "$out/bin/$dst"
- set -u
chmod +x "$out/bin/$dst"
}
''
@@ -163,8 +159,6 @@ stdenv.mkDerivation {
[[ -e "$underlying" ]] || continue
wrap ${targetPrefix}$variant ${./ld-wrapper.sh} $underlying
done
-
- set +u
'';
emulation = let
@@ -190,6 +184,7 @@ stdenv.mkDerivation {
else if targetPlatform.isMsp430 then "msp430"
else if targetPlatform.isAvr then "avr"
else if targetPlatform.isAlpha then "alpha"
+ else if targetPlatform.isVc4 then "vc4"
else throw "unknown emulation for platform: ${targetPlatform.config}";
in if targetPlatform.useLLVM or false then ""
else targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
@@ -205,11 +200,7 @@ stdenv.mkDerivation {
];
postFixup =
- ''
- set -u
- ''
-
- + optionalString (libc != null) (''
+ optionalString (libc != null) (''
##
## General libc support
##
@@ -307,7 +298,6 @@ stdenv.mkDerivation {
''
+ ''
- set +u
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh
index 2e15fa95c794..a714bd151c90 100644
--- a/pkgs/build-support/bintools-wrapper/setup-hook.sh
+++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh
@@ -2,8 +2,6 @@
#
# See comments in cc-wrapper's setup hook. This works exactly the same way.
-set -u
-
# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a
# native compile.
#
@@ -73,4 +71,3 @@ export NIX_HARDENING_ENABLE
# No local scope in sourced file
unset -v role_pre role_post cmd upper_case
-set +u
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index a1a38484386d..8fa3cc55279b 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -4,10 +4,30 @@
, lib
}:
-args@{ name, bazelFlags ? [], bazelBuildFlags ? [], bazelFetchFlags ? [], bazelTarget, buildAttrs, fetchAttrs, ... }:
+args@{
+ name
+, bazelFlags ? []
+, bazelBuildFlags ? []
+, bazelFetchFlags ? []
+, bazelTarget
+, buildAttrs
+, fetchAttrs
+
+# Newer versions of Bazel are moving away from built-in rules_cc and instead
+# allow fetching it as an external dependency in a WORKSPACE file[1]. If
+# removed in the fixed-output fetch phase, building will fail to download it.
+# This can be seen e.g. in #73097
+#
+# This option allows configuring the removal of rules_cc in cases where a
+# project depends on it via an external dependency.
+#
+# [1]: https://github.com/bazelbuild/rules_cc
+, removeRulesCC ? true
+, ...
+}:
let
- fArgs = removeAttrs args [ "buildAttrs" "fetchAttrs" ];
+ fArgs = removeAttrs args [ "buildAttrs" "fetchAttrs" "removeRulesCC" ];
fBuildAttrs = fArgs // buildAttrs;
fFetchAttrs = fArgs // removeAttrs fetchAttrs [ "sha256" ];
@@ -24,8 +44,12 @@ in stdenv.mkDerivation (fBuildAttrs // {
export bazelOut="$(echo ''${NIX_BUILD_TOP}/output | sed -e 's,//,/,g')"
export bazelUserRoot="$(echo ''${NIX_BUILD_TOP}/tmp | sed -e 's,//,/,g')"
export HOME="$NIX_BUILD_TOP"
+ export USER="nix"
# This is needed for git_repository with https remotes
export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt"
+ # This is needed for Bazel fetchers that are themselves programs (e.g.
+ # rules_go using the go toolchain)
+ export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
'';
buildPhase = fFetchAttrs.buildPhase or ''
@@ -60,7 +84,7 @@ in stdenv.mkDerivation (fBuildAttrs // {
# 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/{rules_cc,\@rules_cc.marker}
+ ${if removeRulesCC then "rm -rf $bazelOut/external/{rules_cc,\\@rules_cc.marker}" else ""}
rm -rf $bazelOut/external/{embedded_jdk,\@embedded_jdk.marker}
rm -rf $bazelOut/external/{local_*,\@local_*.marker}
diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix
index f36c69e43392..dae9ed888c75 100644
--- a/pkgs/build-support/build-dotnet-package/default.nix
+++ b/pkgs/build-support/build-dotnet-package/default.nix
@@ -29,9 +29,9 @@ attrsOrig @
configurePhase = ''
runHook preConfigure
- [ -z "$dontPlacateNuget" ] && placate-nuget.sh
- [ -z "$dontPlacatePaket" ] && placate-paket.sh
- [ -z "$dontPatchFSharpTargets" ] && patch-fsharp-targets.sh
+ [ -z "''${dontPlacateNuget-}" ] && placate-nuget.sh
+ [ -z "''${dontPlacatePaket-}" ] && placate-paket.sh
+ [ -z "''${dontPatchFSharpTargets-}" ] && patch-fsharp-targets.sh
runHook postConfigure
'';
@@ -69,7 +69,7 @@ attrsOrig @
cp -rv ${arrayToShell outputFiles} "''${outputFilesArray[@]}" "$target"
- if [ -z "$dontRemoveDuplicatedDlls" ]
+ if [ -z "''${dontRemoveDuplicatedDlls-}" ]
then
pushd "$out"
remove-duplicated-dlls.sh
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index cf2d38cd9978..151313847e40 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -35,8 +35,8 @@ let
targetPrefix = stdenv.lib.optionalString (targetPlatform != hostPlatform)
(targetPlatform.config + "-");
- ccVersion = (builtins.parseDrvName cc.name).version;
- ccName = (builtins.parseDrvName cc.name).name;
+ ccVersion = stdenv.lib.getVersion cc;
+ ccName = stdenv.lib.removePrefix targetPrefix (stdenv.lib.getName cc);
libc_bin = if libc == null then null else getBin libc;
libc_dev = if libc == null then null else getDev libc;
@@ -93,9 +93,9 @@ assert nativeLibc == bintools.nativeLibc;
assert nativePrefix == bintools.nativePrefix;
stdenv.mkDerivation {
- name = targetPrefix
- + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${ccName}-wrapper")
- + (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}");
+ pname = targetPrefix
+ + (if name != "" then name else "${ccName}-wrapper");
+ version = if cc == null then null else ccVersion;
preferLocalBuild = true;
@@ -132,10 +132,10 @@ stdenv.mkDerivation {
src=$PWD
'';
+ wrapper = ./cc-wrapper.sh;
+
installPhase =
''
- set -u
-
mkdir -p $out/bin $out/nix-support
wrap() {
@@ -173,42 +173,42 @@ stdenv.mkDerivation {
export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}"
if [ -e $ccPath/${targetPrefix}gcc ]; then
- wrap ${targetPrefix}gcc ${./cc-wrapper.sh} $ccPath/${targetPrefix}gcc
+ wrap ${targetPrefix}gcc $wrapper $ccPath/${targetPrefix}gcc
ln -s ${targetPrefix}gcc $out/bin/${targetPrefix}cc
export named_cc=${targetPrefix}gcc
export named_cxx=${targetPrefix}g++
elif [ -e $ccPath/clang ]; then
- wrap ${targetPrefix}clang ${./cc-wrapper.sh} $ccPath/clang
+ wrap ${targetPrefix}clang $wrapper $ccPath/clang
ln -s ${targetPrefix}clang $out/bin/${targetPrefix}cc
export named_cc=${targetPrefix}clang
export named_cxx=${targetPrefix}clang++
fi
if [ -e $ccPath/${targetPrefix}g++ ]; then
- wrap ${targetPrefix}g++ ${./cc-wrapper.sh} $ccPath/${targetPrefix}g++
+ wrap ${targetPrefix}g++ $wrapper $ccPath/${targetPrefix}g++
ln -s ${targetPrefix}g++ $out/bin/${targetPrefix}c++
elif [ -e $ccPath/clang++ ]; then
- wrap ${targetPrefix}clang++ ${./cc-wrapper.sh} $ccPath/clang++
+ wrap ${targetPrefix}clang++ $wrapper $ccPath/clang++
ln -s ${targetPrefix}clang++ $out/bin/${targetPrefix}c++
fi
if [ -e $ccPath/cpp ]; then
- wrap ${targetPrefix}cpp ${./cc-wrapper.sh} $ccPath/cpp
+ wrap ${targetPrefix}cpp $wrapper $ccPath/cpp
fi
''
+ optionalString cc.langFortran or false ''
- wrap ${targetPrefix}gfortran ${./cc-wrapper.sh} $ccPath/${targetPrefix}gfortran
+ wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran
ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77
ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77
''
+ optionalString cc.langJava or false ''
- wrap ${targetPrefix}gcj ${./cc-wrapper.sh} $ccPath/${targetPrefix}gcj
+ wrap ${targetPrefix}gcj $wrapper $ccPath/${targetPrefix}gcj
''
+ optionalString cc.langGo or false ''
- wrap ${targetPrefix}gccgo ${./cc-wrapper.sh} $ccPath/${targetPrefix}gccgo
+ wrap ${targetPrefix}gccgo $wrapper $ccPath/${targetPrefix}gccgo
'';
strictDeps = true;
@@ -224,8 +224,6 @@ stdenv.mkDerivation {
postFixup =
''
- set -u
-
# Backwards compatability for packages expecting this file, e.g. with
# `$NIX_CC/nix-support/dynamic-linker`.
#
@@ -239,7 +237,7 @@ stdenv.mkDerivation {
fi
''
- + optionalString (libc != null) ''
+ + optionalString (libc != null) (''
##
## General libc support
##
@@ -255,11 +253,17 @@ stdenv.mkDerivation {
# compile, because it uses "#include_next " to find the
# limits.h file in ../includes-fixed. To remedy the problem,
# another -idirafter is necessary to add that directory again.
- echo "-B${libc_lib}${libc.libdir or "/lib/"} -idirafter ${libc_dev}${libc.incdir or "/include"} ${optionalString isGNU "-idirafter ${cc}/lib/gcc/*/*/include-fixed"}" > $out/nix-support/libc-cflags
+ echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-cflags
+ echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags
+ '' + optionalString isGNU ''
+ for dir in "${cc}"/lib/gcc/*/*/include-fixed; do
+ echo '-idirafter' ''${dir} >> $out/nix-support/libc-cflags
+ done
+ '' + ''
echo "${libc_lib}" > $out/nix-support/orig-libc
echo "${libc_dev}" > $out/nix-support/orig-libc-dev
- ''
+ '')
+ optionalString (!nativeTools) ''
##
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 211b50632914..5b13f2683097 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -54,8 +54,6 @@
# For more details, read the individual files where the mechanisms used to
# accomplish this will be individually documented.
-set -u
-
# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a
# native compile.
#
@@ -120,4 +118,3 @@ export NIX_HARDENING_ENABLE
# No local scope in sourced file
unset -v role_pre role_post
-set +u
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 37b25232b961..e10ff269950d 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -287,10 +287,16 @@ rec {
# unless there are more paths than $maxLayers. In that case, create
# $maxLayers-1 for the most popular layers, and smush the remainaing
# store paths in to one final layer.
+ #
+ # NOTE: the `closures` parameter is a list of closures to include.
+ # The TOP LEVEL store paths themselves will never be present in the
+ # resulting image. At this time (2019-12-16) none of these layers
+ # are appropriate to include, as they are all created as
+ # implementation details of dockerTools.
mkManyPureLayers = {
name,
# Files to add to the layer.
- closure,
+ closures,
configJson,
# Docker has a 125-layer maximum, we pick 100 to ensure there is
# plenty of room for extension.
@@ -303,10 +309,12 @@ rec {
isExecutable = true;
src = ./store-path-to-layer.sh;
};
+
+ overallClosure = writeText "closure" (lib.concatStringsSep " " closures);
in
runCommand "${name}-granular-docker-layers" {
inherit maxLayers;
- paths = referencesByPopularity closure;
+ paths = referencesByPopularity overallClosure;
nativeBuildInputs = [ jshon rsync tarsum ];
enableParallelBuilding = true;
}
@@ -317,15 +325,20 @@ rec {
| jshon -d config \
| jshon -s "1970-01-01T00:00:01Z" -i created > generic.json
+
# WARNING!
# The following code is fiddly w.r.t. ensuring every layer is
# created, and that no paths are missed. If you change the
# following head and tail call lines, double-check that your
# code behaves properly when the number of layers equals:
# maxLayers-1, maxLayers, and maxLayers+1
- head -n $((maxLayers - 1)) $paths | cat -n | xargs -P$NIX_BUILD_CORES -n2 ${storePathToLayer}
- if [ $(cat $paths | wc -l) -ge $maxLayers ]; then
- tail -n+$maxLayers $paths | xargs ${storePathToLayer} $maxLayers
+ paths() {
+ cat $paths ${lib.concatMapStringsSep " " (path: "| grep -v ${path}") (closures ++ [ overallClosure ])}
+ }
+
+ paths | head -n $((maxLayers - 1)) | cat -n | xargs -P$NIX_BUILD_CORES -n2 ${storePathToLayer}
+ if [ $(paths | wc -l) -ge $maxLayers ]; then
+ paths | tail -n+$maxLayers | xargs ${storePathToLayer} $maxLayers
fi
echo "Finished building layer '$name'"
@@ -528,15 +541,18 @@ rec {
created ? "1970-01-01T00:00:01Z",
# Optional bash script to run on the files prior to fixturizing the layer.
extraCommands ? "", uid ? 0, gid ? 0,
- # Docker's lowest maximum layer limit is 42-layers for an old
- # version of the AUFS graph driver. We pick 24 to ensure there is
- # plenty of room for extension. I believe the actual maximum is
- # 128.
- maxLayers ? 24
+ # We pick 100 to ensure there is plenty of room for extension. I
+ # believe the actual maximum is 128.
+ maxLayers ? 100
}:
let
baseName = baseNameOf name;
- contentsEnv = symlinkJoin { name = "bulk-layers"; paths = (if builtins.isList contents then contents else [ contents ]); };
+ contentsEnv = symlinkJoin {
+ name = "bulk-layers";
+ paths = if builtins.isList contents
+ then contents
+ else [ contents ];
+ };
configJson = let
pure = writeText "${baseName}-config.json" (builtins.toJSON {
@@ -553,7 +569,7 @@ rec {
bulkLayers = mkManyPureLayers {
name = baseName;
- closure = writeText "closure" "${contentsEnv} ${configJson}";
+ closures = [ contentsEnv configJson ];
# One layer will be taken up by the customisationLayer, so
# take up one less.
maxLayers = maxLayers - 1;
@@ -845,6 +861,9 @@ rec {
echo " be better to only have one layer that contains a nix store."
export NIX_REMOTE=local?root=$PWD
+ # A user is required by nix
+ # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478
+ export USER=nobody
${nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration
mkdir -p nix/var/nix/gcroots/docker/
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 29eea33a7e18..d7d1a6933100 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -117,7 +117,12 @@ rec {
pkgs.nix
];
config = {
- Env = [ "NIX_PAGER=cat" ];
+ Env = [
+ "NIX_PAGER=cat"
+ # A user is required by nix
+ # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478
+ "USER=nobody"
+ ];
};
};
@@ -231,7 +236,6 @@ rec {
name = "another-layered-image";
tag = "latest";
config.Cmd = [ "${pkgs.hello}/bin/hello" ];
- contents = [ pkgs.hello ];
};
}
diff --git a/pkgs/build-support/emacs/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh
index e1db3e828fd7..b210511d670d 100644
--- a/pkgs/build-support/emacs/setup-hook.sh
+++ b/pkgs/build-support/emacs/setup-hook.sh
@@ -1,11 +1,13 @@
addEmacsVars () {
if test -d $1/share/emacs/site-lisp; then
- export EMACSLOADPATH="$1/share/emacs/site-lisp:$EMACSLOADPATH"
+ # it turns out, that the trailing : is actually required
+ # see https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html
+ export EMACSLOADPATH="$1/share/emacs/site-lisp:${EMACSLOADPATH-}"
fi
}
# If this is for a wrapper derivation, emacs and the dependencies are all
# run-time dependencies. If this is for precompiling packages into bytecode,
# emacs is a compile-time dependency of the package.
-addEnvHooks "$targetOffset" addEmacsVars
+addEnvHooks "$hostOffset" addEmacsVars
addEnvHooks "$targetOffset" addEmacsVars
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 931be1a37007..8020ba46f3f1 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -42,6 +42,7 @@ Options:
--url url Any url understood by 'git clone'.
--rev ref Any sha1 or references (such as refs/heads/master)
--hash h Expected hash.
+ --branch-name Branch name to check out into
--deepClone Clone the entire repository.
--no-deepClone Make a shallow clone of just the required ref.
--leave-dotGit Keep the .git directories.
diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix
deleted file mode 100644
index 6731cf87fbd1..000000000000
--- a/pkgs/build-support/fetchgit/private.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ fetchgit, runCommand, makeWrapper, openssh }: args: derivation ((fetchgit args).drvAttrs // {
- SSH_AUTH_SOCK = if (builtins.tryEval ).success
- then builtins.toString
- else null;
-
- GIT_SSH = let
- config = let
- sshConfigFile = if (builtins.tryEval ).success
- then
- else builtins.trace ''
- Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path.
-
- Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access.
-
- You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user.
- '' "/var/lib/empty/config";
- in builtins.toString sshConfigFile;
-
- ssh-wrapped = runCommand "fetchgit-ssh" {
- nativeBuildInputs = [ makeWrapper ];
- } ''
- mkdir -p $out/bin
- makeWrapper ${openssh}/bin/ssh $out/bin/ssh --prefix PATH : "$out/bin" --add-flags "-F ${config}" "$@"
- '';
- in "${ssh-wrapped}/bin/ssh";
-})
diff --git a/pkgs/build-support/fetchgitiles/default.nix b/pkgs/build-support/fetchgitiles/default.nix
new file mode 100644
index 000000000000..827680992d69
--- /dev/null
+++ b/pkgs/build-support/fetchgitiles/default.nix
@@ -0,0 +1,10 @@
+{ fetchzip, lib }:
+
+{ url, rev, name ? "source", ... } @ args:
+
+fetchzip ({
+ inherit name;
+ url = "${url}/+archive/${rev}.tar.gz";
+ stripRoot = false;
+ meta.homepage = url;
+} // removeAttrs args [ "url" "rev" ]) // { inherit rev; }
diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix
index be110cf8393e..6c4d52a05337 100644
--- a/pkgs/build-support/fetchgitlab/default.nix
+++ b/pkgs/build-support/fetchgitlab/default.nix
@@ -3,8 +3,19 @@
# gitlab example
{ owner, repo, rev, domain ? "gitlab.com", name ? "source", group ? null
, ... # For hash agility
-}@args: fetchzip ({
+} @ args:
+
+with lib;
+
+let
+ slug = concatStringsSep "/"
+ ((optional (group != null) group) ++ [ owner repo ]);
+
+ escapedSlug = replaceStrings ["." "/"] ["%2E" "%2F"] slug;
+in
+
+fetchzip ({
inherit name;
- url = "https://${domain}/api/v4/projects/${lib.optionalString (group != null) "${lib.replaceStrings ["."] ["%2E"] group}%2F"}${lib.replaceStrings ["."] ["%2E"] owner}%2F${lib.replaceStrings ["."] ["%2E"] repo}/repository/archive.tar.gz?sha=${rev}";
- meta.homepage = "https://${domain}/${lib.optionalString (group != null) "${group}/"}${owner}/${repo}/";
+ url = "https://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${rev}";
+ meta.homepage = "https://${domain}/${slug}/";
} // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; }
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 6300587a7d15..7d23a3a7f8f1 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, curl }: # Note that `curl' may be `null', in case of the native stdenvNoCC.
+{ lib, buildPackages ? { inherit stdenvNoCC; }, stdenvNoCC, curl }: # Note that `curl' may be `null', in case of the native stdenvNoCC.
let
@@ -10,7 +10,7 @@ let
# resulting store derivations (.drv files) much smaller, which in
# turn makes nix-env/nix-instantiate faster.
mirrorsFile =
- stdenvNoCC.mkDerivation ({
+ buildPackages.stdenvNoCC.mkDerivation ({
name = "mirrors-list";
builder = ./write-mirror-list.sh;
preferLocalBuild = true;
diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh
index 5658094872c8..220f3b00a771 100644
--- a/pkgs/build-support/kernel/modules-closure.sh
+++ b/pkgs/build-support/kernel/modules-closure.sh
@@ -56,4 +56,12 @@ for module in $closure; do
done
done
+# copy module ordering hints for depmod
+cp $kernel/lib/modules/"$version"/modules.order $out/lib/modules/"$version"/.
+cp $kernel/lib/modules/"$version"/modules.builtin $out/lib/modules/"$version"/.
+
depmod -b $out -a $version
+
+# remove original hints from final derivation
+rm $out/lib/modules/"$version"/modules.order
+rm $out/lib/modules/"$version"/modules.builtin
diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c
index 8e8da00b02a2..d31b7551e949 100644
--- a/pkgs/build-support/libredirect/libredirect.c
+++ b/pkgs/build-support/libredirect/libredirect.c
@@ -59,6 +59,11 @@ static const char * rewrite(const char * path, char * buf)
return path;
}
+static int open_needs_mode(int flags)
+{
+ return (flags & O_CREAT) || (flags & O_TMPFILE) == O_TMPFILE;
+}
+
/* The following set of Glibc library functions is very incomplete -
it contains only what we needed for programs in Nixpkgs. Just add
more functions as needed. */
@@ -67,7 +72,7 @@ int open(const char * path, int flags, ...)
{
int (*open_real) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open");
mode_t mode = 0;
- if (flags & O_CREAT) {
+ if (open_needs_mode(flags)) {
va_list ap;
va_start(ap, flags);
mode = va_arg(ap, mode_t);
@@ -81,7 +86,7 @@ int open64(const char * path, int flags, ...)
{
int (*open64_real) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64");
mode_t mode = 0;
- if (flags & O_CREAT) {
+ if (open_needs_mode(flags)) {
va_list ap;
va_start(ap, flags);
mode = va_arg(ap, mode_t);
@@ -95,7 +100,7 @@ int openat(int dirfd, const char * path, int flags, ...)
{
int (*openat_real) (int, const char *, int, mode_t) = dlsym(RTLD_NEXT, "openat");
mode_t mode = 0;
- if (flags & O_CREAT) {
+ if (open_needs_mode(flags)) {
va_list ap;
va_start(ap, flags);
mode = va_arg(ap, mode_t);
@@ -140,9 +145,9 @@ int stat(const char * path, struct stat * st)
return __stat_real(rewrite(path, buf), st);
}
-int * access(const char * path, int mode)
+int access(const char * path, int mode)
{
- int * (*access_real) (const char *, int mode) = dlsym(RTLD_NEXT, "access");
+ int (*access_real) (const char *, int mode) = dlsym(RTLD_NEXT, "access");
char buf[PATH_MAX];
return access_real(rewrite(path, buf), mode);
}
diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix
index f8c31ed5c1d4..67b82fd66db1 100644
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@@ -1,4 +1,4 @@
-{stdenv, lib}:
+{ lib, runCommandLocal }:
{ name
, type ? "Application"
, exec
@@ -13,24 +13,20 @@
, extraEntries ? null
}:
-stdenv.mkDerivation {
- name = "${name}.desktop";
+let
+ optionalEntriesList = [{k="Icon"; v=icon;}
+ {k="Comment"; v=comment;}
+ {k="GenericName"; v=genericName;}
+ {k="MimeType"; v=mimeType;}
+ {k="StartupNotify"; v=startupNotify;}];
- buildCommand = let
+ valueNotNull = {k, v}: v != null;
+ entriesToKeep = builtins.filter valueNotNull optionalEntriesList;
- optionalEntriesList = [{k="Icon"; v=icon;}
- {k="Comment"; v=comment;}
- {k="GenericName"; v=genericName;}
- {k="MimeType"; v=mimeType;}
- {k="StartupNotify"; v=startupNotify;}];
-
- valueNotNull = {k, v}: v != null;
- entriesToKeep = builtins.filter valueNotNull optionalEntriesList;
-
- mkEntry = {k, v}: k + "=" + v;
- optionalEntriesString = lib.concatMapStringsSep "\n" mkEntry entriesToKeep;
-
- in
+ mkEntry = {k, v}: k + "=" + v;
+ optionalEntriesString = lib.concatMapStringsSep "\n" mkEntry entriesToKeep;
+in
+runCommandLocal "${name}.desktop" {}
''
mkdir -p $out/share/applications
cat > $out/share/applications/${name}.desktop <> target/link
- L=$(echo $lib | sed -e "s#$(pwd)/target/build#$out/lib#")
+ for library in $i; do
+ echo "-L $library" >> target/link
+ L=$(echo $library | sed -e "s#$(pwd)/target/build#$lib/lib#")
echo "-L $L" >> target/link.final
done
fi
done
echo "$EXTRA_LINK" | while read i; do
if [[ ! -z "$i" ]]; then
- for lib in $i; do
- echo "-l $lib" >> target/link
- echo "-l $lib" >> target/link.final
+ for library in $i; do
+ echo "-l $library" >> target/link
+ echo "-l $library" >> target/link.final
done
fi
done
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index 6534e21c0f0c..edff3941636c 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -4,7 +4,7 @@
# This can be useful for deploying packages with NixOps, and to share
# binary dependencies between projects.
-{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc }:
+{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc, rust }:
let
# This doesn't appear to be officially documented anywhere yet.
@@ -22,9 +22,9 @@ let
else
extern;
in (if lib.lists.any (x: x == "lib") dep.crateType then
- " --extern ${name}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib"
+ " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}.rlib"
else
- " --extern ${name}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
+ " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
) dependencies);
echo_build_heading = colors: ''
@@ -59,7 +59,7 @@ let
'';
configureCrate = import ./configure-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps; };
- buildCrate = import ./build-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps; };
+ buildCrate = import ./build-crate.nix { inherit lib stdenv echo_build_heading noisily makeDeps rust; };
installCrate = import ./install-crate.nix;
in
@@ -96,12 +96,12 @@ stdenv.mkDerivation (rec {
buildInputs = (crate.buildInputs or []) ++ buildInputs_;
dependencies =
builtins.map
- (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })
+ (dep: lib.getLib (dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }))
dependencies_;
buildDependencies =
builtins.map
- (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; })
+ (dep: lib.getLib (dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }))
buildDependencies_;
completeDeps = lib.lists.unique (dependencies ++ lib.lists.concatMap (dep: dep.completeDeps) dependencies);
@@ -160,6 +160,9 @@ stdenv.mkDerivation (rec {
};
installPhase = installCrate crateName metadata;
+ outputs = [ "out" "lib" ];
+ outputDev = [ "lib" ];
+
} // extraDerivationAttrs
)) {
rust = rustc;
diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/pkgs/build-support/rust/build-rust-crate/install-crate.nix
index 3b0282621ea1..934c3a031764 100644
--- a/pkgs/build-support/rust/build-rust-crate/install-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/install-crate.nix
@@ -1,24 +1,26 @@
crateName: metadata:
''
runHook preInstall
- mkdir -p $out
+ # always create $out even if we do not have binaries. We are detecting binary targets during compilation, if those are missing there is no way to only have $lib
+ mkdir $out
if [[ -s target/env ]]; then
- cp target/env $out/env
+ mkdir -p $lib
+ cp target/env $lib/env
fi
if [[ -s target/link.final ]]; then
- mkdir -p $out/lib
- cp target/link.final $out/lib/link
+ mkdir -p $lib/lib
+ cp target/link.final $lib/lib/link
fi
if [[ "$(ls -A target/lib)" ]]; then
- mkdir -p $out/lib
- cp target/lib/* $out/lib #*/
- for lib in $out/lib/*.so $out/lib/*.dylib; do #*/
- ln -s $lib $(echo $lib | sed -e "s/-${metadata}//")
+ mkdir -p $lib/lib
+ cp target/lib/* $lib/lib #*/
+ for library in $lib/lib/*.so $lib/lib/*.dylib; do #*/
+ ln -s $library $(echo $library | sed -e "s/-${metadata}//")
done
fi
if [[ "$(ls -A target/build)" ]]; then # */
- mkdir -p $out/lib
- cp -r target/build/* $out/lib # */
+ mkdir -p $lib/lib
+ cp -r target/build/* $lib/lib # */
fi
if [[ -d target/bin ]]; then
if [[ "$(ls -A target/bin)" ]]; then
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index f0f949b22056..f9cf8f1f0c1f 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, cacert, git, cargo, rustc, fetchcargo, buildPackages, windows }:
+{ stdenv, cacert, git, rust, cargo, rustc, fetchcargo, buildPackages, windows }:
{ name ? "${args.pname}-${args.version}"
, cargoSha256 ? "unset"
, src ? null
, srcs ? null
+, unpackPhase ? null
, cargoPatches ? []
, patches ? []
, sourceRoot ? null
@@ -29,7 +30,7 @@ assert buildType == "release" || buildType == "debug";
let
cargoDeps = if cargoVendorDir == null
then fetchcargo {
- inherit name src srcs sourceRoot cargoUpdateHook;
+ inherit name src srcs sourceRoot unpackPhase cargoUpdateHook;
copyLockfile = verifyCargoDeps;
patches = cargoPatches;
sha256 = cargoSha256;
@@ -46,12 +47,7 @@ let
cargoDepsCopy="$sourceRoot/${cargoVendorDir}"
'';
- hostConfig = stdenv.hostPlatform.config;
-
- rustHostConfig = {
- x86_64-pc-mingw32 = "x86_64-pc-windows-gnu";
- }.${hostConfig} or hostConfig;
- rustTarget = if target == null then rustHostConfig else target;
+ rustTarget = if target == null then rust.toRustTarget stdenv.hostPlatform else target;
ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
@@ -87,7 +83,7 @@ stdenv.mkDerivation (args // {
--subst-var-by vendor "$(pwd)/$cargoDepsCopy"
cat >> .cargo/config <<'EOF'
- [target."${stdenv.buildPlatform.config}"]
+ [target."${rust.toRustTarget stdenv.buildPlatform}"]
"linker" = "${ccForBuild}"
${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
[target."${rustTarget}"]
@@ -129,10 +125,10 @@ stdenv.mkDerivation (args // {
(
set -x
env \
- "CC_${stdenv.buildPlatform.config}"="${ccForBuild}" \
- "CXX_${stdenv.buildPlatform.config}"="${cxxForBuild}" \
- "CC_${stdenv.hostPlatform.config}"="${ccForHost}" \
- "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \
+ "CC_${rust.toRustTarget stdenv.buildPlatform}"="${ccForBuild}" \
+ "CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \
+ "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \
+ "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \
cargo build \
${stdenv.lib.optionalString (buildType == "release") "--release"} \
--target ${rustTarget} \
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index a515ce9c6eb5..7a0ba38dce71 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -18,19 +18,19 @@ let cargo-vendor-normalise = stdenv.mkDerivation {
};
in
{ name ? "cargo-deps"
-, src
-, srcs
-, patches
+, src ? null
+, srcs ? []
+, patches ? []
, sourceRoot
, sha256
, cargoUpdateHook ? ""
, # whenever to also include the Cargo.lock in the output
copyLockfile ? false
-}:
-stdenv.mkDerivation {
+, ...
+} @ args:
+stdenv.mkDerivation ({
name = "${name}-vendor";
nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ];
- inherit src srcs patches sourceRoot;
phases = "unpackPhase patchPhase installPhase";
@@ -76,4 +76,6 @@ stdenv.mkDerivation {
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
preferLocalBuild = true;
-}
+} // (builtins.removeAttrs args [
+ "name" "sha256" "cargoUpdateHook" "copyLockfile"
+]))
diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh
index 5264ce398511..c9dd32d1dd22 100644
--- a/pkgs/build-support/setup-hooks/audit-tmpdir.sh
+++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh
@@ -7,7 +7,7 @@
# the moment that would produce too many spurious errors (e.g. debug
# info or assertion messages that refer to $TMPDIR).
-fixupOutputHooks+=('if [ -z "$noAuditTmpdir" -a -e "$prefix" ]; then auditTmpdir "$prefix"; fi')
+fixupOutputHooks+=('if [[ -z "${noAuditTmpdir-}" && -e "$prefix" ]]; then auditTmpdir "$prefix"; fi')
auditTmpdir() {
local dir="$1"
diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 6af8eb1aed99..52c50091d08c 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -228,7 +228,7 @@ autoPatchelf() {
# behaviour as fixupOutputHooks because the setup hook for patchelf is run in
# fixupOutput and the postFixup hook runs later.
postFixupHooks+=('
- if [ -z "$dontAutoPatchelf" ]; then
+ if [ -z "${dontAutoPatchelf-}" ]; then
autoPatchelf -- $(for output in $outputs; do
[ -e "${!output}" ] || continue
echo "${!output}"
diff --git a/pkgs/build-support/setup-hooks/compress-man-pages.sh b/pkgs/build-support/setup-hooks/compress-man-pages.sh
index d10a898d6e46..82e48cd8aa77 100644
--- a/pkgs/build-support/setup-hooks/compress-man-pages.sh
+++ b/pkgs/build-support/setup-hooks/compress-man-pages.sh
@@ -1,4 +1,4 @@
-fixupOutputHooks+=('if [ -z "$dontGzipMan" ]; then compressManPages "$prefix"; fi')
+fixupOutputHooks+=('if [ -z "${dontGzipMan-}" ]; then compressManPages "$prefix"; fi')
compressManPages() {
local dir="$1"
diff --git a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh
index 85364a61f612..f446a6f27fd9 100644
--- a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh
+++ b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh
@@ -11,12 +11,12 @@ addXMLCatalogs () {
done
}
-if [ -z "$libxmlHookDone" ]; then
+if [ -z "${libxmlHookDone-}" ]; then
libxmlHookDone=1
# Set up XML_CATALOG_FILES. An empty initial value prevents
# xmllint and xsltproc from looking in /etc/xml/catalog.
- export XML_CATALOG_FILES
+ export XML_CATALOG_FILES=''
if [ -z "$XML_CATALOG_FILES" ]; then XML_CATALOG_FILES=" "; fi
addEnvHooks "$hostOffset" addXMLCatalogs
fi
diff --git a/pkgs/build-support/setup-hooks/move-lib64.sh b/pkgs/build-support/setup-hooks/move-lib64.sh
index 7724be369c9c..9517af797323 100644
--- a/pkgs/build-support/setup-hooks/move-lib64.sh
+++ b/pkgs/build-support/setup-hooks/move-lib64.sh
@@ -8,7 +8,7 @@
fixupOutputHooks+=(_moveLib64)
_moveLib64() {
- if [ "$dontMoveLib64" = 1 ]; then return; fi
+ if [ "${dontMoveLib64-}" = 1 ]; then return; fi
if [ ! -e "$prefix/lib64" -o -L "$prefix/lib64" ]; then return; fi
echo "moving $prefix/lib64/* to $prefix/lib"
mkdir -p $prefix/lib
diff --git a/pkgs/build-support/setup-hooks/move-sbin.sh b/pkgs/build-support/setup-hooks/move-sbin.sh
index cc51c27cafdf..1c0c4dc9f2d9 100644
--- a/pkgs/build-support/setup-hooks/move-sbin.sh
+++ b/pkgs/build-support/setup-hooks/move-sbin.sh
@@ -5,7 +5,7 @@
fixupOutputHooks+=(_moveSbin)
_moveSbin() {
- if [ "$dontMoveSbin" = 1 ]; then return; fi
+ if [ "${dontMoveSbin-}" = 1 ]; then return; fi
if [ ! -e "$prefix/sbin" -o -L "$prefix/sbin" ]; then return; fi
echo "moving $prefix/sbin/* to $prefix/bin"
mkdir -p $prefix/bin
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index d43b18776742..2e95495c96fd 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -9,8 +9,8 @@ _assignFirst() {
local varName="$1"
local REMOVE=REMOVE # slightly hacky - we allow REMOVE (i.e. not a variable name)
shift
- while [ $# -ge 1 ]; do
- if [ -n "${!1}" ]; then eval "${varName}"="$1"; return; fi
+ while (( $# )); do
+ if [ -n "${!1-}" ]; then eval "${varName}"="$1"; return; fi
shift
done
echo "Error: _assignFirst found no valid variant!"
@@ -19,7 +19,7 @@ _assignFirst() {
# Same as _assignFirst, but only if "$1" = ""
_overrideFirst() {
- if [ -z "${!1}" ]; then
+ if [ -z "${!1-}" ]; then
_assignFirst "$@"
fi
}
diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh
index 3e900d0704cf..29fed7ad7940 100644
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@@ -105,7 +105,7 @@ patchShebangs() {
}
patchShebangsAuto () {
- if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then
+ if [ -z "${dontPatchShebangs-}" -a -e "$prefix" ]; then
# Dev output will end up being run on the build platform. An
# example case of this is sdl2-config. Otherwise, we can just
diff --git a/pkgs/build-support/setup-hooks/prune-libtool-files.sh b/pkgs/build-support/setup-hooks/prune-libtool-files.sh
index 5d7432e8f09a..0ec56549645c 100644
--- a/pkgs/build-support/setup-hooks/prune-libtool-files.sh
+++ b/pkgs/build-support/setup-hooks/prune-libtool-files.sh
@@ -8,7 +8,7 @@
fixupOutputHooks+=(_pruneLibtoolFiles)
_pruneLibtoolFiles() {
- if [ "$dontPruneLibtoolFiles" ] || [ ! -e "$prefix" ]; then
+ if [ "${dontPruneLibtoolFiles-}" ] || [ ! -e "$prefix" ]; then
return
fi
diff --git a/pkgs/build-support/setup-hooks/set-java-classpath.sh b/pkgs/build-support/setup-hooks/set-java-classpath.sh
index 5d3548dc2e88..445fa56d61de 100644
--- a/pkgs/build-support/setup-hooks/set-java-classpath.sh
+++ b/pkgs/build-support/setup-hooks/set-java-classpath.sh
@@ -6,7 +6,7 @@ export CLASSPATH
addPkgToClassPath () {
local jar
for jar in $1/share/java/*.jar; do
- export CLASSPATH=''${CLASSPATH}''${CLASSPATH:+:}''${jar}
+ export CLASSPATH=''${CLASSPATH-}''${CLASSPATH:+:}''${jar}
done
}
diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh
index fc4c7bfbaf95..f5fa9378fd7e 100644
--- a/pkgs/build-support/setup-hooks/strip.sh
+++ b/pkgs/build-support/setup-hooks/strip.sh
@@ -10,7 +10,7 @@ _doStrip() {
local -ra stripCmds=(STRIP TARGET_STRIP)
# Optimization
- if [[ "$STRIP" == "$TARGET_STRIP" ]]; then
+ if [[ "${STRIP-}" == "${TARGET_STRIP-}" ]]; then
dontStripTarget+=1
fi
@@ -20,7 +20,7 @@ _doStrip() {
local -n stripCmd="${stripCmds[$i]}"
# `dontStrip` disables them all
- if [[ "$dontStrip" || "$flag" ]] || ! type -f "$stripCmd" 2>/dev/null
+ if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null
then continue; fi
stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}
diff --git a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh b/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
index 66f4e91c7bb6..ebd3afa05d94 100644
--- a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
+++ b/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
@@ -1,7 +1,7 @@
preConfigurePhases+=" updateAutotoolsGnuConfigScriptsPhase"
updateAutotoolsGnuConfigScriptsPhase() {
- if [ -n "$dontUpdateAutotoolsGnuConfigScripts" ]; then return; fi
+ if [ -n "${dontUpdateAutotoolsGnuConfigScripts-}" ]; then return; fi
for script in config.sub config.guess; do
for f in $(find . -type f -name "$script"); do
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index 717740f1f20f..ff0cda7eaf0d 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -15,7 +15,7 @@ wrapGApp() {
wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@"
}
-# Note: $gappsWrapperArgs still gets defined even if $dontWrapGApps is set.
+# Note: $gappsWrapperArgs still gets defined even if ${dontWrapGApps-} is set.
wrapGAppsHook() {
# guard against running multiple times (e.g. due to propagation)
[ -z "$wrapGAppsHookHasRun" ] || return 0
@@ -42,7 +42,9 @@ wrapGAppsHook() {
fi
for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
- gappsWrapperArgs+=(--prefix "$v" : "${!v}")
+ if [ -n "${!v}" ]; then
+ gappsWrapperArgs+=(--prefix "$v" : "${!v}")
+ fi
done
if [[ -z "${dontWrapGApps:-}" ]]; then
diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
index 9b159a994c80..9e4456a3a151 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -18,12 +18,15 @@ in {
, configureFlags
# mostly for moving and deleting files from the build directory
# : lines
-, postInstall
+, postInstall ? ""
+ # : lines
+, postFixup ? ""
# : list Maintainer
, maintainers ? []
-
-
-}:
+ # : attrs
+, meta ? {}
+, ...
+} @ args:
let
@@ -50,16 +53,12 @@ let
"README.*"
];
-in stdenv.mkDerivation {
- name = "${pname}-${version}";
-
+in stdenv.mkDerivation ({
src = fetchurl {
url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
inherit sha256;
};
- inherit outputs;
-
dontDisableStatic = true;
enableParallelBuilding = true;
@@ -84,13 +83,11 @@ in stdenv.mkDerivation {
noiseFiles = commonNoiseFiles;
docFiles = commonMetaFiles;
}} $doc/share/doc/${pname}
-
- ${postInstall}
- '';
+ '' + postInstall;
postFixup = ''
${cleanPackaging.checkForRemainingFiles}
- '';
+ '' + postFixup;
meta = {
homepage = "https://skarnet.org/software/${pname}/";
@@ -98,6 +95,9 @@ in stdenv.mkDerivation {
license = stdenv.lib.licenses.isc;
maintainers = with lib.maintainers;
[ pmahoney Profpatsch ] ++ maintainers;
- };
+ } // meta;
-}
+} // builtins.removeAttrs args [
+ "sha256" "configureFlags" "postInstall" "postFixup"
+ "meta" "description" "platforms" "maintainers"
+])
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 55df09121b42..5210b7d7ba20 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -2,11 +2,16 @@
let
- runCommand' = stdenv: name: env: buildCommand:
+ runCommand' = runLocal: stdenv: name: env: buildCommand:
stdenv.mkDerivation ({
inherit name buildCommand;
passAsFile = [ "buildCommand" ];
- } // env);
+ }
+ // (lib.optionalAttrs runLocal {
+ preferLocalBuild = true;
+ allowSubstitutes = false;
+ })
+ // env);
in
@@ -21,11 +26,27 @@ rec {
* runCommand "name" {envVariable = true;} ''echo hello > $out''
* runCommandNoCC "name" {envVariable = true;} ''echo hello > $out'' # equivalent to prior
* runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out'';
+ *
+ * The `*Local` variants force a derivation to be built locally,
+ * it is not substituted.
+ *
+ * This is intended for very cheap commands (<1s execution time).
+ * It saves on the network roundrip and can speed up a build.
+ *
+ * It is the same as adding the special fields
+ * `preferLocalBuild = true;`
+ * `allowSubstitutes = false;`
+ * to a derivation’s attributes.
*/
runCommand = runCommandNoCC;
- runCommandNoCC = runCommand' stdenvNoCC;
- runCommandCC = runCommand' stdenv;
+ runCommandLocal = runCommandNoCCLocal;
+ runCommandNoCC = runCommand' false stdenvNoCC;
+ runCommandNoCCLocal = runCommand' true stdenvNoCC;
+
+ runCommandCC = runCommand' false stdenv;
+ # `runCommandCCLocal` left out on purpose.
+ # We shouldn’t force the user to have a cc in scope.
/* Writes a text file to the nix store.
* The contents of text is added to the file in the store.
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 335cab7c45e1..a7050f52e521 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -430,7 +430,7 @@ rec {
set +o pipefail
for i in $rpms; do
echo "$i..."
- ${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories --unconditional --extract-over-symlinks
+ ${rpm}/bin/rpm2cpio "$i" | chroot /mnt ${cpio}/bin/cpio -i --make-directories --unconditional
done
eval "$preInstall"
diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix
index 48ee2713d1f6..309241c36dee 100644
--- a/pkgs/build-support/vm/windows/default.nix
+++ b/pkgs/build-support/vm/windows/default.nix
@@ -20,8 +20,7 @@ let
'';
in {
- runInWindowsVM = drv: let
- in pkgs.lib.overrideDerivation drv (attrs: let
+ runInWindowsVM = drv: pkgs.lib.overrideDerivation drv (attrs: let
bootstrap = bootstrapper attrs.windowsImage;
in {
requiredSystemFeatures = [ "kvm" ];
diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index 2cd4f1af022b..b90c6490e4a6 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -148,6 +148,7 @@ rec {
cp $contentPath tmp.hs
${ghc.withPackages (_: libraries )}/bin/ghc tmp.hs
mv tmp $out
+ ${pkgs.binutils-unwrapped}/bin/strip --strip-unneeded "$out"
'';
} name;
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 591ffa6ca5ba..d051a0f75c13 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -92,8 +92,8 @@ if [ -z "$oldUrl" ]; then
die "Couldn't evaluate source url from '$attr.src'!"
fi
-drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"')
-oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"')
+drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; lib.getName $attr" | tr -d '"')
+oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (lib.getVersion $attr)" | tr -d '"')
if [ -z "$drvName" -o -z "$oldVersion" ]; then
die "Couldn't evaluate name and version from '$attr.name'!"
diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix
index 4bdfa70c63ff..a47ec9ea7909 100644
--- a/pkgs/data/documentation/gnome-user-docs/default.nix
+++ b/pkgs/data/documentation/gnome-user-docs/default.nix
@@ -1,27 +1,41 @@
-{ stdenv, fetchurl, itstool, libxml2, gettext, gnome3 }:
+{ stdenv
+, fetchurl
+, gettext
+, gnome3
+, itstool
+, libxml2
+, yelp-tools
+}:
stdenv.mkDerivation rec {
pname = "gnome-user-docs";
- version = "3.2.2";
+ version = "3.34.1";
src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1ka0nw2kc85p10y8x31v0wv06a88k7qrgafp4ys04y9fzz0rkcjj";
+ url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "11m9fv8k2hynrcgah4jvbm6yczg0s1ly302mipysbwpn6gbdkvf2";
};
- nativeBuildInputs = [ itstool libxml2 gettext ];
+ nativeBuildInputs = [
+ gettext
+ itstool
+ libxml2
+ yelp-tools
+ ];
+
+ enableParallelBuilding = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
- attrPath = "gnome3.gnome-user-docs";
};
};
- meta = {
- homepage = "https://gitlab.gnome.org/GNOME/gnome-user-docs";
- description = "GNOME User Documentation";
- license = stdenv.lib.licenses.cc-by-30;
+ meta = with stdenv.lib; {
+ description = "User and system administration help for the GNOME desktop";
+ homepage = "https://help.gnome.org/users/gnome-help/";
+ license = licenses.cc-by-30;
maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index a266a597e0b0..b4435fb911fa 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "man-pages";
- version = "5.03";
+ version = "5.04";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
- sha256 = "082i9258rl9xxjgpxpz3v8jcwk96dsk704ki9h9lq7q8z7m3mqbz";
+ sha256 = "1bx4ws24bjq6iyfyilg7aih5f0qrhy9l97ksrwcd4yxvjh8gn13x";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];
diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix
index 113ee5b92041..0d46fc92d5f2 100644
--- a/pkgs/data/fonts/babelstone-han/default.nix
+++ b/pkgs/data/fonts/babelstone-han/default.nix
@@ -5,7 +5,7 @@ let
in fetchzip {
name = "babelstone-han-${version}";
- url = http://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip;
+ url = https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip;
postFetch = ''
mkdir -p $out/share/fonts/truetype
unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype
@@ -14,7 +14,7 @@ in fetchzip {
meta = with lib; {
description = "Unicode CJK font with over 36000 Han characters";
- homepage = http://www.babelstone.co.uk/Fonts/Han.html;
+ homepage = https://www.babelstone.co.uk/Fonts/Han.html;
license = licenses.free;
platforms = platforms.all;
diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix
index 4403d690a16d..4c3459d0f114 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -33,6 +33,6 @@ in stdenv.mkDerivation rec {
description = "Default typeface used in the user interface of GNOME since version 3.0";
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.ofl;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix
index d2d2ad342561..c89d4c6dfd47 100644
--- a/pkgs/data/fonts/cascadia-code/default.nix
+++ b/pkgs/data/fonts/cascadia-code/default.nix
@@ -2,7 +2,7 @@
let
pname = "cascadia-code";
- version = "1910.04";
+ version = "1911.21";
in
fetchurl {
name = "${pname}-${version}";
@@ -15,7 +15,7 @@ fetchurl {
install -Dm444 $downloadedFile $out/share/fonts/truetype/Cascadia.ttf
'';
- sha256 = "124zbv7xwirwwxrm988h3plwd2vynqxyx7p2gijqrnw69q9pf67q";
+ sha256 = "0b41xkpqx4ybpw5ar8njy0yznbk0hwf1ypigxf8f16chsfim7dkr";
meta = with lib; {
description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal";
diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix
index 2615d0260f0d..6dcefe900556 100644
--- a/pkgs/data/fonts/comic-neue/default.nix
+++ b/pkgs/data/fonts/comic-neue/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
- version = "2.2";
+ version = "2.3";
in fetchzip rec {
name = "comic-neue-${version}";
@@ -9,15 +9,15 @@ in fetchzip rec {
postFetch = ''
mkdir -vp $out/share/{doc,fonts}
- unzip -j $downloadedFile comic-neue-2.2/\*.otf -d $out/share/fonts/opentype
- unzip -j $downloadedFile comic-neue-2.2/\*.ttf -d $out/share/fonts/truetype
- unzip -j $downloadedFile comic-neue-2.2/\*.eot -d $out/share/fonts/EOT
- unzip -j $downloadedFile comic-neue-2.2/\*.woff -d $out/share/fonts/WOFF
- unzip -j $downloadedFile comic-neue-2.2/\*.woff2 -d $out/share/fonts/WOFF2
- unzip -j $downloadedFile comic-neue-2.2/\*.pdf comic-neue-2.2/FONTLOG.txt comic-neue-2.2/OFL-FAQ.txt comic-neue-2.2/SIL-License.txt -d $out/share/doc/${name}
+ unzip -j $downloadedFile OTF/\*.otf -d $out/share/fonts/opentype
+ unzip -j $downloadedFile Web/\*.ttf -d $out/share/fonts/truetype
+ unzip -j $downloadedFile Web/\*.eot -d $out/share/fonts/EOT
+ unzip -j $downloadedFile Web/\*.woff -d $out/share/fonts/WOFF
+ unzip -j $downloadedFile Web/\*.woff2 -d $out/share/fonts/WOFF2
+ unzip -j $downloadedFile \*.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt -d $out/share/doc/${name}
'';
- sha256 = "1yypq5aqqzv3q1c6vx5130mi2iwihzzvrawhwqpwsfjl0p25sq9q";
+ sha256 = "1gs4vhys0m3qsw06qaxzyi81f06w5v66kbyl64yw3pq2rb656779";
meta = with lib; {
homepage = http://comicneue.com/;
diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix
index 5b982dcaa3e6..156db5d214ca 100644
--- a/pkgs/data/fonts/fantasque-sans-mono/default.nix
+++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
- version = "1.7.2";
+ version = "1.8.0";
in
fetchzip rec {
@@ -15,7 +15,7 @@ fetchzip rec {
unzip -j $downloadedFile README.md -d $out/share/doc/${name}
'';
- sha256 = "1fwvbqfrgb539xybwdawvwa8cg4f215kw905rgl9a6p0iwa1nxqk";
+ sha256 = "07y2w6xzkbaj6vr95fvvnmwq1pw9jib4z02xf8937dx812yic9ni";
meta = with lib; {
homepage = https://github.com/belluzj/fantasque-sans;
diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
index 29b4241be92c..e4e9954d1187 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "2.1";
src = fetchurl {
- url = "http://font.gohu.org/${pname}-${version}.tar.gz";
+ url = "https://font.gohu.org/${pname}-${version}.tar.gz";
sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm";
};
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
description = ''
A monospace bitmap font well suited for programming and terminal use
'';
- homepage = http://font.gohu.org/;
+ homepage = https://font.gohu.org/;
license = licenses.wtfpl;
maintainers = with maintainers; [ epitrochoid rnhmjoj ];
};
diff --git a/pkgs/data/fonts/gubbi/default.nix b/pkgs/data/fonts/gubbi/default.nix
new file mode 100644
index 000000000000..2d1c520e6103
--- /dev/null
+++ b/pkgs/data/fonts/gubbi/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, fontforge }:
+
+stdenv.mkDerivation rec {
+ pname = "gubbi-font";
+ version = "1.3";
+
+ src = fetchFromGitHub {
+ owner = "aravindavk";
+ repo = "gubbi";
+ rev = "v${version}";
+ sha256 = "10w9i3pmjvs1b3xclrgn4q5a95ss4ipldbxbqrys2dmfivx7i994";
+ };
+
+ nativeBuildInputs = [ fontforge ];
+
+ dontConfigure = true;
+
+ preBuild = "patchShebangs generate.pe";
+
+ installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Gubbi.ttf";
+
+ meta = with stdenv.lib; {
+ inherit (src.meta) homepage;
+ description = "A Kannada font";
+ license = licenses.gpl3Plus;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ ehmry ];
+ };
+}
diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix
index d4a673533af7..ffd6a49be5c8 100644
--- a/pkgs/data/fonts/ibm-plex/default.nix
+++ b/pkgs/data/fonts/ibm-plex/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
- version = "3.0.0";
+ version = "4.0.2";
in fetchzip {
name = "ibm-plex-${version}";
url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
@@ -9,7 +9,7 @@ in fetchzip {
mkdir -p $out/share/fonts
unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype
'';
- sha256 = "1vv0lf2fn0y0ln14s4my8x2mykq1lwqpmkjkhs6cm48mzf740nhs";
+ sha256 = "1v00y1l9sjcv9w8d3115w1vv1b7bgwbrv4d3zv68galk8wz8px1x";
meta = with lib; {
description = "IBM Plex Typeface";
diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix
index 3bc836fa4e48..c3d3bf4aa6a0 100644
--- a/pkgs/data/fonts/input-fonts/default.nix
+++ b/pkgs/data/fonts/input-fonts/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation {
pname = "input-fonts";
- version = "2017-08-10"; # date of the download and checksum
+ version = "2019-11-25"; # date of the download and checksum
src = requireFile {
name = "Input-Font.zip";
url = "https://input.fontbureau.com/download/";
- sha256 = "07fkyvbb12agkb2kpnq2j45nycgbjvb4n1s5hjyqsipdh2z9zihq";
+ sha256 = "10rax2a7vzidcs7kyfg5lv5bwp9i7kvjpdcsd10p0517syijkp3b";
};
nativeBuildInputs = [ unzip ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "0k7xqkgqldd110ch9s144ilh762q777qcjvg3plmrb9s6xiaqvvd";
+ outputHash = "15sdhqqqd4jgk80fw7ncx49avi9cxbdgyrvnrfya0066x4q4r6lv";
meta = with stdenv.lib; {
description = "Fonts for Code, from Font Bureau";
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
generous spacing, large punctuation, and easily distinguishable
characters — but without the limitations of a fixed width.
'';
- homepage = http://input.fontbureau.com;
+ homepage = https://input.fontbureau.com;
license = licenses.unfree;
maintainers = with maintainers; [ romildo ];
platforms = platforms.all;
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index d6d986c699ad..cbe4b25bd360 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchzip }:
let
- version = "2.3.2";
+ version = "2.3.3";
in fetchzip {
name = "iosevka-bin-${version}";
@@ -12,7 +12,7 @@ in fetchzip {
unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
'';
- sha256 = "1dkfh354scjgzq7kgy4cn70z030wmfgxixqp8p9m6i0ps8gccjgs";
+ sha256 = "1dfm1888rii5kfmkxp5hnx8ycji57cbs5gazpgkxg1mnmn7i35wl";
meta = with stdenv.lib; {
homepage = https://be5invis.github.io/Iosevka/;
diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix
index 4730a67e290c..1d0cf04d7569 100644
--- a/pkgs/data/fonts/overpass/default.nix
+++ b/pkgs/data/fonts/overpass/default.nix
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let
- version = "3.0.3";
+ version = "3.0.4";
in fetchzip rec {
name = "overpass-${version}";
@@ -12,10 +12,10 @@ in fetchzip rec {
mkdir -p $out/share/doc/${name} ; unzip -j $downloadedFile \*.md -d $out/share/doc/${name}
'';
- sha256 = "1m6p7rrlyqikjvypp4698sn0lp3a4z0z5al4swblfhg8qaxzv5pg";
+ sha256 = "13b4yam0nycclccxidzj2fa3nwms5qji7gfkixdnl4ybf0f56b64";
meta = with lib; {
- homepage = http://overpassfont.org/;
+ homepage = "https://overpassfont.org/";
description = "Font heavily inspired by Highway Gothic";
license = licenses.ofl;
platforms = platforms.all;
diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix
index cb4c5523a70e..326fe73341ff 100644
--- a/pkgs/data/fonts/public-sans/default.nix
+++ b/pkgs/data/fonts/public-sans/default.nix
@@ -1,18 +1,22 @@
{ lib, fetchzip }:
let
- version = "1.006";
+ version = "1.007";
in fetchzip {
name = "public-sans-${version}";
url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip";
postFetch = ''
- mkdir -p $out/share
- unzip $downloadedFile fonts/{otf,variable}/\*.\[ot\]tf -d $out/share/
+ mkdir -p $out/share/fonts
+ unzip -j $downloadedFile binaries/otf/\*.otf -d $out/share/fonts/opentype
+ unzip -j $downloadedFile binaries/variable/\*.ttf -d $out/share/fonts/truetype
+ unzip -j $downloadedFile binaries/webfonts/\*.ttf -d $out/share/fonts/truetype
+ unzip -j $downloadedFile binaries/webfonts/\*.woff -d $out/share/fonts/woff
+ unzip -j $downloadedFile binaries/webfonts/\*.woff2 -d $out/share/fonts/woff2
'';
- sha256 = "1x04mpynfhcgiwx68w5sawgn69xld7k65mbq7n5vcgbfzh2sjwhq";
+ sha256 = "1yzraw08qm1ig7ks850b329xp6zv2znjwl610dppax34kwhqghsm";
meta = with lib; {
description = "A strong, neutral, principles-driven, open source typeface for text or display";
diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix
new file mode 100644
index 000000000000..d3d65f8e515c
--- /dev/null
+++ b/pkgs/data/fonts/recursive/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+ pname = "recursive";
+ version = "1.022";
+
+ srcs = [
+ (fetchzip {
+ name = "${pname}";
+ url = "https://github.com/arrowtype/recursive/releases/download/v${version}/recursive-beta_1_022.zip";
+ sha256 = "09nr1fli7ksv8z4yb25c4xidwsqq50av18qrybsy4kqy5c22957v";
+ stripRoot = false;
+ })
+
+ (fetchzip {
+ name = "${pname}-static";
+ url = "https://github.com/arrowtype/recursive/releases/download/v${version}/recursive-static_fonts-b020.zip";
+ sha256 = "1wlj113gjm26ra9y2r2b3syis2wx0mjq2m8i8xpwscp1kflma1r6";
+ stripRoot = false;
+ })
+ ];
+
+ sourceRoot = ".";
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/{opentype,truetype,woff2}
+ find -name "*.otf" -exec cp "{}" $out/share/fonts/opentype \;
+ find -name "*.ttf" -exec cp "{}" $out/share/fonts/truetype \;
+ find -name "*.woff2" -exec cp "{}" $out/share/fonts/woff2 \;
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/arrowtype/recursive;
+ description = "A variable font family for code & UI";
+ license = licenses.ofl;
+ maintainers = [ maintainers.eadwu ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/fonts/rhodium-libre/default.nix b/pkgs/data/fonts/rhodium-libre/default.nix
new file mode 100644
index 000000000000..fc89d6525922
--- /dev/null
+++ b/pkgs/data/fonts/rhodium-libre/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchFromGitHub }:
+
+let
+ pname = "RhodiumLibre";
+ version = "1.2.0";
+in fetchFromGitHub {
+ name = "${pname}-${version}";
+
+ owner = "DunwichType";
+ repo = pname;
+ rev = version;
+
+ postFetch = ''
+ tar xf $downloadedFile --strip=1
+ install -Dm444 -t $out/share/fonts/opentype/ RhodiumLibre-Regular.otf
+ install -Dm444 -t $out/share/fonts/truetype/ RhodiumLibre-Regular.ttf
+ '';
+
+ sha256 = "04ax6bri5vsji465806p8d7zbdf12r5bpvcm9nb8isfqm81ggj0r";
+
+ meta = with lib; {
+ description = "F/OSS/Libre font for Latin and Devanagari";
+ homepage = "https://github.com/DunwichType/RhodiumLibre";
+ license = licenses.ofl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.marsam ];
+ };
+}
diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index c5dfc1e156f9..3e843e30f5ee 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -2,7 +2,7 @@
let
pname = "spleen";
- version = "1.5.0";
+ version = "1.6.0";
in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@@ -18,7 +18,7 @@ in fetchurl {
# create fonts.dir so NixOS xorg module adds to fp
${mkfontdir}/bin/mkfontdir $d
'';
- sha256 = "13ndyw1m6c778k7jr7qwbfg28gqmpcgksprn2mjgsv75wvy51z19";
+ sha256 = "0h9gj7syn87hl5rhwckih92r228zac6b1dvh3034caml8ad3fyla";
meta = with lib; {
description = "Monospaced bitmap fonts";
diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix
index 1d5ed37767c3..c71b51ad75de 100644
--- a/pkgs/data/fonts/stix-two/default.nix
+++ b/pkgs/data/fonts/stix-two/default.nix
@@ -1,18 +1,22 @@
-{ stdenv, fetchzip }:
+{ stdenv, fetchFromGitHub }:
let
- version = "2.0.0";
-in fetchzip {
+ version = "2.0.2";
+in fetchFromGitHub {
name = "stix-two-${version}";
- url = "https://github.com/stipub/stixfonts/archive/${version}.zip";
+ owner = "stipub";
+ repo = "stixfonts";
+ rev = "v${version}";
postFetch = ''
- mkdir -p $out/share/fonts
- unzip -j $downloadedFile '*/OTF/*.otf' -d $out/share/fonts/opentype
+ tar xf $downloadedFile --strip=1
+ install -m444 -Dt $out/share/fonts/opentype/ OTF/*.otf
+ install -m444 -Dt $out/share/fonts/woff/ WOFF/*.woff
+ install -m444 -Dt $out/share/fonts/woff2/ WOFF2/*.woff2
'';
- sha256 = "19i30d2xjk52bjj7xva1hnlyh58yd5phas1njcc8ldcz87a1lhql";
+ sha256 = "1ah8s0cb67yv4ll8zfs01mdh9m5i2lbkrfbmkhi1xdid6pxsk32x";
meta = with stdenv.lib; {
homepage = http://www.stixfonts.org/;
diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/pkgs/data/fonts/uw-ttyp0/default.nix
new file mode 100644
index 000000000000..eae820fb0d11
--- /dev/null
+++ b/pkgs/data/fonts/uw-ttyp0/default.nix
@@ -0,0 +1,78 @@
+{ stdenv, fetchurl, perl
+, bdftopcf, bdf2psf, mkfontdir
+, fonttosfnt
+, targetsDat ? null
+, variantsDat ? null
+}:
+
+stdenv.mkDerivation rec {
+ pname = "uw-ttyp0";
+ version = "1.3";
+
+ src = fetchurl {
+ url = "https://people.mpi-inf.mpg.de/~uwe/misc/${pname}/${pname}-${version}.tar.gz";
+ sha256 = "1vp053bwv8sr40p3pn4sjaiq570zp7knh99z9ynk30v7ml4cz2i8";
+ };
+
+ # remove for version >1.3
+ patches = [ ./determinism.patch ];
+
+ nativeBuildInputs = [ perl bdftopcf bdf2psf fonttosfnt mkfontdir ];
+
+ outputHashAlgo = "sha256";
+ outputHashMode = "recursive";
+ outputHash = "0hzhaakbbcnz5ksi5p8mavw9578rsqlqadkrirrkhfnyqqlrii4j";
+
+ # configure sizes, encodings and variants
+ preConfigure =
+ (if targetsDat == null
+ then ''
+ cat << EOF > TARGETS.dat
+ SIZES = 11 12 13 14 15 16 17 18 22 \
+ 11b 12b 13b 14b 15b 16b 17b 18b 22b 15i 16i 17i 18i
+ ENCODINGS = uni
+ EOF
+ ''
+ else ''cp "${targetsDat}" TARGETS.dat'') +
+ (if variantsDat == null
+ then ''
+ cat << EOF > VARIANTS.dat
+ COPYTO AccStress PApostropheAscii
+ COPYTO PAmComma AccGraveAscii
+ COPYTO Digit0Slashed Digit0
+ EOF
+ ''
+ else ''cp "${variantsDat}" VARIANTS.dat'');
+
+ postBuild = ''
+ # convert bdf to psf and otb fonts
+ build=$(pwd)
+ mkdir {psf,otb}
+ cd ${bdf2psf}/share/bdf2psf
+ for i in $build/genbdf/*.bdf; do
+ name="$(basename $i .bdf)"
+ bdf2psf \
+ --fb "$i" standard.equivalents \
+ ascii.set+useful.set+linux.set 512 \
+ "$build/psf/$name.psf"
+ fonttosfnt -v -o "$build/otb/$name.otb" "$i"
+ done
+ cd $build
+ '';
+
+ postInstall = ''
+ # install psf fonts
+ fontDir="$out/share/consolefonts"
+ mkdir -p "$fontDir"
+ mv -t "$fontDir" psf/*.psf
+ mv -t "$out/share/fonts/X11/misc" otb/*.otb
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Monospace bitmap screen fonts for X11";
+ homepage = https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/;
+ license = with licenses; [ free mit ];
+ maintainers = with maintainers; [ rnhmjoj ];
+ };
+
+}
diff --git a/pkgs/data/fonts/uw-ttyp0/determinism.patch b/pkgs/data/fonts/uw-ttyp0/determinism.patch
new file mode 100644
index 000000000000..8546ad35933f
--- /dev/null
+++ b/pkgs/data/fonts/uw-ttyp0/determinism.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index b9736cd..5740412 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -76,7 +76,7 @@ bdf : $(bdf)
+
+ genpcf/%.pcf.gz : genbdf/%.bdf
+ $(BDFTOPCF) $< > $(@:.pcf.gz=.pcf)
+- gzip -9 -f $(@:.pcf.gz=.pcf)
++ gzip -n -9 -f $(@:.pcf.gz=.pcf)
+
+ genbdf/t0-11-uni.bdf : bdf/t0-11.bdf bdf/t0-12.bdf VARIANTS.dat mgl/unicode.mgl
+ $(MKSHALLOW) bdf/t0-12.bdf | cat - bdf/t0-11.bdf | $(BDFMANGLE) - VARIANTS.dat mgl/unicode.mgl > $@
diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix
index 24e9f2a39357..db0ed425dee2 100644
--- a/pkgs/data/fonts/xits-math/default.nix
+++ b/pkgs/data/fonts/xits-math/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, python2Packages, fontforge }:
+{ stdenv, fetchFromGitHub, python3Packages}:
stdenv.mkDerivation rec {
pname = "xits-math";
- version = "1.200";
+ version = "1.301";
src = fetchFromGitHub {
owner = "alif-type";
repo = "xits";
rev = "v${version}";
- sha256 = "0s1qqqg3zv9k4wqn1vkx0z895fjccg96n58syc1d5f2wba9kyfcm";
+ sha256 = "043g0gnjc7wn1szvrs0rc1vvrq1qmhqh45b0y2kwrlxsgprpv8ll";
};
- nativeBuildInputs = [ fontforge ] ++ (with python2Packages; [ python fonttools ]);
+ nativeBuildInputs = (with python3Packages; [ python fonttools fontforge ]);
postPatch = ''
rm *.otf
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = https://github.com/khaledhosny/xits-math;
+ homepage = "https://github.com/alif-type/xits";
description = "OpenType implementation of STIX fonts with math support";
license = licenses.ofl;
platforms = platforms.all;
diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix
new file mode 100644
index 000000000000..f0e13b21dfd4
--- /dev/null
+++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub , gtk3 }:
+
+stdenv.mkDerivation rec {
+ pname = "flat-remix-icon-theme";
+ version = "20191018";
+
+ src = fetchFromGitHub {
+ owner = "daniruiz";
+ repo = "flat-remix";
+ rev = version;
+ sha256 = "13ibxvrvri04lb5phm49b6d553jh0aigm57z5i0nsins405gixn9";
+ };
+
+ nativeBuildInputs = [ gtk3 ];
+
+ installPhase = ''
+ mkdir -p $out/share/icons
+ mv Flat-Remix* $out/share/icons/
+ '';
+
+ postFixup = ''
+ for theme in $out/share/icons/*; do
+ gtk-update-icon-cache $theme
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Flat remix is a pretty simple icon theme inspired on material design";
+ homepage = https://drasite.com/flat-remix;
+ license = with licenses; [ gpl3 ];
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ mschneider ];
+ };
+}
+
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index 5658f20c7446..ed4b2581e850 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
+ for panel in $out/share/icons/*/*/panel; do
+ ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel
+ done
+
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
done
diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 76176f9ad04b..620ef02fde72 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
+ for panel in $out/share/icons/*/*/panel; do
+ ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel
+ done
+
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
done
diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index 88611faa3082..c4092e3d8581 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "papirus-icon-theme";
- version = "20191101";
+ version = "20191201";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = pname;
rev = version;
- sha256 = "17as9i5b9wqzvj08hwxqk9dlv6hrvkylns85s8gzhv6b5x2q5ma3";
+ sha256 = "02bkd9gx9z14x5gjhpwchhhngiigzvb51a4z67aqfdnmqirv102n";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix
index 0b28a02ba4d9..c3670a6f58ce 100644
--- a/pkgs/data/icons/zafiro-icons/default.nix
+++ b/pkgs/data/icons/zafiro-icons/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zafiro-icons";
- version = "0.9";
+ version = "1.0";
src = fetchFromGitHub {
owner = "zayronxio";
repo = pname;
- rev = "v${version}";
- sha256 = "0zmnhih4gz8bidyzf1wimy85z7zx9i29mv1zirmykpqj819g7mx9";
+ rev = "${version}";
+ sha256 = "0gy3c0jkj1icnwcs23b6km9cj9cccv8y5z1w11nfdv91cq3mdhmb";
};
nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/data/misc/cldr-emoji-annotation/default.nix b/pkgs/data/misc/cldr-emoji-annotation/default.nix
new file mode 100644
index 000000000000..4279cf8aec48
--- /dev/null
+++ b/pkgs/data/misc/cldr-emoji-annotation/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "cldr-emoji-annotation";
+ version = "36.12.120191002_0";
+
+ src = fetchFromGitHub {
+ owner = "fujiwarat";
+ repo = "cldr-emoji-annotation";
+ rev = version;
+ sha256 = "0nxigzs3mxjgi7c8mmdaxsy5sfl7ihsc2nysaj0db198b33w9clw";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Emoji annotation files in CLDR";
+ homepage = "https://www.unicode.org/";
+ license = licenses.free; # https://www.unicode.org/license.html
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 7548ddcce3e5..0537a5d53737 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
- url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/ac01c6f574b4d9466be25edc107530b14276a89b.tar.gz";
- sha256 = "0a9yd0470848bbng3pfhjzla8pw7mbgql0a827wm2daman0icrqq";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/477d50a859be91a25b2fed6494d414044d7e71ab.tar.gz";
+ sha256 = "0wzi2wgcp5ykwp4wrhcfdaxlbdzrmlgalparx3ap80q069c8fd0n";
}
diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 8af161e8707c..31f7eb7efdb8 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "osinfo-db";
- version = "20190920";
+ version = "20191125";
src = fetchurl {
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
- sha256 = "12kwlqljaai4fsa08m7l28v41q6244dbracvqzcbg1cs0y9jxqy8";
+ sha256 = "102mdykp5pjv7lw7saig640vb5a8ivy4ji8sa68q2wzfwg1yix78";
};
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index b2363b4b549e..3227d9a76235 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "tzdata";
- version = "2019b";
+ version = "2019c";
srcs =
[ (fetchurl {
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
- sha256 = "0r0clnlslwm15m1c61dinf1fi9ffgl6aipng7i7yryfwj0n0kn85";
+ sha256 = "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr";
})
(fetchurl {
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
- sha256 = "0vbmswvv3li25s31shyllq5v24449lxnrki9hr043nipjd09sirf";
+ sha256 = "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn";
})
];
diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/pkgs/data/misc/unicode-character-database/default.nix
new file mode 100644
index 000000000000..5f50049856f3
--- /dev/null
+++ b/pkgs/data/misc/unicode-character-database/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, fetchurl
+, unzip
+}:
+
+stdenv.mkDerivation rec {
+ pname = "unicode-character-database";
+ version = "12.1.0";
+
+ src = fetchurl {
+ url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip";
+ sha256 = "19m06iw0jl7lhlggcmghi12p6jld0qrmfpksgc243yn6sjh53fi5";
+ };
+
+ nativeBuildInputs = [
+ unzip
+ ];
+
+ setSourceRoot = ''
+ sourceRoot=$PWD
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/unicode
+ cp -r * $out/share/unicode
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Unicode Character Database";
+ homepage = "https://www.unicode.org/";
+ license = licenses.free; # https://www.unicode.org/license.html
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix
new file mode 100644
index 000000000000..05472b26d88c
--- /dev/null
+++ b/pkgs/data/misc/unicode-emoji/default.nix
@@ -0,0 +1,59 @@
+{ stdenv
+, fetchurl
+, symlinkJoin
+, lib
+}:
+
+let
+ version = "12.1";
+
+ fetchData = { file, sha256 }: fetchurl {
+ url = "https://www.unicode.org/Public/emoji/${version}/${file}";
+ inherit sha256;
+ downloadToTemp = true;
+ recursiveHash = true;
+ postFetch = ''
+ installDir="$out/share/unicode/emoji"
+ mkdir -p "$installDir"
+ mv "$downloadedFile" "$installDir/${file}"
+ '';
+ };
+
+ srcs = {
+ emoji-data = fetchData {
+ file = "emoji-data.txt";
+ sha256 = "17gfm5a28lsymx36prbjy2g0b27gf3rcgggy0yxdshbxwf6zpf9k";
+ };
+ emoji-sequences = fetchData {
+ file = "emoji-sequences.txt";
+ sha256 = "1fckw5hfyvz5jfp2jczzx8qcs79vf0zyq0z2942230j99arq70vc";
+ };
+ emoji-test = fetchData {
+ file = "emoji-test.txt";
+ sha256 = "0w29lva7gp9g9lf7bz1i24qdalvf440bcq8npsbwr3cpp7na95kh";
+ };
+ emoji-variation-sequences = fetchData {
+ file = "emoji-variation-sequences.txt";
+ sha256 = "0akpib3cinr8xcs045hda5wnpfj6qfdjlkzmq5vgdc50gyhrd2z3";
+ };
+ emoji-zwj-sequences = fetchData {
+ file = "emoji-zwj-sequences.txt";
+ sha256 = "0s2mvy1nr2v1x0rr1fxlsv8ly1vyf9978rb4hwry5vnr678ls522";
+ };
+ };
+in
+
+symlinkJoin rec {
+ name = "unicode-emoji-${version}";
+
+ paths = lib.attrValues srcs;
+
+ passthru = srcs;
+
+ meta = with stdenv.lib; {
+ description = "Unicode Emoji Data Files";
+ homepage = "https://home.unicode.org/emoji/";
+ license = licenses.free; # https://www.unicode.org/license.html
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/data/misc/unihan-database/default.nix b/pkgs/data/misc/unihan-database/default.nix
new file mode 100644
index 000000000000..77da77242a92
--- /dev/null
+++ b/pkgs/data/misc/unihan-database/default.nix
@@ -0,0 +1,38 @@
+{ stdenv
+, fetchurl
+, unzip
+}:
+
+stdenv.mkDerivation rec {
+ pname = "unihan-database";
+ version = "12.1.0";
+
+ src = fetchurl {
+ url = "https://www.unicode.org/Public/zipped/${version}/Unihan.zip";
+ sha256 = "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf";
+ };
+
+ nativeBuildInputs = [
+ unzip
+ ];
+
+ setSourceRoot = ''
+ sourceRoot=$PWD
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/share/unicode
+ cp -r * $out/share/unicode
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Unicode Han Database";
+ homepage = "https://www.unicode.org/";
+ license = licenses.free; # https://www.unicode.org/license.html
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/misc/themes/adapta-kde/default.nix b/pkgs/data/themes/adapta-kde/default.nix
similarity index 83%
rename from pkgs/misc/themes/adapta-kde/default.nix
rename to pkgs/data/themes/adapta-kde/default.nix
index a7624d2889bb..47740aa67622 100644
--- a/pkgs/misc/themes/adapta-kde/default.nix
+++ b/pkgs/data/themes/adapta-kde/default.nix
@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "adapta-kde-theme";
- version = "20180512";
+ version = "20180828";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = "adapta-kde";
rev = version;
- sha256 = "1lgpkylhzbayk892inql16sjyy9d3v126f9i1v7qgha1203rwcji";
+ sha256 = "1q85678sff8is2kwvgd703ckcns42gdga2c1rqlp61gb6bqf09j8";
};
- makeFlags = ["PREFIX=$(out)" ];
+ makeFlags = [ "PREFIX=$(out)" ];
# Make this a fixed-output derivation
outputHashMode = "recursive";
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix
similarity index 100%
rename from pkgs/misc/themes/adapta/default.nix
rename to pkgs/data/themes/adapta/default.nix
diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix
similarity index 73%
rename from pkgs/misc/themes/adwaita-qt/default.nix
rename to pkgs/data/themes/adwaita-qt/default.nix
index 9b979a11b93b..7428b5fab2fd 100644
--- a/pkgs/misc/themes/adwaita-qt/default.nix
+++ b/pkgs/data/themes/adwaita-qt/default.nix
@@ -1,14 +1,14 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, qtbase, pantheon }:
mkDerivation rec {
pname = "adwaita-qt";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "FedoraQt";
repo = pname;
rev = version;
- sha256 = "1jlh4l3sxiwglgx6h4aqi364gr4xipmn09bk88cp997r9sm8jcp9";
+ sha256 = "1z1zl6b1190nffcdyjnwz2xy4s6cvgd98aas9z71l5iddwzy32fm";
};
nativeBuildInputs = [
@@ -26,6 +26,12 @@ mkDerivation rec {
--replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles"
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with lib; {
description = "A style to bend Qt applications to look like they belong into GNOME Shell";
homepage = https://github.com/FedoraQt/adwaita-qt;
diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/data/themes/albatross/default.nix
similarity index 100%
rename from pkgs/misc/themes/albatross/default.nix
rename to pkgs/data/themes/albatross/default.nix
diff --git a/pkgs/misc/themes/arc-kde/default.nix b/pkgs/data/themes/arc-kde/default.nix
similarity index 73%
rename from pkgs/misc/themes/arc-kde/default.nix
rename to pkgs/data/themes/arc-kde/default.nix
index decdbdfac2dc..4937a99daecd 100644
--- a/pkgs/misc/themes/arc-kde/default.nix
+++ b/pkgs/data/themes/arc-kde/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "arc-kde-theme";
- version = "2017-11-09";
+ version = "20180614";
src = fetchFromGitHub {
owner = "PapirusDevelopmentTeam";
repo = "arc-kde";
- rev = "a0abe6fc5ebf74f9ae88b8a2035957cc16f706f5";
- sha256 = "1p6f4ny97096nb054lrgyjwikmvg0qlbcnsjag7m5dfbclfnvzkg";
+ rev = version;
+ sha256 = "0wli16k9my7m8a9561545vjwfifmxm4w606z1h0j08msvlky40xw";
};
- makeFlags = ["PREFIX=$(out)" ];
+ makeFlags = [ "PREFIX=$(out)" ];
# Make this a fixed-output derivation
outputHashMode = "recursive";
diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/data/themes/blackbird/default.nix
similarity index 100%
rename from pkgs/misc/themes/blackbird/default.nix
rename to pkgs/data/themes/blackbird/default.nix
diff --git a/pkgs/misc/themes/clearlooks-phenix/default.nix b/pkgs/data/themes/clearlooks-phenix/default.nix
similarity index 89%
rename from pkgs/misc/themes/clearlooks-phenix/default.nix
rename to pkgs/data/themes/clearlooks-phenix/default.nix
index 7c1eb54f92f5..2f701b9b765b 100644
--- a/pkgs/misc/themes/clearlooks-phenix/default.nix
+++ b/pkgs/data/themes/clearlooks-phenix/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
version = "7.0.1";
pname = "clearlooks-phenix";
- src = fetchurl {
+ src = fetchzip {
url = "https://github.com/jpfleury/clearlooks-phenix/archive/${version}.tar.gz";
- sha256 = "1x2psfbhxc3bk3q795bafxv6p890yfsankfw64p44q4r1x0236ra";
+ sha256 = "1b6y4l3rf3c5r4v72fyj3ppvnvw13kvr2a1dyl63ni1jxnlk50kd";
};
dontBuild = true;
diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/data/themes/e17gtk/default.nix
similarity index 100%
rename from pkgs/misc/themes/e17gtk/default.nix
rename to pkgs/data/themes/e17gtk/default.nix
diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix
similarity index 100%
rename from pkgs/misc/themes/equilux-theme/default.nix
rename to pkgs/data/themes/equilux-theme/default.nix
diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/data/themes/gnome-breeze/default.nix
similarity index 100%
rename from pkgs/misc/themes/gnome-breeze/default.nix
rename to pkgs/data/themes/gnome-breeze/default.nix
diff --git a/pkgs/misc/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix
similarity index 58%
rename from pkgs/misc/themes/kde2/default.nix
rename to pkgs/data/themes/kde2/default.nix
index fac8c38eecae..547e4f30aa6c 100644
--- a/pkgs/misc/themes/kde2/default.nix
+++ b/pkgs/data/themes/kde2/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchFromGitHub, mkDerivation
+{ lib, fetchFromGitHub, mkDerivation
, cmake, extra-cmake-modules
-, qtbase, kcoreaddons, kdecoration }:
+, qtbase, kcoreaddons, kdecoration
+}:
-let
- version = "2017-03-15";
-in mkDerivation rec {
+mkDerivation rec {
pname = "kde2-decoration";
- inherit version;
+ version = "1.0";
src = fetchFromGitHub {
owner = "repos-holder";
repo = "kdecoration2-kde2";
- rev = "2a9cf18ac0646b3532d4db2dd28bd73c4c229783";
- sha256 = "0kilw6sd3blvm6gx9w4w5ivkjfxlv6wnyivw46pwwvhgxqymkbxk";
+ rev = version;
+ sha256 = "1766z9wscybcqvr828xih93b3rab3hb0ghsf818iflhp1xy0js08";
};
enableParallelBuilding = true;
@@ -21,9 +20,9 @@ in mkDerivation rec {
buildInputs = [ qtbase kcoreaddons kdecoration ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "KDE 2 window decoration ported to Plasma 5";
- homepage = src.meta.homepage;
+ homepage = "https://github.com/repos-holder/kdecoration2-kde2";
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = with maintainers; [ gnidorah ];
diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/data/themes/lounge/default.nix
new file mode 100644
index 000000000000..15ec68b07570
--- /dev/null
+++ b/pkgs/data/themes/lounge/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome3, gdk-pixbuf, librsvg, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+ pname = "lounge-gtk-theme";
+ version = "1.22";
+
+ src = fetchFromGitHub {
+ owner = "monday15";
+ repo = pname;
+ rev = version;
+ sha256 = "1y1wkfsv2zrxqcqr53lmr9743mvzcy4swi5j6sxmk1aykx6ccs1p";
+ };
+
+ nativeBuildInputs = [ meson ninja sassc gtk3 ];
+
+ buildInputs = [ gdk-pixbuf librsvg ];
+
+ propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+ mesonFlags = [
+ "-D gnome_version=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}"
+ ];
+
+ postFixup = ''
+ gtk-update-icon-cache "$out"/share/icons/Lounge-aux;
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Simple and clean GTK theme with vintage scrollbars, inspired by Absolute, based on Adwaita";
+ homepage = https://github.com/monday15/lounge-gtk-theme;
+ license = licenses.gpl3Plus;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.romildo ];
+ };
+}
diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix
index 714e026d32c1..6c38e3aaba41 100644
--- a/pkgs/data/themes/mojave/default.nix
+++ b/pkgs/data/themes/mojave/default.nix
@@ -1,15 +1,23 @@
-{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, fetchurl, gtk_engines, gtk-engine-murrine }:
stdenv.mkDerivation rec {
pname = "mojave-gtk-theme";
- version = "2019-09-09";
+ version = "2019-12-12";
- src = fetchFromGitHub {
- owner = "vinceliuice";
- repo = pname;
- rev = version;
- sha256 = "1qffh6jsvy61f29ymw1v9hpjnsvhqin19mp05cys1lnwc7y810zr";
- };
+ srcs = [
+ (fetchFromGitHub {
+ owner = "vinceliuice";
+ repo = pname;
+ rev = version;
+ sha256 = "0d5m9gh97db01ygqlp2sv9v1m183d9fgid9n9wms9r5rrrw6bs8m";
+ })
+ (fetchurl {
+ url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz";
+ sha256 = "18zzkwm1kqzsdaj8swf0xby1n65gxnyslpw4lnxcx1rphip0rwf7";
+ })
+ ];
+
+ sourceRoot = "source";
buildInputs = [ gtk_engines ];
@@ -17,8 +25,8 @@ stdenv.mkDerivation rec {
installPhase = ''
patchShebangs .
- mkdir -p $out/share/themes
name= ./install.sh -d $out/share/themes
+ install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/*
'';
meta = with stdenv.lib; {
diff --git a/pkgs/misc/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix
similarity index 94%
rename from pkgs/misc/themes/numix-solarized/default.nix
rename to pkgs/data/themes/numix-solarized/default.nix
index 4fd06fae61bc..0596141da80b 100644
--- a/pkgs/misc/themes/numix-solarized/default.nix
+++ b/pkgs/data/themes/numix-solarized/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- version = "20170810";
+ version = "20180913";
pname = "numix-solarized-gtk-theme";
src = fetchFromGitHub {
owner = "Ferdi265";
repo = "numix-solarized-gtk-theme";
rev = version;
- sha256 = "0l4xvsiyg15kp6xwpvm3jckxyhr1lxd678lkhrcyf40n7rd4xinl";
+ sha256 = "1kda0lyqi3cxh163fbj8yyi6jj6pf0y980k4s0cmyi3hkh4cqyd5";
};
nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape optipng ];
diff --git a/pkgs/misc/themes/numix-sx/default.nix b/pkgs/data/themes/numix-sx/default.nix
similarity index 100%
rename from pkgs/misc/themes/numix-sx/default.nix
rename to pkgs/data/themes/numix-sx/default.nix
diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/data/themes/numix/default.nix
similarity index 100%
rename from pkgs/misc/themes/numix/default.nix
rename to pkgs/data/themes/numix/default.nix
diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/data/themes/onestepback/default.nix
similarity index 100%
rename from pkgs/misc/themes/onestepback/default.nix
rename to pkgs/data/themes/onestepback/default.nix
diff --git a/pkgs/misc/themes/orion/default.nix b/pkgs/data/themes/orion/default.nix
similarity index 100%
rename from pkgs/misc/themes/orion/default.nix
rename to pkgs/data/themes/orion/default.nix
diff --git a/pkgs/misc/themes/paper/default.nix b/pkgs/data/themes/paper-gtk/default.nix
similarity index 100%
rename from pkgs/misc/themes/paper/default.nix
rename to pkgs/data/themes/paper-gtk/default.nix
diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix
index d1d7228183c5..37eb9b7e5bcd 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/pkgs/data/themes/plata/default.nix
@@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "plata-theme";
- version = "0.9.0";
+ version = "0.9.1";
src = fetchFromGitLab {
owner = "tista500";
repo = "plata-theme";
rev = version;
- sha256 = "1bcjrnh6bm7pxyqrr39yx5zykf3yzxrsydd5xcawjfihnph3yrlg";
+ sha256 = "0rva56xdvsj6vwwvrn55137mw83c9p4xy00i3mq0ryh43imyj4mg";
};
preferLocalBuild = true;
diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix
new file mode 100644
index 000000000000..151fadddc16c
--- /dev/null
+++ b/pkgs/data/themes/pop-gtk/default.nix
@@ -0,0 +1,62 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, sassc
+, gtk3
+, inkscape
+, optipng
+, gtk-engine-murrine
+, gdk-pixbuf
+, librsvg
+}:
+
+stdenv.mkDerivation rec {
+ pname = "pop-gtk-theme";
+ version = "2019-12-17";
+
+ src = fetchFromGitHub {
+ owner = "pop-os";
+ repo = "gtk-theme";
+ rev = "77601545f049251bce9c63a07f0d9819aa27cb60";
+ sha256 = "0bmkcdr1z9m3inrw33zprq2a4jawql4724a84nr89r19xllj2z1s";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ sassc
+ gtk3
+ inkscape
+ optipng
+ ];
+
+ buildInputs = [
+ gdk-pixbuf
+ librsvg
+ ];
+
+ propagatedUserEnvPkgs = [
+ gtk-engine-murrine
+ ];
+
+ postPatch = ''
+ for file in $(find -name render-\*.sh); do
+ patchShebangs "$file"
+
+ substituteInPlace "$file" \
+ --replace 'INKSCAPE="/usr/bin/inkscape"' \
+ 'INKSCAPE="inkscape"' \
+ --replace 'OPTIPNG="/usr/bin/optipng"' \
+ 'OPTIPNG="optipng"'
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "System76 Pop GTK+ Theme";
+ homepage = "https://github.com/pop-os/gtk-theme";
+ license = with licenses; [ gpl3 lgpl21 cc-by-sa-40 ];
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ elyhaka ];
+ };
+}
diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
similarity index 95%
rename from pkgs/misc/themes/qtcurve/default.nix
rename to pkgs/data/themes/qtcurve/default.nix
index 0071e386e88c..673b97cc137c 100644
--- a/pkgs/misc/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -11,7 +11,7 @@ in mkDerivation {
pname = "qtcurve";
inherit version;
src = fetchurl {
- url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz";
+ url = "https://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz";
sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8";
};
diff --git a/pkgs/data/themes/sierra/default.nix b/pkgs/data/themes/sierra/default.nix
index e5b5ad8d611f..0c9cef9e0977 100644
--- a/pkgs/data/themes/sierra/default.nix
+++ b/pkgs/data/themes/sierra/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "sierra-gtk-theme";
- version = "2019-05-07";
+ version = "2019-12-16";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
- sha256 = "0rm9lcwp89ljxqrya9bi882qcs339pc1l945cr1xq2rganqyk9cq";
+ sha256 = "14hlz8kbrjypyd6wyrwmnj2wm9w3kc8y00ms35ard7x8lmhs56hr";
};
nativeBuildInputs = [ libxml2 ];
diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/data/themes/solarc/default.nix
similarity index 100%
rename from pkgs/misc/themes/solarc/default.nix
rename to pkgs/data/themes/solarc/default.nix
diff --git a/pkgs/data/themes/sweet/default.nix b/pkgs/data/themes/sweet/default.nix
new file mode 100644
index 000000000000..9d3603cbf520
--- /dev/null
+++ b/pkgs/data/themes/sweet/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+ pname = "sweet";
+ version = "1.10.5";
+
+ srcs = [
+ (fetchurl {
+ url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar-Blue.zip";
+ sha256 = "11040hx8ci4vbnyaj63zj924v0ln7rjm9a28mcqdax60h3dp12lj";
+ })
+ (fetchurl {
+ url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar.zip";
+ sha256 = "0lvnjmirpwdav8q0bfbhybwkr2h6dilc7lhhj18xd2k57xadjmxr";
+ })
+ (fetchurl {
+ url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Dark.zip";
+ sha256 = "0a7mh1pgvi8w1ahsmvgnmpdawm30lcjqk4zqvg0lqadsd04dn4h1";
+ })
+ (fetchurl {
+ url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-mars.zip";
+ sha256 = "0n2dkl35qrik10wvhvkayyra987p03g56pxhz5kc73cbsl5zd96l";
+ })
+ (fetchurl {
+ url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet.zip";
+ sha256 = "0wwmc3wj2pjg4kimfkvcsimk3s4s7l7k000vxqi8yjlfs70f273c";
+ })
+ ];
+
+ nativeBuildInputs = [ unzip ];
+
+ sourceRoot = ".";
+
+ installPhase = ''
+ mkdir -p $out/share/themes/
+ cp -a Sweet* $out/share/themes/
+ rm $out/share/themes/*/{LICENSE,README*}
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Light and dark colorful Gtk3.20+ theme";
+ homepage = "https://github.com/EliverLara/Sweet";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ fuzen ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/data/themes/vertex/default.nix
similarity index 100%
rename from pkgs/misc/themes/vertex/default.nix
rename to pkgs/data/themes/vertex/default.nix
diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix
new file mode 100644
index 000000000000..09d53cdd1c56
--- /dev/null
+++ b/pkgs/desktops/cdesktopenv/default.nix
@@ -0,0 +1,75 @@
+{ stdenv, fetchgit, xorgproto, libX11, bison, ksh, perl, gnum4
+, libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps
+, libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf
+, ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales, gawk
+, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot }:
+
+let
+ x11ProjectRoot = symlinkJoin {
+ name = "x11ProjectRoot";
+ paths = [
+ bdftopcf mkfontdir
+ xset # fonts
+ xrdb # session load
+ ];
+ };
+in stdenv.mkDerivation rec {
+ version = "2019-11-30";
+ name = "cde-${version}";
+
+ src = fetchgit {
+ url = "https://git.code.sf.net/p/cdesktopenv/code";
+ rev = "5cebd7c4da1afea353a3baef250e31a4cf867bc5";
+ sha256 = "06wvnb3n8hn98kxvmrf6v3lyqp8bxpzl8wrixlw9jinmsivfs4b9";
+ };
+ setSourceRoot = ''export sourceRoot="$(echo */cde)"'';
+
+ buildInputs = [
+ libX11 libXinerama libXt libXext libtirpc motif libXft xbitmaps
+ libjpeg libXmu libXdmcp libXScrnSaver tcl libXaw ksh
+ ];
+ nativeBuildInputs = [
+ bison ncompress gawk autoPatchelfHook makeWrapper fakeroot
+ ];
+
+ makeFlags = [
+ "World"
+ "BOOTSTRAPCFLAGS=-I${xorgproto}/include/X11"
+ "IMAKECPP=cpp"
+ "LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive"
+ ];
+
+ preBuild = ''
+ while IFS= read -r -d ''$'\0' i; do
+ substituteInPlace "$i" --replace /usr/dt $out/opt/dt
+ done < <(find "." -type f -exec grep -Iq /usr/dt {} \; -and -print0)
+
+ cat >> config/cf/site.def << EOF
+#define MakeFlagsToShellFlags(makeflags,shellcmd) set -e
+#define KornShell ${ksh}/bin/ksh
+#define PerlCmd ${perl}/bin/perl
+#define M4Cmd ${gnum4}/bin/m4
+#define X11ProjectRoot ${x11ProjectRoot}
+#define CppCmd ${gcc}/bin/cpp
+TIRPCINC = -I${libtirpc.dev}/include/tirpc
+EOF
+
+ patchShebangs .
+ unset AR
+ '';
+
+ installPhase = ''
+ fakeroot admin/IntegTools/dbTools/installCDE -s . -DontRunScripts
+
+ mkdir -p $out/bin
+ mv $out/opt/dt/bin/dtmail $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Common Desktop Environment";
+ homepage = https://sourceforge.net/projects/cdesktopenv/;
+ license = licenses.lgpl2;
+ maintainers = [ maintainers.gnidorah ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
new file mode 100644
index 000000000000..445890782414
--- /dev/null
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, lib }:
+
+lib.makeScope pkgs.newScope (self: with self; {
+ xapps = callPackage ./xapps {};
+})
diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix
new file mode 100644
index 000000000000..f63ab3cedd8c
--- /dev/null
+++ b/pkgs/desktops/cinnamon/xapps/default.nix
@@ -0,0 +1,104 @@
+{ fetchFromGitHub
+, fetchpatch
+, glib
+, gobject-introspection
+, gtk3
+, libgnomekbd
+, gdk-pixbuf
+, cairo
+, xorg
+, meson
+, ninja
+, pkgconfig
+, python3
+, stdenv
+, vala
+, wrapGAppsHook
+, inxi
+, mate
+}:
+
+stdenv.mkDerivation rec {
+ pname = "xapps";
+ version = "1.6.8";
+
+ outputs = [ "out" "dev" ];
+
+ src = fetchFromGitHub {
+ owner = "linuxmint";
+ repo = pname;
+ rev = version;
+ sha256 = "09f77vsydv8r6r43py8hrpq7pb4a1pfivy19zgijjy2241i7059v";
+ };
+
+ # TODO: https://github.com/NixOS/nixpkgs/issues/36468
+ NIX_CFLAGS_COMPILE = [
+ "-I${glib.dev}/include/gio-unix-2.0"
+ ];
+
+ patches = [
+ (fetchpatch { # details see https://github.com/linuxmint/xapps/pull/65
+ url = "https://github.com/linuxmint/xapps/compare/d361d9cf357fade59b4bb68df2dcb2c0c39f90e1...2dfe82ec68981ea046345b2be349bd56293579f7.diff";
+ sha256 = "0sffclamvjas8ad57kxrg0vrgrd95xsk0xdl53dc3yivpxkfxrnk";
+ })
+ ];
+
+ nativeBuildInputs = [
+ gobject-introspection
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ (python3.withPackages(ps: with ps; [
+ pygobject3
+ setproctitle # mate applet
+ ]))
+ libgnomekbd
+ gdk-pixbuf
+ xorg.libxkbfile
+ python3.pkgs.pygobject3 # for .pc file
+ mate.mate-panel # for gobject-introspection
+ ];
+
+ # Requires in xapp.pc
+ propagatedBuildInputs = [
+ gtk3
+ cairo
+ glib
+ ];
+
+ mesonFlags = [
+ "-Dpy-overrides-dir=${placeholder "out"}/${python3.sitePackages}/gi/overrides"
+ ];
+
+ postPatch = ''
+ chmod +x schemas/meson_install_schemas.py # patchShebangs requires executable file
+
+ # The fetchpatch hook removes the renames, so postPatch has to rename those files, remove once PR merged
+ mv files/usr/bin/pastebin scripts/pastebin
+ mv files/usr/bin/upload-system-info scripts/upload-system-info
+ mv files/usr/bin/xfce4-set-wallpaper scripts/xfce4-set-wallpaper
+ mv files/usr/share/icons/hicolor icons
+
+ patchShebangs \
+ libxapp/g-codegen.py \
+ schemas/meson_install_schemas.py
+
+ # Patch pastebin & inxi location
+ sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info
+ sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/linuxmint/xapps";
+ description = "Cross-desktop libraries and common resources";
+ license = licenses.lgpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.mkg20001 ];
+ };
+}
diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix
index 2511f05c4ea3..9f7b0e478e1b 100644
--- a/pkgs/desktops/deepin/dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dbus-factory/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
sed -i -e 's:/share/gocode:/share/go:' Makefile
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Generates static DBus bindings for Golang and QML at build-time";
diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix
index b052a1042403..c4082ce454ce 100644
--- a/pkgs/desktops/deepin/dde-api/default.nix
+++ b/pkgs/desktops/deepin/dde-api/default.nix
@@ -24,7 +24,7 @@
buildGoPackage rec {
pname = "dde-api";
- version = "3.18.4.1";
+ version = "5.0.0";
goPackagePath = "pkg.deepin.io/dde/api";
@@ -32,7 +32,7 @@ buildGoPackage rec {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0bcjp5ijwa4wmx6p43lik6vjlb7d5rk7nf8xl495i3yk9x70wyfa";
+ sha256 = "0iv4krj6dqdknwvmax7aj40k1h96259kqcfnljadrwpl7cvsvp5p";
};
goDeps = ./deps.nix;
@@ -113,7 +113,7 @@ buildGoPackage rec {
searchHardCodedPaths $out # debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Go-lang bindings for dde-daemon";
diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix
index a3b5e20effc7..5ebe1f6af952 100644
--- a/pkgs/desktops/deepin/dde-api/deps.nix
+++ b/pkgs/desktops/deepin/dde-api/deps.nix
@@ -5,8 +5,8 @@
fetch = {
type = "git";
url = "https://github.com/alecthomas/template";
- rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
- sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ rev = "fb15b899a75114aa79cc930e33c46b577cc664b1";
+ sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26";
};
}
{
@@ -14,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/alecthomas/units";
- rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
- sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b";
+ sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc";
};
}
{
@@ -32,8 +32,8 @@
fetch = {
type = "git";
url = "https://github.com/disintegration/imaging";
- rev = "465faf0892b5c7b3325643b0e47282e1331672e7";
- sha256 = "1z9rkphmqgyphznl53pp1gmf0dfrfrmr95bx46p422ldml26c5a0";
+ rev = "9aab30e6aa535fe3337b489b76759ef97dfaf362";
+ sha256 = "015amm3x989hl3r4gxnixj602fl9j8z53n0lrq804cbfbk7a31fw";
};
}
{
@@ -41,8 +41,8 @@
fetch = {
type = "git";
url = "https://github.com/fogleman/gg";
- rev = "f194ddec6f45226fc9e1b4a61b7237f186edd543";
- sha256 = "095g5hpqvpy5w9l4kb65cif013snsvlbw6sgln0kwdix0z099j3i";
+ rev = "4dc34561c649343936bb2d29e23959bd6d98ab12";
+ sha256 = "1x1finzdrr80dd3r7wvf7zb184yjf4dawz7s581p2dr64dcialww";
};
}
{
@@ -77,8 +77,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
- rev = "7e034cad644213bc79b336b52fce73624259aeca";
- sha256 = "04n4yi0p2yjv8sr9dmnzwc2k6hvzzvl6jdq2xd043kvjwzk583va";
+ rev = "e7c1f5e7dbb87d8921928a6d9fc52fb31ce73b24";
+ sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf";
};
}
{
@@ -86,8 +86,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "3b0461eec859c4b73bb64fdc8285971fd33e3938";
- sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
+ rev = "daa7c04131f568e31c51927b359a2d197a357058";
+ sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h";
};
}
{
diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix
index 427cb1249c90..5460a9329629 100644
--- a/pkgs/desktops/deepin/dde-calendar/default.nix
+++ b/pkgs/desktops/deepin/dde-calendar/default.nix
@@ -4,13 +4,13 @@
mkDerivation rec {
pname = "dde-calendar";
- version = "1.2.10";
+ version = "5.0.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "00aqx24jccf88vvkpb9svyjz8knrqyjgd0152psf9dxc9q13f61h";
+ sha256 = "1zzr3crkz4l5l135y0m53vqhv7fkrbvbspk8295swz9gsm3f7ah9";
};
nativeBuildInputs = [
@@ -37,7 +37,7 @@ mkDerivation rec {
-e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert,"
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Calendar for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix
index 0871e004e5f9..97e44c6c36ea 100644
--- a/pkgs/desktops/deepin/dde-control-center/default.nix
+++ b/pkgs/desktops/deepin/dde-control-center/default.nix
@@ -8,13 +8,13 @@
mkDerivation rec {
pname = "dde-control-center";
- version = "4.10.11";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1ip8wjwf0n9q8xnqymzh8lz0j5gcnns976n291np6k5kdh2wqhr5";
+ sha256 = "10bx8bpvi3ib32a3l4nyb1j0iq3bch8jm9wfm6d5v0ym1zb92x3b";
};
nativeBuildInputs = [
@@ -99,7 +99,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Control panel of Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index da217186e276..b5460029f78f 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -8,7 +8,7 @@
buildGoPackage rec {
pname = "dde-daemon";
- version = "3.27.2.6";
+ version = "5.0.0";
goPackagePath = "pkg.deepin.io/dde/daemon";
@@ -16,7 +16,7 @@ buildGoPackage rec {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "14g138h23f1lh1y98pdrfhnph1m7pw8lq8ypiwv9qf3fmdyn35d4";
+ sha256 = "08jri31bvzbaxaq78rpp46ndv0li2dij63hakvd9b9gs786srql1";
};
patches = [
@@ -121,7 +121,7 @@ buildGoPackage rec {
searchHardCodedPaths $out # debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Daemon for handling Deepin Desktop Environment session settings";
diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix
index c9a15ad88d4a..bcc5ab81808f 100644
--- a/pkgs/desktops/deepin/dde-daemon/deps.nix
+++ b/pkgs/desktops/deepin/dde-daemon/deps.nix
@@ -5,8 +5,8 @@
fetch = {
type = "git";
url = "https://github.com/alecthomas/template";
- rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
- sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+ rev = "fb15b899a75114aa79cc930e33c46b577cc664b1";
+ sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26";
};
}
{
@@ -14,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/alecthomas/units";
- rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
- sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+ rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b";
+ sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc";
};
}
{
@@ -77,8 +77,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/image";
- rev = "7e034cad644213bc79b336b52fce73624259aeca";
- sha256 = "04n4yi0p2yjv8sr9dmnzwc2k6hvzzvl6jdq2xd043kvjwzk583va";
+ rev = "e7c1f5e7dbb87d8921928a6d9fc52fb31ce73b24";
+ sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf";
};
}
{
@@ -86,8 +86,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "3b0461eec859c4b73bb64fdc8285971fd33e3938";
- sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
+ rev = "daa7c04131f568e31c51927b359a2d197a357058";
+ sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h";
};
}
{
@@ -95,8 +95,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475";
- sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+ rev = "4b67af870c6ffd08258ef1202f371aebccaf7b68";
+ sha256 = "01mhy1xs2dh18kp6wdk1xnb34lbzv2qkvdwj7w5ha2qgm5rrm4ik";
};
}
{
diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix
index fc25d007f200..7b44b69d5b7b 100644
--- a/pkgs/desktops/deepin/dde-dock/default.nix
+++ b/pkgs/desktops/deepin/dde-dock/default.nix
@@ -7,13 +7,13 @@
let
unwrapped = mkDerivation rec {
pname = "dde-dock";
- version = "4.10.3";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "17iy78r0frpv42g521igfdcgdklbifzig1wzxq2nl14fq0bgxg4v";
+ sha256 = "12dshsqhzajnxm7r53qg0c84b6xlj313qnssnx2m25z4jdp5i7pr";
};
nativeBuildInputs = [
@@ -68,7 +68,7 @@ unwrapped = mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Dock for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix
index 081c93a65c86..62b4da71dd62 100644
--- a/pkgs/desktops/deepin/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/dde-file-manager/default.nix
@@ -1,22 +1,23 @@
-{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, avfs, dde-daemon, dde-dock,
- dde-polkit-agent, dde-qt-dbus-factory, deepin, deepin-anything,
- deepin-desktop-schemas, deepin-gettext-tools, deepin-movie-reborn,
- deepin-shortcut-viewer, deepin-terminal, dtkcore, dtkwidget,
- ffmpegthumbnailer, file, glib, gnugrep, gsettings-qt, gvfs,
- jemalloc, kcodecs, libX11, libsecret, polkit, polkit-qt, poppler,
- procps, qmake, qt5integration, qtmultimedia, qtsvg, qttools,
- qtx11extras, runtimeShell, samba, shadow, taglib, udisks2-qt5,
- xdg-user-dirs, xorg, zlib, wrapGAppsHook }:
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, avfs, dde-daemon,
+ dde-dock, dde-polkit-agent, dde-qt-dbus-factory, deepin,
+ deepin-anything, deepin-desktop-schemas, deepin-gettext-tools,
+ deepin-movie-reborn, deepin-shortcut-viewer, deepin-terminal,
+ disomaster, dtkcore, dtkwidget, ffmpegthumbnailer, file, glib,
+ gnugrep, gsettings-qt, gvfs, jemalloc, kcodecs, libX11, libsecret,
+ polkit, polkit-qt, poppler, procps, qmake, qt5integration,
+ qtmultimedia, qtsvg, qttools, qtx11extras, runtimeShell, samba,
+ shadow, taglib, udisks2-qt5, xdg-user-dirs, xorg, zlib,
+ wrapGAppsHook }:
mkDerivation rec {
pname = "dde-file-manager";
- version = "4.8.6.4";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1m0ykw5a91rm5xcah8bzk21xsambqvncj8104ihdhf9h0z9kdmm2";
+ sha256 = "0n2nl09anqdq0n5yn688n385rn81lcpybs0sa8m311k3k9ndkkyr";
};
nativeBuildInputs = [
@@ -39,6 +40,7 @@ mkDerivation rec {
deepin-movie-reborn.dev
deepin-shortcut-viewer
deepin-terminal
+ disomaster
dtkcore
dtkwidget
ffmpegthumbnailer
@@ -238,7 +240,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "File manager and desktop module for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix
index b36d87604e74..f5e5f23cc2cd 100644
--- a/pkgs/desktops/deepin/dde-launcher/default.nix
+++ b/pkgs/desktops/deepin/dde-launcher/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "dde-launcher";
- version = "4.6.13";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1lwwn2qjbd4i7wx18mi8n7hzdh832i3kdadrivr10sbafdank7ky";
+ sha256 = "0zh6bb0r3pgjrnw9rba46ghdzza1ka1mv7r1znf8gw24wsjgjcpn";
};
nativeBuildInputs = [
@@ -63,7 +63,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin Desktop Environment launcher module";
diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix
index 5397439949b3..778481fc6516 100644
--- a/pkgs/desktops/deepin/dde-network-utils/default.nix
+++ b/pkgs/desktops/deepin/dde-network-utils/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "dde-network-utils";
- version = "0.1.4";
+ version = "5.0.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0nj9lf455lf2hyqv6xwhm4vrr825ldbl83azzrrzqs6p781x65i1";
+ sha256 = "0670kfnkplf7skkd1ql6y9x15kmrcbdv1005qwkg4vn8hic6s0z3";
};
nativeBuildInputs = [
@@ -41,7 +41,7 @@ mkDerivation rec {
searchHardCodedPaths $out # for debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin network utils";
diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
index 9d181c188d4d..7aaddf538723 100644
--- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix
+++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "dde-polkit-agent";
- version = "0.2.10";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0syg121slpd6d9xpifgcf85lg9ca0k96cl1g3rjvsmczs2d2ffgf";
+ sha256 = "00p8syx6rfwhq7wdsk37hm9mvwd0kwj9h0s39hii892h1psd84q9";
};
nativeBuildInputs = [
@@ -38,7 +38,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "PolicyKit agent for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
index a0e1e35ad859..ba237bcf7554 100644
--- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dde-qt-dbus-factory";
- version = "1.1.5";
+ version = "5.0.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1jzfblsmnfpgym95mmbd8mjkk8wqqfb0kz6n6fy742hmqlzrpsj7";
+ sha256 = "1wbh4jgvy3c09ivy0vvfk0azkg4d2sv37y23c9rq49jb3sakcjgm";
};
nativeBuildInputs = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Qt DBus interface library for Deepin software";
diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix
index bad409303d98..699403567b7b 100644
--- a/pkgs/desktops/deepin/dde-session-ui/default.nix
+++ b/pkgs/desktops/deepin/dde-session-ui/default.nix
@@ -7,13 +7,13 @@
mkDerivation rec {
pname = "dde-session-ui";
- version = "4.9.12";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "00i45xv87wx9cww1d445lg6zjbhda5kki8nhsaav8gf2d4cmwzf4";
+ sha256 = "1gy9nlpkr9ayrs1z2dvd7h0dqlw6fq2m66d9cs48qyfkr6c8l9jj";
};
nativeBuildInputs = [
@@ -89,8 +89,8 @@ mkDerivation rec {
substituteInPlace lightdm-deepin-greeter/scripts/lightdm-deepin-greeter --replace "/usr/bin/lightdm-deepin-greeter" "$out/bin/lightdm-deepin-greeter"
substituteInPlace session-ui-guardien/guardien.cpp --replace "dde-lock" "$out/bin/dde-lock"
substituteInPlace session-ui-guardien/guardien.cpp --replace "dde-shutdown" "$out/bin/dde-shutdown"
- substituteInPlace session-widgets/lockworker.cpp --replace "dde-switchtogreeter" "$out/bin/dde-switchtogreeter"
- substituteInPlace session-widgets/lockworker.cpp --replace "which" "${which}/bin/which"
+ substituteInPlace dde-lock/lockworker.cpp --replace "dde-switchtogreeter" "$out/bin/dde-switchtogreeter"
+ substituteInPlace dde-lock/lockworker.cpp --replace "which" "${which}/bin/which"
substituteInPlace session-widgets/userinfo.cpp --replace "/usr/share/wallpapers/deepin" "${deepin-wallpapers}/share/wallpapers/deepin"
substituteInPlace widgets/fullscreenbackground.cpp --replace "/usr/share/wallpapers/deepin" "${deepin-wallpapers}/share/wallpapers/deepin"
substituteInPlace widgets/kblayoutwidget.cpp --replace "setxkbmap" "${setxkbmap}/bin/setxkbmap"
@@ -113,7 +113,7 @@ mkDerivation rec {
searchHardCodedPaths $out # debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin desktop-environment - Session UI module";
diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix
index 7c88102c5f3a..184153a3981d 100644
--- a/pkgs/desktops/deepin/deepin-anything/default.nix
+++ b/pkgs/desktops/deepin/deepin-anything/default.nix
@@ -3,7 +3,7 @@
mkDerivation rec {
pname = "deepin-anything";
- version = "0.1.0";
+ version = "5.0.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
@@ -51,7 +51,7 @@ mkDerivation rec {
searchHardCodedPaths $modsrc # for debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin file search tool";
diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix
index 97d2b53da70a..26f2b99612e6 100644
--- a/pkgs/desktops/deepin/deepin-calculator/default.nix
+++ b/pkgs/desktops/deepin/deepin-calculator/default.nix
@@ -3,13 +3,13 @@
mkDerivation rec {
pname = "deepin-calculator";
- version = "1.0.11";
+ version = "5.0.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "10bfq0h8v0a8i46gcbsy79l194g8sc0ysg289ndrra209fhwlidq";
+ sha256 = "0f26y7b3giybybhvlzbnwcw8kidzvhq66h0c15n9ww81gnlqf7v5";
};
nativeBuildInputs = [
@@ -36,7 +36,7 @@ mkDerivation rec {
searchHardCodedPaths $out # debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Easy to use calculator for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
index ba826eb9063f..0ca42a887611 100644
--- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "deepin-desktop-base";
- version = "2019.06.19";
+ version = "2019.07.10";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1r158x4z4qalv4q1ni3aln05krdzblvr7y6wyciwl7cr5ag1i1jy";
+ sha256 = "0rs7bjy35k5gc5nbba1cijhdz16zny30lgmcf2ckx1pkdszk2vra";
};
nativeBuildInputs = [ deepin.setupHook ];
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Base assets and definitions for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
index 4f2427e8237a..579ceb442be6 100644
--- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
+++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, python3, gnome3, glib, deepin-gtk-theme,
+{ stdenv, fetchFromGitHub, python3, dconf, glib, deepin-gtk-theme,
deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }:
stdenv.mkDerivation rec {
pname = "deepin-desktop-schemas";
- version = "3.13.6";
+ version = "3.13.9";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "03jqb47kjyb9b43m2yincfjn2i43ma1pn1hddyicrrpg937caa81";
+ sha256 = "1c69j6s7561zb1hrd1j3ihji1nvpgfzfgnp6svsv8jd8dg8vs8l1";
};
nativeBuildInputs = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome3.dconf
+ dconf
deepin-gtk-theme
deepin-icon-theme
deepin-sound-theme
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "GSettings deepin desktop-wide schemas";
diff --git a/pkgs/desktops/deepin/deepin-editor/default.nix b/pkgs/desktops/deepin/deepin-editor/default.nix
new file mode 100644
index 000000000000..0aea9558ec00
--- /dev/null
+++ b/pkgs/desktops/deepin/deepin-editor/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, deepin,
+ dtkcore, dtkwidget, kcodecs, qttools, syntax-highlighting,
+ wrapQtAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ name = "${pname}-${version}";
+ pname = "deepin-editor";
+ version = "1.2.9.1";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "0g7c3adqwn8i4ndxdrzibahr75dddz1fiqnsh3bjj1jjr86rv4ks";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ qttools
+ wrapQtAppsHook
+ deepin.setupHook
+ ];
+
+ buildInputs = [
+ dtkcore
+ dtkwidget
+ kcodecs
+ syntax-highlighting
+ ];
+
+ postPatch = ''
+ searchHardCodedPaths # debugging
+
+ patchShebangs translate_generation.sh
+
+ fixPath $out /usr \
+ CMakeLists.txt \
+ dedit/main.cpp \
+ src/resources/settings.json \
+ src/thememodule/themelistmodel.cpp
+
+ substituteInPlace deepin-editor.desktop \
+ --replace "Exec=deepin-editor" "Exec=$out/bin/deepin-editor"
+
+ substituteInPlace src/editwrapper.cpp \
+ --replace "appExec = \"deepin-editor\"" "appExec = \"$out/bin/deepin-editor\""
+ '';
+
+ postFixup = ''
+ searchHardCodedPaths $out # debugging
+ '';
+
+ passthru.updateScript = deepin.updateScript { inherit name; };
+
+ meta = with stdenv.lib; {
+ description = "Simple editor for Deepin Desktop Environment";
+ homepage = https://github.com/linuxdeepin/deepin-editor;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo worldofpeace ];
+ };
+}
diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
index 67fcc36bcefc..915cb8c6ac76 100644
--- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
+++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin Internationalization utilities";
diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
index 8e2469a2c788..7c10e8732094 100644
--- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=${placeholder "out"}" ];
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin GTK Theme";
diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
index 51b67e055541..f8258a1d8cdc 100644
--- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Icons for the Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
index 733f4846f5cf..aa13eb76055c 100644
--- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "deepin-image-viewer";
- version = "1.3.17";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0hz4f1kqcycyvggwfzpkblhhha87rqd427hq0mf31jfh5x17ymnh";
+ sha256 = "01524hfdy3wvdf07n9b3qb8jdpxzg2hwjpl4gxvr68qws5nbnb3c";
};
nativeBuildInputs = [
@@ -41,7 +41,7 @@ mkDerivation rec {
-e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix,"
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Image Viewer for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix
index 9aef8a15eb94..b23a7491aaf6 100644
--- a/pkgs/desktops/deepin/deepin-menu/default.nix
+++ b/pkgs/desktops/deepin/deepin-menu/default.nix
@@ -34,7 +34,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin menu service";
diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
index 046f589263bd..b3930c8e399e 100644
--- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
+++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras,
+{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkgconfig, qttools, qtx11extras,
dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio,
libdvdnav, libdvdread, xorg, deepin }:
mkDerivation rec {
pname = "deepin-movie-reborn";
- version = "3.2.24";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "16mxym7dm6qk90q2w7xqm62047rq0lirrjmnnpaxshzaww9gngkh";
+ sha256 = "0cly8q0514a58s3h3wsvx9yxar7flz6i2q8xkrkfjias22b3z7b0";
};
outputs = [ "out" "dev" ];
@@ -19,6 +19,7 @@ mkDerivation rec {
cmake
pkgconfig
qttools
+ deepin.setupHook
];
buildInputs = [
@@ -37,14 +38,27 @@ mkDerivation rec {
xorg.xcbproto
];
+ patches = [
+ # fix: build failed if cannot find dtk-settings tool
+ (fetchpatch {
+ url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/fbb307b.patch";
+ sha256 = "0915za0khki0729rvcfpxkh6vxhqwc47cgcmjc90kfq1004221vx";
+ })
+ ];
+
NIX_LDFLAGS = "-ldvdnav";
+
postPatch = ''
- sed -i src/CMakeLists.txt -e "s,/usr/lib/dtk2,${dtkcore}/lib/dtk2,"
+ searchHardCodedPaths # debugging
+
sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,'
+
+ substituteInPlace src/deepin-movie.desktop \
+ --replace "Exec=deepin-movie" "Exec=$out/bin/deepin-movie"
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin movie player";
diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix
index e77aa5e68c63..374af8be2be8 100644
--- a/pkgs/desktops/deepin/deepin-screenshot/default.nix
+++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix
@@ -4,13 +4,13 @@
mkDerivation rec {
pname = "deepin-screenshot";
- version = "4.2.1";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "16wy1ywp4lm7fg488laqxgxpir745rbpj9z410r6x7krpgjds189";
+ sha256 = "0h1kcf9i8q6rz4jhym3yf84zr6svzff0hh9sl7b24sflzkxx6zwk";
};
nativeBuildInputs = [
@@ -48,7 +48,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Easy-to-use screenshot tool for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
index 62c6c7ed9259..a8d143ff8b0c 100644
--- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
+++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix
@@ -3,7 +3,7 @@
mkDerivation rec {
pname = "deepin-shortcut-viewer";
- version = "1.3.5";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
@@ -25,7 +25,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Pop-up shortcut viewer for Deepin applications";
diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
index e61e91fc87c7..378945ac1dde 100644
--- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix
+++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=${placeholder "out"}" ];
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin sound theme";
diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix
index bb2ab7bc8a16..049c856419d6 100644
--- a/pkgs/desktops/deepin/deepin-terminal/default.nix
+++ b/pkgs/desktops/deepin/deepin-terminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_44,
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_40,
gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib,
libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1,
libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2,
@@ -6,20 +6,20 @@
stdenv.mkDerivation rec {
pname = "deepin-terminal";
- version = "3.2.6";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = "deepin-terminal";
rev = version;
- sha256 = "09s5gvzfxfb353kb61x1b6z3h2aqgln3s3mah3f3zkf5y8hrp2pj";
+ sha256 = "1929saj828b438d07caw3cjhqq60v6gni7mi3fqrg9wdjz81xwv7";
};
nativeBuildInputs = [
pkgconfig
cmake
ninja
- vala_0_44 # xcb.vapi:411.3-411.48: error: missing return statement at end of subroutine body
+ vala_0_40 # xcb.vapi:411.3-411.48: error: missing return statement at end of subroutine body
gettext
libselinux libsepol utillinux # required by gio
deepin.setupHook
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
"-DVERSION=${version}"
];
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Default terminal emulator for Deepin";
diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix
index 299db5336746..3aa6003592b6 100644
--- a/pkgs/desktops/deepin/deepin-turbo/default.nix
+++ b/pkgs/desktops/deepin/deepin-turbo/default.nix
@@ -31,7 +31,7 @@ mkDerivation rec {
searchHardCodedPaths $out # for debugging
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "A daemon that helps to launch applications faster";
diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix
index e822cf6269dd..6baee0eda110 100644
--- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix
+++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
$out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Wallpapers for Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix
index 5d4b6f732448..57b0b35a5327 100644
--- a/pkgs/desktops/deepin/default.nix
+++ b/pkgs/desktops/deepin/default.nix
@@ -23,6 +23,7 @@ let
deepin-calculator = callPackage ./deepin-calculator { };
deepin-desktop-base = callPackage ./deepin-desktop-base { };
deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { };
+ deepin-editor = callPackage ./deepin-editor { };
deepin-gettext-tools = callPackage ./deepin-gettext-tools { };
deepin-gtk-theme = callPackage ./deepin-gtk-theme { };
deepin-icon-theme = callPackage ./deepin-icon-theme { };
@@ -37,6 +38,7 @@ let
};
deepin-turbo = callPackage ./deepin-turbo { };
deepin-wallpapers = callPackage ./deepin-wallpapers { };
+ disomaster = callPackage ./disomaster { };
dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
dtkcore = callPackage ./dtkcore { };
dtkwidget = callPackage ./dtkwidget { };
diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/pkgs/desktops/deepin/disomaster/default.nix
new file mode 100644
index 000000000000..3ce2adba098d
--- /dev/null
+++ b/pkgs/desktops/deepin/disomaster/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtbase, libisoburn, deepin }:
+
+mkDerivation rec {
+ pname = "disomaster";
+ version = "5.0.0";
+
+ src = fetchFromGitHub {
+ owner = "linuxdeepin";
+ repo = pname;
+ rev = version;
+ sha256 = "13144gq0mpbpclzxc79fb1kirh0vvi50jvjnbpla9s8lvh59xl62";
+ };
+
+ nativeBuildInputs = [
+ deepin.setupHook
+ pkgconfig
+ qmake
+ ];
+
+ buildInputs = [
+ libisoburn
+ qtbase
+ ];
+
+ postPatch = ''
+ searchHardCodedPaths # debugging
+
+ sed -i '/^QMAKE_PKGCONFIG_DESTDIR/i QMAKE_PKGCONFIG_PREFIX = $$PREFIX' \
+ libdisomaster/libdisomaster.pro
+ '';
+
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
+
+ meta = with stdenv.lib; {
+ description = "A libisoburn wrapper for Qt";
+ homepage = https://github.com/linuxdeepin/disomaster;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ romildo worldofpeace ];
+ };
+}
diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
index f645be0f4d9b..ed01cd92c7c7 100644
--- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
+++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "dpa-ext-gnomekeyring";
- version = "0.1.0";
+ version = "5.0.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "GNOME keyring extension for dde-polkit-agent";
diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix
index 2ed10f993681..8ae1c6f0952f 100644
--- a/pkgs/desktops/deepin/dtkcore/default.nix
+++ b/pkgs/desktops/deepin/dtkcore/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "dtkcore";
- version = "2.0.14";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "0yc6zx8rhzg9mj2brggcsr1jy1pzfvgqy1h305y2dwnx5haazd04";
+ sha256 = "0xdh6mmrv8yr6mjmlwj0fv037parkkwfwlaibcbrskwxqp9iri1y";
};
nativeBuildInputs = [
@@ -31,21 +31,22 @@ mkDerivation rec {
qmakeFlags = [
"DTK_VERSION=${version}"
+ "LIB_INSTALL_DIR=${placeholder "out"}/lib"
"MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs"
];
postFixup = ''
- chmod +x $out/lib/dtk2/*.py
- wrapPythonProgramsIn "$out/lib/dtk2" "$out $pythonPath"
+ chmod +x $out/lib/libdtk-${version}/DCore/bin/*.py
+ wrapPythonProgramsIn "$out/lib/libdtk-${version}/DCore/bin" "$out $pythonPath"
searchHardCodedPaths $out # debugging
'';
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
- description = "Deepin tool kit core modules";
+ description = "Deepin tool kit core library";
homepage = https://github.com/linuxdeepin/dtkcore;
license = licenses.gpl3;
platforms = platforms.linux;
diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix
index 54c4163fcd1d..751fe02562f0 100644
--- a/pkgs/desktops/deepin/dtkwidget/default.nix
+++ b/pkgs/desktops/deepin/dtkwidget/default.nix
@@ -4,13 +4,13 @@
mkDerivation rec {
pname = "dtkwidget";
- version = "2.0.14";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "11ws0rl7rhlgwbqd4nqpqxhngf4lcyfrrdq33wzxwdlk33d69i1h";
+ sha256 = "0yqrm1p0k1843ldvcd79dxl26ybyl5kljl6vwhzc58sx7pw4qmvh";
};
nativeBuildInputs = [
@@ -40,7 +40,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin graphical user interface library";
diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix
index 4807c3d312b5..ead96fe25338 100644
--- a/pkgs/desktops/deepin/dtkwm/default.nix
+++ b/pkgs/desktops/deepin/dtkwm/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore,
- deepin }:
+{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qmake, qtx11extras, dtkcore, deepin }:
mkDerivation rec {
pname = "dtkwm";
- version = "2.0.11";
+ version = "2.0.12";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "10l89i84vsh5knq9wg2php7vfg5rj5c9hrrl9rjlcidn1rz8yx6f";
+ sha256 = "0rdzzqsggqarldwb4yp5s4sf5czicgxbdmibjn0pw32129r2d1g3";
};
nativeBuildInputs = [
@@ -22,6 +21,14 @@ mkDerivation rec {
qtx11extras
];
+ patches = [
+ # Set DTK_MODULE_NAME
+ (fetchpatch {
+ url = "https://github.com/linuxdeepin/dtkwm/commit/2490891a.patch";
+ sha256 = "0krydxjpnaihkgs1n49b6mcf3rd3lkispcnkb1j5vpfs9hp9f48j";
+ })
+ ];
+
outRef = placeholder "out";
qmakeFlags = [
@@ -30,7 +37,7 @@ mkDerivation rec {
"LIB_INSTALL_DIR=${outRef}/lib"
];
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Deepin graphical user interface library";
diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix
index d302cc3417f2..0b7c6cfdc914 100644
--- a/pkgs/desktops/deepin/go-dbus-factory/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sed -i -e 's:/share/gocode:/share/go:' Makefile
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "GoLang DBus factory for the Deepin Desktop Environment";
diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix
index 125629764902..fed8b6f2c6ae 100644
--- a/pkgs/desktops/deepin/go-dbus-generator/default.nix
+++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "go-dbus-generator";
- version = "0.6.6";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"GOCACHE=$(TMPDIR)/go-cache"
];
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Convert dbus interfaces to go-lang or qml wrapper code";
diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix
index 2f431bd941b8..5a10efa1932b 100644
--- a/pkgs/desktops/deepin/go-gir-generator/default.nix
+++ b/pkgs/desktops/deepin/go-gir-generator/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
"GOCACHE=$(TMPDIR)/go-cache"
];
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Generate static golang bindings for GObject";
diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix
index fff92b595f8b..730412a58f31 100644
--- a/pkgs/desktops/deepin/go-lib/default.nix
+++ b/pkgs/desktops/deepin/go-lib/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "go-lib";
- version = "1.10.2";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "05z7ayl23cm8mbn4vkn3isy5kgwxljc26ifmzrhmnqm5yibd6lsf";
+ sha256 = "0j1ik5hfrysqgync8cyv815cwyjn67k8n69x6llxdp39jli1k8q0";
};
buildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
rm -r $out/share/go/src/pkg.deepin.io/lib/debian
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Go bindings for Deepin Desktop Environment development";
diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix
index ffbc230d2e2a..38ca4f3b6766 100644
--- a/pkgs/desktops/deepin/qcef/default.nix
+++ b/pkgs/desktops/deepin/qcef/default.nix
@@ -40,7 +40,7 @@ in
mkDerivation rec {
pname = "qcef";
- version = "1.1.6";
+ version = "1.1.7";
srcs = [
(fetchFromGitHub {
@@ -53,8 +53,8 @@ mkDerivation rec {
(fetchFromGitHub {
owner = "linuxdeepin";
repo = "cef-binary";
- rev = "059a0c9cef4e289a50dc7a2f4c91fe69db95035e";
- sha256 = "1h7cq63n94y2a6fprq4g63admh49rcci7avl5z9kdimkhqb2jb84";
+ rev = "fecf00339545d2819224333cc506d5aa22ae8008";
+ sha256 = "06i1zc7ciy7d0qhndiwpjrsii0x5i5hg9j6ddi4w5yf1nzgsrj4n";
name = "cef-binary";
})
];
@@ -90,7 +90,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Qt5 binding of Chromium Embedded Framework";
diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
index f382e605bac3..6b1f212716cf 100644
--- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
+++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix
@@ -43,7 +43,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Qt platform theme integration plugin for DDE";
diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix
index 97e60be6d678..5de46f8a1dd4 100644
--- a/pkgs/desktops/deepin/qt5integration/default.nix
+++ b/pkgs/desktops/deepin/qt5integration/default.nix
@@ -4,7 +4,7 @@
mkDerivation rec {
pname = "qt5integration";
- version = "0.3.12";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
@@ -40,7 +40,7 @@ mkDerivation rec {
enableParallelBuilding = true;
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "Qt platform theme integration plugins for DDE";
diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix
index 51c38f6d3474..7972d8f9a3f7 100644
--- a/pkgs/desktops/deepin/udisks2-qt5/default.nix
+++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix
@@ -2,13 +2,13 @@
mkDerivation rec {
pname = "udisks2-qt5";
- version = "0.0.1";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
- sha256 = "1gk4jmq7mrzk181r6man2rz1iyzkfasz7053a30h4nn24mq8ikig";
+ sha256 = "0mqxm6ixzpbg0rr6ly2kvnkpag8gjza67ya7jv4i4rihbq1d0wzi";
};
nativeBuildInputs = [
@@ -28,7 +28,7 @@ mkDerivation rec {
searchHardCodedPaths $out
'';
- passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
+ passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; };
meta = with stdenv.lib; {
description = "UDisks2 D-Bus interfaces binding for Qt5";
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 153616a3bc8e..355cc58f348f 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, SDL, SDL2, alsaLib, avahi, bullet, check, curl, dbus,
- doxygen, expat, fontconfig, freetype, fribidi, ghostscript, giflib,
- glib, gst_all_1, gtk3, harfbuzz, ibus, jbig2dec, libGL, libdrm, libinput,
- libjpeg, libpng, libpulseaudio, libraw, librsvg, libsndfile,
- libspectre, libtiff, libwebp, libxkbcommon, luajit, lz4, mesa,
- openjpeg, openssl, poppler, python27Packages, systemd, udev,
- utillinux, writeText, xorg, zlib
+{ stdenv, fetchurl, meson, ninja, pkgconfig, SDL, SDL2, alsaLib,
+ avahi, bullet, check, curl, dbus, doxygen, expat, fontconfig,
+ freetype, fribidi, ghostscript, giflib, glib, gst_all_1, gtk3,
+ harfbuzz, ibus, jbig2dec, libGL, libdrm, libinput, libjpeg, libpng,
+ libpulseaudio, libraw, librsvg, libsndfile, libspectre, libtiff,
+ libwebp, libxkbcommon, luajit, lz4, mesa, openjpeg, openssl,
+ poppler, python27Packages, systemd, udev, utillinux, writeText,
+ xorg, zlib
}:
stdenv.mkDerivation rec {
pname = "efl";
- version = "1.23.1";
+ version = "1.23.3";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0q9g4j7k10s1a8rv2ca9v9lydh7ml3zsrqvgncc4qhvdl76208nn";
+ sha256 = "00b9lp3h65254kdb1ys15fv7p3ln7qsvf15jkw4kli5ymagadkjk";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix
index 3563b9aabc1c..b00b3d7a8462 100644
--- a/pkgs/desktops/enlightenment/ephoto.nix
+++ b/pkgs/desktops/enlightenment/ephoto.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Image viewer and editor written using the Enlightenment Foundation Libraries";
- homepage = http://smhouston.us/ephoto/;
+ homepage = https://smhouston.us/projects/ephoto/;
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.romildo ];
diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 672e1b3da73c..ee140e091505 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "terminology";
- version = "1.5.0";
+ version = "1.6.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
- sha256 = "0v4amfg8ji0mb6j7kcxh3wz1xw5zyxg4rw6ylx17rfw2nc1yamfy";
+ sha256 = "0xxx4xyhis6fy3frgb34ip0aj0kc4zashf60gzbxmq5gadbb0p5r";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 6cc6848b316f..d0a7a890355a 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -37,9 +37,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { };
- gnome_vfs = callPackage ./platform/gnome-vfs {
- openssl = pkgs.openssl_1_0_2;
- };
+ gnome_vfs = callPackage ./platform/gnome-vfs { };
libgnome = callPackage ./platform/libgnome { };
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index c15f43b542aa..7196840978f4 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, bzip2, openssl, dbus-glib
, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
stdenv.mkDerivation rec {
@@ -20,6 +20,18 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ GConf glib ];
+ # struct SSL is opaque in openssl-1.1; and the SSL_free() man page
+ # says that one should not free members of it manually (in both
+ # the openssl-1.0 and openssl-1.1 man pages).
+ # https://bugs.gentoo.org/592540
+ patches = [ (fetchpatch {
+ name = "gnome-vfs-2.24.4-openssl-1.1.patch";
+ url = "https://bugs.gentoo.org/attachment.cgi?id=535944";
+ sha256 = "1q4icapvmwmd5rjah7rr0bqazzk5cg36znmjlpra20n9y27nz040";
+ extraPrefix = "";
+ })
+ ];
+
postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i ";
doCheck = false; # needs dbus daemon
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
index 27caaa70634f..522c5ce6b061 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
@@ -1,32 +1,58 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk2, libGLU_combined, pango, pangox_compat, xorg }:
+{ stdenv
+, fetchFromGitLab
+, pkgconfig
+, gtk-doc
+, autoconf
+, automake
+, which
+, libtool
+, gobject-introspection
+, glib
+, gtk2
+, libGLU
+, libGL
+, pango
+, xorg
+}:
stdenv.mkDerivation rec {
- name = "gtkglext-1.2.0";
+ pname = "gtkglext";
+ version = "unstable-2019-12-19";
- src = fetchurl {
- url = "mirror://gnome/sources/gtkglext/1.2/${name}.tar.bz2";
- sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n";
+ src = fetchFromGitLab {
+ domain = "gitlab.gnome.org";
+ owner = "Archive";
+ repo = pname;
+ # build fixes
+ # https://gitlab.gnome.org/Archive/gtkglext/merge_requests/1
+ rev = "ad95fbab68398f81d7a5c895276903b0695887e2";
+ sha256 = "1d1bp4635nla7d07ci40c7w4drkagdqk8wg93hywvdipmjfb4yqb";
};
- buildInputs = with xorg;
- [ pkgconfig glib gtk2 libGLU_combined pango libX11 libXmu ];
- propagatedBuildInputs = [ pangox_compat ];
-
- patches = [
- # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and
- # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays.
- (fetchpatch {
- name = "02_fix_gtk-2.20_deprecated_symbols.diff";
- url = https://git.gnome.org/browse/gtkglext/patch/?id=d8f285d1397f6c41099c67e668288eecc1cdae67;
- sha256 = "1zxak73plhy3m6psil1q9ssvjh9aqrif7kcbcz69y480qfb4ja08";
- })
- # Fix build with glibc ≥ 2.27
- (fetchurl {
- url = https://salsa.debian.org/gewo/gtkglext/raw/3b002677c907890c7de002c9f5b4b3ec71d11b31/debian/patches/04_glibc2.27-ftbfs.diff;
- sha256 = "1l1swkjkai6pnah23xfsfpbq2fgbhp5pzj3l0ybsx6b858cxqzj5";
- })
+ nativeBuildInputs = [
+ pkgconfig
+ gtk-doc
+ autoconf
+ automake
+ which
+ libtool
+ gobject-introspection
];
+ buildInputs = [
+ glib
+ gtk2
+ libGLU
+ libGL
+ pango
+ xorg.libX11
+ xorg.libXmu
+ ];
+
+ preConfigure = ''
+ NOCONFIGURE=1 ./autogen.sh
+ '';
+
meta = with stdenv.lib; {
homepage = https://projects.gnome.org/gtkglext/;
description = "GtkGLExt, an OpenGL extension to GTK";
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index c801657f74bf..0b833a876b61 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -17,13 +17,13 @@
python3.pkgs.buildPythonApplication rec {
name = "accerciser-${version}";
- version = "3.34.1";
+ version = "3.34.2";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1awf7fcm52r23s51gllyybhywf2kljqkaw4znblajph9sawnfs3l";
+ sha256 = "1n6sy95j0r0v01sc9rbbpzikq2z4z42j8ah73hzmjdmck4iniik4";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index 701f894939e1..a8c5d93b88d8 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -43,11 +43,11 @@
stdenv.mkDerivation rec {
pname = "evolution";
- version = "3.34.1";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0hmxz3b9paqlpfjpqn379a8c01z3gb8lz0jgxxpgn6iygzfr4sk5";
+ sha256 = "164vy8h432pjglafn8y2ms4gsvk3kbgc63h5qp0mk5dv4smsp29c";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 36b89a310522..387f0ebdc446 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "file-roller";
- version = "3.32.2";
+ version = "3.32.3";
src = fetchurl {
url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0w8s6hakgsvb2nqwbv0lr8ki4cbf1pz5z3qwkb0b2k7ppbh7j2n6";
+ sha256 = "0ap2hxvjljh4p6wsd9ikh2my3vsxp9r2nvjxxj3v87nwfyw1y4dy";
};
LANG = "en_US.UTF-8"; # postinstall.py
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix
index 5115c2d8fb4f..6ea04910d230 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "gedit";
- version = "3.34.0";
+ version = "3.34.1";
src = fetchurl {
url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0zjh3p3lns7a7kx3g3v7gkgcqdzyx1zyv8ssr6d5ljfb7hfyb59y";
+ sha256 = "1inm50sdfw63by1lf4f1swb59mpyxlly0g5rdg99j5l3357fzygb";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index c48e6a7446f4..d59746adc3d9 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -1,37 +1,118 @@
-{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, itstool, libvirt-glib
-, glib, gobject-introspection, libxml2, gtk3, gtk-vnc, freerdp, libvirt, spice-gtk, python3
-, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
-, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
-, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, libsecret
-, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, wrapGAppsHook
+, pkgconfig
+, gettext
+, itstool
+, libvirt-glib
+, glib
+, gobject-introspection
+, libxml2
+, gtk3
+, gtk-vnc
+, freerdp
+, libvirt
+, spice-gtk
+, python3
+, spice-protocol
+, libsoup
+, libosinfo
+, systemd
+, tracker
+, tracker-miners
+, vala
+, libcap
+, yajl
+, gmp
+, gdbm
+, cyrus_sasl
+, gnome3
+, librsvg
+, desktop-file-utils
+, mtools
+, cdrkit
+, libcdio
+, libusb
+, libarchive
+, acl
+, libgudev
+, libsecret
+, libcap_ng
+, numactl
+, xen
+, libapparmor
+, json-glib
+, webkitgtk
+, vte
+, glib-networking
}:
-let
- version = "3.34.1";
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "gnome-boxes";
- inherit version;
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1758k5b79kyywdg67b4byqhva9045i13lzg5r62my950c4c2p0pc";
+ sha256 = "1rqdjf61cbi3zcpzr6cfkj3lcfrdlhs20bl65lxw2xrwk4jn0ph5";
};
doCheck = true;
nativeBuildInputs = [
- meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobject-introspection desktop-file-utils python3
+ desktop-file-utils
+ gettext
+ gobject-introspection
+ itstool
+ meson
+ ninja
+ pkgconfig
+ python3
+ vala
+ wrapGAppsHook
];
# Required for USB redirection PolicyKit rules file
- propagatedUserEnvPkgs = [ spice-gtk ];
+ propagatedUserEnvPkgs = [
+ spice-gtk
+ ];
buildInputs = [
- libvirt-glib glib gtk3 gtk-vnc freerdp libxml2
- libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
- tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
- gnome3.adwaita-icon-theme librsvg acl libgudev libsecret
- libcap_ng numactl xen libapparmor vte
+ acl
+ cyrus_sasl
+ freerdp
+ gdbm
+ glib
+ glib-networking
+ gmp
+ gnome3.adwaita-icon-theme
+ gtk-vnc
+ gtk3
+ json-glib
+ libapparmor
+ libarchive
+ libcap
+ libcap_ng
+ libgudev
+ libosinfo
+ librsvg
+ libsecret
+ libsoup
+ libusb
+ libvirt
+ libvirt-glib
+ libxml2
+ numactl
+ spice-gtk
+ spice-protocol
+ systemd
+ tracker
+ tracker-miners
+ vte
+ webkitgtk
+ xen
+ yajl
];
preFixup = ''
@@ -45,8 +126,8 @@ in stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
- packageName = "gnome-boxes";
- attrPath = "gnome3.gnome-boxes";
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
};
};
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index 3a7e1473332c..5aa39e09cd6f 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -1,36 +1,86 @@
-{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs
-, pkgconfig, gtk3, glib, tracker, tracker-miners
-, itstool, libxslt, webkitgtk, libgdata
-, gnome-desktop, libzapojit, libgepub
-, gnome3, gdk-pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42
-, gobject-introspection, inkscape, poppler_utils
-, desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }:
+{ stdenv
+, meson
+, ninja
+, gettext
+, fetchurl
+, evince
+, gjs
+, pkgconfig
+, gtk3
+, glib
+, tracker
+, tracker-miners
+, itstool
+, libxslt
+, webkitgtk
+, libgdata
+, gnome-desktop
+, libzapojit
+, libgepub
+, gnome3
+, gdk-pixbuf
+, libsoup
+, docbook_xsl
+, docbook_xml_dtd_42
+, gobject-introspection
+, inkscape
+, poppler_utils
+, desktop-file-utils
+, wrapGAppsHook
+, python3
+, gsettings-desktop-schemas
+}:
stdenv.mkDerivation rec {
pname = "gnome-documents";
- version = "3.33.90";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0l9g10i380bnjp1y3pslsy8ph1hd5x1d57dadvq70p5ki4r3qjaw";
+ sha256 = "1qph567mapg3s1a26k7b8y57g9bklhj2mh8xm758z9zkms20xafq";
};
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ gettext
+ itstool
+ libxslt
+ desktop-file-utils
+ docbook_xsl
+ docbook_xml_dtd_42
+ wrapGAppsHook
+ python3
+
+ # building getting started
+ inkscape
+ poppler_utils
+ ];
+
+ buildInputs = [
+ gtk3
+ glib
+ gsettings-desktop-schemas
+ gdk-pixbuf
+ gnome3.adwaita-icon-theme
+ evince
+ libsoup
+ webkitgtk
+ gjs
+ gobject-introspection
+ tracker
+ tracker-miners
+ libgdata
+ gnome-desktop
+ libzapojit
+ libgepub
+ ];
+
doCheck = true;
mesonFlags = [
- "-Dgetting-started=true"
- ];
-
- nativeBuildInputs = [
- meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3
- inkscape poppler_utils # building getting started
- ];
- buildInputs = [
- gtk3 glib gsettings-desktop-schemas
- gdk-pixbuf gnome3.adwaita-icon-theme evince
- libsoup webkitgtk gjs gobject-introspection
- tracker tracker-miners libgdata
- gnome-desktop libzapojit libgepub
+ "-Dgetting_started=true"
];
postPatch = ''
@@ -44,13 +94,13 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = gnome3.updateScript {
- packageName = "gnome-documents";
- attrPath = "gnome3.gnome-documents";
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
};
};
meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Documents;
+ homepage = "https://wiki.gnome.org/Apps/Documents";
description = "Document manager application designed to work with GNOME 3";
maintainers = gnome3.maintainers;
license = licenses.gpl2;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 49b44f5f2838..12dba8b41e13 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -5,13 +5,13 @@
let
pname = "gnome-maps";
- version = "3.34.1";
+ version = "3.34.2";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "03nswj60lqznr2j3ld2lgjzr4j9x2gblqx2ip4l2yxnm9kgbm14s";
+ sha256 = "00xslcnhhwslqglgfv2im7vq3awa49y2jxzr8wsby7f713k28vf5";
};
doCheck = true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 204d0a8982e2..61ceb55aaf07 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -1,29 +1,85 @@
-{ stdenv, meson, ninja, gettext, fetchurl, gdk-pixbuf, tracker
-, libxml2, python3, libnotify, wrapGAppsHook, libmediaart
-, gobject-introspection, gnome-online-accounts, grilo, grilo-plugins
-, pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib
-, itstool, gnome3, gst_all_1, libdazzle, libsoup, gsettings-desktop-schemas }:
+{ stdenv
+, meson
+, ninja
+, gettext
+, fetchurl
+, gdk-pixbuf
+, tracker
+, libxml2
+, python3
+, libnotify
+, wrapGAppsHook
+, libmediaart
+, gobject-introspection
+, gnome-online-accounts
+, grilo
+, grilo-plugins
+, pkgconfig
+, gtk3
+, glib
+, desktop-file-utils
+, appstream-glib
+, itstool
+, gnome3
+, gst_all_1
+, libdazzle
+, libsoup
+, gsettings-desktop-schemas
+}:
python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
- version = "3.34.0";
+ version = "3.34.2";
format = "other";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1a566ifx08clfm22qzdh1i6w8cr2kv7avqzkk6zgc5adba0vmzx4";
+ sha256 = "19d28ndk3i6b5dqgfv7jr2cpk86vxh0mx1xzagb43xpxaaq02jdr";
};
- nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
- buildInputs = with gst_all_1; [
- gtk3 glib libmediaart gnome-online-accounts gobject-introspection
- gdk-pixbuf gnome3.adwaita-icon-theme python3
- grilo grilo-plugins libnotify libdazzle libsoup
- gsettings-desktop-schemas tracker
- gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
+ nativeBuildInputs = [
+ meson
+ ninja
+ gettext
+ itstool
+ pkgconfig
+ libxml2
+ wrapGAppsHook
+ desktop-file-utils
+ appstream-glib
+ gobject-introspection
+ ];
+
+ buildInputs = [
+ gtk3
+ glib
+ libmediaart
+ gnome-online-accounts
+ gobject-introspection
+ gdk-pixbuf
+ gnome3.adwaita-icon-theme
+ python3
+ grilo
+ grilo-plugins
+ libnotify
+ libdazzle
+ libsoup
+ gsettings-desktop-schemas
+ tracker
+ ] ++ (with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-good
+ gst-plugins-bad
+ gst-plugins-ugly
+ ]);
+
+ propagatedBuildInputs = with python3.pkgs; [
+ pycairo
+ dbus-python
+ pygobject3
];
- propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python pygobject3 ];
postPatch = ''
@@ -43,10 +99,10 @@ python3.pkgs.buildPythonApplication rec {
};
meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Music;
+ homepage = "https://wiki.gnome.org/Apps/Music";
description = "Music player and management application for the GNOME desktop environment";
maintainers = gnome3.maintainers;
- license = licenses.gpl2;
+ license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index 0202821f7d55..02b476c2eea1 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -5,13 +5,13 @@
let
pname = "polari";
- version = "3.34.0";
+ version = "3.34.1";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "09g2ylx2fwm55h28w0c03fxkdvlwmr2yc033m93c4acz1h30rjns";
+ sha256 = "0wcfkib673fpys7hcpi5cqc0zgqzqmqvpzjzx4wwmim8lb121x5w";
};
propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ];
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 d2f161f23b4f..4900717898fd 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "adwaita-icon-theme";
- version = "3.34.0";
+ version = "3.34.3";
src = fetchurl {
url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0zvwikj3a07i3g3rir4cc63b14822lrzzgprs1j2nmb3h8gykds0";
+ sha256 = "025rj1fskw1y448hiar4a9icyzpyr242nlh9xhsmyp8jb71dihp7";
};
# For convenience, we can specify adwaita-icon-theme only in packages
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index c7a126034f2b..5934f56274cb 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3
+{ stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3, dconf
, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }:
let
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
gettext docbook_xsl libxml2 gobject-introspection python3
];
- buildInputs = [ glib gtk3 gnome3.dconf ];
+ buildInputs = [ glib gtk3 dconf ];
postPatch = ''
chmod +x meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index bfcf01591e56..f042bbd146a4 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -34,11 +34,11 @@
stdenv.mkDerivation rec {
pname = "epiphany";
- version = "3.34.1";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1nf1pqv3pdgrlq7fbic06rl3731dx5ihpfsphpai9grcmnbwjyx0";
+ sha256 = "18d48vcp2nxs63bddkdplslgbnlfq79pm2ivl8hk38kkggy3dahf";
};
# Tests need an X display
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 61f27f10ae10..bab84eeb78ce 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -43,13 +43,13 @@
stdenv.mkDerivation rec {
pname = "evince";
- version = "3.34.1";
+ version = "3.34.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1pr6fvbaam1mzxjwyqd53hcxzdjzf73idn10j4j7n54nwg6hgr45";
+ sha256 = "05q6v9lssd21623mnj2p49clj9v9csw9kay7n4nklki025grbh1w";
};
postPatch = ''
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 fa70ecea264a..6c293cb55b9d 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "evolution-data-server";
- version = "3.34.1";
+ version = "3.34.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1gisymfjhkibqy73pmd0d3fwl43a23d0lvlxzqkycfdn9jh6pxbg";
+ sha256 = "16z85y6hhazcrp5ngw47w4x9r0j8zrj7awv5im58hhp0xs19zf1y";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 9d1602dfccd3..ba660a64418c 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg
-, accountsservice, libX11, gnome3, systemd, autoreconfHook
+, accountsservice, libX11, gnome3, systemd, autoreconfHook, dconf
, gtk3, libcanberra-gtk3, pam, libtool, gobject-introspection, plymouth
, librsvg, coreutils, xwayland, nixos-icons, fetchpatch }:
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
"--with-udevdir=$(out)/lib/udev"
];
- nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool gnome3.dconf ];
+ nativeBuildInputs = [ pkgconfig libxml2 itstool autoreconfHook libtool dconf ];
buildInputs = [
glib accountsservice systemd
gobject-introspection libX11 gtk3
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 6770f3df8500..f7f83b569327 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "gnome-desktop";
- version = "3.34.1";
+ version = "3.34.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0nnwc837k244gjsmx8wff5sfvm8xnhm8xr39qxk73lnscrbfpny1";
+ sha256 = "1v983xirwp1y6ggz97bh742ak6gff0hxb359dgn37nikjxhvm0a0";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
index 8aaf68ea1e36..459512017c5d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gnome-session";
- version = "3.34.1";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0q366pns99f6wka5ikahqpasnsm72q9pg0c0nnfb2ld7spi1z06p";
+ sha256 = "1qgqp97f8k2zi2ydvhds14zsjzfj7cv521r6wx5sw0qacn0p7dwb";
};
patches = [
@@ -55,6 +55,7 @@ stdenv.mkDerivation rec {
packageName = "gnome-session";
attrPath = "gnome3.gnome-session";
};
+ providedSessions = [ "gnome" "gnome-xorg" ];
};
meta = with stdenv.lib; {
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 3d9f901b66b4..36da3349c46a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
@@ -41,11 +41,11 @@
stdenv.mkDerivation rec {
pname = "gnome-settings-daemon";
- version = "3.34.1";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "07y1gbicz0pbxmdgwrdzyc4byy30wfwpbqgvnx27gnpqmc5s50cr";
+ sha256 = "1vfpgbdxkhh9xwvb3ja174jk3gpzj4n3jzcy9ygbjlvy45zfdflz";
};
patches = [
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 92c960016823..44c9e3eff44f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extensions";
- version = "3.34.1";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0ny7mk82kpfac977j02860c75d7zn05gvy0h9bphvx0v7ca53bdh";
+ sha256 = "1f5l35l3kdkzrv49xmg1sh11vwmgjbg7hx3gb91i39bfl1snxqd1";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index e8d5b7dbffdd..e2d14ffcd263 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -15,11 +15,11 @@ let
in stdenv.mkDerivation rec {
pname = "gnome-shell";
- version = "3.34.1";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "07kd7wdk12nba33jfr44xqdlryiy86wgvsyjs8cw55y8p5cnbn6c";
+ sha256 = "0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh";
};
LANG = "en_US.UTF-8";
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index fb4114a524a4..051f0e4b432f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -11,11 +11,11 @@ in
stdenv.mkDerivation rec {
pname = "gnome-software";
- version = "3.34.1";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1yd806dp1c51ym6sidbfafzcywkbxmzxbr4zz57i0yhfjmwr9mjx";
+ sha256 = "1zhi6zkphq0wfm9z2d1rp1ym8x52c7as4r8h2nrcd34mmv02xnm7";
};
patches = [
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
deleted file mode 100644
index cb0c1494b946..000000000000
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, itstool, libxml2, intltool }:
-
-stdenv.mkDerivation rec {
- pname = "gnome-user-docs";
- version = "3.34.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1v94mz8zwzx67db2avbi9p2klw36cz45qr6fbskpvygz2pzhg6cg";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gnome-user-docs"; attrPath = "gnome3.gnome-user-docs"; };
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ gnome3.yelp itstool libxml2 intltool ];
-
- meta = with stdenv.lib; {
- 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;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index 6c291c1874f8..ce5e073ac064 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,11 +1,48 @@
-{ stdenv, intltool, fetchFromGitLab, pkgconfig, gtk3, adwaita-icon-theme
-, glib, desktop-file-utils, gtk-doc, autoconf, automake, libtool
-, wrapGAppsHook, gnome3, itstool, libxml2, yelp-tools
-, docbook_xsl, docbook_xml_dtd_412, gsettings-desktop-schemas
-, callPackage, unzip, gobject-introspection }:
+{ stdenv
+, intltool
+, fetchFromGitLab
+, fetchpatch
+, pkgconfig
+, gtk3
+, adwaita-icon-theme
+, glib
+, desktop-file-utils
+, gtk-doc
+, autoconf
+, automake
+, libtool
+, wrapGAppsHook
+, gnome3
+, itstool
+, libxml2
+, yelp-tools
+, docbook_xsl
+, docbook_xml_dtd_412
+, gsettings-desktop-schemas
+, callPackage
+, unzip
+, unicode-character-database
+, unihan-database
+, runCommand
+, symlinkJoin
+, gobject-introspection
+}:
let
- unicode-data = callPackage ./unicode-data.nix {};
+ # TODO: make upstream patch allowing to use the uncompressed file,
+ # preferably from XDG_DATA_DIRS.
+ # https://gitlab.gnome.org/GNOME/gucharmap/issues/13
+ unihanZip = runCommand "unihan" {} ''
+ mkdir -p $out/share/unicode
+ ln -s ${unihan-database.src} $out/share/unicode/Unihan.zip
+ '';
+ ucd = symlinkJoin {
+ name = "ucd+unihan";
+ paths = [
+ unihanZip
+ unicode-character-database
+ ];
+ };
in stdenv.mkDerivation rec {
pname = "gucharmap";
version = "12.0.1";
@@ -20,16 +57,41 @@ in stdenv.mkDerivation rec {
sha256 = "0si3ymyfzc5v7ly0dmcs3qgw2wp8cyasycq5hmcr8frl09lr6gkw";
};
- nativeBuildInputs = [
- pkgconfig wrapGAppsHook unzip intltool itstool
- autoconf automake libtool gtk-doc docbook_xsl docbook_xml_dtd_412
- yelp-tools libxml2 desktop-file-utils gobject-introspection
+ patches = [
+ # fix build with Unicode 12.1
+ (fetchpatch {
+ url = "https://salsa.debian.org/gnome-team/gucharmap/raw/de079ad494a15f662416257fca2f2b8db757f4ea/debian/patches/update-to-unicode-12.1.patch";
+ sha256 = "093gqsxfpp3s0b88p1dgkskr4ng3hv8irmxc60l3fdrkl8am00xh";
+ })
];
- buildInputs = [ gtk3 glib gsettings-desktop-schemas adwaita-icon-theme ];
+ nativeBuildInputs = [
+ pkgconfig
+ wrapGAppsHook
+ unzip
+ intltool
+ itstool
+ autoconf
+ automake
+ libtool
+ gtk-doc
+ docbook_xsl
+ docbook_xml_dtd_412
+ yelp-tools
+ libxml2
+ desktop-file-utils
+ gobject-introspection
+ ];
+
+ buildInputs = [
+ gtk3
+ glib
+ gsettings-desktop-schemas
+ adwaita-icon-theme
+ ];
configureFlags = [
- "--with-unicode-data=${unicode-data}"
+ "--with-unicode-data=${ucd}/share/unicode"
"--enable-gtk-doc"
];
@@ -51,7 +113,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "GNOME Character Map, based on the Unicode Character Database";
- homepage = https://wiki.gnome.org/Apps/Gucharmap;
+ homepage = "https://wiki.gnome.org/Apps/Gucharmap";
license = licenses.gpl3;
maintainers = gnome3.maintainers;
platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
deleted file mode 100644
index 56104aff4840..000000000000
--- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ fetchurl, stdenv, gnome3 }:
-stdenv.mkDerivation rec {
- pname = "unicode-data";
- version = "12.0.0";
- srcs = [
- (fetchurl {
- url = "http://www.unicode.org/Public/${version}/ucd/Blocks.txt";
- sha256 = "041sk54v6rjzb23b9x7yjdwzdp2wc7gvfz7ybavgg4gbh51wm8x1";
- })
- (fetchurl {
- url = "http://www.unicode.org/Public/${version}/ucd/DerivedAge.txt";
- sha256 = "04j92xp07v273z3pxkbfmi1svmw9kmnjl9nvz9fv0g5ybk9zk7r6";
- })
- (fetchurl {
- url = "http://www.unicode.org/Public/${version}/ucd/NamesList.txt";
- sha256 = "0vsq8gx7hws8mvxy3nlglpwxw7ky57q0fs09d7w9xgb2ylk7fz61";
- })
- (fetchurl {
- url = "http://www.unicode.org/Public/${version}/ucd/Scripts.txt";
- sha256 = "18c63hx4y5yg408a8d0wx72d2hfnlz4l560y1fsf9lpzifxpqcmx";
- })
- (fetchurl {
- url = "http://www.unicode.org/Public/${version}/ucd/UnicodeData.txt";
- sha256 = "07d1kq190kgl92ispfx6zmdkvwvhjga0ishxsngzlw8j3kdkz4ap";
- })
- (fetchurl {
- url = "http://www.unicode.org/Public/${version}/ucd/Unihan.zip";
- sha256 = "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf";
- })
- ];
- phases = "installPhase";
- installPhase = with stdenv.lib; ''
- mkdir $out
- for f in $srcs;do
- cp $f $out/$(stripHash $f)
- done
- '';
- meta = with stdenv.lib; {
- homepage = http://www.unicode.org/ucd/;
- description = "Unicode Character Database";
- maintainers = gnome3.maintainers;
- license = licenses.mit;
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
index cc00fc5ece44..85208163415b 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
})
# See patch commit message
./0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch
+ # Fix build with libglvnd provided headers
+ ./libglvnd-328.patch
];
configureFlags = [
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index c8b1ac7e4661..61024788f157 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -1,61 +1,123 @@
-{ fetchurl, fetchpatch, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo
-, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3
-, ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput
-, gsettings-desktop-schemas, glib, gtk3, gnome-desktop
-, geocode-glib, pipewire, libgudev, libwacom, xwayland, meson
+{ fetchurl
+, fetchpatch
+, substituteAll
+, stdenv
+, pkgconfig
+, gnome3
+, gettext
+, gobject-introspection
+, upower
+, cairo
+, pango
+, cogl
+, json-glib
+, libstartup_notification
+, zenity
+, libcanberra-gtk3
+, ninja
+, xkeyboard_config
+, libxkbfile
+, libxkbcommon
+, libXtst
+, libinput
+, gsettings-desktop-schemas
+, glib
+, gtk3
+, gnome-desktop
+, geocode-glib
+, pipewire
+, libgudev
+, libwacom
+, xwayland
+, meson
, gnome-settings-daemon
, xorgserver
, python3
, wrapGAppsHook
, sysprof
, desktop-file-utils
+, libcap_ng
+, egl-wayland
}:
stdenv.mkDerivation rec {
pname = "mutter";
- version = "3.34.1";
+ version = "3.34.2";
outputs = [ "out" "dev" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "13kmmgg2zizr0522clwc2zn3bkwbir503b1wjiiixf5xi37jc65s";
+ sha256 = "0b8bz5kvs7rlwvqsg87cf6jhrrj95vgd1l235mjx8rip35ipfvrd";
};
mesonFlags = [
- "-Dxwayland-path=${xwayland}/bin/Xwayland"
+ "-Degl_device=true"
"-Dinstalled_tests=false" # TODO: enable these
+ "-Dwayland_eglstream=true"
+ "-Dxwayland-path=${xwayland}/bin/Xwayland"
];
propagatedBuildInputs = [
# required for pkgconfig to detect mutter-clutter
+ json-glib
libXtst
+ libcap_ng
];
nativeBuildInputs = [
- meson
- pkgconfig
- gettext
- ninja
- python3
- # for cvt command
- xorgserver
- wrapGAppsHook
desktop-file-utils
+ gettext
+ meson
+ ninja
+ pkgconfig
+ python3
+ wrapGAppsHook
+ xorgserver # for cvt command
];
buildInputs = [
- glib gobject-introspection gtk3 gsettings-desktop-schemas upower
- gnome-desktop cairo pango cogl clutter zenity libstartup_notification
- geocode-glib libinput libgudev libwacom
- libcanberra-gtk3 zenity xkeyboard_config libxkbfile
- libxkbcommon pipewire xwayland
- gnome-settings-daemon sysprof
+ cairo
+ cogl
+ egl-wayland
+ geocode-glib
+ glib
+ gnome-desktop
+ gnome-settings-daemon
+ gobject-introspection
+ gsettings-desktop-schemas
+ gtk3
+ libcanberra-gtk3
+ libgudev
+ libinput
+ libstartup_notification
+ libwacom
+ libxkbcommon
+ libxkbfile
+ pango
+ pipewire
+ sysprof
+ upower
+ xkeyboard_config
+ xwayland
+ zenity
+ zenity
];
patches = [
- # TODO: submit upstream
- ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
+ # Fix build with libglvnd provided headers
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch";
+ sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd";
+ })
+
+ # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
+ # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
+ ./drop-inheritable.patch
+
+ # TODO: submit upstream
+ ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch
+
(substituteAll {
src = ./fix-paths.patch;
inherit zenity;
@@ -70,18 +132,18 @@ stdenv.mkDerivation rec {
${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas"
'';
- enableParallelBuilding = true;
-
passthru = {
updateScript = gnome3.updateScript {
- packageName = "mutter";
- attrPath = "gnome3.mutter";
+ packageName = pname;
+ attrPath = "gnome3.${pname}";
};
};
meta = with stdenv.lib; {
- platforms = platforms.linux;
- maintainers = gnome3.maintainers;
+ description = "A window manager for GNOME";
+ homepage = "https://gitlab.gnome.org/GNOME/mutter";
license = licenses.gpl2;
+ maintainers = gnome3.maintainers;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch b/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch
new file mode 100644
index 000000000000..574ed5725612
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch
@@ -0,0 +1,132 @@
+From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?=
+Date: Sat, 19 Oct 2019 13:26:05 +0200
+Subject: [PATCH] drop inheritable
+
+Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01
+
+We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell.
+
+---
+ config.h.meson | 3 +++
+ meson.build | 5 +++++
+ meson_options.txt | 6 ++++++
+ src/core/main.c | 11 +++++++++++
+ src/meson.build | 1 +
+ 5 files changed, 26 insertions(+)
+
+diff --git a/config.h.meson b/config.h.meson
+index 0bab71848..202fb7ed1 100644
+--- a/config.h.meson
++++ b/config.h.meson
+@@ -58,6 +58,9 @@
+ /* Xwayland applications allowed to issue keyboard grabs */
+ #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES
+
++/* Defined if libcap-ng is available */
++#mesondefine HAVE_LIBCAPNG
++
+ /* XKB base prefix */
+ #mesondefine XKB_BASE
+
+diff --git a/meson.build b/meson.build
+index 3322bd3b1..01c8020fa 100644
+--- a/meson.build
++++ b/meson.build
+@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7'
+ libcanberra_req = '>= 0.26'
+ libwacom_req = '>= 0.13'
+ atk_req = '>= 2.5.3'
++libcapng_req = '>= 0.7.9'
+
+ # optional version requirements
+ udev_req = '>= 228'
+@@ -125,6 +126,7 @@ xau_dep = dependency('xau')
+ ice_dep = dependency('ice')
+ atk_dep = dependency('atk', version: atk_req)
+ libcanberra_dep = dependency('libcanberra', version: libcanberra_req)
++libcapng_dep = dependency('libcap-ng', required: get_option('libcapng'))
+
+ # For now always require X11 support
+ have_x11 = true
+@@ -256,6 +258,7 @@ have_core_tests = false
+ have_cogl_tests = false
+ have_clutter_tests = false
+ have_installed_tests = false
++have_libcapng = libcapng_dep.found()
+
+ if have_tests
+ have_core_tests = get_option('core_tests')
+@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom)
+ cdata.set('HAVE_SM', have_sm)
+ cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification)
+ cdata.set('HAVE_INTROSPECTION', have_introspection)
++cdata.set('HAVE_LIBCAPNG', have_libcapng)
+ cdata.set('HAVE_PROFILER', have_profiler)
+
+ xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base')
+@@ -443,6 +447,7 @@ output = [
+ ' Startup notification..... ' + have_startup_notification.to_string(),
+ ' Introspection............ ' + have_introspection.to_string(),
+ ' Profiler................. ' + have_profiler.to_string(),
++ ' libcap-ng................ ' + have_libcapng.to_string(),
+ '',
+ ' Tests:',
+ '',
+diff --git a/meson_options.txt b/meson_options.txt
+index 73aa7adde..8bfaacd9a 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules',
+ value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr',
+ description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland'
+ )
++
++option('libcapng',
++ type: 'feature',
++ value: 'auto',
++ description: 'Enable libcap-ng support'
++)
+diff --git a/src/core/main.c b/src/core/main.c
+index 7f4f666d2..b27968f13 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -66,6 +66,10 @@
+ #include
+ #endif
+
++#ifdef HAVE_LIBCAPNG
++#include
++#endif
++
+ #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND)
+ #include
+ #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */
+@@ -673,6 +677,12 @@ meta_run (void)
+ if (!meta_display_open ())
+ meta_exit (META_EXIT_ERROR);
+
++#ifdef HAVE_LIBCAPNG
++ capng_clear(CAPNG_SELECT_BOTH);
++ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE);
++ capng_apply(CAPNG_SELECT_BOTH);
++#endif
++
+ g_main_loop_run (meta_main_loop);
+
+ meta_finalize ();
+diff --git a/src/meson.build b/src/meson.build
+index 90d80734f..a9fffa2c2 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -18,6 +18,7 @@ mutter_pkg_deps = [
+ glib_dep,
+ gsettings_desktop_schemas_dep,
+ gtk3_dep,
++ libcapng_dep,
+ pango_dep,
+ ]
+
+--
+2.23.0
+
diff --git a/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch b/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch
new file mode 100644
index 000000000000..96e275598288
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch
@@ -0,0 +1,63 @@
+diff --git a/cogl/configure.ac b/cogl/configure.ac
+index 3be282f..d338cd1 100644
+--- a/cogl/configure.ac
++++ b/cogl/configure.ac
+@@ -490,6 +490,11 @@ AS_IF([test "x$enable_gles1" = "xyes"],
+ #include "],
+ [],
+ [$COGL_EGL_INCLUDES])
++ AC_CHECK_HEADERS([EGL/eglmesaext.h],
++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
++#include "],
++ [],
++ [$COGL_EGL_INCLUDES])
+
+ # Check for a GLES 1.x Common Profile library with/without EGL.
+ #
+@@ -759,7 +764,9 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
+ )
+
+ COGL_EGL_INCLUDES="#include
+-#include "
++#include
++#include
++"
+ AC_SUBST([COGL_EGL_INCLUDES])
+ ])
+
+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
+index 8705e7d..db0b74f 100644
+--- a/src/backends/meta-egl-ext.h
++++ b/src/backends/meta-egl-ext.h
+@@ -29,6 +29,7 @@
+
+ #include
+ #include
++#include
+
+ /*
+ * This is a little different to the tests shipped with EGL implementations,
+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
+index 755ec49..bd253c9 100644
+--- a/src/backends/meta-egl.c
++++ b/src/backends/meta-egl.c
+@@ -31,6 +31,7 @@
+
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
+index 060c7cd..2fef264 100644
+--- a/src/backends/meta-egl.h
++++ b/src/backends/meta-egl.h
+@@ -27,6 +27,7 @@
+
+ #include
+ #include
++#include
+ #include
+
+ #define META_EGL_ERROR meta_egl_error_quark ()
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 48f47be04bc1..e55bf19f5288 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -32,11 +32,11 @@
stdenv.mkDerivation rec {
pname = "nautilus";
- version = "3.34.1";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1wvp0272wky2v1pcx6z27275crb48j9903v6qzf8ki8hlqb2rkip";
+ sha256 = "19zqwq4qyyncc5wq3xls0f7rsavnw741k336p2h7kx35p4kf41mv";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix
index c38e677a4217..415974d0c2b7 100644
--- a/pkgs/desktops/gnome-3/core/rygel/default.nix
+++ b/pkgs/desktops/gnome-3/core/rygel/default.nix
@@ -28,14 +28,14 @@
stdenv.mkDerivation rec {
pname = "rygel";
- version = "0.38.1";
+ version = "0.38.3";
# TODO: split out lib
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1w8bi2rw91qyfny1zxhy32k4qn62hdjl2m38f75cp7wv6494d7w0";
+ sha256 = "003xficqb08r1dgid20i7cn889lbfwrglpx78rjd5nkvgxbimhh8";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 21e198a867f1..8d737b22a7ac 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "simple-scan";
- version = "3.34.1";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0glzskxdc7p9z7nwcakqc7qzij4l79adlvvb2cj5fmis731zw9yq";
+ sha256 = "1fk3g4f9slckqfwm576jrjq1d1qihw0dlgzdf00ns7qbhzb0kxsp";
};
buildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
index 7cb63b8df797..34f6accdd5ff 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
@@ -10,11 +10,11 @@
stdenv.mkDerivation rec {
pname = "yelp-xsl";
- version = "3.34.0";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1qjfw4s8yf4hmyqrcqy6q2rsnb8b2cl1qbq67m7n7pyiczp3l1p8";
+ sha256 = "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 952f6eaf4f87..c7c26cec7c3c 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -14,10 +14,9 @@ lib.makeScope pkgs.newScope (self: with self; {
*/
removePackagesByName = packages: packagesToRemove:
let
- pkgName = drv: (builtins.parseDrvName drv.name).name;
- namesToRemove = map pkgName packagesToRemove;
+ namesToRemove = map lib.getName packagesToRemove;
in
- lib.filter (x: !(builtins.elem (pkgName x) namesToRemove)) packages;
+ lib.filter (x: !(builtins.elem (lib.getName x) namesToRemove)) packages;
maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning worldofpeace ];
@@ -36,7 +35,6 @@ lib.makeScope pkgs.newScope (self: with self; {
caribou = callPackage ./core/caribou { };
- dconf = callPackage ./core/dconf { };
dconf-editor = callPackage ./core/dconf-editor { };
empathy = callPackage ./core/empathy { };
@@ -49,8 +47,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gdm = callPackage ./core/gdm { };
- gjs = callPackage ./core/gjs { };
-
gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
@@ -101,8 +97,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-themes-extra = callPackage ./core/gnome-themes-extra { };
- gnome-user-docs = callPackage ./core/gnome-user-docs { };
-
gnome-user-share = callPackage ./core/gnome-user-share { };
gucharmap = callPackage ./core/gucharmap { };
@@ -144,10 +138,6 @@ lib.makeScope pkgs.newScope (self: with self; {
withGnome = true;
};
- networkmanagerapplet = pkgs.networkmanagerapplet.override {
- withGnome = true;
- };
-
rygel = callPackage ./core/rygel { };
simple-scan = callPackage ./core/simple-scan { };
@@ -162,8 +152,6 @@ lib.makeScope pkgs.newScope (self: with self; {
yelp-xsl = callPackage ./core/yelp-xsl { };
- yelp-tools = callPackage ./core/yelp-tools { };
-
zenity = callPackage ./core/zenity { };
@@ -351,13 +339,23 @@ lib.makeScope pkgs.newScope (self: with self; {
pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01
# added 2019-08-25
- corePackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-shell.enable`";
- optionalPackages = throw "deprecated 2019-08-25: please use `services.gnome3.core-utilities.enable`";
- gamesPackages = throw "deprecated 2019-08-25: please use `services.gnome3.games.enable`";
+ corePackages = throw "gnome3.corePackages is removed since 2019-08-25: please use `services.gnome3.core-shell.enable`";
+ optionalPackages = throw "gnome3.optionalPackages is removed since 2019-08-25: please use `services.gnome3.core-utilities.enable`";
+ gamesPackages = throw "gnome3.gamesPackages is removed since 2019-08-25: please use `services.gnome3.games.enable`";
- nautilus-sendto = throw "deprecated 2019-09-17: abandoned";
+ nautilus-sendto = throw "nautilus-sendto is removed since 2019-09-17: abandoned upstream";
inherit (pkgs) vala; # added 2019-10-10
+ inherit (pkgs) gnome-user-docs; # added 2019-11-20
+
inherit (pkgs) gegl_0_4; # added 2019-10-31
+
+ inherit (pkgs) gjs; # added 2019-01-05
+
+ inherit (pkgs) yelp-tools; # added 2019-11-20
+
+ inherit (pkgs) dconf; # added 2019-11-30
+
+ inherit (pkgs) networkmanagerapplet; # added 2019-12-12
})
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
index 4df3ed10a693..4f5562bbffa5 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, gjs, flex, bison, libxml2, intltool,
gdl, libgda, gtksourceview, gsettings-desktop-schemas,
itstool, python3, ncurses, makeWrapper }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
ncurses
];
buildInputs = [
- flex bison gtk3 libxml2 gnome3.gjs gdl
+ flex bison gtk3 libxml2 gjs gdl
libgda gtksourceview
gsettings-desktop-schemas
];
diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
index 8cf9fb9f0e63..1761887f8fb1 100644
--- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-caffeine";
- version = "unstable-2019-04-02";
+ version = "33";
src = fetchFromGitHub {
owner = "eonpatapon";
repo = "gnome-shell-extension-caffeine";
- rev = "a6b37dee108cddf50a0f0a19f0101854a75bf173";
- sha256 = "1j3q12j36v97551sjb0c8qc8zr7a7gmxibygczryfdfmwjzp6icl";
+ rev = "v${version}";
+ sha256 = "1v74xfk7csgc4kw1fg75brmhk2aby3d453ksnmj4k8ivyxkzxmfg";
};
uuid = "caffeine@patapon.info";
@@ -32,6 +32,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ eperuffo ];
homepage = https://github.com/eonpatapon/gnome-shell-extension-caffeine;
- broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
};
}
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
index f7f189e23bdc..33261472487f 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-dash-to-panel";
- version = "23";
+ version = "26";
src = fetchFromGitHub {
owner = "home-sweet-gnome";
repo = "dash-to-panel";
rev = "v${version}";
- sha256 = "12smkz3clcvgicr0pdc0fk6igf82nw4hzih1ywv9q43xkqh9w1i6";
+ sha256 = "1phfx2pblygpcvsppsqqqflm7qnz46mqkw29hj0nv2dn69hf4xbc";
};
buildInputs = [
diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
index c0ecfc29e2cf..4e7fa17d495c 100644
--- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, substituteAll, gnome3, vte }:
+{ stdenv, fetchFromGitHub, substituteAll, gjs, vte }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-drop-down-terminal";
@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./fix_vte_and_gjs.patch;
- inherit vte;
- gjs = gnome3.gjs;
+ inherit gjs vte;
})
];
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index cb1dd5ceaa8c..ca232d090a87 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, folks, gsound
, meson, ninja, libxml2, pkgconfig, gobject-introspection, wrapGAppsHook
-, glib, gtk3, at-spi2-core, upower, openssh, gnome3 }:
+, glib, gtk3, at-spi2-core, upower, openssh, gnome3, gjs }:
stdenv.mkDerivation rec {
pname = "gnome-shell-gsconnect";
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
gsound
upower
gnome3.caribou
- gnome3.gjs # for running daemon
+ gjs # for running daemon
gnome3.evolution-data-server # for libebook-contacts typelib
];
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 921991a33aea..13b2d6a1db4f 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
+{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }:
stdenv.mkDerivation rec {
pname = "gnome-shell-system-monitor";
@@ -41,6 +41,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ aneeshusa tiramiseb ];
homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
- broken = versionAtLeast gnome3.gnome-shell.version "3.32";
};
}
diff --git a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
deleted file mode 100644
index 811e9911f628..000000000000
--- a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchFromGitHub, glib }:
-
-stdenv.mkDerivation rec {
- pname = "gnome-shell-workspace-grid";
- version = "0f3a430e7d04bb5465a17c1225aab0f574426d6b";
-
- src = fetchFromGitHub {
- owner = "zakkak";
- repo = "workspace-grid-gnome-shell-extension";
- rev = version;
- sha256 = "0503b7lmydrbblfvf9b56pv5hpmykzgyc6v8y99rckg58h2jhs69";
- };
-
- buildInputs = [
- glib
- ];
-
- installPhase = ''
- cp -r ${uuid} $out
- '';
-
- uuid = "workspace-grid@mathematical.coffee.gmail.com";
-
- meta = with stdenv.lib; {
- description = "Arranges workspaces in a configurable grid";
- license = licenses.gpl3Plus;
- maintainers = with maintainers; [ aneeshusa ];
- homepage = https://github.com/zakkak/workspace-grid-gnome-shell-extension;
- };
-}
diff --git a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
new file mode 100644
index 000000000000..ca4b72111c6c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, findutils, glib }:
+
+stdenv.mkDerivation rec {
+ pname = "gnome-shell-extension-workspace-matrix";
+ version = "3.0.0";
+
+ src = fetchFromGitHub {
+ owner = "mzur";
+ repo = "gnome-shell-wsmatrix";
+ rev = "v${version}";
+ sha256 = "1fgyzmd16kklcca7600bwg8w8pbb4klmapqsvmahlwa99vmkhfkn";
+ };
+
+ uuid = "wsmatrix@martin.zurowietz.de";
+
+ nativeBuildInputs = [
+ findutils
+ glib
+ ];
+
+ buildFlags = "schemas";
+
+ installPhase = ''
+ mkdir -p $out/share/gnome-shell/extensions
+ cp -r ${uuid} $out/share/gnome-shell/extensions
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Arrange workspaces in a two dimensional grid with workspace thumbnails";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ chkno ];
+ homepage = https://github.com/mzur/gnome-shell-wsmatrix;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index dd7908ba726e..9edeb3ea5dec 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "gnome-taquin";
- version = "3.34.1";
+ version = "3.34.2";
src = fetchurl {
url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0vyrfhkfpx83n9p70jssykbndvb3sxwdihqvvvb94rbw7n6c4q4r";
+ sha256 = "1ff3h57wr26np3dlh7smpslba2awxasmhv3y45bn498i3n1vyvsk";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index c679f3f74b8f..33cd60f52720 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "iagno";
- version = "3.34.2";
+ version = "3.34.3";
src = fetchurl {
url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0r31k6b8mqgn5c55hi94gpdr776ykq7ww55vq6pmp5irhdwb3gn9";
+ sha256 = "1m9654dbi4vrl59wvbyxz7jf81v4mn4n5lcq7abb42lba965d2z2";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 787bdd97ebf8..07319337a9a0 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
-, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext
+, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext, fetchpatch
, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking
, gobject-introspection, gspell, appstream-glib, libytnef, libhandy }:
@@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
"-Dcontractor=true" # install the contractor file (Pantheon specific)
];
+ patches = [
+ # Longer timeout for client test.
+ (fetchpatch {
+ url = "https://salsa.debian.org/gnome-team/geary/raw/04be1e058a2e65075dd8cf8843d469ee45a9e09a/debian/patches/Bump-client-test-timeout-to-300s.patch";
+ sha256 = "1zvnq8bgla160531bjdra8hcg15mp8r1j1n53m1xfgm0ssnj5knx";
+ })
+ ];
+
postPatch = ''
chmod +x build-aux/post_install.py build-aux/git_version.py
patchShebangs build-aux/post_install.py build-aux/git_version.py
diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
index 8ccf5107046b..8f1d193a6d36 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
@@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "gnome-autoar";
- version = "0.2.3";
+ version = "0.2.4";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax";
+ sha256 = "0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a";
};
passthru = {
diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
index e381860ca2c9..c1791ee5bbdc 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
@@ -22,18 +22,19 @@
, writeTextFile
, writeShellScriptBin
, xkeyboard_config
+, runCommand
}:
let
pname = "gnome-flashback";
- version = "3.34.1";
+ version = "3.34.2";
requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;";
gnome-flashback = stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0xxw5w66gx04amyxhf4xbz0s4bf0rdp7y9nyrf6bb4xdc6b0rfnx";
+ sha256 = "1726xcm2q94nfvb055d3m61m20s0xy3xl1fc3ds3k3rcrn457riv";
};
# make .desktop Execs absolute
@@ -140,7 +141,16 @@ let
Type=Application
DesktopNames=GNOME-Flashback;GNOME;
'';
+ } // {
+ providedSessions = [ "gnome-flashback-${wmName}" ];
};
+
+ mkSystemdTargetForWm = { wmName }:
+ runCommand "gnome-flashback-${wmName}.target" {} ''
+ mkdir -p $out/lib/systemd/user
+ cp "${gnome-flashback}/lib/systemd/user/gnome-session-x11@gnome-flashback-metacity.target" \
+ "$out/lib/systemd/user/gnome-session-x11@gnome-flashback-${wmName}.target"
+ '';
};
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnustep/make/setup-hook.sh b/pkgs/desktops/gnustep/make/setup-hook.sh
index 531389011164..b2b90f1e5222 100644
--- a/pkgs/desktops/gnustep/make/setup-hook.sh
+++ b/pkgs/desktops/gnustep/make/setup-hook.sh
@@ -20,57 +20,57 @@ addEnvVars() {
local filename
for filename in $1/share/GNUstep/Makefiles/Additional/*.make ; do
- if case "$NIX_GNUSTEP_MAKEFILES_ADDITIONAL" in *"{$filename}"*) false;; *) true;; esac; then
+ if case "${NIX_GNUSTEP_MAKEFILES_ADDITIONAL-}" in *"{$filename}"*) false;; *) true;; esac; then
export NIX_GNUSTEP_MAKEFILES_ADDITIONAL+=" $filename"
fi
done
local tmp="$1/lib/GNUstep/Applications"
- if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_APPS" in *"${tmp}"*) false;; *) true;; esac; then
+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then
addToSearchPath NIX_GNUSTEP_SYSTEM_APPS "$tmp"
fi
tmp="$1/lib/GNUstep/Applications"
- if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_APPS" in *"${tmp}"*) false;; *) true;; esac; then
+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then
addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_APPS "$tmp"
fi
tmp="$1/lib/GNUstep/WebApplications"
- if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_WEB_APPS" in *"${tmp}"*) false;; *) true;; esac; then
+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_WEB_APPS-}" in *"${tmp}"*) false;; *) true;; esac; then
addToSearchPath NIX_GNUSTEP_SYSTEM_WEB_APPS "$tmp"
fi
tmp="$1/bin"
- if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then
+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then
addToSearchPath NIX_GNUSTEP_SYSTEM_TOOLS "$tmp"
fi
tmp="$1/sbin"
- if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS" in *"${tmp}"*) false;; *) true;; esac; then
+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS-}" in *"${tmp}"*) false;; *) true;; esac; then
addToSearchPath NIX_GNUSTEP_SYSTEM_ADMIN_TOOLS "$tmp"
fi
tmp="$1/lib/GNUstep"
- if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARY" in *"${tmp}"*) false;; *) true;; esac; then
+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARY-}" in *"${tmp}"*) false;; *) true;; esac; then
addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARY "$tmp"
fi
tmp="$1/include"
- if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_HEADERS" in *"${tmp}"*) false;; *) true;; esac; then
- if [ -z "$NIX_GNUSTEP_SYSTEM_HEADERS" ]; then
+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_HEADERS-}" in *"${tmp}"*) false;; *) true;; esac; then
+ if [ -z "${NIX_GNUSTEP_SYSTEM_HEADERS-}" ]; then
export NIX_GNUSTEP_SYSTEM_HEADERS="$tmp"
else
export NIX_GNUSTEP_SYSTEM_HEADERS+=" $tmp"
fi
fi
tmp="$1/lib"
- if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_LIBRARIES" in *"${tmp}"*) false;; *) true;; esac; then
+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_LIBRARIES-}" in *"${tmp}"*) false;; *) true;; esac; then
addToSearchPath NIX_GNUSTEP_SYSTEM_LIBRARIES "$tmp"
fi
tmp="$1/share/GNUstep/Documentation"
- if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC" in *"${tmp}"*) false;; *) true;; esac; then
+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC-}" in *"${tmp}"*) false;; *) true;; esac; then
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC "$tmp"
fi
tmp="$1/share/man"
- if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_MAN" in *"${tmp}"*) false;; *) true;; esac; then
+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_MAN-}" in *"${tmp}"*) false;; *) true;; esac; then
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_MAN "$tmp"
fi
tmp="$1/share/info"
- if [ -d "$tmp" ] && case "$NIX_GNUSTEP_SYSTEM_DOC_INFO" in *"${tmp}"*) false;; *) true;; esac; then
+ if [ -d "$tmp" ] && case "${NIX_GNUSTEP_SYSTEM_DOC_INFO-}" in *"${tmp}"*) false;; *) true;; esac; then
addToSearchPath NIX_GNUSTEP_SYSTEM_DOC_INFO "$tmp"
fi
}
diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index f19114a54422..ecb9ea2e377e 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "atril";
- version = "1.22.2";
+ version = "1.22.3";
src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "11l78zkxszvsjr74cmk1wff5ycqrzd89y6k36rydv2rb5af2nsfw";
+ sha256 = "06hmyw7fwdrdyl3n79b8qxlrwbzf240n82arzmlg62q9zxzdc0is";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix
index 597391eb135c..820b1e905ecd 100644
--- a/pkgs/desktops/mate/caja-dropbox/default.nix
+++ b/pkgs/desktops/mate/caja-dropbox/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18cnd3yw2ingvl38mhmfbl5k0kfg8pzcf2649j00i6v90cwiril5";
};
diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index 74b184d2cb09..10595bbbaecc 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xzhphzvaxbwyyp242pnhl5zjrkiznj90i0xjmy7pvi155pmp16h";
};
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index 265b0b922226..c460a2cf2dc0 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "caja";
- version = "1.22.2";
+ version = "1.22.3";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1c5yr4b8pzd7nz7g7ln9jwp4fx6qgq8vgbv4spfryy53il3gv75h";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1w2liq9h1kr5zyaaq82xz8pic04qi5sra8kaycfg1iddmknkfqn7";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index 0278fd7fec83..4eefc7aa2e19 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0ph7ngk32nnzc3psqjs5zy52zbjilk30spr2r4sixqxvmz7d28gd";
};
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 2d32d8301c96..457a9e56c5d4 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0za1lw4awg1i0ls0r9iw0ail2hqa34y1dx65b50bw9kx9kbfyl9l";
};
diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index d6709c375e6d..6364b89204af 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8";
};
diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
index 17fee5d61cbe..9c2dc412d4d4 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9";
};
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index c22c849a165e..0c14cdb96b5d 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1y3z82ymc7q6z8ly9f6nys0hbs373fjnvr6j7zwlgf6zc88f71h3";
};
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 88dd9e79bc8d..fd551c0cc78a 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "marco";
- version = "1.22.3";
+ version = "1.22.4";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0faiqj9i1mqqy1v4jdcwy8nsbkkvs0cwd2dqypgscmcqpbq7jf8a";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "0z8q4nwm43imbnbxz348ylgzfl25sknb19kml57d6z6flxws19k3";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index a99405d517af..3b5a4ccf2a2b 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1c32rkkry6kka2arrx5psjj037j79icp5jr1s0qh596dvsgxciqc";
};
diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix
index 2667c25959e6..4b41caba710b 100644
--- a/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9";
};
diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index 81cfd3201a67..d89e1e35d924 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1as4gshydcf84vynq8ijd9n8pslz5jpw6aj18ri4bdc91a6q3rpg";
};
diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index 5eacbd081460..b0a7096c5e78 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1xx7qrw8kc6355r1a1nybncf8s2rxjb2nqzw0gv2r5j5sqx8fzgf";
};
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index e16effed670c..d5c39a67d208 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib,
libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
- desktop-file-utils, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook
+ desktop-file-utils, dconf, gtk3, mate, hicolor-icon-theme, wrapGAppsHook
}:
stdenv.mkDerivation rec {
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ybdjibi6wgqn3587a66ckxp2qkvl4mcvv2smhflyxksl5djrjgh";
};
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
librsvg
libappindicator-gtk3
gtk3
- gnome3.dconf
+ dconf
hicolor-icon-theme
mate.mate-desktop
mate.libmatekbd
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index 8d157a201bed..2dca83bcd46e 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "mate-desktop";
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18w5r9p3bqpvxqqy2am7z686xf65cz5vhj247kki8s2yvvap6rlh";
};
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome3.dconf
+ dconf
gtk3
isocodes
];
diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index 1e1b2b837c37..a4fa6fedae32 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.20.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna";
};
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 74777a7ef5e8..d374092c48ac 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0r2bk4flb6kjj97badj2lnml4lfwpl2ym5hkf7r6f7cj8g6pzc4r";
};
diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix
index 9b471805ad38..b2e07d0a3e7c 100644
--- a/pkgs/desktops/mate/mate-indicator-applet/default.nix
+++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "05j5s6r4kx1rbz0j7a7xv38d0kbdi1r8iv8b6nx3lkbkdzq1x0w2";
};
diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index ca1d78678070..156a305a63f3 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0m8q2rqbxzvh82yj63syd8sbfjrc8y4a8caa42zs66j9x60d1agw";
};
diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index 3788c2d4894e..299c9b0e60f0 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0kh6y76f1rhp3nr22rp93bx77wcgqnygag2ir076cqkppayjc3c0";
};
diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix
index 077ba2268c9b..337e2bfdb3b8 100644
--- a/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/pkgs/desktops/mate/mate-netbook/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0m38v2276s2d3zs7smxyf70nyl7bcwp5665zgva28lvs8ip3gijx";
};
diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index a44b73c81a36..a83bbcb3ffbf 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0f8m3m94iqj2x61dzwwvwq2qlsl2ma8pqr6rfns5pzd0nj0waz0m";
};
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index db45dc9c4725..06e9b386adb4 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "mate-panel";
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1sm0fniywcxg8rbakhhc37bamwq1x3jqqyaqcvqwxvm6jg1hc97y";
};
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
librsvg
libxml2
gtk3
- gnome3.dconf
+ dconf
mate.libmateweather
mate.mate-desktop
mate.mate-menus
diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix
index 253472e3987e..e11bcb102573 100644
--- a/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/pkgs/desktops/mate/mate-polkit/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.0";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0";
};
diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index df7223e22880..3f84e60f9b65 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "12pnj7y01k1fhfhswxmf6q9yyb0772am5anm338hzfhjp0lcxlbn";
};
diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
index 4a2c0a5e2b88..0e99d03c0813 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1y8828g4bys8y4r5y478z6i7dgdqm2wkymi5fq75vxx4lzq919cb";
};
diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix
index bd9ed9f6cbe7..0c20880d7ecc 100644
--- a/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0rv19jxxviqqwk2wlhxlm98jsxa26scvs7ilp2i6plhn3ap2alq3";
};
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index fb9ea7699ac5..61dec6b34845 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "mate-session-manager";
- version = "1.22.2";
+ version = "1.22.3";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1v0a9jbsmf9axfqm2cnsqp5ihwffw7rl0z77dyw0m4j2pmyb0558";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ sha256 = "1ys26af75xl1psck8v32gygxipd8ms1xgpvdhwmnj7bqhabhh249";
};
nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 73dd7011d49d..f126918afca8 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier,
- libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate,
+ libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
wrapGAppsHook, fetchpatch, autoreconfHook }:
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0idw02z0iig0pfxvlhc4dq4sr7kl1w50xscvg0jzzswnxid2l4ip";
};
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
nss
polkit
gtk3
- gnome3.dconf
+ dconf
mate.mate-desktop
mate.libmatekbd
mate.libmatemixer
diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix
index 12818d206a8f..982d2d77b3ee 100644
--- a/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1d4l5rv01343jf8bk2j5hxvrbp3d705nd4v2pdrjn4h5dw8nxsl1";
};
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index 7ec9944aa0e1..905e56438988 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, gtk3, vte, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "mate-terminal";
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "08210ry5lrivsgzqpdaxrchhpj0n5s1q0x4pxmwdpnksjpcj11mn";
};
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
vte
gtk3
- gnome3.dconf
+ dconf
];
nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 9ed5515ea3e7..c994513273b7 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
version = "3.22.20";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx";
};
diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index 72330317bc41..386b53837b16 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.3";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0zv8arsxnbab0qk3ck9i1wp3d4gfclcv6vq6nh5i8zjz6rpp9cjs";
};
diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
index 999bee2e5d10..7f5e4e10f147 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k";
};
diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index adb8fef27f59..0afeb00610bf 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1i6fnm3y1hj8r57x4jpc4ixqs77zln8f7477d0haypflxm3s4kjr";
};
diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix
index 9d61f45e18ea..365a471dd7ae 100644
--- a/pkgs/desktops/mate/mozo/default.nix
+++ b/pkgs/desktops/mate/mozo/default.nix
@@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec {
doCheck = false;
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1lzcwsz940v218frwzhpywp1an9x3cgfvqr7r8dplpdapvd0khrs";
};
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index e0b61fd35cbe..cb1e3de376ee 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.2";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1gsj8grdhzb1jvl5zwd8zjc9cj9ys2ndny04gy4bbh80sjaj6xva";
};
diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix
index d861ddbf4d7e..c566c8a6953a 100644
--- a/pkgs/desktops/mate/python-caja/default.nix
+++ b/pkgs/desktops/mate/python-caja/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "1.22.1";
src = fetchurl {
- url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+ url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "07hkvs4a6anrvh28zjsrj8anbcz32p19hslhq66yhcvh0hh4kvqk";
};
diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index db674f4fb7ec..244146771c43 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -28,18 +28,18 @@
stdenv.mkDerivation rec {
pname = "appcenter";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0xsxm0qgmnljd4s8m6xajzsjp9skpsa8wwlwqmc5yx34diad7zag";
+ sha256 = "18l0kbm778728rksifslnaw2arnpr92sk24nw26k1zvs4prz5i7j";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
index bcbe50e5de35..1876020a8fe4 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix
@@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "elementary-calculator";
- version = "1.5.2";
+ version = "1.5.4";
repoName = "calculator";
@@ -26,13 +26,12 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "1vdgl89hdf9q1ya6as7310hlr0xls3w7js2gzsd9z8arb6037ccl";
+ sha256 = "0053bdzn5viqlni6qg6q39nma6bsddmhnafa0mzggiv8l4qasbrx";
};
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index 4e5f69fc9e6c..5a70fa94c5ee 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -25,22 +25,20 @@
stdenv.mkDerivation rec {
pname = "elementary-calendar";
- version = "unstable-2019-10-29";
+ version = "5.0.3";
repoName = "calendar";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
- rev = "7d201fc5ea9e8dc25c46427397594fcab2016ed6"; # needed for libical 2.0 compat
- sha256 = "11bqf3nxrj1sfd0qq5h0jsmimc6mwkd2g7q9ycizn9x5ak2gb8xi";
+ rev = version;
+ sha256 = "1dqcmh585fjib4m8bs7qy23fv429s7q9nbcqnn0vvmy1n36fic4m";
};
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
- versionPolicy = "master";
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
index aedc445b05f9..7c95d88053dd 100644
--- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix
@@ -36,8 +36,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 355f3ea8d0f6..0e692a8e8061 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -40,8 +40,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
index 70d8f63c13cd..fb56b3d1b33a 100644
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
@@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 1b5de7c168ed..1cb81344ea6c 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -45,8 +45,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index 7d235551a802..b53030217722 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -42,8 +42,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index 94b6a2fce8ec..ea74686e5041 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -33,7 +33,7 @@
stdenv.mkDerivation rec {
pname = "elementary-photos";
- version = "2.6.4";
+ version = "2.6.5";
repoName = "photos";
@@ -41,13 +41,12 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1";
+ sha256 = "0r6d9y936nw4bn0jvixi1p62dy8qsgl2bx8g3889fndnhfnhbjv0";
};
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
index 4dd168f25f05..8485a1df9f3a 100644
--- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix
@@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "elementary-screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93
- version = "1.6.2";
+ version = "1.7.0";
repoName = "screenshot";
@@ -25,13 +25,12 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "1z61j96jk9zjr3bn5hgsp25m4v8h1rqwxm0kg8c34bvl06f13v8q";
+ sha256 = "09jcyy4drzpfxb1blln7hyjg5b7r8w5j5v7va2qhq31y7vzczh62";
};
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
index 8bd335c65305..8416898710d8 100644
--- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix
@@ -20,7 +20,7 @@
stdenv.mkDerivation rec {
pname = "elementary-terminal";
- version = "5.3.6";
+ version = "5.4.0";
repoName = "terminal";
@@ -28,13 +28,12 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "0jp21sy8k3jq3ycvng9yy2hbhcvfgiknxxa8vcg3c06vqhadmnc3";
+ sha256 = "1rj4hrg5qljsv11apgdp0x4dazlfmjq3s0lk0dvwjvh9nqkr6jbw";
};
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
index 9132707db2ba..c8bde4943992 100644
--- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix
@@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "elementary-videos";
- version = "2.6.3";
+ version = "2.7.0";
repoName = "videos";
@@ -27,13 +27,12 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "1ncm8kh6dcy83p8pmpilnk03b4dx3b1jm8w13izq2dkglfgdwvqx";
+ sha256 = "1b6dqqmxa83fwlh9r0v918ikxd3mnwk0j5xssw1wk5l7q72s43w7";
};
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix
index 1fcd486263bd..f04cb7cd53b3 100644
--- a/pkgs/desktops/pantheon/apps/sideload/default.nix
+++ b/pkgs/desktops/pantheon/apps/sideload/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
index 7a79f72f1a2e..5cd5d365ed95 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index c179160ddabe..d501cba7c066 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -16,18 +16,18 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-about";
- version = "2.6.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "12ysymk5y2k49yh3rzmra7jmimxrd54gz2f4ssc9i8w06xj5djp7";
+ sha256 = "1z58d21xrjghvjx0ng53pcxwdk2f5d00dvngcyjja0kf7sixba71";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
index ddb589c9e792..0d0a7507afea 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix
@@ -13,18 +13,18 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-applications";
- version = "2.1.5";
+ version = "2.1.6";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1c4agff456625kycacpsww7c9jsnsg1rqps96r7cvn9zq371b5ir";
+ sha256 = "19l979sdn9jzibvn98ag3ys28ka7zqlsbs0gj2gs9jcxhzngrxvg";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -42,8 +42,6 @@ stdenv.mkDerivation rec {
switchboard
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
-
meta = with stdenv.lib; {
description = "Switchboard Applications Plug";
homepage = https://github.com/elementary/switchboard-plug-applications;
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index ca29ab65afcb..6f2fefa4873f 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
index cafb40144078..501059896f24 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
index 00524786f4bb..bd9669e24997 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
@@ -13,18 +13,18 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-display";
- version = "2.1.9";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0g9apywxgkan82h933rjjdm9fhd8vak8mziwsbqlprdz310b2jb2";
+ sha256 = "0mr89kyq034wffzixqlq6lmhyc4jry3dcgxrk306dhks2myindqh";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
index e31355b7b7ed..81a694f2ea93 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index a8556bd54014..260b340c2239 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -15,27 +15,18 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-mouse-touchpad";
- version = "2.2.0";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0mr25p7j5hl8zmvz5i3g30s4xbdhk6d22lw2akch3si40il9q5fv";
+ sha256 = "1974zdr5w3xd882gi95fp7axgilfni1sclsr750qm32yhl7d9bfn";
};
- patches = [
- ./hardcode-settings-daemon-gsettings.patch
- ];
-
- postPatch = ''
- substituteInPlace src/Views/General.vala \
- --subst-var-by GSD_GSETTINGS ${glib.getSchemaPath elementary-settings-daemon}
- '';
-
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -51,11 +42,10 @@ stdenv.mkDerivation rec {
granite
gtk3
libgee
+ elementary-settings-daemon
switchboard
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
-
meta = with stdenv.lib; {
description = "Switchboard Mouse & Touchpad Plug";
homepage = https://github.com/elementary/switchboard-plug-mouse-touchpad;
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch
deleted file mode 100644
index b904fe153094..000000000000
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/hardcode-settings-daemon-gsettings.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/src/Views/General.vala b/src/Views/General.vala
-index 4b19b73..dfa3d4d 100644
---- a/src/Views/General.vala
-+++ b/src/Views/General.vala
-@@ -138,32 +138,34 @@ public class MouseTouchpad.GeneralView : Gtk.Grid {
- attach (pointer_speed_scale, 3, 8);
- attach (pointer_speed_help, 1, 9, 3);
-
-- var xsettings_schema = SettingsSchemaSource.get_default ().lookup ("org.gnome.settings-daemon.plugins.xsettings", false);
-- if (xsettings_schema != null) {
-- var primary_paste_switch = new Gtk.Switch ();
-- primary_paste_switch.halign = Gtk.Align.START;
--
-- var primary_paste_help = new Gtk.Label (_("Middle or three-finger clicking on an input will paste any selected text"));
-- primary_paste_help.margin_bottom = 18;
-- primary_paste_help.wrap = true;
-- primary_paste_help.xalign = 0;
-- primary_paste_help.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
--
-- attach (new SettingLabel (_("Middle click paste:")), 0, 4);
-- attach (primary_paste_switch, 1, 4);
-- attach (primary_paste_help, 1, 5, 3);
--
-- var xsettings = new GLib.Settings ("org.gnome.settings-daemon.plugins.xsettings");
-- primary_paste_switch.notify["active"].connect (() => on_primary_paste_switch_changed (primary_paste_switch, xsettings));
--
-- var current_value = xsettings.get_value ("overrides").lookup_value ("Gtk/EnablePrimaryPaste", VariantType.INT32);
-- if (current_value != null) {
-- primary_paste_switch.active = current_value.get_int32 () == 1;
-- }
-+ var primary_paste_switch = new Gtk.Switch ();
-+ primary_paste_switch.halign = Gtk.Align.START;
-+
-+ var primary_paste_help = new Gtk.Label (_("Middle or three-finger clicking on an input will paste any selected text"));
-+ primary_paste_help.margin_bottom = 18;
-+ primary_paste_help.wrap = true;
-+ primary_paste_help.xalign = 0;
-+ primary_paste_help.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
-+
-+ attach (new SettingLabel (_("Middle click paste:")), 0, 4);
-+ attach (primary_paste_switch, 1, 4);
-+ attach (primary_paste_help, 1, 5, 3);
-+
-+ SettingsSchemaSource daemon_schema_source = new SettingsSchemaSource.from_directory ("@GSD_GSETTINGS@", null, true);
-+ SettingsSchema xsettings_schema = daemon_schema_source.lookup ("org.gnome.settings-daemon.plugins.xsettings", false);
-+
-+ var xsettings = new GLib.Settings.full (xsettings_schema, null, null);
-+ primary_paste_switch.notify["active"].connect (() => on_primary_paste_switch_changed (primary_paste_switch, xsettings));
-+
-+ var current_value = xsettings.get_value ("overrides").lookup_value ("Gtk/EnablePrimaryPaste", VariantType.INT32);
-+ if (current_value != null) {
-+ primary_paste_switch.active = current_value.get_int32 () == 1;
- }
-
-- var daemon_settings = new GLib.Settings ("org.gnome.settings-daemon.peripherals.mouse");
-- daemon_settings.bind ("locate-pointer", reveal_pointer_switch, "active", GLib.SettingsBindFlags.DEFAULT);
-+ SettingsSchema daemon_mouse_schema = daemon_schema_source.lookup ("org.gnome.settings-daemon.peripherals.mouse", false);
-+
-+ var daemon_mouse_settings = new GLib.Settings.full (daemon_mouse_schema, null, null);
-+ daemon_mouse_settings.bind ("locate-pointer", reveal_pointer_switch, "active", GLib.SettingsBindFlags.DEFAULT);
-
- var a11y_mouse_settings = new GLib.Settings ("org.gnome.desktop.a11y.mouse");
- a11y_mouse_settings.bind ("secondary-click-enabled", hold_switch, "active", GLib.SettingsBindFlags.DEFAULT);
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 175f0e45f46e..6e050c92d805 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -16,18 +16,18 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-network";
- version = "2.1.4";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "12lvcc15jngzsa40fjhxa6kccs58h5qq4lqrc7lcx5przmfaik8k";
+ sha256 = "0zg4bxrrw1nmm91yp8ymji7mha2wcjrwljcnpcvxq7lf8f2k0145";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -49,14 +49,12 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
- src = ./nma.patch;
- networkmanagerapplet = networkmanagerapplet;
+ src = ./fix-paths.patch;
+ inherit networkmanagerapplet;
})
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
-
meta = with stdenv.lib; {
description = "Switchboard Networking Plug";
homepage = https://github.com/elementary/switchboard-plug-network;
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch
new file mode 100644
index 000000000000..e2d7a6d49705
--- /dev/null
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch
@@ -0,0 +1,35 @@
+diff --git a/src/Views/VPNPage.vala b/src/Views/VPNPage.vala
+index 82e7826..cf00145 100644
+--- a/src/Views/VPNPage.vala
++++ b/src/Views/VPNPage.vala
+@@ -265,7 +265,7 @@ public class Network.VPNPage : Network.Widgets.Page {
+ private void try_connection_editor (string args) {
+ try {
+ var appinfo = AppInfo.create_from_commandline (
+- "nm-connection-editor %s".printf (args),
++ "@networkmanagerapplet@/bin/nm-connection-editor %s".printf (args),
+ null,
+ GLib.AppInfoCreateFlags.NONE
+ );
+diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala
+index ed36b38..bc71c0c 100644
+--- a/src/Widgets/SettingsButton.vala
++++ b/src/Widgets/SettingsButton.vala
+@@ -24,7 +24,7 @@
+ clicked.connect (() => {
+ try {
+ var appinfo = AppInfo.create_from_commandline (
+- "nm-connection-editor",
++ "@networkmanagerapplet@/bin/nm-connection-editor",
+ null,
+ AppInfoCreateFlags.NONE
+ );
+@@ -71,7 +71,7 @@
+ private void edit_connection_uuid (string uuid) {
+ try {
+ var appinfo = AppInfo.create_from_commandline (
+- "nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
++ "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
+ );
+
+ appinfo.launch (null, null);
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.patch
deleted file mode 100644
index a5fff9d6a32b..000000000000
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/nma.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala
-index 19fd514..bc800d9 100644
---- a/src/Widgets/SettingsButton.vala
-+++ b/src/Widgets/SettingsButton.vala
-@@ -23,7 +23,7 @@
- label = _("Edit Connections…");
- clicked.connect (() => {
- try {
-- var appinfo = AppInfo.create_from_commandline ("nm-connection-editor", null, AppInfoCreateFlags.NONE);
-+ var appinfo = AppInfo.create_from_commandline ("@networkmanagerapplet@/bin/nm-connection-editor", null, AppInfoCreateFlags.NONE);
- appinfo.launch (null, null);
- } catch (Error e) {
- warning ("%s", e.message);
-@@ -61,13 +61,13 @@
- label = title;
- clicked.connect (() => {
- edit_connection_uuid (connection.get_uuid ());
-- });
-+ });
- }
-
- private void edit_connection_uuid (string uuid) {
- try {
- var appinfo = AppInfo.create_from_commandline (
-- "nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
-+ "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE
- );
-
- appinfo.launch (null, null);
-diff --git a/src/Widgets/VPN/VPNPage.vala b/src/Widgets/VPN/VPNPage.vala
-index 23c3ae9..c71984c 100644
---- a/src/Widgets/VPN/VPNPage.vala
-+++ b/src/Widgets/VPN/VPNPage.vala
-@@ -86,8 +86,7 @@ namespace Network {
- add_button.tooltip_text = _("Add VPN Connection…");
- add_button.clicked.connect (() => {
- add_button.sensitive = false;
-- var command = new Granite.Services.SimpleCommand ("/usr/bin",
-- "nm-connection-editor --create --type=vpn");
-+ var command = new Granite.Services.SimpleCommand ("@networkmanagerapplet@", "bin/nm-connection-editor --create --type=vpn");
- command.done.connect ((exit) => {
- if (exit != 0) {
- var dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, "%s", _("Failed to run Connection Editor."));
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
index a61124954698..bd7fee51d8dc 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index fd1719814b82..fdd3f4f57650 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
index 35dd958483d6..ab9ecbc5a336 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix
@@ -4,18 +4,18 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-pantheon-shell";
- version = "2.8.1";
+ version = "2.8.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1vrnzxqzl84k8gbrais4j1jyap10kvil4cr769jpr3q3bkbblwrw";
+ sha256 = "0l4js2gqvn8lmky5b3jjqw6mzxcv9i2gjqr1vka0z40px6vfzf0z";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -36,30 +36,16 @@ stdenv.mkDerivation rec {
granite
gtk3
libgee
+ gala
+ wingpanel
plank
switchboard
];
patches = [
./backgrounds.patch # Having https://github.com/elementary/switchboard-plug-pantheon-shell/issues/166 would make this patch uneeded
- ./hardcode-gsettings.patch
- # Fixes https://github.com/elementary/switchboard-plug-pantheon-shell/issues/172
- (fetchpatch {
- url = "https://github.com/elementary/switchboard-plug-pantheon-shell/commit/e4f86df6a6be402db4c979a4b005573618b744d1.patch";
- sha256 = "0sa8611k6sqg96mnp2plmxd30w6zq76bfwszl8ankr9kwsgyc66y";
- })
];
- postPatch = ''
- substituteInPlace src/Views/Appearance.vala \
- --subst-var-by GALA_GSETTINGS_PATH ${glib.getSchemaPath gala}
- substituteInPlace src/Views/Appearance.vala \
- --subst-var-by WINGPANEL_GSETTINGS_PATH ${glib.getSchemaPath wingpanel}
- '';
-
-
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
-
meta = with stdenv.lib; {
description = "Switchboard Desktop Plug";
homepage = https://github.com/elementary/switchboard-plug-pantheon-shell;
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch
deleted file mode 100644
index d023e1b55ce6..000000000000
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/hardcode-gsettings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/Views/Appearance.vala b/src/Views/Appearance.vala
-index 721d458..17e1c58 100644
---- a/src/Views/Appearance.vala
-+++ b/src/Views/Appearance.vala
-@@ -66,10 +66,16 @@ public class Appearance : Gtk.Grid {
- attach (text_size_label, 0, 2);
- attach (text_size_modebutton, 1, 2);
-
-- var animations_settings = new Settings (ANIMATIONS_SCHEMA);
-+ SettingsSchemaSource gala_schema_source = new SettingsSchemaSource.from_directory ("@GALA_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
-+ SettingsSchema animations_schema = gala_schema_source.lookup (ANIMATIONS_SCHEMA, false);
-+
-+ var animations_settings = new Settings.full (animations_schema, null, null);
- animations_settings.bind (ANIMATIONS_KEY, animations_switch, "active", SettingsBindFlags.DEFAULT);
-
-- var panel_settings = new Settings (PANEL_SCHEMA);
-+ SettingsSchemaSource panel_schema_source = new SettingsSchemaSource.from_directory ("@WINGPANEL_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
-+ SettingsSchema panel_schema = panel_schema_source.lookup (PANEL_SCHEMA, false);
-+
-+ var panel_settings = new Settings.full (panel_schema, null, null);
- panel_settings.bind (TRANSLUCENCY_KEY, translucency_switch, "active", SettingsBindFlags.DEFAULT);
-
- var interface_settings = new Settings (INTERFACE_SCHEMA);
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 7bc3f6ba7adb..a8513f0b29ba 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -19,18 +19,18 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-power";
- version = "2.3.5";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1wcxz4jxyv8kms9gxpwvrb356h10qvcwmdjzjzl2bvj5yl1rfcs9";
+ sha256 = "1b25slfh8166v9z2zmb25k64pcj0lh001qh04qhfilzfcbh54krj";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
buildInputs = [
dbus
+ elementary-dpms-helper
+ elementary-settings-daemon
glib
granite
gtk3
@@ -56,21 +58,8 @@ stdenv.mkDerivation rec {
src = ./dpms-helper-exec.patch;
elementary_dpms_helper = elementary-dpms-helper;
})
- ./hardcode-gsettings.patch
];
- postPatch = ''
- substituteInPlace src/MainView.vala \
- --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${glib.getSchemaPath elementary-dpms-helper}
- substituteInPlace src/MainView.vala \
- --subst-var-by GSD_GSETTINGS_PATH ${glib.getSchemaPath elementary-settings-daemon}
- '';
-
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
- PKG_CONFIG_DBUS_1_SYSTEM_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/system-services";
- PKG_CONFIG_DBUS_1_SYSCONFDIR = "${placeholder "out"}/etc";
- PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
-
meta = with stdenv.lib; {
description = "Switchboard Power Plug";
homepage = https://github.com/elementary/switchboard-plug-power;
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch
deleted file mode 100644
index caacdad6eda9..000000000000
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/hardcode-gsettings.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/MainView.vala b/src/MainView.vala
-index 1654e68..ad8fed9 100644
---- a/src/MainView.vala
-+++ b/src/MainView.vala
-@@ -46,8 +46,13 @@ public class Power.MainView : Gtk.Grid {
-
- var label_size = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
-
-- settings = new GLib.Settings ("org.gnome.settings-daemon.plugins.power");
-- elementary_dpms_settings = new GLib.Settings ("io.elementary.dpms");
-+ SettingsSchemaSource gsd_sss = new SettingsSchemaSource.from_directory ("@GSD_GSETTINGS_PATH@", null, true);
-+ SettingsSchema gsd_schema = gsd_sss.lookup ("org.gnome.settings-daemon.plugins.power", false);
-+ settings = new GLib.Settings.full (gsd_schema, null, null);
-+
-+ SettingsSchemaSource dpms_sss = new SettingsSchemaSource.from_directory ("@DPMS_HELPER_GSETTINGS_PATH@", null, true);
-+ SettingsSchema elementary_dpms_schema = dpms_sss.lookup ("io.elementary.dpms", false);
-+ elementary_dpms_settings = new GLib.Settings.full (elementary_dpms_schema, null, null);
-
- battery = new Battery ();
- power_supply = new PowerSupply ();
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
index aa65934acdb2..b21fc1c099f1 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix
@@ -15,18 +15,18 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-printers";
- version = "2.1.6";
+ version = "2.1.7";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "05pkf3whh51gd9d0h2h4clgf7r3mvzl4ybas7834vhy19dzcbzmc";
+ sha256 = "03r67q6my10i4hl8d0q3d6fhqm9abs9kn9j92hk6ykqb4ybxw1z1";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -45,16 +45,6 @@ stdenv.mkDerivation rec {
switchboard
];
- patches = [
- # Fix build with latest vala.
- (fetchpatch {
- url = "https://github.com/elementary/switchboard-plug-printers/commit/3175c2ebf106145a95355d2571e0a2aa4834e884.patch";
- sha256 = "1b2q48a1284037nz79vjcrz8g2qpsyg7s5rag6bfp03a1ijb7gw3";
- })
- ];
-
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
-
meta = with stdenv.lib; {
description = "Switchboard Printers Plug";
homepage = https://github.com/elementary/switchboard-plug-printers;
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
index 5c72af923975..9d457aedc969 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -48,21 +48,13 @@ stdenv.mkDerivation rec {
libgee
polkit
switchboard
+ lightlocker
zeitgeist
];
- patches = [
- ./hardcode-gsettings.patch
- ];
-
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
-
- substituteInPlace src/Views/LockPanel.vala \
- --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${glib.getSchemaPath lightlocker}
- substituteInPlace src/Views/FirewallPanel.vala \
- --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch
deleted file mode 100644
index 24a104248f82..000000000000
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/hardcode-gsettings.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/src/Views/FirewallPanel.vala b/src/Views/FirewallPanel.vala
-index 0335c29..481b1c8 100644
---- a/src/Views/FirewallPanel.vala
-+++ b/src/Views/FirewallPanel.vala
-@@ -49,7 +49,11 @@ public class SecurityPrivacy.FirewallPanel : Granite.SimpleSettingsPage {
- }
-
- construct {
-- settings = new Settings ("io.elementary.switchboard.security-privacy");
-+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
-+ SettingsSchema security_privacy_schema = sss.lookup ("io.elementary.switchboard.security-privacy", false);
-+
-+ settings = new Settings.full (security_privacy_schema, null, null);
-+
- disabled_rules = new Gee.HashMap ();
- load_disabled_rules ();
-
-diff --git a/src/Views/LockPanel.vala b/src/Views/LockPanel.vala
-index 4f523f9..7135a83 100644
---- a/src/Views/LockPanel.vala
-+++ b/src/Views/LockPanel.vala
-@@ -30,7 +30,10 @@ public class SecurityPrivacy.LockPanel : Granite.SimpleSettingsPage {
- }
-
- construct {
-- locker = new Settings ("apps.light-locker");
-+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@LIGHTLOCKER_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true);
-+ SettingsSchema locker_schema = sss.lookup ("apps.light-locker", false);
-+
-+ locker = new Settings.full (locker_schema, null, null);
-
- var lock_suspend_label = new Gtk.Label (_("Lock on suspend:"));
- var lock_suspend_switch = new Gtk.Switch ();
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
index 57e7fe6af441..3d240fc6221e 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index dee2f851e3fd..8d8cd1c940a6 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -16,18 +16,18 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-sound";
- version = "2.2.1";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0frml591r82j7hf1zlccgv8pzk3w10x470f9nzvdgdjpz0r776k2";
+ sha256 = "1aa9wgaz34glrrnilnqis3k0bnx2a2ir38j493y4d0klkjkwyn5k";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -48,8 +48,6 @@ stdenv.mkDerivation rec {
switchboard
];
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
-
meta = with stdenv.lib; {
description = "Switchboard Sound Plug";
homepage = https://github.com/elementary/switchboard-plug-sound;
diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix
index 5c10cc0e9e4b..03e6ef999eb0 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix
@@ -11,25 +11,24 @@
, granite
, gettext
, clutter-gtk
-, libunity
, elementary-icon-theme
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "switchboard";
- version = "2.3.6";
+ version = "2.3.7";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0lsrn636b0f9a58jbid6mlhgrf8ajnh7phwmhgxz55sz7k7qa58g";
+ sha256 = "160aar5dqd019vn28cm0d0ijj1i6mwpqkl7a1l4lpasw12drxwxz";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -49,7 +48,6 @@ stdenv.mkDerivation rec {
granite
gtk3
libgee
- libunity
];
patches = [
diff --git a/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch b/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch
index f5d8567bffed..d5931d59ec9a 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch
+++ b/pkgs/desktops/pantheon/apps/switchboard/plugs-path-env.patch
@@ -1,13 +1,9 @@
diff --git a/lib/PlugsManager.vala b/lib/PlugsManager.vala
-index 75d0eaf..c227908 100644
+index 8b21e7b..bc36321 100644
--- a/lib/PlugsManager.vala
+++ b/lib/PlugsManager.vala
-@@ -34,10 +34,18 @@ public class Switchboard.PlugsManager : GLib.Object {
- private Gee.LinkedList plugs;
-
- public signal void plug_added (Switchboard.Plug plug);
--
-+
+@@ -36,7 +36,15 @@ public class Switchboard.PlugsManager : GLib.Object {
+
private PlugsManager () {
plugs = new Gee.LinkedList ();
- var base_folder = File.new_for_path (Build.PLUGS_DIR);
diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
index 756ae86bb19d..cc6b37095fdb 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
@@ -1,23 +1,38 @@
-{ makeWrapper
+{ wrapGAppsHook
+, glib
+, lib
, symlinkJoin
, switchboard
, switchboardPlugs
, plugs
+ # Only useful to disable for development testing.
+, useDefaultPlugs ? true
}:
let
- selectedPlugs = if plugs == null then switchboardPlugs else plugs;
+ selectedPlugs =
+ if plugs == null then switchboardPlugs
+ else plugs ++ (lib.optionals useDefaultPlugs switchboardPlugs);
in
symlinkJoin {
name = "${switchboard.name}-with-plugs";
- paths = [ switchboard ] ++ selectedPlugs;
+ paths = [
+ switchboard
+ ] ++ selectedPlugs;
- buildInputs = [ makeWrapper ];
+ buildInputs = [
+ wrapGAppsHook
+ glib
+ ] ++ (lib.forEach selectedPlugs (x: x.buildInputs))
+ ++ selectedPlugs;
postBuild = ''
- wrapProgram $out/bin/io.elementary.switchboard \
- --set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard"
+ make_glib_find_gsettings_schemas
+
+ gappsWrapperArgs+=(--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard")
+
+ wrapGAppsHook
'';
inherit (switchboard) meta;
diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index 34a87a6cb167..be8df39ab068 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index 1fba6a949d6b..9943415a4573 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
index aff830fda568..c19a465e9b14 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix
@@ -19,19 +19,18 @@ stdenv.mkDerivation rec {
sha256 = "1dc583lq61c361arjl3s44d2k72c46bqvcqv1c3s69f2ndsnxjdz";
};
- passthru = {
- updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
- };
- };
-
nativeBuildInputs = [
meson
ninja
pkgconfig
];
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = "pantheon.${pname}";
+ };
+ };
+
meta = with stdenv.lib; {
description = "A set of system sounds for elementary";
homepage = https://github.com/elementary/sound-theme;
diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
index c48dd761e081..2f3b0ee059fc 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix
@@ -1,11 +1,14 @@
{ stdenv
, fetchFromGitHub
, pantheon
+, meson
+, ninja
+, gettext
}:
stdenv.mkDerivation rec {
pname = "elementary-wallpapers";
- version = "5.4";
+ version = "5.5.0";
repoName = "wallpapers";
@@ -13,24 +16,21 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "1ihvv9v8m5f2n2v3bgg769l52wbg241zgp3d45q6phk7p8s1gz3s";
+ sha256 = "0c63nds2ylqgcp39s13mfwhipgyw8cirn0bhybp291l5g86ii6s3";
};
+ nativeBuildInputs = [
+ gettext
+ meson
+ ninja
+ ];
+
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
- dontBuild = true;
- dontConfigure = true;
-
- installPhase = ''
- mkdir -p $out/share/backgrounds/elementary
- cp -av *.jpg $out/share/backgrounds/elementary
- '';
-
meta = with stdenv.lib; {
description = "Collection of wallpapers for elementary";
homepage = https://github.com/elementary/wallpapers;
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index 9e5391243bd1..d4e6b192f200 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -3,37 +3,6 @@
lib.makeScope pkgs.newScope (self: with self; {
- apps = [
- elementary-calculator elementary-calendar
- elementary-camera elementary-code elementary-files
- elementary-music elementary-photos elementary-screenshot-tool
- elementary-terminal elementary-videos switchboard-with-plugs
- ];
-
- artwork = [
- elementary-gtk-theme
- elementary-icon-theme
- elementary-sound-theme
- elementary-wallpapers
- ];
-
- desktop = [
- elementary-default-settings
- elementary-session-settings
- elementary-shortcut-overlay
- gala
- wingpanel-with-indicators
- ];
-
- services = [
- cerbere
- elementary-capnet-assist
- elementary-settings-daemon
- elementary-dpms-helper
- pantheon-agent-geoclue2
- pantheon-agent-polkit
- ];
-
switchboardPlugs = [
switchboard-plug-a11y switchboard-plug-about
switchboard-plug-applications switchboard-plug-bluetooth
@@ -54,6 +23,8 @@ lib.makeScope pkgs.newScope (self: with self; {
wingpanel-indicator-session wingpanel-indicator-sound
];
+ nixpkgs-github-update = callPackage ./nixpkgs_github_update { };
+
updateScript = callPackage ./update.nix { };
maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ];
@@ -155,9 +126,7 @@ lib.makeScope pkgs.newScope (self: with self; {
wingpanel-indicator-keyboard = callPackage ./desktop/wingpanel-indicators/keyboard { };
- wingpanel-indicator-network = callPackage ./desktop/wingpanel-indicators/network {
- inherit (gnome3) networkmanagerapplet;
- };
+ wingpanel-indicator-network = callPackage ./desktop/wingpanel-indicators/network { };
wingpanel-indicator-nightlight = callPackage ./desktop/wingpanel-indicators/nightlight { };
@@ -193,9 +162,7 @@ lib.makeScope pkgs.newScope (self: with self; {
switchboard-plug-mouse-touchpad = callPackage ./apps/switchboard-plugs/mouse-touchpad { };
- switchboard-plug-network = callPackage ./apps/switchboard-plugs/network {
- inherit (gnome3) networkmanagerapplet;
- };
+ switchboard-plug-network = callPackage ./apps/switchboard-plugs/network { };
switchboard-plug-notifications = callPackage ./apps/switchboard-plugs/notifications { };
diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
index f20f11974993..e601c99108b3 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix
@@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index 440893935f81..dc0b764d3197 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -41,8 +41,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
xgreeters = linkFarm "pantheon-greeter-xgreeters" [{
diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
index 3ee55a141b82..06b5183c1e03 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
@@ -14,12 +14,13 @@
, elementary-icon-theme
, elementary-gtk-theme
, gettext
+, libhandy
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "elementary-onboarding";
- version = "1.0.1";
+ version = "1.1.0";
repoName = "onboarding";
@@ -27,13 +28,12 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "025i9av4waqwp1gn8d6sjp8qdwg2j3jskxhmyf9qxbzwfc5msysg";
+ sha256 = "17fw95qg7j0mvam90jrvr77hw2ipxb2lkw0xxql1lzwvdx1h0r2k";
};
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -48,20 +48,13 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ elementary-gtk-theme
elementary-icon-theme
+ glib
granite
gtk3
- elementary-gtk-theme
libgee
- glib
- ];
-
- patches = [
- # Make sure we use our logo from /etc/os-release
- (fetchpatch {
- url = "https://github.com/elementary/onboarding/commit/03975bacb75741d3dd391a126217e415f43c6059.patch";
- sha256 = "1yw7dysav90abxnmkv86bc60dyl8nvi0sgaiz8v39cc2x00rqsg1";
- })
+ libhandy
];
postPatch = ''
diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
index 0be2431d33d8..e79a85bee958 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix
@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index ab7333212a05..58acdd12147e 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -128,9 +128,9 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
+ providedSessions = [ "pantheon" ];
};
meta = with stdenv.lib; {
diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
index 20b1ac7d353f..2ba5f4becc15 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
@@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "elementary-shortcut-overlay";
- version = "1.0.1";
+ version = "1.1.0";
repoName = "shortcut-overlay";
@@ -25,13 +25,12 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "1ph4rx2l5fn0zh4fjfjlgbgskmzc0lvzqgcv7v4kr5m4rij1p4y4";
+ sha256 = "10s44x5qln3asrdr6v5b3v92prh8rfhv96dbm73zhifm2jjm22g8";
};
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix
index 4b75b3bff56b..baff9871105a 100644
--- a/pkgs/desktops/pantheon/desktop/gala/default.nix
+++ b/pkgs/desktops/pantheon/desktop/gala/default.nix
@@ -37,8 +37,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
- versionPolicy = "master";
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index a266223eced8..34c29c1b72ac 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -26,7 +26,7 @@
stdenv.mkDerivation rec {
pname = "wingpanel-applications-menu";
- version = "2.4.4";
+ version = "2.5.0";
repoName = "applications-menu";
@@ -34,13 +34,12 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "09ssxn264v6nzrxgk529kpdxq5j3b14z8mbwq0gni1bgjcla773d";
+ sha256 = "1zry9xvcljsn5fnl8qs21x7q8rpwv0sxvp2dmnx3ddqnvj4q2m7d";
};
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -73,13 +72,10 @@ stdenv.mkDerivation rec {
"--sysconfdir=${placeholder "out"}/etc"
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
- PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard";
-
patches = [
(substituteAll {
- src = ./bc.patch;
- exec = "${bc}/bin/bc";
+ src = ./fix-paths.patch;
+ bc = "${bc}/bin/bc";
})
];
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch
new file mode 100644
index 000000000000..25e3891a205a
--- /dev/null
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch
@@ -0,0 +1,24 @@
+diff --git a/src/synapse-plugins/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin.vala
+index 18ca3af..f5d1076 100644
+--- a/src/synapse-plugins/calculator-plugin.vala
++++ b/src/synapse-plugins/calculator-plugin.vala
+@@ -44,9 +44,7 @@ namespace Synapse {
+ _("Calculator"),
+ _("Calculate basic expressions."),
+ "accessories-calculator",
+- register_plugin,
+- Environment.find_program_in_path ("bc") != null,
+- _("bc is not installed")
++ register_plugin
+ );
+ }
+
+@@ -87,7 +85,7 @@ namespace Synapse {
+ if (matched) {
+ Pid pid;
+ int read_fd, write_fd;
+- string[] argv = {"bc", "-l"};
++ string[] argv = {"@bc@", "-l"};
+ string? solution = null;
+
+ try {
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
index 3a462219f1e6..93ddb0e1dee2 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
@@ -16,18 +16,18 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-bluetooth";
- version = "2.1.3";
+ version = "2.1.4";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "04ggakf7qp4q0kah5xksbwjn78wpdrp9kdgkj6ibzsb97ngn70g9";
+ sha256 = "05v3qy4rxi4l3g1ql99vcjylb01hz3galh19c2jc3lqc1mf1z1j1";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -48,8 +48,6 @@ stdenv.mkDerivation rec {
wingpanel
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
-
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 91549342052c..f6ff962a9446 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -16,37 +16,22 @@
, libxml2
, libsoup
, elementary-calendar
-, fetchurl
}:
-let
-
- # Terrible workaround https://github.com/elementary/wingpanel-indicator-datetime/issues/122
- # Evolution Data Server functionality will be broken (events from calendar in indicator)
- # but at least we don't fail to build.
- old-evolution-data-server = evolution-data-server.overrideAttrs(old: {
- src = fetchurl {
- url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor "3.32.4"}/${old.pname}-3.32.4.tar.xz";
- sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3";
- };
- });
-
-in
-
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-datetime";
- version = "2.2.0";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1whdx0vgm0qbbzsw8dg2liz3cbh3ad5ybkriy4lmx5ynyhpbz0sx";
+ sha256 = "0y8lfrrkzcj8nw94jqawbxr4jz41ac0z539kkr3n3x0qmx72md2y";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -60,7 +45,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- old-evolution-data-server
+ evolution-data-server
granite
gtk3
libgee
@@ -69,6 +54,14 @@ stdenv.mkDerivation rec {
wingpanel
];
+ patches = [
+ # Add support for libecal-2.0
+ (fetchpatch {
+ url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/3ccd05d611e6dd5274a03f061ba1b5e13d6fe0cf.patch";
+ sha256 = "011q9b4pjmk4fpq5zscl5r8m4n3jiyx464023h4j7zf8r1070jz6";
+ })
+ ];
+
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
index 2f917b19f113..66f805b9a494 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix
@@ -17,18 +17,18 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-keyboard";
- version = "2.1.2";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0lrd474m6p8di73hqjilqnnl7qg72ky5narkgcvm4lk8dyi78mz0";
+ sha256 = "0jc12xfaj3micpjssxc7m6hzssvyq26ln5az05x5f1j6v8lccbyn";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index 01a815404a64..fd22de25d63c 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index 3b50866c0ed9..9d2669821de6 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
index 4dbf6528c70b..e5dabead7c5b 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
@@ -14,18 +14,18 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-notifications";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1960s3xcsx6yjlnk0csf1m66s1z1sj5rym9b2fy7pm2nan47z3ld";
+ sha256 = "1lx023z7xxlgwh0br48fw5w7xw673p2sqxwl1gz9f54xx7rv81py";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -44,8 +44,6 @@ stdenv.mkDerivation rec {
wingpanel
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
-
meta = with stdenv.lib; {
description = "Notifications Indicator for Wingpanel";
homepage = https://github.com/elementary/wingpanel-indicator-notifications;
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
index b989bada5711..122236449710 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
index 7efb03f9d665..72f94252cca9 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix
@@ -14,18 +14,18 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-session";
- version = "2.2.5";
+ version = "2.2.6";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0lqh9g6qq09m744gncspm79lbwx1vjl1d6j2szwcq9f0jdm01pm5";
+ sha256 = "0pzknbm0hg4kf2izfg1mcmyildfzwyq1hh0xhlq16gsmakq4ld26";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -44,8 +44,6 @@ stdenv.mkDerivation rec {
wingpanel
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
-
meta = with stdenv.lib; {
description = "Session Indicator for Wingpanel";
homepage = https://github.com/elementary/wingpanel-indicator-session;
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index fa89cca68c0e..ccd233e1a3e7 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -18,18 +18,18 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-sound";
- version = "2.1.3";
+ version = "2.1.4";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0lgjl969c7s31nszh6d4pr1vsxfdsizplsihvd8r02mm1mlxmsda";
+ sha256 = "00r3dqkyp7k34xwn12l0dbzfmz70084lblxchykmk77pgzid2a0b";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -52,8 +52,6 @@ stdenv.mkDerivation rec {
wingpanel
];
- PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel";
-
postPatch = ''
chmod +x meson/post_install.py
patchShebangs meson/post_install.py
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
index 1fc7304feb2d..694166a5d641 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
index 6b554d89caa9..596ee816f891 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
@@ -1,29 +1,44 @@
{ lib
-, makeWrapper
+, wrapGAppsHook
+, glib
, symlinkJoin
, wingpanel
, wingpanelIndicators
, switchboard-with-plugs
, indicators ? null
+ # Only useful to disable for development testing.
+, useDefaultIndicators ? true
}:
let
- selectedIndicators = if indicators == null then wingpanelIndicators else indicators;
+ selectedIndicators =
+ if indicators == null then wingpanelIndicators
+ else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators);
in
symlinkJoin {
name = "${wingpanel.name}-with-indicators";
- paths = [ wingpanel ] ++ selectedIndicators;
+ paths = [
+ wingpanel
+ ] ++ selectedIndicators;
- buildInputs = [ makeWrapper ];
+ buildInputs = [
+ glib
+ wrapGAppsHook
+ ] ++ (lib.forEach selectedIndicators (x: x.buildInputs))
+ ++ selectedIndicators;
# We have to set SWITCHBOARD_PLUGS_PATH because wingpanel-applications-menu
# has a plugin to search switchboard settings
postBuild = ''
- wrapProgram $out/bin/wingpanel \
- --set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel" \
- --set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard" \
- --suffix XDG_DATA_DIRS : ${lib.concatMapStringsSep ":" (indicator: ''${indicator}/share/gsettings-schemas/${indicator.name}'') selectedIndicators}
+ make_glib_find_gsettings_schemas
+
+ gappsWrapperArgs+=(
+ --set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel"
+ --set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard"
+ )
+
+ wrapGAppsHook
'';
inherit (wingpanel) meta;
diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix
index ab673832857d..198be9f3430d 100644
--- a/pkgs/desktops/pantheon/granite/default.nix
+++ b/pkgs/desktops/pantheon/granite/default.nix
@@ -16,18 +16,18 @@
stdenv.mkDerivation rec {
pname = "granite";
- version = "5.2.5";
+ version = "5.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "0z40vhcp2w8s8rnc56pzvjc4s77bln8k84rwwypivjmk3lhpw1vi";
+ sha256 = "1gvrk8gh959bmq8w0kaym7sx13v763lk8x5hck00msgmyrsarfwa";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc b/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc
new file mode 100644
index 000000000000..1d953f4bd735
--- /dev/null
+++ b/pkgs/desktops/pantheon/nixpkgs_github_update/.envrc
@@ -0,0 +1 @@
+use nix
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs
new file mode 100644
index 000000000000..d2cda26eddc9
--- /dev/null
+++ b/pkgs/desktops/pantheon/nixpkgs_github_update/.formatter.exs
@@ -0,0 +1,4 @@
+# Used by "mix format"
+[
+ inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"]
+]
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore b/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore
new file mode 100644
index 000000000000..877c95f1f63b
--- /dev/null
+++ b/pkgs/desktops/pantheon/nixpkgs_github_update/.gitignore
@@ -0,0 +1,32 @@
+# The directory Mix will write compiled artifacts to.
+_build/
+
+# If you run "mix test --cover", coverage assets end up here.
+cover/
+
+# The directory Mix downloads your dependencies sources to.
+deps/
+
+# Where third-party dependencies like ExDoc output generated docs.
+doc/
+
+# Ignore .fetch files in case you like to edit your project deps locally.
+.fetch
+
+# If the VM crashes, it generates a dump, let's ignore it too.
+erl_crash.dump
+
+# Also ignore archive artifacts (built via "mix archive.build").
+*.ez
+
+# Ignore package tarball (built via "mix hex.build").
+nixpkgs_github_update-*.tar
+
+# Ignore elixir_ls
+.elixir_ls
+
+# mix escript.build result
+nixpkgs_github_update
+
+# lockfile. only because this is nixpkgs.
+mix.lock
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix b/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix
new file mode 100644
index 000000000000..834291222cf0
--- /dev/null
+++ b/pkgs/desktops/pantheon/nixpkgs_github_update/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, beamPackages
+, makeWrapper
+, common-updater-scripts
+}:
+
+let
+
+ poison_4 = beamPackages.buildMix {
+ name = "poison";
+ version = "4.0.1";
+
+ src = beamPackages.fetchHex {
+ pkg = "poison";
+ version = "4.0.1";
+ sha256 = "098gdz7xzfmnjzgnnv80nl4h3zl8l9czqqd132vlnfabxbz3d25s";
+ };
+ };
+
+
+in
+
+beamPackages.buildMix {
+ name = "nixpkgs-github-update";
+ version = "0.1.0";
+
+ src = lib.cleanSource ./.;
+
+ nativeBuildInputs = [
+ makeWrapper
+ ];
+
+ beamDeps = with beamPackages; [ erlang poison_4 ];
+
+ buildPhase = ''
+ export HEX_OFFLINE=1
+ export HEX_HOME=`pwd`
+ export MIX_ENV=prod
+ export MIX_NO_DEPS=1
+
+ mix escript.build --no-deps-check
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp nixpkgs_github_update $out/bin
+ '';
+
+ postFixup = ''
+ wrapProgram $out/bin/nixpkgs_github_update \
+ --prefix PATH : "${lib.makeBinPath [ common-updater-scripts ]}"
+ '';
+}
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex
new file mode 100644
index 000000000000..e735c4285169
--- /dev/null
+++ b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/cli.ex
@@ -0,0 +1,71 @@
+defmodule NixpkgsGitHubUpdate.CLI do
+ @moduledoc """
+ Run updates on Nix Expressions that use fetchFromGitHub.
+
+ Arguments the script accepts:
+ --attribute
+
+ Example usage:
+ ```
+ ./nixpkgs_github_update --attribute "notes-up"
+ ```
+ """
+ alias NixpkgsGitHubUpdate.{Nix, GitHubLatestVersion}
+
+ def help do
+ IO.puts("""
+ Run updates on Nix Expressions that use fetchFromGitHub.
+
+ Arguments the script accepts:
+ --attribute
+
+ Example usage:
+ ./nixpkgs_github_update --attribute "notes-up"
+ """)
+ end
+
+ def main([]) do
+ help()
+ end
+
+ def main(args) do
+ opts = parse_args(args)
+
+ attribute = opts[:attribute]
+
+ case Nix.attribute_exists?(attribute) do
+ true -> update(attribute)
+ _ -> exit("Requested attribute doesn't exist.")
+ end
+ end
+
+ def parse_args(args) do
+ {options, _, _} =
+ args
+ |> OptionParser.parse(strict: [attribute: :string])
+
+ options
+ end
+
+ def update(attribute) do
+ version =
+ Nix.get_owner_repo(attribute)
+ |> GitHubLatestVersion.fetch()
+ |> decode_response()
+ |> construct_version()
+
+ Nix.update_source_version(attribute, version)
+ end
+
+ def decode_response({:ok, response}), do: response
+
+ def decode_response({:error, error}) do
+ IO.puts("Error getting latest release from GitHub: #{error["message"]}")
+ System.halt(2)
+ end
+
+ def construct_version(response) do
+ Map.get(response, "tag_name")
+ |> String.trim_leading("v")
+ end
+end
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex
new file mode 100644
index 000000000000..bd4bb8100ba5
--- /dev/null
+++ b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/github_latest_version.ex
@@ -0,0 +1,42 @@
+defmodule NixpkgsGitHubUpdate.GitHubLatestVersion do
+ @user_agent 'httpc'
+
+ def fetch({owner, repo}) do
+ endpoint = releases_endpoint(owner, repo)
+ headers = construct_headers()
+
+ :httpc.request(:get, {endpoint, headers}, [], [])
+ |> handle_response
+ end
+
+ def releases_endpoint(owner, repo) do
+ 'https://api.github.com/repos/#{owner}/#{repo}/releases/latest'
+ end
+
+ def construct_headers do
+ headers = %{'User-Agent' => @user_agent}
+
+ put_token(headers, get_token())
+ |> Map.to_list
+ end
+
+ defp get_token do
+ String.to_charlist("#{System.get_env("OAUTH_TOKEN")}")
+ end
+
+ defp put_token(headers, token) when is_binary(token) do
+ Map.put_new(headers, 'Authorization', 'token #{token}')
+ end
+
+ defp put_token(headers, _), do: headers
+
+ def handle_response({_, {{_httpv, status_code, _}, _headers, response}}) do
+ {
+ status_code |> check_for_error(),
+ response |> Poison.Parser.parse!(%{})
+ }
+ end
+
+ defp check_for_error(200), do: :ok
+ defp check_for_error(_), do: :error
+end
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex
new file mode 100644
index 000000000000..d5d9af84a6ba
--- /dev/null
+++ b/pkgs/desktops/pantheon/nixpkgs_github_update/lib/nixpkgs_github_update/nix.ex
@@ -0,0 +1,85 @@
+defmodule NixpkgsGitHubUpdate.Nix do
+ def executable do
+ nix = System.find_executable("nix")
+
+ if nix == nil do
+ raise RuntimeError, message: "missing executable for 'nix'"
+ end
+
+ nix
+ end
+
+ def eval!(attribute) do
+ System.cmd(
+ executable(),
+ [
+ "eval",
+ "--json",
+ attribute
+ ],
+ stderr_to_stdout: true
+ )
+ |> handle_eval
+ end
+
+ defp handle_eval({eval_result, 0}) do
+ case eval_result do
+ "" -> eval_result
+ _ -> Poison.Parser.parse!(eval_result, %{})
+ end
+ end
+
+ defp handle_eval({eval_result, _}) do
+ raise RuntimeError, message: "Error running nix eval: #{eval_result}"
+ end
+
+ def attribute_exists?(attribute) do
+ attr_exist_expression = """
+ with import {};
+
+ let
+ attrSet = pkgs.lib.attrByPath (pkgs.lib.splitString "." "#{attribute}") null pkgs;
+ in
+ if attrSet == null then false
+ else true
+ """
+
+ eval!("(#{attr_exist_expression})")
+ end
+
+ def update_source_version(attribute, version) do
+ System.cmd("update-source-version", [
+ attribute,
+ version
+ ])
+ end
+
+ def get_url_attr(attribute) do
+ case attribute_exists?("#{attribute}.src.fetchSubmodules") do
+ true -> "url"
+ false -> "urls"
+ end
+ end
+
+ def get_owner_repo(attribute) do
+ url_attr = get_url_attr(attribute)
+
+ eval!("nixpkgs.#{attribute}.src.#{url_attr}")
+ |> case do
+ # It's fetchFromGitHub if we got a list
+ [url | _] ->
+ URI.parse(url).path
+ |> String.split("/archive", trim: true)
+ |> List.first()
+ |> String.split("/", trim: true)
+
+ # It's fetchgit if we got a plain string
+ url ->
+ URI.parse(url).path
+ |> String.split(".git", trim: true)
+ |> List.first()
+ |> String.split("/", trim: true)
+ end
+ |> List.to_tuple()
+ end
+end
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs
new file mode 100644
index 000000000000..3498c7066a43
--- /dev/null
+++ b/pkgs/desktops/pantheon/nixpkgs_github_update/mix.exs
@@ -0,0 +1,28 @@
+defmodule NixpkgsGitHubUpdate.MixProject do
+ use Mix.Project
+
+ def project do
+ [
+ app: :nixpkgs_github_update,
+ version: "0.1.0",
+ elixir: "~> 1.9",
+ escript: [main_module: NixpkgsGitHubUpdate.CLI],
+ start_permanent: Mix.env() == :prod,
+ deps: deps()
+ ]
+ end
+
+ # Run "mix help compile.app" to learn about applications.
+ def application do
+ [
+ extra_applications: [:logger, :inets, :ssl]
+ ]
+ end
+
+ # Run "mix help deps" to learn about dependencies.
+ defp deps do
+ [
+ {:poison, "~> 4.0.1"}
+ ]
+ end
+end
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix b/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix
new file mode 100644
index 000000000000..0bb4e58a6a12
--- /dev/null
+++ b/pkgs/desktops/pantheon/nixpkgs_github_update/shell.nix
@@ -0,0 +1,19 @@
+with import {};
+
+let
+ inherit (lib) optional;
+in
+
+mkShell rec {
+ name = "nixpkgs-github-update-shell";
+
+ buildInputs = [
+ elixir
+ erlang
+ common-updater-scripts
+ ]
+ ++ optional stdenv.isLinux libnotify # For ExUnit Notifier on Linux.
+ ++ optional stdenv.isLinux inotify-tools # For file_system on Linux.
+ ;
+
+}
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs
new file mode 100644
index 000000000000..c5a57698fed6
--- /dev/null
+++ b/pkgs/desktops/pantheon/nixpkgs_github_update/test/nix_test.exs
@@ -0,0 +1,49 @@
+defmodule NixTest do
+ @fake_package "asanotehhhuh"
+ @fetchgit_package "polybar"
+ @fetchgithub_package "notes-up"
+
+ use ExUnit.Case
+
+ import NixpkgsGitHubUpdate.Nix
+
+ def check_for_nix(_context) do
+ try do
+ executable()
+ rescue
+ RuntimeError ->
+ IO.puts("You need Nix installed to run these tests.")
+ System.halt(127)
+ end
+
+ :ok
+ end
+
+ setup_all :check_for_nix
+
+ describe "evaluation tests" do
+ test "evaluation handling" do
+ exists_attr = "nixpkgs.#{@fetchgithub_package}"
+
+ assert is_binary(eval!(exists_attr)) == true
+ catch_error(eval!(@fake_package) == 1)
+ end
+
+ # This should always be true or false
+ test "package exists?" do
+ assert attribute_exists?(@fetchgithub_package) == true
+ assert attribute_exists?(@fake_package) == false
+ end
+ end
+
+ test "owner repo" do
+ assert get_url_attr(@fetchgit_package) == "url"
+ assert get_url_attr(@fetchgithub_package) == "urls"
+
+ assert get_owner_repo(@fetchgit_package) ==
+ {@fetchgit_package, @fetchgit_package}
+
+ assert get_owner_repo(@fetchgithub_package) ==
+ {"Philip-Scott", String.capitalize(@fetchgithub_package)}
+ end
+end
diff --git a/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs b/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs
new file mode 100644
index 000000000000..869559e709ea
--- /dev/null
+++ b/pkgs/desktops/pantheon/nixpkgs_github_update/test/test_helper.exs
@@ -0,0 +1 @@
+ExUnit.start()
diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix
index a8eaf766664e..a911440fa5de 100644
--- a/pkgs/desktops/pantheon/services/cerbere/default.nix
+++ b/pkgs/desktops/pantheon/services/cerbere/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix
index b10e97f77d73..68532bdd8120 100644
--- a/pkgs/desktops/pantheon/services/contractor/default.nix
+++ b/pkgs/desktops/pantheon/services/contractor/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A desktop-wide extension service used by elementary OS";
- homepage = https://github.com/elementarycontractor;
+ homepage = "https://github.com/elementary/contractor";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = pantheon.maintainers;
diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
index 6305c872b2fa..d41750f8dfc0 100644
--- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix
@@ -17,7 +17,7 @@
stdenv.mkDerivation rec {
pname = "elementary-capnet-assist";
- version = "2.2.3";
+ version = "2.2.4";
repoName = "capnet-assist";
@@ -25,13 +25,12 @@ stdenv.mkDerivation rec {
owner = "elementary";
repo = repoName;
rev = version;
- sha256 = "15cnwimkmmsb4rwvgm8bizcsn1krsj6k3qc88izn79is75y6wwji";
+ sha256 = "0yz827gs1qv6csgv4v993rjmqzc6dbymbvznsy45ghlh19l4l7j1";
};
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
index fb9d28eaf6b1..4ec1df36bea2 100644
--- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
passthru = {
updateScript = pantheon.updateScript {
- inherit repoName;
- attrPath = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
index 8afbbbeed829..0f919c7c94d4 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix
@@ -15,18 +15,18 @@
stdenv.mkDerivation rec {
pname = "pantheon-agent-geoclue2";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1hjnbbzsch09090b200b3i85x8fv95agfqd6nrlc9za3jqjhm2xs";
+ sha256 = "1fhgdcykn0ykn8fp7inn2akygpglhdwfpdkpnih86kqmqj8siahv";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
index 53a65ddb9474..f244e0e46371 100644
--- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
+++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix
@@ -7,24 +7,25 @@
, vala
, gtk3
, libgee
+, granite
, polkit
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "pantheon-agent-polkit";
- version = "0.1.6";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "1g9l2jzpvv0dbvxh93w98a7ijsfqv3s3382li4s256179gihhd67";
+ sha256 = "1yybblprcn0cgcf9j76yckqcimm4h8l41cczxjvgp789p1pki3bn";
};
passthru = {
updateScript = pantheon.updateScript {
- repoName = pname;
+ attrPath = "pantheon.${pname}";
};
};
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
+ granite
gtk3
libgee
polkit
diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix
index 3bc432c5d325..1137c5330169 100644
--- a/pkgs/desktops/pantheon/update.nix
+++ b/pkgs/desktops/pantheon/update.nix
@@ -1,36 +1,6 @@
-{ runCommand
-, nix
-, bash
-, git
-, jq
-, nix-prefetch-scripts
-, coreutils
-, common-updater-scripts
-, gnugrep
-, gnused
-, curl
-}:
+{ nixpkgs-github-update }:
-{ repoName
-, attrPath ? repoName
-, versionPolicy ? "release"
-}:
+{ attrPath }:
-let
- script = ./update.sh;
- updateScript = runCommand "update.sh" {
- inherit bash git jq nix coreutils gnugrep gnused curl;
- # These weren't being substituted
- nix_prefetch_scripts = nix-prefetch-scripts;
- common_updater_scripts = common-updater-scripts;
- } ''
- substituteAll ${script} $out
- chmod +x $out
- '';
-
- throwFlag = throw "${versionPolicy} is not a valid versionPolicy - Options are either 'release' or 'master' (defaults to release).";
-
- versionFlag = { release = "-r"; master = "-m"; }.${versionPolicy} or throwFlag;
-
-in [ updateScript versionFlag repoName attrPath ]
+[ "${nixpkgs-github-update}/bin/nixpkgs_github_update" "--attribute" attrPath ]
diff --git a/pkgs/desktops/pantheon/update.sh b/pkgs/desktops/pantheon/update.sh
deleted file mode 100755
index 8d002fe47c27..000000000000
--- a/pkgs/desktops/pantheon/update.sh
+++ /dev/null
@@ -1,217 +0,0 @@
-#!@bash@/bin/bash
-PATH=@bash@/bin:@nix_prefetch_scripts@/bin:@common_updater_scripts@/bin:@git@/bin:@jq@/bin:@nix@/bin:@gnugrep@/bin:@gnused@/bin:@curl@/bin:$PATH
-#!/usr/bin/env bash
-
-set -eu -o pipefail
-
-#
-# ─── HOW TO USE ─────────────────────────────────────────────────────────────────
-#
-
-function usage ( ) {
- cat <
-EOF
-}
-
-#
-# ─── POINTS YOU IN THE RIGHT DIRECTION ──────────────────────────────────────────
-#
-
- function usage_tip ( ) {
- echo 'run `update.sh -h` for usage instructions' >&2
- exit 1
- }
-
-#
-# ─── OPTIONS: RELEASE | MASTER ────────────────────────────────────────────────────
-#
-
- while getopts ":hrm" opt; do
- case $opt in
- r)
- release=1
- master=0
- ;;
- m)
- master=1
- release=0
- ;;
- h)
- usage
- exit
- ;;
- ?)
- echo "Invalid option: -$OPTARG" >&2
- usage_tip
- ;;
- esac
- done
-
- shift $((OPTIND-1))
-
-#
-# ─── FAIL WITH MESSAGE AND NON-ZERO EXIT STATUS ─────────────────────────────────
-#
-
- function fail ( ) {
- echo "$1" >&2
- exit 1
- }
-
-#
-# ─── UPDATES PACKAGE TO LATEST TAGGED RELEASE ───────────────────────────────
-#
-
- function update_to_latest_release ( ) {
- repo_name="$1"
- attr="$2"
-
- version=$(get_latest_tag "$repo_name")
- fetch=$(fetch "$repo_name" "refs/tags/${version}")
- sha256=$(get_hash "${fetch}")
-
- update-source-version "pantheon.$attr" "$version" "$sha256"
-
- nix_file=$(get_file_path $attr)
-
- if [ ! -f "$nix_file" ]; then
- fail "Couldn't evaluate 'pantheon.$attr.meta.position' to locate the .nix file!"
- fi
-
- correct_rev "$attr" "$nix_file" "version"
- }
-
-#
-# ─── UPDATES PACKAGE TO MASTER ──────────────────────────────────────────────────
-#
-
- function update_to_master ( ) {
- repo_name="$1"
- attr="$2"
-
- fetch=$(fetch "$repo_name" "refs/heads/master")
-
- version=$(get_version "$fetch")
- sha256=$(get_hash "$fetch")
- proper_version=$(get_master_date "$fetch")
-
- update-source-version "pantheon.$attr" "$proper_version" "$sha256"
-
- nix_file=$(get_file_path $attr)
-
- if [ ! -f "$nix_file" ]; then
- fail "Couldn't evaluate 'pantheon.$attr.meta.position' to locate the .nix file!"
- fi
-
- correct_rev "$attr" "$nix_file" '"'$version'"'
- }
-
-#
-# ─── GETS THE LATEST TAGGED RELEASE NAME FROM GITHUB ─────────────────────
-#
-
- function get_latest_tag ( ) {
- repo_name="$1"
-
- curl --silent --show-error --fail -X GET "https://api.github.com/repos/elementary/$repo_name/releases/latest" | jq -r '.tag_name'
- }
-
-#
-# ─── FETCHES REPO AND RETURNS RELEVANT INFORMATION ──────────────────
-#
-
- function fetch ( ) {
- repo_name="$1"
- version="$2"
-
- base_url="https://github.com/elementary"
- full_url="$base_url/$repo_name"
-
- nix-prefetch-git --quiet --no-deepClone --url "$full_url" --rev "$version"
- }
-
-#
-# ─── PARSES GIT REVISION FROM FETCH ─────────────────────────────────────────────
-#
-
- function get_version ( ) {
- fetch_info="$1"
-
- echo "$fetch_info" | jq -r '.rev'
- }
-
-#
-# ─── PARSES HASH FROM FETCH ─────────────────────────────────────────────────────
-#
-
- function get_hash ( ) {
- fetch_info="$1"
-
- echo "$fetch_info" | jq -r '.sha256'
- }
-
-#
-# ─── PARSES DATE FROM FETCH AND NORMALIZES IT TO NIXPKGS STANDARD ───────────────
-#
-
- function get_master_date ( ) {
- fetch_info="$1"
-
- full_date=$(echo "$fetch_info" | jq -r '.date')
- short_date=$(date -d "$full_date" +"%Y-%m-%d")
-
- echo "unstable-$short_date"
- }
-
-#
-# ─── RETURN NIX EXPRESSION PATH ─────────────────────────────────────────────────
-#
-
- function get_file_path () {
- attr="$1"
-
- nix-instantiate --eval --strict -A "pantheon.$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/'
- }
-
-#
-# ─── CORRECTS REV VERSION ───────────────────────────────────────────────────────────
-#
-
- function correct_rev ( ) {
- attr="$1"
- nix_file="$2"
- rev="$3"
-
- check_pattern1='^\s*rev\s*=\s*"[0-9a-f]{5,40}"'
- check_pattern2='^\s*rev\s*=\s*version'
-
- replace_pattern1='/\brev\b\s*=/ s|\"[0-9a-f]{5,40}\"|'$rev'|'
- replace_pattern2='/\brev\b\s*=/ s|version|'$rev'|'
-
- if [ $(grep -c -P "$check_pattern1" "$nix_file") = 1 ]; then
- pattern="$replace_pattern1"
- elif [ $(grep -c -P "$check_pattern2" "$nix_file") = 1 ]; then
- pattern="$replace_pattern2"
- else
- fail "Couldn't figure out where out where to patch in the correct version in pantheon.$attr!"
- fi
-
- sed -i.bak "$nix_file" -re "$pattern"
- rm -f "$nix_file.bak"
- }
-
-
-#
-# ─── WHETHER TO UPDATE TO RELEASE OR MASTER ──────────────────────────────────
-#
-
- if [ $release = 1 ]; then
- update_to_latest_release $1 $2
- elif [ $master = 1 ]; then
- update_to_master $1 $2
- else
- exit 1
- fi
-
-# ────────────────────────────────────────────────────────────────────────────────
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index e188e4e3fcdd..a199a4a959db 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -43,11 +43,11 @@ let
propagate = out:
let setupHook = { writeScript }:
writeScript "setup-hook" ''
- if [ "$hookName" != postHook ]; then
+ if [[ "''${hookName-}" != postHook ]]; then
postHooks+=("source @dev@/nix-support/setup-hook")
else
# Propagate $${out} output
- propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@"
+ propagatedUserEnvPkgs+=" @${out}@"
if [ -z "$outputDev" ]; then
echo "error: \$outputDev is unset!" >&2
@@ -57,7 +57,7 @@ let
# Propagate $dev so that this setup hook is propagated
# But only if there is a separate $dev output
if [ "$outputDev" != out ]; then
- propagatedBuildInputs="$propagatedBuildInputs @dev@"
+ propagatedBuildInputs+=" @dev@"
fi
fi
'';
diff --git a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix
new file mode 100644
index 000000000000..7a7c88b6bcff
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix
@@ -0,0 +1,39 @@
+{ lib, mkDerivation, fetchFromGitHub
+, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
+
+mkDerivation rec {
+ pname = "krohnkite";
+ version = "0.5";
+
+ src = fetchFromGitHub {
+ owner = "esjeon";
+ repo = "krohnkite";
+ rev = "v${version}";
+ sha256 = "0i0xr5aj565dzr72zjg7wmyca2gwg9izhnri63pab5y5gp5zjqn2";
+ };
+
+ buildInputs = [
+ kcoreaddons kwindowsystem plasma-framework systemsettings
+ ];
+
+ dontBuild = true;
+
+ # 1. --global still installs to $HOME/.local/share so we use --packageroot
+ # 2. plasmapkg2 doesn't copy metadata.desktop into place, so we do that manually
+ installPhase = ''
+ runHook preInstall
+
+ plasmapkg2 --type kwinscript --install ${src}/res/ --packageroot $out/share/kwin/scripts
+ install -Dm644 ${src}/res/metadata.desktop $out/share/kservices5/krohnkite.desktop
+
+ runHook postInstalll
+ '';
+
+ meta = with lib; {
+ description = "A dynamic tiling extension for KWin";
+ license = licenses.mit;
+ maintainers = with maintainers; [ seqizz ];
+ inherit (src.meta) homepage;
+ inherit (kwindowsystem.meta) platforms;
+ };
+}
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
index 5c27eee5010e..5159328ed3fe 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
@@ -1,9 +1,8 @@
diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
-index 69d3070..52e9102 100644
+index ea9a943..f98ddd2 100644
--- a/sddm-theme/theme.conf.cmake
+++ b/sddm-theme/theme.conf.cmake
-@@ -1,5 +1,5 @@
- [General]
+@@ -2,4 +2,4 @@
type=image
color=#1d99f3
fontSize=10
@@ -37,7 +36,7 @@ index 493218e..d507aa5 100644
+ return system( NIXPKGS_KDOSTARTUPCONFIG5 );
}
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index b68f0c6..a0ec214 100644
+index b68f0c6..97a13a1 100644
--- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake
@@ -1,22 +1,31 @@
@@ -443,7 +442,7 @@ index b68f0c6..a0ec214 100644
if test $? -eq 255; then
# Startup error
echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2
-@@ -286,36 +387,36 @@ fi
+@@ -286,19 +387,19 @@ fi
#Anything after here is logout
#It is not called after shutdown/restart
@@ -465,13 +464,12 @@ index b68f0c6..a0ec214 100644
# ask remaining drkonqis to die in a graceful way
- qdbus | grep 'org.kde.drkonqi-' | while read address ; do
- qdbus "$address" "/MainApplication" "quit"
-- done
-- break
+ @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do
+ @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit"
+ done
+ break
fi
- done
- fi
+@@ -307,15 +408,17 @@ fi
echo 'startkde: Shutting down...' 1>&2
# just in case
@@ -1008,5 +1006,3 @@ index dcb473a..0988740 100644
echo 'startplasmacompositor: Shutting down...' 1>&2
---
-2.19.2
diff --git a/pkgs/desktops/surf-display/default.nix b/pkgs/desktops/surf-display/default.nix
index 47b7e1172068..dd0644866478 100644
--- a/pkgs/desktops/surf-display/default.nix
+++ b/pkgs/desktops/surf-display/default.nix
@@ -43,6 +43,10 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=${placeholder "out"}" ];
+ passthru = {
+ providedSessions = [ "surf-display" ];
+ };
+
meta = with stdenv.lib; {
description = "Kiosk browser session manager based on the surf browser";
homepage = "https://code.it-zukunft-schule.de/cgit/surf-display/";
diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/desktops/xfce/applications/catfish/default.nix
similarity index 71%
rename from pkgs/applications/search/catfish/default.nix
rename to pkgs/desktops/xfce/applications/catfish/default.nix
index bce5795a9c7e..3c0fbafc7842 100644
--- a/pkgs/applications/search/catfish/default.nix
+++ b/pkgs/desktops/xfce/applications/catfish/default.nix
@@ -1,21 +1,19 @@
{ stdenv, fetchurl, file, which, intltool, gobject-introspection,
- findutils, xdg_utils, gnome3, gtk3, pythonPackages,
+ findutils, xdg_utils, dconf, gtk3, python3Packages,
wrapGAppsHook
}:
-pythonPackages.buildPythonApplication rec {
- majorver = "1.4";
- minorver = "10";
- version = "${majorver}.${minorver}";
+python3Packages.buildPythonApplication rec {
pname = "catfish";
+ version = "1.4.11";
src = fetchurl {
- url = "https://archive.xfce.org/src/apps/${pname}/${majorver}/${pname}-${version}.tar.bz2";
- sha256 = "0g9l5sv5d7wmyb23cvpz5mpvjnxiqjh25v9gr5qzhcah202a0wr5";
+ url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
+ sha256 = "11fdzz3l5mydscs4a398siphxwr6xf3cfyimr0hgpkg3169syyv1";
};
nativeBuildInputs = [
- pythonPackages.distutils_extra
+ python3Packages.distutils_extra
file
which
intltool
@@ -25,17 +23,17 @@ pythonPackages.buildPythonApplication rec {
buildInputs = [
gtk3
- gnome3.dconf
- pythonPackages.pyxdg
- pythonPackages.ptyprocess
- pythonPackages.pycairo
+ dconf
+ python3Packages.pyxdg
+ python3Packages.ptyprocess
+ python3Packages.pycairo
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
];
propagatedBuildInputs = [
- pythonPackages.dbus-python
- pythonPackages.pygobject3
- pythonPackages.pexpect
+ python3Packages.dbus-python
+ python3Packages.pygobject3
+ python3Packages.pexpect
xdg_utils
findutils
];
diff --git a/pkgs/desktops/xfce/applications/gigolo.nix b/pkgs/desktops/xfce/applications/gigolo.nix
deleted file mode 100644
index d0fc55e77e82..000000000000
--- a/pkgs/desktops/xfce/applications/gigolo.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, python, gettext, intltool, pkgconfig, gtk, gvfs }:
-
-stdenv.mkDerivation rec {
- p_name = "gigolo";
- ver_maj = "0.4";
- ver_min = "2";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0r4ij0mlnp0bqq44pyrdcpz18r1zwsksw6w5yc0jzgg7wj7wfgsm";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ python gettext intltool gtk gvfs];
-
- meta = {
- homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
- description = "A frontend to easily manage connections to remote filesystems";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/gigolo/default.nix b/pkgs/desktops/xfce/applications/gigolo/default.nix
similarity index 72%
rename from pkgs/desktops/xfce4-14/gigolo/default.nix
rename to pkgs/desktops/xfce/applications/gigolo/default.nix
index 5b25e474af27..32486aab981f 100644
--- a/pkgs/desktops/xfce4-14/gigolo/default.nix
+++ b/pkgs/desktops/xfce/applications/gigolo/default.nix
@@ -9,4 +9,8 @@ mkXfceDerivation {
nativeBuildInputs = [ exo ];
buildInputs = [ gtk3 glib gvfs ];
+
+ meta = {
+ description = "A frontend to easily manage connections to remote filesystems";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/mousepad-12134.patch b/pkgs/desktops/xfce/applications/mousepad-12134.patch
deleted file mode 100644
index 74a28ecf61af..000000000000
--- a/pkgs/desktops/xfce/applications/mousepad-12134.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -urNZ a/mousepad/mousepad-action-group.c b/mousepad/mousepad-action-group.c
---- a/mousepad/mousepad-action-group.c 2014-09-01 20:50:07.000000000 +0000
-+++ b/mousepad/mousepad-action-group.c 2017-12-18 16:57:46.836538403 +0000
-@@ -302,11 +302,6 @@
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
- self->locked = FALSE;
-
-- /* update the setting when the active action is changed */
-- self->locked = TRUE;
-- MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, gtk_source_style_scheme_get_id (scheme));
-- self->locked = FALSE;
--
- g_object_notify (G_OBJECT (self), "active-style-scheme");
- }
-
-@@ -473,6 +468,8 @@
- mousepad_action_group_style_scheme_action_activate (MousepadActionGroup *self,
- MousepadStyleSchemeAction *action)
- {
-+ const gchar *scheme_name = NULL;
-+
- /* only update the active action if we're not already in the process of
- * setting it and the sender action is actually active */
- if (! self->locked &&
-@@ -481,7 +478,14 @@
- GtkSourceStyleScheme *scheme;
-
- scheme = mousepad_style_scheme_action_get_style_scheme (action);
-- mousepad_action_group_set_active_style_scheme (self, scheme);
-+
-+ /* update the setting when the active action is changed */
-+ if (scheme != NULL)
-+ scheme_name = gtk_source_style_scheme_get_id(scheme);
-+
-+ self->locked = TRUE;
-+ MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, scheme_name);
-+ self->locked = FALSE;
- }
- }
-
-diff -urNZ a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
---- a/mousepad/mousepad-window.c 2014-09-01 20:58:02.000000000 +0000
-+++ b/mousepad/mousepad-window.c 2017-12-18 17:07:51.099321408 +0000
-@@ -712,32 +712,6 @@
-
-
- static void
--mousepad_window_action_group_style_scheme_changed (MousepadWindow *window,
-- GParamSpec *pspec,
-- MousepadActionGroup *group)
--{
-- GtkSourceStyleScheme *scheme;
-- const gchar *scheme_id;
-- gint npages, i;
--
-- /* get the new active language */
-- scheme = mousepad_action_group_get_active_style_scheme (group);
-- scheme_id = gtk_source_style_scheme_get_id (scheme);
--
-- /* update the color scheme on all the documents */
-- npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->notebook));
-- for (i = 0; i < npages; i++)
-- {
-- MousepadDocument *document;
--
-- document = MOUSEPAD_DOCUMENT (gtk_notebook_get_nth_page (GTK_NOTEBOOK (window->notebook), i));
-- mousepad_view_set_color_scheme (document->textview, scheme_id);
-- }
--}
--
--
--
--static void
- mousepad_window_create_style_schemes_menu (MousepadWindow *window)
- {
- GtkWidget *menu, *item;
-@@ -751,13 +725,6 @@
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
- gtk_widget_show_all (menu);
- gtk_widget_show (item);
--
-- /* watch for activations of the style schemes actions */
-- g_signal_connect_object (window->action_group,
-- "notify::active-style-scheme",
-- G_CALLBACK (mousepad_window_action_group_style_scheme_changed),
-- window,
-- G_CONNECT_SWAPPED);
- }
-
-
diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix
deleted file mode 100644
index 2dca1fa29b0f..000000000000
--- a/pkgs/desktops/xfce/applications/mousepad.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util
-, gtk, gtksourceview, dbus, dbus-glib, makeWrapper
-, dconf }:
-
-stdenv.mkDerivation rec {
- p_name = "mousepad";
- ver_maj = "0.4";
- ver_min = "0";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "60114431eac8db6bb6ce18bd38f1630cccb684375b97a445a1b6fd619848d132";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- patches = [ ./mousepad-12134.patch ];
-
- buildInputs =
- [ pkgconfig intltool libxfce4util
- gtk gtksourceview dbus dbus-glib makeWrapper
- dconf
- ];
-
- configureFlags = [ "--enable-keyfile-settings" ];
-
- preFixup = ''
- wrapProgram "$out/bin/mousepad" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \
- --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
- '';
-
- meta = {
- homepage = https://www.xfce.org/;
- description = "A simple text editor for Xfce";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix
similarity index 86%
rename from pkgs/desktops/xfce4-14/mousepad/default.nix
rename to pkgs/desktops/xfce/applications/mousepad/default.nix
index 77559aaf329f..6f841958c795 100644
--- a/pkgs/desktops/xfce4-14/mousepad/default.nix
+++ b/pkgs/desktops/xfce/applications/mousepad/default.nix
@@ -12,4 +12,8 @@ mkXfceDerivation {
# See https://github.com/NixOS/nixpkgs/issues/36468
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+ meta = {
+ description = "A simple text editor for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix
deleted file mode 100644
index 19bd560cbaef..000000000000
--- a/pkgs/desktops/xfce/applications/orage.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, bison, flex, intltool, gtk, libical, dbus-glib, tzdata
-, libnotify, popt, xfce }:
-
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
- p_name = "orage";
- ver_maj = "4.12";
- ver_min = "1";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w";
- };
-
- patches = [
- # Fix build with libical 3.0
- (fetchpatch {
- name = "fix-libical3.patch";
- url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f;
- sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf";
- })
- ];
-
- postPatch = ''
- substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
- substituteInPlace src/tz_zoneinfo_read.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
- substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
- '';
-
- postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources
-
- nativeBuildInputs = [ pkgconfig intltool bison flex ];
-
- buildInputs = [ gtk libical dbus-glib libnotify popt xfce.libxfce4util
- xfce.xfce4-panel ];
-
- meta = {
- homepage = https://www.xfce.org/projects/;
- description = "A simple calendar application with reminders";
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.romildo ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix
similarity index 93%
rename from pkgs/desktops/xfce4-14/orage/default.nix
rename to pkgs/desktops/xfce/applications/orage/default.nix
index 7bb10c2fd94b..4a48cc83dda4 100644
--- a/pkgs/desktops/xfce4-14/orage/default.nix
+++ b/pkgs/desktops/xfce/applications/orage/default.nix
@@ -32,4 +32,8 @@ mkXfceDerivation {
sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf";
})
];
+
+ meta = {
+ description = "A simple calendar application with reminders";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/parole.nix b/pkgs/desktops/xfce/applications/parole.nix
deleted file mode 100644
index ac0180c20fe8..000000000000
--- a/pkgs/desktops/xfce/applications/parole.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, gst_all_1
-, gtk, dbus-glib, libxfce4ui, libxfce4util, xfconf
-, taglib, libnotify, hicolor-icon-theme
-, withGstPlugins ? true
-}:
-
-stdenv.mkDerivation rec {
- p_name = "parole";
- ver_maj = "0.5";
- ver_min = "4";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1hxzqg9dfghrhvmnnccwwa4278fh2awkcqy89sla05m08mxvvx60";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig intltool ];
-
- buildInputs = [
- makeWrapper hicolor-icon-theme
- gtk dbus-glib libxfce4ui libxfce4util xfconf
- taglib libnotify
- ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav]);
-
- configureFlags = [ "--with-gstreamer=1.0" ];
-
- postInstall = stdenv.lib.optionalString withGstPlugins ''
- wrapProgram "$out/bin/parole" --prefix \
- GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
- '';
-
- meta = {
- homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
- description = "Modern simple media player";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix
similarity index 79%
rename from pkgs/desktops/xfce4-14/parole/default.nix
rename to pkgs/desktops/xfce/applications/parole/default.nix
index ed3979072ed3..20b899165f09 100644
--- a/pkgs/desktops/xfce4-14/parole/default.nix
+++ b/pkgs/desktops/xfce/applications/parole/default.nix
@@ -1,6 +1,5 @@
{ mkXfceDerivation, dbus, dbus-glib
-, gst-plugins-bad, gst-plugins-base, gst-plugins-good
-, gst-plugins-ugly, gtk3, libnotify, libxfce4ui, libxfce4util
+, gst_all_1, gtk3, libnotify, libxfce4ui, libxfce4util
, taglib, xfconf }:
# Doesn't seem to find H.264 codec even though built with gst-plugins-bad.
@@ -17,7 +16,7 @@ mkXfceDerivation {
--replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS
'';
- buildInputs = [
+ buildInputs = with gst_all_1; [
dbus
dbus-glib
gst-plugins-bad
@@ -31,4 +30,8 @@ mkXfceDerivation {
taglib
xfconf
];
+
+ meta = {
+ description = "Modern simple media player";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/ristretto.nix b/pkgs/desktops/xfce/applications/ristretto.nix
deleted file mode 100644
index 3c0e8040c3b2..000000000000
--- a/pkgs/desktops/xfce/applications/ristretto.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk
-, exo, dbus-glib, libxfce4util, libxfce4ui, xfconf
-, hicolor-icon-theme, makeWrapper
-}:
-
-stdenv.mkDerivation rec {
- p_name = "ristretto";
- ver_maj = "0.6";
- ver_min = "3";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0y9d8w1plwp4vmxs44y8k8x15i0k0xln89k6jndhv6lf57g1cs1b";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- buildInputs =
- [ pkgconfig intltool libexif gtk dbus-glib exo libxfce4util
- libxfce4ui xfconf hicolor-icon-theme makeWrapper
- ];
-
- postInstall = ''
- wrapProgram "$out/bin/ristretto" \
- --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share"
- '';
-
- meta = {
- homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
- description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix
similarity index 76%
rename from pkgs/desktops/xfce4-14/ristretto/default.nix
rename to pkgs/desktops/xfce/applications/ristretto/default.nix
index 4a24bf905328..8766bd302ab3 100644
--- a/pkgs/desktops/xfce4-14/ristretto/default.nix
+++ b/pkgs/desktops/xfce/applications/ristretto/default.nix
@@ -10,4 +10,8 @@ mkXfceDerivation {
nativeBuildInputs = [ exo ];
buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ];
+
+ meta = {
+ description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/terminal.nix b/pkgs/desktops/xfce/applications/terminal.nix
deleted file mode 100644
index 31e851a469d7..000000000000
--- a/pkgs/desktops/xfce/applications/terminal.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, ncurses, gtk, vte, dbus-glib
-, exo, libxfce4util, libxfce4ui
-}:
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-terminal";
- ver_maj = "0.6";
- ver_min = "3";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "023y0lkfijifh05yz8grimxadqpi98mrivr00sl18nirq8b4fbwi";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool exo gtk vte libxfce4util ncurses dbus-glib libxfce4ui ];
-
- meta = {
- homepage = https://www.xfce.org/projects/terminal;
- description = "A modern terminal emulator primarily for the Xfce desktop environment";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix
new file mode 100644
index 000000000000..08f2bd511a87
--- /dev/null
+++ b/pkgs/desktops/xfce/applications/xfburn/default.nix
@@ -0,0 +1,12 @@
+{ mkXfceDerivation, docbook_xsl, exo, gtk3, libburn, libisofs, libxfce4ui, libxslt }:
+
+mkXfceDerivation {
+ category = "apps";
+ pname = "xfburn";
+ version = "0.6.1";
+
+ sha256 = "0a1ly79x7j5pgr3vbsabb4i0jd5rryaigj9z8iqzr8p9miypx20v";
+
+ nativeBuildInputs = [ libxslt docbook_xsl ];
+ buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ];
+}
diff --git a/pkgs/desktops/xfce4-14/xfce4-dict/configure-gio.patch b/pkgs/desktops/xfce/applications/xfce4-dict/configure-gio.patch
similarity index 100%
rename from pkgs/desktops/xfce4-14/xfce4-dict/configure-gio.patch
rename to pkgs/desktops/xfce/applications/xfce4-dict/configure-gio.patch
diff --git a/pkgs/desktops/xfce4-14/xfce4-dict/default.nix b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix
similarity index 84%
rename from pkgs/desktops/xfce4-14/xfce4-dict/default.nix
rename to pkgs/desktops/xfce/applications/xfce4-dict/default.nix
index 66ca7affa481..b2682080216c 100644
--- a/pkgs/desktops/xfce4-14/xfce4-dict/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix
@@ -16,4 +16,8 @@ mkXfceDerivation {
'';
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel ];
+
+ meta = {
+ description = "A Dictionary Client for the Xfce desktop environment";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
deleted file mode 100644
index e1646d93a619..000000000000
--- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, makeWrapper
-, glib, gstreamer, gst-plugins-base, gtk
-, libxfce4util, libxfce4ui, xfce4-panel, xfconf, libunique ? null
-, pulseaudioSupport ? false, gst-plugins-good
-}:
-
-let
- # The usual Gstreamer plugins package has a zillion dependencies
- # that we don't need for a simple mixer, so build a minimal package.
- gst_plugins_minimal = gst-plugins-base.override {
- minimalDeps = true;
- };
- gst_plugins_pulse = gst-plugins-good.override {
- minimalDeps = true;
- };
- gst_plugins = [ gst_plugins_minimal ] ++ stdenv.lib.optional pulseaudioSupport gst_plugins_pulse;
-
-in
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-mixer";
- ver_maj = "4.10";
- ver_min = "0";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1pnsd00583l7p5d80rxbh58brzy3jnccwikbbbm730a33c08kid8";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- buildInputs =
- [ pkgconfig intltool glib gstreamer gtk
- libxfce4util libxfce4ui xfce4-panel xfconf libunique makeWrapper
- ] ++ gst_plugins;
-
- postInstall =
- ''
- wrapProgram "$out/bin/xfce4-mixer" \
- --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
- '';
-
- passthru = { inherit gst_plugins; };
-
- meta = {
- homepage = https://www.xfce.org/projects/xfce4-mixer; # referenced but inactive
- description = "A volume control application for the Xfce desktop environment";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
deleted file mode 100644
index 19ecff290933..000000000000
--- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libnotify
-, gtk , libxfce4util, libxfce4ui, xfconf, hicolor-icon-theme }:
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-notifyd";
- ver_maj = "0.2";
- ver_min = "4";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1l6fpfk0fkizdx7vwbyjdyzzj5i2ng8pf7r8j49nv0cnjhpxczlc";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libnotify gtk libxfce4util libxfce4ui xfconf hicolor-icon-theme ];
-
- preFixup = ''
- # to be able to run the daemon we need it in PATH
- ln -rs $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin
- '';
-
- doCheck = true;
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
- description = "Notification daemon for Xfce";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
similarity index 82%
rename from pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
rename to pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
index e468fea637e8..a991e8c81807 100644
--- a/pkgs/desktops/xfce4-14/xfce4-notifyd/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix
@@ -9,4 +9,8 @@ mkXfceDerivation {
sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai";
buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+ meta = {
+ description = "Simple notification daemon for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
deleted file mode 100644
index 085cfd7b8f90..000000000000
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, xfce4-panel, libxfce4util, gtk, libsoup
-, glib-networking, exo, hicolor-icon-theme, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-screenshooter";
- ver_maj = "1.8";
- ver_min = "2";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "9dce2ddfaa87f703e870e29bae13f3fc82a1b3f06b44f8386640e45a135f5f69";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [
- pkgconfig intltool wrapGAppsHook
- ];
-
- buildInputs = [
- xfce4-panel libxfce4util gtk libsoup exo hicolor-icon-theme glib-networking
- ];
-
- meta = {
- homepage = https://goodies.xfce.org/projects/applications/xfce4-screenshooter;
- description = "Xfce screenshooter";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
similarity index 81%
rename from pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
rename to pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
index f13a8fba6d0a..012486baac9b 100644
--- a/pkgs/desktops/xfce4-14/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation {
sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06";
buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
+
+ meta = {
+ description = "Screenshot utility for the Xfce desktop";
+ };
}
diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
deleted file mode 100644
index 96f71e004a87..000000000000
--- a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk, libwnck }:
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-taskmanager";
- ver_maj = "1.1";
- ver_min = "0";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1jwywmkkkmz7406m1jq40w6apiav25cznafhigbgpjv6z5hv27if";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool gtk libwnck ];
-
- meta = {
- homepage = "https://goodies.xfce.org/projects/applications/${p_name}";
- description = "Easy to use task manager for Xfce";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
similarity index 80%
rename from pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix
rename to pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
index 776b3797f769..e3d8b4b87d94 100644
--- a/pkgs/desktops/xfce4-14/xfce4-taskmanager/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix
@@ -9,4 +9,8 @@ mkXfceDerivation {
nativeBuildInputs = [ exo ];
buildInputs = [ gtk3 libwnck3 libXmu ];
+
+ meta = {
+ description = "Easy to use task manager for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce4-14/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/xfce4-terminal/default.nix
rename to pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
deleted file mode 100644
index 4344d34f13f6..000000000000
--- a/pkgs/desktops/xfce/applications/xfce4-volumed-pulse.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libpulseaudio
-, gtk2, libnotify
-, keybinder, xfconf
-}:
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-volumed-pulse";
- ver_maj = "0.2";
- ver_min = "2";
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0xjcs1b6ix6rwj9xgr9n89h315r3yhdm8wh5bkincd4lhz6ibhqf";
- };
-
- buildInputs =
- [ libpulseaudio gtk2
- keybinder xfconf libnotify
- ];
-
- nativeBuildInputs = [ pkgconfig ];
-
- meta = with stdenv.lib; {
- homepage = https://launchpad.net/xfce4-volumed-pulse;
- description = "A volume keys control daemon for the Xfce desktop environment (Xubuntu fork)";
- license = licenses.gpl3;
- platforms = platforms.linux;
- maintainers = [ maintainers.abbradar ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
similarity index 75%
rename from pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
rename to pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
index 97a00e9b67fa..413c04a84cc1 100644
--- a/pkgs/desktops/xfce4-14/xfce4-volumed-pulse/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-volumed-pulse/default.nix
@@ -10,6 +10,8 @@ mkXfceDerivation {
buildInputs = [ gtk3 libnotify libpulseaudio keybinder3 xfconf ];
meta = with lib; {
+ description = "A volume keys control daemon for Xfce using pulseaudio";
license = licenses.gpl3Plus;
+ maintainers = [ maintainers.abbradar ];
};
}
diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed.nix b/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix
similarity index 100%
rename from pkgs/desktops/xfce/applications/xfce4-volumed.nix
rename to pkgs/desktops/xfce/applications/xfce4-volumed/default.nix
diff --git a/pkgs/desktops/xfce4-14/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/xfdashboard/default.nix
rename to pkgs/desktops/xfce/applications/xfdashboard/default.nix
diff --git a/pkgs/desktops/xfce4-14/automakeAddFlags.sh b/pkgs/desktops/xfce/automakeAddFlags.sh
similarity index 100%
rename from pkgs/desktops/xfce4-14/automakeAddFlags.sh
rename to pkgs/desktops/xfce/automakeAddFlags.sh
diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix
deleted file mode 100644
index 6b5ee4b31328..000000000000
--- a/pkgs/desktops/xfce/core/exo.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util
-, hicolor-icon-theme }:
-
-stdenv.mkDerivation rec {
- p_name = "exo";
- ver_maj = "0.10";
- ver_min = "7";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "521581481128af93e815f9690020998181f947ac9e9c2b232b1f144d76b1b35c";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- outputs = [ "out" "dev" "devdoc" ];
- # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/
-
- nativeBuildInputs = [ pkgconfig intltool ];
- buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor-icon-theme ];
-
- meta = with stdenv.lib; {
- homepage = "http://www.xfce.org/projects/${p_name}";
- description = "Application library for the Xfce desktop environment";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/exo/default.nix
rename to pkgs/desktops/xfce/core/exo/default.nix
diff --git a/pkgs/desktops/xfce/core/garcon-10967.patch b/pkgs/desktops/xfce/core/garcon-10967.patch
deleted file mode 100644
index aea123255478..000000000000
--- a/pkgs/desktops/xfce/core/garcon-10967.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urNZ a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c
---- a/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:22:33.551926068 +0000
-+++ b/garcon-gtk/garcon-gtk-menu.c 2017-11-16 19:23:33.055497211 +0000
-@@ -676,6 +676,9 @@
- G_CALLBACK (garcon_gtk_menu_deactivate), menu);
- gtk_widget_show (mi);
-
-+ /* submenu are child items, too. */
-+ has_children = TRUE;
-+
- if (menu->priv->show_menu_icons)
- {
- icon_name = garcon_menu_element_get_icon_name (li->data);
-Binary files a/.git/index and b/.git/index differ
diff --git a/pkgs/desktops/xfce/core/garcon-12700.patch b/pkgs/desktops/xfce/core/garcon-12700.patch
deleted file mode 100644
index b95a65cc2194..000000000000
--- a/pkgs/desktops/xfce/core/garcon-12700.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 222080e6d5fce85eb2a8a5c33df671bd9f21add8 Mon Sep 17 00:00:00 2001
-From: Yegor Timoshenko
-Date: Thu, 14 Dec 2017 22:04:04 +0000
-Subject: [PATCH] Decrement allocation counter on item unref (#12700)
-
----
- garcon/garcon-menu-item-pool.c | 7 ++++++-
- garcon/garcon-menu-item.c | 2 ++
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c
-index 2017180..355e520 100644
---- a/garcon/garcon-menu-item-pool.c
-+++ b/garcon/garcon-menu-item-pool.c
-@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar *desktop_id,
- g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);
- g_return_val_if_fail (node != NULL, FALSE);
-
-- return garcon_menu_node_tree_rule_matches (node, item);
-+ gboolean matches = garcon_menu_node_tree_rule_matches (node, item);
-+
-+ if (matches)
-+ garcon_menu_item_increment_allocated (item);
-+
-+ return matches;
- }
-
-
-diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
-index 66a86bf..d61c88f 100644
---- a/garcon/garcon-menu-item.c
-+++ b/garcon/garcon-menu-item.c
-@@ -1516,6 +1516,8 @@ garcon_menu_item_unref (GarconMenuItem *item)
- {
- g_return_if_fail (GARCON_IS_MENU_ITEM (item));
-
-+ garcon_menu_item_decrement_allocated (item);
-+
- /* Decrement the reference counter */
- g_object_unref (G_OBJECT (item));
- }
---
-2.15.1
-
diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix
deleted file mode 100644
index 41d98f17516d..000000000000
--- a/pkgs/desktops/xfce/core/garcon.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, libxfce4ui, gtk }:
-let
- p_name = "garcon";
- ver_maj = "0.4";
- ver_min = "0";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq";
- };
-
- outputs = [ "out" "dev" ];
- patches = [ ./garcon-10967.patch ./garcon-12700.patch ];
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool glib libxfce4util gtk libxfce4ui ];
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/;
- description = "Xfce menu support library";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/garcon/default.nix b/pkgs/desktops/xfce/core/garcon/default.nix
similarity index 80%
rename from pkgs/desktops/xfce4-14/garcon/default.nix
rename to pkgs/desktops/xfce/core/garcon/default.nix
index 0d6cb8c410e0..69184f2afa88 100644
--- a/pkgs/desktops/xfce4-14/garcon/default.nix
+++ b/pkgs/desktops/xfce/core/garcon/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation {
sha256 = "0pamhp1wffiw638s66nws2mpzmwkhvhb6iwccfy8b0kyr57wipjv";
buildInputs = [ gtk3 libxfce4ui libxfce4util ];
+
+ meta = {
+ description = "Xfce menu support library";
+ };
}
diff --git a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
deleted file mode 100644
index 567d3b80387a..000000000000
--- a/pkgs/desktops/xfce/core/gtk-xfce-engine.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk2, withGtk3 ? false, gtk3 ? null }:
-
-assert withGtk3 -> (gtk3 != null);
-
-stdenv.mkDerivation rec {
- p_name = "gtk-xfce-engine";
- ver_maj = "3.2";
- ver_min = "0";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1va71f3gpl8gikfkmqsd5ikgp7qj8b64jii2l98g1ylnv8xrqp47";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool gtk2 ] ++ stdenv.lib.optional withGtk3 gtk3;
-
- # `glib-mkenums' is unhappy that some source files are not valid UTF-8
- postPatch = ''find . -type f -name '*.[ch]' -exec sed -r -i 's/\xD6/O/g' {} +'';
-
- configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3";
-
- meta = {
- homepage = https://www.xfce.org/;
- description = "GTK theme engine for Xfce";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix
deleted file mode 100644
index 797b51de8e40..000000000000
--- a/pkgs/desktops/xfce/core/libxfce4ui.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, xorg, gtk, libxfce4util, xfconf
-, libglade, libstartup_notification, hicolor-icon-theme
-, withGtk3 ? false, gtk3
-}:
-let
- p_name = "libxfce4ui";
- ver_maj = "4.12";
- ver_min = "1";
- inherit (stdenv.lib) optional;
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43";
- };
-
- outputs = [ "out" "dev" "devdoc" ];
-
- nativeBuildInputs = [ pkgconfig intltool ];
-
- buildInputs =
- [ gtk libxfce4util xfconf libglade
- libstartup_notification hicolor-icon-theme
- ] ++ optional withGtk3 gtk3;
-
- propagatedBuildInputs = [ xorg.libICE xorg.libSM ];
-
- #TODO: glade?
- configureFlags = optional withGtk3 "--enable-gtk3";
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/;
- description = "Basic GUI library for Xfce";
- license = licenses.lgpl2Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/libxfce4ui/default.nix b/pkgs/desktops/xfce/core/libxfce4ui/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/libxfce4ui/default.nix
rename to pkgs/desktops/xfce/core/libxfce4ui/default.nix
diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix
deleted file mode 100644
index b68b7059f8df..000000000000
--- a/pkgs/desktops/xfce/core/libxfce4util.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool }:
-let
- p_name = "libxfce4util";
- ver_maj = "4.12";
- ver_min = "1";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7";
- };
-
- outputs = [ "out" "dev" "devdoc" ];
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ glib intltool ];
-
- meta = {
- homepage = https://www.xfce.org/;
- description = "Basic utility non-GUI functions for Xfce";
- license = "bsd";
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/libxfce4util/default.nix b/pkgs/desktops/xfce/core/libxfce4util/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/libxfce4util/default.nix
rename to pkgs/desktops/xfce/core/libxfce4util/default.nix
diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix
deleted file mode 100644
index 5c61c16cbcc1..000000000000
--- a/pkgs/desktops/xfce/core/libxfcegui4.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk
-, libxfce4util, xfconf, libglade, libstartup_notification, hicolor-icon-theme }:
-let
- p_name = "libxfcegui4";
- ver_maj = "4.10";
- ver_min = "0";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib";
- };
-
- outputs = [ "out" "dev" "devdoc" ];
-
- #TODO: gladeui
- # By default, libxfcegui4 tries to install into libglade's prefix.
- # Install into our own prefix instead.
- configureFlags = [
- "--with-libglade-module-path=$(out)/lib/libglade/2.0"
- ];
- #NOTE: missing keyboard library support is OK according to the mailing-list
-
- buildInputs =
- [ pkgconfig intltool gtk libxfce4util xfconf libglade
- libstartup_notification hicolor-icon-theme
- ];
-
- meta = {
- homepage = https://www.xfce.org/;
- description = "Basic GUI library for Xfce";
- license = stdenv.lib.licenses.lgpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce/core/thunar-build.nix b/pkgs/desktops/xfce/core/thunar-build.nix
deleted file mode 100644
index 0b606ee5fdd7..000000000000
--- a/pkgs/desktops/xfce/core/thunar-build.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool
-, gtk, dbus-glib, libstartup_notification, libnotify, libexif, pcre, udev
-, exo, libxfce4util, xfconf, xfce4-panel, hicolor-icon-theme, wrapGAppsHook
-}:
-
-stdenv.mkDerivation rec {
- p_name = "thunar";
- ver_maj = "1.6";
- ver_min = "10";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/Thunar-${ver_maj}.${ver_min}.tar.bz2";
- sha256 = "7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a";
- };
-
- name = "${p_name}-build-${ver_maj}.${ver_min}";
-
- patches = [ ./thunarx_plugins_directory.patch ];
-
- postPatch = ''
- sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c
- '';
-
- nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
- buildInputs = [
- intltool
- gtk dbus-glib libstartup_notification libnotify libexif pcre udev
- exo libxfce4util xfconf xfce4-panel
- hicolor-icon-theme
- ];
- # TODO: optionality?
-
- enableParallelBuilding = true;
-
- meta = {
- homepage = http://thunar.xfce.org/;
- description = "Xfce file manager";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce/core/thunar-volman.nix b/pkgs/desktops/xfce/core/thunar-volman.nix
deleted file mode 100644
index eda3aab070ac..000000000000
--- a/pkgs/desktops/xfce/core/thunar-volman.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
-, xfconf, udev, libgudev, libnotify, hicolor-icon-theme }:
-
-stdenv.mkDerivation rec {
- p_name = "thunar-volman";
- ver_maj = "0.8";
- ver_min = "1";
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1gf259n1v3y23n1zlkhyr6r0i8j59rnl1cmxvxj6la9cwdfbn22s";
- };
-
-
- buildInputs =
- [ pkgconfig intltool exo gtk udev libgudev libxfce4ui libxfce4util
- xfconf libnotify hicolor-icon-theme
- ];
-
- enableParallelBuilding = true;
-
- meta = {
- homepage = https://goodies.xfce.org/projects/thunar-plugins/thunar-volman;
- description = "Thunar extension for automatic management of removable drives and media";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/thunar-volman/default.nix b/pkgs/desktops/xfce/core/thunar-volman/default.nix
similarity index 73%
rename from pkgs/desktops/xfce4-14/thunar-volman/default.nix
rename to pkgs/desktops/xfce/core/thunar-volman/default.nix
index 11b29c64b33f..fc6db0fcce4f 100644
--- a/pkgs/desktops/xfce4-14/thunar-volman/default.nix
+++ b/pkgs/desktops/xfce/core/thunar-volman/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation {
buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
sha256 = "1qrlpn0q5g9psd41l6y80r3bvbg8jaic92m6r400zzwcvivf95z0";
+
+ meta = {
+ description = "Thunar extension for automatic management of removable drives and media";
+ };
}
diff --git a/pkgs/desktops/xfce/core/thunar.nix b/pkgs/desktops/xfce/core/thunar.nix
deleted file mode 100644
index 83e3a2879d79..000000000000
--- a/pkgs/desktops/xfce/core/thunar.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ stdenv, buildEnv, runCommand, makeWrapper, lndir, thunar-bare
-, thunarPlugins ? []
-}:
-
-with stdenv.lib;
-
-let
-
- build = thunar-bare;
-
- replaceLnExeListWithWrapped = exeDir: exeNameList: mkWrapArgs: ''
- exeDir="${exeDir}"
- oriDir=`realpath -e "$exeDir"`
- unlink "$exeDir"
- mkdir -p "$exeDir"
- lndir "$oriDir" "$exeDir"
-
- exeList="${concatStrings (intersperse " " (map (x: "${exeDir}/${x}") exeNameList))}"
-
- for exe in $exeList; do
- oriExe=`realpath -e "$exe"`
- rm -f "$exe"
- makeWrapper "$oriExe" "$exe" ${concatStrings (intersperse " " mkWrapArgs)}
- done
- '';
-
- name = "${build.p_name}-${build.ver_maj}.${build.ver_min}";
-
- meta = {
- inherit (build.meta) homepage license platforms;
-
- description = build.meta.description + optionalString
- (0 != length thunarPlugins)
- " (with plugins: ${concatStrings (intersperse ", " (map (x: x.name) thunarPlugins))})";
- maintainers = build.meta.maintainers /*++ [ jraygauthier ]*/;
- };
-
-in
-
-# TODO: To be replaced with `buildEnv` awaiting missing features.
-runCommand name {
- inherit build;
- inherit meta;
-
- nativeBuildInputs = [ makeWrapper lndir ];
-
- dontPatchELF = true;
- dontStrip = true;
-
-}
-(let
- buildWithPlugins = buildEnv {
- name = "thunar-bare-with-plugins";
- paths = [ build ] ++ thunarPlugins;
- };
-
-in ''
- mkdir -p $out
- pushd ${buildWithPlugins} > /dev/null
- for d in `find . -maxdepth 1 -name "*" -printf "%f\n" | tail -n+2`; do
- ln -s "${buildWithPlugins}/$d" "$out/$d"
- done
- popd > /dev/null
-
- ${replaceLnExeListWithWrapped "$out/bin" [ "thunar" "thunar-settings" ] [
- "--set THUNARX_MODULE_DIR \"${buildWithPlugins}/lib/thunarx-2\""
- ]}
-'')
diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix
new file mode 100644
index 000000000000..11220141d2a0
--- /dev/null
+++ b/pkgs/desktops/xfce/core/thunar/default.nix
@@ -0,0 +1,70 @@
+{ mkXfceDerivation
+, lib
+, docbook_xsl
+, exo
+, gdk-pixbuf
+, gtk3
+, libgudev
+, libnotify
+, libX11
+, libxfce4ui
+, libxfce4util
+, libxslt
+, xfconf
+, gobject-introspection
+, gvfs
+, makeWrapper
+, symlinkJoin
+, thunarPlugins ? []
+}:
+
+let unwrapped = mkXfceDerivation {
+ category = "xfce";
+ pname = "thunar";
+ version = "1.8.9";
+
+ sha256 = "01w60csbs2nq1bhb8n1bnmjmx48fm0va3qbnq84z0h2dxpr80b1w";
+
+ nativeBuildInputs = [
+ docbook_xsl
+ gobject-introspection
+ libxslt
+ ];
+
+ buildInputs = [
+ exo
+ gdk-pixbuf
+ gtk3
+ gvfs
+ libX11
+ libgudev
+ libnotify
+ libxfce4ui
+ libxfce4util
+ xfconf
+ ];
+
+ patches = [
+ ./thunarx_plugins_directory.patch
+ ];
+
+ # the desktop file … is in an insecure location»
+ # which pops up when invoking desktop files that are
+ # symlinks to the /nix/store
+ #
+ # this error was added by this commit:
+ # https://github.com/xfce-mirror/thunar/commit/1ec8ff89ec5a3314fcd6a57f1475654ddecc9875
+ postPatch = ''
+ sed -i -e 's|thunar_dialogs_show_insecure_program (parent, _(".*"), file, exec)|1|' thunar/thunar-file.c
+ '';
+
+ meta = {
+ description = "Xfce file manager";
+ };
+};
+
+in if thunarPlugins == [] then unwrapped
+ else import ./wrapper.nix {
+ inherit makeWrapper symlinkJoin thunarPlugins lib;
+ thunar = unwrapped;
+ }
diff --git a/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch b/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch
similarity index 94%
rename from pkgs/desktops/xfce/core/thunarx_plugins_directory.patch
rename to pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch
index e1431d86b147..594a81c829ef 100644
--- a/pkgs/desktops/xfce/core/thunarx_plugins_directory.patch
+++ b/pkgs/desktops/xfce/core/thunar/thunarx_plugins_directory.patch
@@ -1,8 +1,8 @@
diff --git a/thunarx/thunarx-provider-factory.c b/thunarx/thunarx-provider-factory.c
-index 31b8835..a3e7f4e 100644
+index 94b11545..1f66c982 100644
--- a/thunarx/thunarx-provider-factory.c
+++ b/thunarx/thunarx-provider-factory.c
-@@ -141,12 +141,19 @@ static GList*
+@@ -150,12 +150,19 @@ static GList*
thunarx_provider_factory_load_modules (ThunarxProviderFactory *factory)
{
ThunarxProviderModule *module;
@@ -24,7 +24,7 @@ index 31b8835..a3e7f4e 100644
{
/* determine the types for all existing plugins */
diff --git a/thunarx/thunarx-provider-module.c b/thunarx/thunarx-provider-module.c
-index 023ad2a..6c21997 100644
+index 023ad2ae..b1d1be8f 100644
--- a/thunarx/thunarx-provider-module.c
+++ b/thunarx/thunarx-provider-module.c
@@ -174,10 +174,17 @@ static gboolean
@@ -33,13 +33,13 @@ index 023ad2a..6c21997 100644
ThunarxProviderModule *module = THUNARX_PROVIDER_MODULE (type_module);
+ const gchar *thunar_dir;
gchar *path;
-+
+
+ thunar_dir = g_getenv("THUNARX_MODULE_DIR");
+ if (NULL == thunar_dir)
+ {
+ thunar_dir = THUNARX_DIRECTORY;
+ }
-
++
/* load the module using the runtime link editor */
- path = g_build_filename (THUNARX_DIRECTORY, type_module->name, NULL);
+ path = g_build_filename (thunar_dir, type_module->name, NULL);
diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/pkgs/desktops/xfce/core/thunar/wrapper.nix
new file mode 100644
index 000000000000..cc44e6624571
--- /dev/null
+++ b/pkgs/desktops/xfce/core/thunar/wrapper.nix
@@ -0,0 +1,34 @@
+{ makeWrapper, symlinkJoin, thunar, thunarPlugins, lib }:
+
+symlinkJoin {
+ name = "thunar-with-plugins-${thunar.version}";
+
+ paths = [ thunar ] ++ thunarPlugins;
+
+ buildInputs = [ makeWrapper ];
+
+ postBuild = ''
+ wrapProgram "$out/bin/thunar" \
+ --set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3"
+
+ wrapProgram "$out/bin/thunar-settings" \
+ --set "THUNARX_MODULE_DIR" "$out/lib/thunarx-3"
+
+ for file in "lib/systemd/user/thunar.service" "share/dbus-1/services/org.xfce.FileManager.service" \
+ "share/dbus-1/services/org.xfce.Thunar.FileManager1.service" \
+ "share/dbus-1/services/org.xfce.Thunar.service"
+ do
+ rm -f "$out/$file"
+ substitute "${thunar}/$file" "$out/$file" \
+ --replace "${thunar}" "$out"
+ done
+ '';
+
+ meta = with lib; {
+ inherit (thunar.meta) homepage license platforms maintainers;
+
+ description = thunar.meta.description + optionalString
+ (0 != length thunarPlugins)
+ " (with plugins: ${concatStrings (intersperse ", " (map (x: x.name) thunarPlugins))})";
+ };
+}
diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix
deleted file mode 100644
index 9087d3a02553..000000000000
--- a/pkgs/desktops/xfce/core/tumbler.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk-pixbuf, curl, freetype
-, libgsf, poppler, bzip2 }:
-let
- p_name = "tumbler";
- ver_maj = "0.1";
- ver_min = "31";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh";
- };
-
- outputs = [ "out" "dev" "devdoc" ];
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [
- intltool dbus-glib gdk-pixbuf curl freetype
- poppler libgsf bzip2
- ];
-
- configureFlags = [
- # Needs gst-tag
- # "--enable-gstreamer-thumbnailer"
-
- # Needs libffmpegthumbnailer
- # "--enable-ffmpeg-thumbnailer"
-
- "--enable-odf-thumbnailer"
- "--enable-poppler-thumbnailer"
- ];
-
- meta = with stdenv.lib; {
- homepage = http://git.xfce.org/xfce/tumbler/;
- description = "A D-Bus thumbnailer service";
- platforms = platforms.linux;
- license = licenses.gpl2;
- };
-}
-
diff --git a/pkgs/desktops/xfce4-14/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix
similarity index 90%
rename from pkgs/desktops/xfce4-14/tumbler/default.nix
rename to pkgs/desktops/xfce/core/tumbler/default.nix
index e99551bd8d26..b795007ca7c1 100644
--- a/pkgs/desktops/xfce4-14/tumbler/default.nix
+++ b/pkgs/desktops/xfce/core/tumbler/default.nix
@@ -32,4 +32,8 @@ mkXfceDerivation {
postFixup = ''
wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}"
'';
+
+ meta = {
+ description = "A D-Bus thumbnailer service";
+ };
}
diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix
deleted file mode 100644
index d39708dd523f..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gtk, libxfce4util
-, libxfce4ui, garcon, xfconf }:
-let
- p_name = "xfce4-appfinder";
- ver_maj = "4.12";
- ver_min = "0";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a";
- };
-
- buildInputs =
- [ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ];
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = http://docs.xfce.org/xfce/xfce4-appfinder/;
- description = "Xfce application finder, a tool to locate and launch programs on your system";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
-
diff --git a/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
similarity index 80%
rename from pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
rename to pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
index 6c4af66c8666..cbb444c6c764 100644
--- a/pkgs/desktops/xfce4-14/xfce4-appfinder/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
@@ -9,4 +9,8 @@ mkXfceDerivation {
nativeBuildInputs = [ exo ];
buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];
+
+ meta = {
+ description = "Appfinder for the Xfce4 Desktop Environment";
+ };
}
diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
deleted file mode 100644
index 109c22f1e58c..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, autoconf, automake, libtool, intltool }:
-let
- p_name = "xfce4-dev-tools";
- ver_maj = "4.12";
- ver_min = "0";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ glib ];
-
- # not needed to build it but to use it
- propagatedBuildInputs = [ autoconf automake libtool intltool ];
-
- meta = {
- homepage = http://foo-projects.org/~benny/projects/xfce4-dev-tools/;
- description = "Tools and M4 macros for Xfce4 developers";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- };
-}
-
diff --git a/pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/xfce4-dev-tools/default.nix
rename to pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
diff --git a/pkgs/desktops/xfce4-14/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/xfce4-14/xfce4-dev-tools/setup-hook.sh
rename to pkgs/desktops/xfce/core/xfce4-dev-tools/setup-hook.sh
diff --git a/pkgs/desktops/xfce/core/xfce4-light-locker.patch b/pkgs/desktops/xfce/core/xfce4-light-locker.patch
deleted file mode 100644
index 0fabdffd7ed6..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-light-locker.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./scripts/xflock4.orig 2017-08-06 23:05:53.807688995 +0100
-+++ ./scripts/xflock4 2017-08-06 23:09:06.171789989 +0100
-@@ -24,12 +24,19 @
- PATH=/bin:/usr/bin
- export PATH
-
--# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
-+# First test for the command set in the session's xfconf channel
-+LOCK_CMD=$(xfconf-query -c xfce4-session -p /general/LockCommand)
-+
-+# Lock by xscreensaver, gnome-screensaver, or light-locker, if a respective daemon is running
- for lock_cmd in \
-+ "$LOCK_CMD" \
- "xscreensaver-command -lock" \
-- "gnome-screensaver-command --lock"
-+ "gnome-screensaver-command --lock" \
-+ "light-locker-command -l"
- do
-- $lock_cmd >/dev/null 2>&1 && exit
-+ if [ ! -z "$lock_cmd" ]; then
-+ $lock_cmd >/dev/null 2>&1 && exit
-+ fi
- done
-
- # else run another access locking utility, if installed
diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix
deleted file mode 100644
index b8ecae7e4e64..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
-, libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification
-, makeWrapper, xfce4-mixer, hicolor-icon-theme, tzdata
-, withGtk3 ? false, gtk3, gettext, glib-networking
-}:
-let
- inherit (stdenv.lib) optional;
- p_name = "xfce4-panel";
- ver_maj = "4.12";
- ver_min = "2";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1s8cvsrgmkmmm84g6mghpj2k4777gm22g5lrsf8pdy5qh6xql1a2";
- };
-
- patches = [ ./xfce4-panel-datadir.patch ];
- patchFlags = "-p1";
-
- postPatch = ''
- for f in $(find . -name \*.sh); do
- substituteInPlace $f --replace gettext ${gettext}/bin/gettext
- done
- substituteInPlace plugins/clock/clock.c \
- --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" \
- --replace "if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))" ""
- '';
-
- outputs = [ "out" "dev" "devdoc" ];
-
- buildInputs =
- [ pkgconfig intltool gtk libxfce4util exo libwnck
- garcon xfconf libstartup_notification makeWrapper hicolor-icon-theme
- ] ++ xfce4-mixer.gst_plugins
- ++ optional withGtk3 gtk3;
-
- propagatedBuildInputs = [ (if withGtk3 then libxfce4ui_gtk3 else libxfce4ui) ];
-
- configureFlags = optional withGtk3 "--enable-gtk3";
-
- postInstall = ''
- wrapProgram "$out/bin/xfce4-panel" \
- --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
- --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules"
- '';
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/projects/xfce4-panel;
- description = "Xfce panel";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
similarity index 93%
rename from pkgs/desktops/xfce4-14/xfce4-panel/default.nix
rename to pkgs/desktops/xfce/core/xfce4-panel/default.nix
index c571666e5c4b..f7e500bdf543 100644
--- a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix
@@ -10,7 +10,7 @@ mkXfceDerivation {
nativeBuildInputs = [ gobject-introspection ];
buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ];
- patches = [ ../../xfce/core/xfce4-panel-datadir.patch ];
+ patches = [ ./xfce4-panel-datadir.patch ];
patchFlags = "-p1";
postPatch = ''
diff --git a/pkgs/desktops/xfce/core/xfce4-panel-datadir.patch b/pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch
similarity index 100%
rename from pkgs/desktops/xfce/core/xfce4-panel-datadir.patch
rename to pkgs/desktops/xfce/core/xfce4-panel/xfce4-panel-datadir.patch
diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
deleted file mode 100644
index 266f30645075..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, lib, fetchurl, pkgconfig, intltool, glib, gtk, dbus-glib, upower, xfconf
-, libxfce4ui, libxfce4util, libnotify, xfce4-panel, hicolor-icon-theme
-, withGtk3 ? false, gtk3, libxfce4ui_gtk3, xfce4panel_gtk3 }:
-let
- p_name = "xfce4-power-manager";
- ver_maj = if withGtk3 then "1.6" else "1.4";
- ver_min = if withGtk3 then "0" else "4";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 =
- if withGtk3
- then "0avzhllpimcn7a6z9aa4jn0zg5ahxr9ks5ldchizycdb0rz1bqxx"
- else "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5";
- };
-
- buildInputs =
- [ pkgconfig intltool glib dbus-glib upower xfconf libxfce4util
- libnotify hicolor-icon-theme
- ] ++
- (if withGtk3
- then [ gtk3 libxfce4ui_gtk3 xfce4panel_gtk3 ]
- else [ gtk libxfce4ui xfce4-panel ]);
-
- postPatch = lib.optionalString withGtk3 ''
- substituteInPlace configure --replace gio-2.0 gio-unix-2.0
- '';
-
- postConfigure = lib.optionalString withGtk3 ''
- substituteInPlace src/Makefile --replace "xfce4_power_manager_CFLAGS = " "xfce4_power_manager_CFLAGS = \$(GIO_CFLAGS) "
- substituteInPlace settings/Makefile --replace "xfce4_power_manager_settings_CFLAGS = " "xfce4_power_manager_settings_CFLAGS = \$(GIO_CFLAGS) "
- '';
-
- meta = with stdenv.lib; {
- homepage = https://goodies.xfce.org/projects/applications/xfce4-power-manager;
- description = "A power manager for the Xfce Desktop Environment";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
similarity index 88%
rename from pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
rename to pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
index 985146c82571..fb3f05b36646 100644
--- a/pkgs/desktops/xfce4-14/xfce4-power-manager/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix
@@ -16,4 +16,8 @@ mkXfceDerivation {
automakeAddFlags src/Makefile.am xfce4_power_manager_CFLAGS GIO_CFLAGS
automakeAddFlags settings/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS
'';
+
+ meta = {
+ description = "A power manager for the Xfce Desktop Environment";
+ };
}
diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix
deleted file mode 100644
index b57dd252033f..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-session.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, polkit
-, libxfce4util, libxfce4ui, xfce4-panel, libwnck, dbus-glib, xfconf, libglade, xorg
-, hicolor-icon-theme
-}:
-
-let
- p_name = "xfce4-session";
- ver_maj = "4.12";
- ver_min = "1";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd";
- };
-
- patches = [
- # Fix "lock screen" not working for light-locker
- ./xfce4-light-locker.patch
- ];
-
- buildInputs =
- [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus-glib
- xfconf xfce4-panel libglade xorg.iceauth xorg.libSM
- polkit hicolor-icon-theme
- ]; #TODO: upower-glib, gconf (assistive?), gnome keyring
-
- preBuild = ''
- sed '/^PATH=/d' -i scripts/xflock4
- sed '/^export PATH$/d' -i scripts/xflock4
- '';
-
- configureFlags = [ "--with-xsession-prefix=$(out)" ];
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/projects/xfce4-session;
- description = "Session manager for Xfce";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix
similarity index 82%
rename from pkgs/desktops/xfce4-14/xfce4-session/default.nix
rename to pkgs/desktops/xfce/core/xfce4-session/default.nix
index d44cd8b0dd7c..0ab362aa21d0 100644
--- a/pkgs/desktops/xfce4-14/xfce4-session/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg }:
+{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session }:
mkXfceDerivation {
category = "xfce";
@@ -14,6 +14,8 @@ mkXfceDerivation {
# See https://github.com/NixOS/nixpkgs/issues/36468
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+ passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
+
meta = {
description = "Session manager for Xfce";
};
diff --git a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch b/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
deleted file mode 100644
index 2683b3c3dfdd..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-settings-default-icon-theme.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/xfsettingsd/xsettings.xml 2015-02-28 22:32:02.681796319 +0100
-+++ b/xfsettingsd/xsettings.xml 2015-02-28 22:32:27.881214735 +0100
-@@ -7,7 +7,7 @@
-
-
-
--
-+
-
-
-
\ No newline at end of file
diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix
deleted file mode 100644
index 584055c8ddf6..000000000000
--- a/pkgs/desktops/xfce/core/xfce4-settings.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, garcon, libxfce4util
-, libxfce4ui, xfconf, libXi, upower ? null, libnotify ? null
-, libXcursor ? null, xf86inputlibinput ? null, libxklavier ? null }:
-
-let
- p_name = "xfce4-settings";
- ver_maj = "4.12";
- ver_min = "1";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0x35i1cvkqp0hib1knwa58mckdwrfbhaisz4bsx6bbbx385llj7n";
- };
-
- patches = [ ./xfce4-settings-default-icon-theme.patch ];
-
- postPatch = ''
- for f in $(find . -name \*.c); do
- substituteInPlace $f --replace \"libinput-properties.h\" ''
- done
- '';
-
- nativeBuildInputs = [ pkgconfig intltool ];
-
- buildInputs = [
- exo
- gtk
- garcon
- libxfce4util
- libxfce4ui
- xfconf
- libXi
- upower
- libnotify
- libXcursor
- xf86inputlibinput
- libxklavier
- ];
-
- configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ];
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/projects/xfce4-settings;
- description = "Settings manager for Xfce";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
similarity index 91%
rename from pkgs/desktops/xfce4-14/xfce4-settings/default.nix
rename to pkgs/desktops/xfce/core/xfce4-settings/default.nix
index 8cda66359e34..74ab96ed1bcd 100644
--- a/pkgs/desktops/xfce4-14/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
@@ -33,4 +33,8 @@ mkXfceDerivation {
"--enable-pluggable-dialogs"
"--enable-sound-settings"
];
+
+ meta = {
+ description = "Settings manager for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix
deleted file mode 100644
index 9af365c6f14d..000000000000
--- a/pkgs/desktops/xfce/core/xfconf.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus-glib }:
-let
- p_name = "xfconf";
- ver_maj = "4.12";
- ver_min = "1";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m";
- };
-
- outputs = [ "out" "dev" "devdoc" ];
-
- #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib)
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool glib libxfce4util ];
- propagatedBuildInputs = [ dbus-glib ];
-
- doCheck = false; # requires dbus daemon
-
- meta = with stdenv.lib; {
- homepage = http://docs.xfce.org/xfce/xfconf/start;
- description = "Simple client-server configuration storage and query system for Xfce";
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix
similarity index 67%
rename from pkgs/desktops/xfce4-14/xfconf/default.nix
rename to pkgs/desktops/xfce/core/xfconf/default.nix
index a9d6ceaf4695..a0923f0fda1b 100644
--- a/pkgs/desktops/xfce4-14/xfconf/default.nix
+++ b/pkgs/desktops/xfce/core/xfconf/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation {
sha256 = "1mbqc1463xgn7gafbh2fyshshdxin33iwk96y4nw2gl48nhx4sgs";
buildInputs = [ libxfce4util ];
+
+ meta = {
+ description = "Simple client-server configuration storage and query system for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix
deleted file mode 100644
index 091dd03c0bcf..000000000000
--- a/pkgs/desktops/xfce/core/xfdesktop.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
-, libwnck, xfconf, libglade, xfce4-panel, thunar, exo, garcon, libnotify
-, hicolor-icon-theme }:
-let
- p_name = "xfdesktop";
- ver_maj = "4.12";
- ver_min = "3";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac";
- };
-
- buildInputs = [
- pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf
- libglade xfce4-panel thunar exo garcon libnotify hicolor-icon-theme
- ];
-
- patches = [(fetchpatch {
- url = https://git.xfce.org/xfce/xfdesktop/patch?id=157f5b55cfc3629d595ef38984278de5915aac27;
- sha256 = "0ki7hnyfpz7bdmsxqnm9qvyk040iyv1fawnhzfbyyzrh4nc5jd3x";
- })];
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/projects/xfdesktop;
- description = "Xfce desktop manager";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/xfdesktop/default.nix
rename to pkgs/desktops/xfce/core/xfdesktop/default.nix
diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix
deleted file mode 100644
index d26649ee6ce9..000000000000
--- a/pkgs/desktops/xfce/core/xfwm4.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util
-, libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }:
-let
- p_name = "xfwm4";
- ver_maj = "4.12";
- ver_min = "4";
-in
-stdenv.mkDerivation rec {
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0dpvdrd5lclkcrzmdpva38gfsgvdf3xkqfknvy96x6k4fn508x7s";
- };
-
- buildInputs =
- [ pkgconfig intltool gtk libglade libxfce4util libxfce4ui xfconf
- libwnck libstartup_notification
- xorg.libXcomposite xorg.libXfixes xorg.libXdamage
- ];
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = https://www.xfce.org/projects/xfwm4;
- description = "Window manager for Xfce";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.eelco ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix
similarity index 89%
rename from pkgs/desktops/xfce4-14/xfwm4/default.nix
rename to pkgs/desktops/xfce/core/xfwm4/default.nix
index 358e99c893f1..2dff3302617c 100644
--- a/pkgs/desktops/xfce4-14/xfwm4/default.nix
+++ b/pkgs/desktops/xfce/core/xfwm4/default.nix
@@ -23,4 +23,8 @@ mkXfceDerivation {
libXpresent
xfconf
];
+
+ meta = {
+ description = "Window manager for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 20d5175fed6f..7442ff478f59 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -3,91 +3,91 @@
lib.makeScope pkgs.newScope (self: with self; {
#### NixOS support
- inherit (pkgs.gnome2) libglade vte gtksourceview;
- inherit (pkgs.gnome3) dconf;
- inherit (pkgs.perlPackages) URI;
+ mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
- gtk = pkgs.gtk2;
+ automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;
# Samba is a rather heavy dependency
gvfs = pkgs.gvfs.override { samba = null; };
- xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
-
#### CORE
- exo = callPackage ./core/exo.nix { };
+ exo = callPackage ./core/exo { };
- garcon = callPackage ./core/garcon.nix { };
+ garcon = callPackage ./core/garcon { };
- # When built with GTK 3, it was breaking GTK 3 app layout
- gtk-xfce-engine = callPackage ./core/gtk-xfce-engine.nix { withGtk3 = false; };
+ libxfce4ui = callPackage ./core/libxfce4ui { };
- libxfce4ui = callPackage ./core/libxfce4ui.nix { };
+ libxfce4util = callPackage ./core/libxfce4util { };
- libxfce4util = callPackage ./core/libxfce4util.nix { };
+ thunar = callPackage ./core/thunar {
+ thunarPlugins = [];
+ };
- libxfcegui4 = callPackage ./core/libxfcegui4.nix { };
-
- thunar-bare = callPackage ./core/thunar-build.nix { };
-
- thunar = callPackage ./core/thunar.nix { };
-
- # NB: thunar already has it
- thunar-volman = callPackage ./core/thunar-volman.nix { };
+ thunar-volman = callPackage ./core/thunar-volman { };
thunar-archive-plugin = callPackage ./thunar-plugins/archive { };
thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { };
- tumbler = callPackage ./core/tumbler.nix { };
+ tumbler = callPackage ./core/tumbler { };
- # TODO: impure plugins from /run/current-system/sw/lib/xfce4
- xfce4-panel = callPackage ./core/xfce4-panel.nix { };
+ xfce4-panel = callPackage ./core/xfce4-panel { };
- xfce4-session = callPackage ./core/xfce4-session.nix { };
+ xfce4-session = callPackage ./core/xfce4-session { };
- xfce4-settings = callPackage ./core/xfce4-settings.nix { };
+ xfce4-settings = callPackage ./core/xfce4-settings { };
- xfce4-power-manager = callPackage ./core/xfce4-power-manager.nix { };
+ xfce4-power-manager = callPackage ./core/xfce4-power-manager { };
- xfconf = callPackage ./core/xfconf.nix { };
+ xfconf = callPackage ./core/xfconf { };
- xfdesktop = callPackage ./core/xfdesktop.nix { };
+ xfdesktop = callPackage ./core/xfdesktop { };
- xfwm4 = callPackage ./core/xfwm4.nix { };
+ xfwm4 = callPackage ./core/xfwm4 { };
- xfce4-appfinder = callPackage ./core/xfce4-appfinder.nix { };
+ xfce4-appfinder = callPackage ./core/xfce4-appfinder { };
- xfce4-dev-tools = callPackage ./core/xfce4-dev-tools.nix { };
+ xfce4-dev-tools = callPackage ./core/xfce4-dev-tools {
+ mkXfceDerivation = mkXfceDerivation.override {
+ xfce4-dev-tools = null;
+ };
+ };
#### APPLICATIONS
- gigolo = callPackage ./applications/gigolo.nix { };
+ catfish = callPackage ./applications/catfish { };
- mousepad = callPackage ./applications/mousepad.nix { };
+ gigolo = callPackage ./applications/gigolo { };
- orage = callPackage ./applications/orage.nix { };
+ mousepad = callPackage ./applications/mousepad { };
- parole = callPackage ./applications/parole.nix { };
+ orage = callPackage ./applications/orage { };
- ristretto = callPackage ./applications/ristretto.nix { };
+ parole = callPackage ./applications/parole { };
- xfce4-mixer = callPackage ./applications/xfce4-mixer.nix { };
+ ristretto = callPackage ./applications/ristretto { };
- xfce4-mixer-pulse = callPackage ./applications/xfce4-mixer.nix { pulseaudioSupport = true; };
+ xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager { };
- xfce4-notifyd = callPackage ./applications/xfce4-notifyd.nix { };
+ xfce4-dict = callPackage ./applications/xfce4-dict { };
- xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager.nix { };
+ xfce4-terminal = callPackage ./applications/xfce4-terminal { };
- xfce4-terminal = callPackage ./applications/terminal.nix { };
+ xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter {
+ inherit (pkgs.gnome3) libsoup;
+ };
- xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { };
+ xfdashbooard = callPackage ./applications/xfdashboard {};
- xfce4-volumed = callPackage ./applications/xfce4-volumed.nix { };
+ # TODO: this repo is inactive for many years. Remove?
+ xfce4-volumed = callPackage ./applications/xfce4-volumed { };
- xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse.nix { };
+ xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { };
+
+ xfce4-notifyd = callPackage ./applications/xfce4-notifyd { };
+
+ xfburn = callPackage ./applications/xfburn { };
#### ART
@@ -99,15 +99,15 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { };
- xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { };
+ xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { };
- xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { };
+ xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { };
- xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { };
+ xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { };
xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { };
- xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { };
+ xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { };
xfce4-dict-plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { };
@@ -125,7 +125,7 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin.nix { };
- xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { };
+ xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { };
xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { };
@@ -139,25 +139,17 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin.nix { };
- xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { };
+ xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { };
- xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { };
+ xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { };
xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { };
- xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { };
+ xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { };
xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin.nix { };
- xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { };
-
- #### GTK3 (deprecated, see NixOS/nixpkgs#32763)
-
- libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; };
-
- xfce4panel_gtk3 = xfce4-panel.override { withGtk3 = true; };
-
- xfce4_power_manager_gtk3 = xfce4-power-manager.override { withGtk3 = true; };
+ xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
} // lib.optionalAttrs (config.allowAliases or true) {
#### ALIASES - added 2018-01
@@ -208,4 +200,24 @@ lib.makeScope pkgs.newScope (self: with self; {
xfce4_whiskermenu_plugin = xfce4-whiskermenu-plugin;
xfce4_windowck_plugin = xfce4-windowck-plugin;
xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin;
+
+ xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18
+ gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17
+
+ # added 2019-11-04
+ libxfce4ui_gtk3 = libxfce4ui;
+ xfce4panel_gtk3 = xfce4-panel;
+ xfce4_power_manager_gtk3 = xfce4-power-manager;
+ gtk = pkgs.gtk2;
+ libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library";
+ xinitrc = xfce4-session.xinitrc;
+ inherit (pkgs.gnome2) libglade;
+ inherit (pkgs.gnome3) vte gtksourceview;
+ xfce4-mixer-pulse = xfce4-mixer;
+ thunar-bare = thunar.override {
+ thunarPlugins = [];
+ };
+
+ # added 2019-11-30
+ inherit (pkgs) dconf;
})
diff --git a/pkgs/desktops/xfce4-14/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix
similarity index 100%
rename from pkgs/desktops/xfce4-14/mkXfceDerivation.nix
rename to pkgs/desktops/xfce/mkXfceDerivation.nix
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
deleted file mode 100644
index 6399aa3cc20d..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-battery-plugin";
- ver_maj = "1.0";
- ver_min = "5";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "04gbplcj8z4vg5xbks8cc2jjf62mmf9sdymg90scjwmb82pv2ngn";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Battery plugin for Xfce panel";
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
similarity index 83%
rename from pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
index 376551b09c0f..3966e256b160 100644
--- a/pkgs/desktops/xfce4-14/xfce4-battery-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation rec {
sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+ meta = {
+ description = "Battery plugin for Xfce panel";
+ };
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
deleted file mode 100644
index 280f39f8d997..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-clipman-plugin";
- ver_maj = "1.2";
- ver_min = "6";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "19a8gwcqc0r5qqi8w28dc8arqip34m8yxdb87lgps9g5qfcky113";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Clipboard manager for Xfce panel";
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
similarity index 83%
rename from pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
index 74628a325d41..bd1a3b5e5e35 100644
--- a/pkgs/desktops/xfce4-14/xfce4-clipman-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation rec {
sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq";
buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+ meta = {
+ description = "Clipboard manager for Xfce panel";
+ };
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
deleted file mode 100644
index 07838f8fe7c9..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-cpufreq-plugin";
- ver_maj = "1.1";
- ver_min = "3";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0crd21l5cw0xgm6w7s049xa36k203yx7l56ssnah9nq1w73n58bl";
- };
-
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig intltool ];
-
- buildInputs = [ libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
-
- enableParallelBuilding = true;
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "CPU Freq load plugin for Xfce panel";
- license = [ licenses.gpl2Plus ];
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
similarity index 81%
rename from pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
index 22793963df3d..3798edbf89dc 100644
--- a/pkgs/desktops/xfce4-14/xfce4-cpufreq-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix
@@ -7,4 +7,8 @@ mkXfceDerivation {
sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+ meta = {
+ description = "CPU Freq load plugin for Xfce panel";
+ };
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
index e088e74cfb1c..ef7f7e580206 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk, hicolor-icon-theme }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk hicolor-icon-theme ];
+ buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk2 hicolor-icon-theme ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
deleted file mode 100644
index c63170100312..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, xfce4-panel
-, gtk }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-datetime-plugin";
- ver_maj = "0.6";
- ver_min = "2";
-
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "0b4yril07qgkmywjym1qp12r4g35bnh96879zbjps7cd3rkxld4p";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfcegui4 xfce4-panel gtk ];
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Shows the date and time in the panel, and a calendar appears when you left-click on it";
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix
new file mode 100644
index 000000000000..3cfb010b12da
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix
@@ -0,0 +1,34 @@
+{ mkXfceDerivation
+, stdenv
+, intltool
+, libxfce4ui
+, xfce4-panel
+, gtk3
+, gettext
+}:
+
+mkXfceDerivation rec {
+ category = "panel-plugins";
+ pname = "xfce4-datetime-plugin";
+ version = "0.8.0";
+
+ rev = "datetime-${version}";
+
+ sha256 = "12drh7y70d70r93lpv43fkj5cbyl0vciz4a41nxrknrfbhxrvyah";
+
+ nativeBuildInputs = [
+ gettext
+ intltool
+ ];
+
+ buildInputs = [
+ gtk3
+ libxfce4ui
+ xfce4-panel
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Shows the date and time in the panel, and a calendar appears when you left-click on it";
+ maintainers = [ maintainers.AndersonTorres ];
+ };
+}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
index 8210fc62ccb4..0b31bac8d54b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
index 3a79f67068c8..03e5a2229672 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Eyes following you!";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
+ broken = true;
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
index 6d0f8ee73a4c..ee663aa71ca8 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Filesystem monitor";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
+ broken = true;
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
index 039ac1440947..193d27af98a3 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,12 +13,13 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Cyclically spawns a command and captures its output";
platforms = platforms.linux;
maintainers = [ maintainers.AndersonTorres ];
+ broken = true;
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
index 541b30ec1b3d..e9d2eb590be9 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui,
-libxfcegui4, xfconf, gtk, exo, gnutls, libgcrypt }:
+ xfconf, gtk2, exo, gnutls, libgcrypt }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -15,12 +15,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel
- libxfcegui4 xfconf gtk exo gnutls libgcrypt ];
+ xfconf gtk2 exo gnutls libgcrypt ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "Mailwatch plugin for Xfce panel";
platforms = platforms.linux;
maintainers = [ ];
+ broken = true;
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
index 5331c29a4546..b909540144ae 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui,
-libxfcegui4, xfconf, gtk, exo }:
+ xfconf, gtk2, exo }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -15,12 +15,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel
- libxfcegui4 xfconf gtk exo ];
+ xfconf gtk2 exo ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
description = "MPD plugin for Xfce panel";
platforms = platforms.linux;
maintainers = [ ];
+ broken = true;
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
deleted file mode 100644
index e82669cc1a35..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-netload-plugin";
- ver_maj = "1.2";
- ver_min = "4";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "1lrhhzxmybcfl52hnadr2dvasis9wmk6a48pcy02s09ch8cfkb7z";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk hicolor-icon-theme ];
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Battery plugin for Xfce panel";
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
similarity index 83%
rename from pkgs/desktops/xfce4-14/xfce4-netload-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
index d9f517981d3e..d774649b5369 100644
--- a/pkgs/desktops/xfce4-14/xfce4-netload-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix
@@ -8,4 +8,8 @@ mkXfceDerivation rec {
sha256 = "0nm8advafw4jpc9p1qszyfqa56194sz51z216rdh4c6ilcrrpy1h";
buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+ meta = {
+ description = "Battery plugin for Xfce panel";
+ };
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
index d61dae6bdd56..2876c1b1f7d8 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, libxfcegui4, xfconf, gtk, libunique }:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf gtk libunique ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 libunique ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
deleted file mode 100644
index 6f6f5699b6e9..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel_gtk3, xfconf
-, gtk3, libpulseaudio, hicolor-icon-theme
-, withKeybinder ? true, keybinder3
-, withLibnotify ? true, libnotify
-}:
-
-assert withKeybinder -> keybinder3 != null;
-assert withLibnotify -> libnotify != null;
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
- p_name = "xfce4-pulseaudio-plugin";
- ver_maj = "0.2";
- ver_min = "3";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "e82836bc8cf7d905b4e60d43dc630ba8e32dea785989700c71d4aeee9f583b33";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig intltool ];
- buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio hicolor-icon-theme ]
- ++ optional withKeybinder keybinder3
- ++ optional withLibnotify libnotify;
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Adjust the audio volume of the PulseAudio sound system";
- platforms = platforms.linux;
- maintainers = [ ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
similarity index 87%
rename from pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
index 6fca6069d1e8..59f282d74117 100644
--- a/pkgs/desktops/xfce4-14/xfce4-pulseaudio-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
@@ -16,4 +16,8 @@ mkXfceDerivation {
'';
buildInputs = [ gtk3 libnotify libpulseaudio libxfce4ui libxfce4util xfce4-panel xfconf ];
+
+ meta = {
+ description = "Adjust the audio volume of the PulseAudio sound system";
+ };
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
index 5a4dfee76fc4..2e7233e6cdb0 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui,
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxfce4ui,
libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gnome2.gtk
+ gtk2
libxfce4ui
libxfce4util
xfce4-panel
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
index 698d4aae5328..5575962ab77e 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk}:
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2}:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
name = "${p_name}-${ver_maj}.${ver_min}";
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk2 ];
meta = {
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
index 57cd48c6f270..4eddfe8df574 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel
-, libxfce4ui, libxfcegui4, xfconf, gtk, hicolor-icon-theme }:
+, libxfce4ui, xfconf, gtk2, hicolor-icon-theme }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
};
name = "${p_name}-${ver_maj}.${ver_min}";
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel libxfcegui4 xfconf
- gtk hicolor-icon-theme ];
+ buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf
+ gtk2 hicolor-icon-theme ];
nativeBuildInputs = [ pkgconfig ];
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.gpl2;
maintainers = [ ];
+ broken = true;
};
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
deleted file mode 100644
index 96ef08cbeb70..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, pcre
-, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-verve-plugin";
- ver_maj = "1.1";
- ver_min = "0";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "114wkmgjxkim1jkswih20zg9d7rbzmlf30b5rlcpvmbsij0ny6d3";
- };
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool glib exo pcre libxfce4util libxfce4ui xfce4-panel xfconf gtk ];
-
- hardeningDisable = [ "format" ];
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "A command-line plugin";
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
new file mode 100644
index 000000000000..288aaddfb982
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix
@@ -0,0 +1,18 @@
+{ lib, mkXfceDerivation, gtk3, libxfce4ui, pcre, libxfce4util, xfce4-panel, xfconf }:
+
+mkXfceDerivation rec {
+ category = "panel-plugins";
+ pname = "xfce4-verve-plugin";
+ version = "2.0.0";
+ rev = version;
+ sha256 = "09vpa6m0ah7pgmra094c16vb79xrcwva808g6zpawwrhcwz85lcz";
+
+ buildInputs = [ gtk3 libxfce4ui pcre libxfce4util xfce4-panel ];
+
+ hardeningDisable = [ "format" ];
+
+ meta = {
+ description = "A command-line plugin";
+ maintainers = with lib.maintainers; [ AndersonTorres ];
+ };
+}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
index 15cd526d6def..5ab311ef16f7 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower,
+{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxml2, libsoup, upower,
libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme }:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
- buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util
+ buildInputs = [ gtk2 libxml2 libsoup upower libxfce4ui libxfce4util
xfce4-panel hicolor-icon-theme ];
enableParallelBuilding = true;
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
deleted file mode 100644
index c29758452ae6..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, intltool, libxfce4util, libxfcegui4
-, xfce4-panel, gtk, exo, garcon }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-whiskermenu-plugin";
- version = "1.7.2";
-
- name = "${p_name}-${version}";
-
- src = fetchFromGitHub {
- owner = "gottcode";
- repo = "xfce4-whiskermenu-plugin";
- rev = "v${version}";
- sha256 = "1rpazgnjp443abc31bgi6gp9q3sgbg13v7v74nn7vf6kl4v725ah";
- };
-
- nativeBuildInputs = [ cmake pkgconfig intltool ];
-
- buildInputs = [ libxfce4util libxfcegui4 xfce4-panel gtk exo garcon ];
-
- enableParallelBuilding = true;
-
- preFixup = ''
- substituteInPlace $out/bin/xfce4-popup-whiskermenu \
- --replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel
- '';
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Alternate application launcher for Xfce";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.pjbarnoy ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
similarity index 88%
rename from pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
index f943f2ab333a..ef47d37e5efd 100644
--- a/pkgs/desktops/xfce4-14/xfce4-whiskermenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
@@ -15,4 +15,8 @@ mkXfceDerivation rec {
substituteInPlace $out/bin/xfce4-popup-whiskermenu \
--replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel
'';
+
+ meta = {
+ description = "Alternate application launcher for Xfce";
+ };
}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
deleted file mode 100644
index 307d2e81bf24..000000000000
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfce4ui, xfce4-panel
-, garcon, gtk, libxklavier, librsvg, libwnck
-}:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- p_name = "xfce4-xkb-plugin";
- ver_maj = "0.7";
- ver_min = "1";
-
- name = "${p_name}-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
- sha256 = "10g65j5ia389ahhn3b9hr52ghpp0817fk0m60rfrv4wrzqrjxzk1";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel garcon
- gtk libxklavier librsvg libwnck ];
-
- meta = {
- homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
- description = "Allows you to setup and use multiple keyboard layouts";
- platforms = platforms.linux;
- maintainers = [ maintainers.AndersonTorres ];
- };
-}
diff --git a/pkgs/desktops/xfce4-14/xfce4-xkb-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
similarity index 52%
rename from pkgs/desktops/xfce4-14/xfce4-xkb-plugin/default.nix
rename to pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
index a024d3a88ba0..4497a7b0e36a 100644
--- a/pkgs/desktops/xfce4-14/xfce4-xkb-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-xkb-plugin/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, gtk3, librsvg, libwnck3, libxklavier, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
+{ lib, mkXfceDerivation, gtk3, librsvg, libwnck3, libxklavier, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
mkXfceDerivation rec {
category = "panel-plugins";
@@ -8,4 +8,9 @@ mkXfceDerivation rec {
sha256 = "1gyky4raynp2ggdnq0g96c6646fjm679fzipcsmf1q0aymr8d5ky";
buildInputs = [ garcon gtk3 librsvg libxfce4ui libxfce4util libxklavier libwnck3 xfce4-panel xfconf ];
+
+ meta = with lib; {
+ description = "Allows you to setup and use multiple keyboard layouts";
+ maintainers = [ maintainers.AndersonTorres ];
+ };
}
diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
index ea3a0f084439..e3c72d3b50e2 100644
--- a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix
@@ -1,57 +1,38 @@
-{ stdenv, fetchFromGitHub, pkgconfig, xfce4-dev-tools
-, gtk
-, thunar-bare
-, exo, libxfce4util, libxfce4ui
-, xfconf, udev, libnotify, hicolor-icon-theme
+{ stdenv
+, mkXfceDerivation
+, fetchFromGitHub
+, gtk3
+, thunar
+, exo
+, libxfce4util
+, intltool
+, gettext
}:
-stdenv.mkDerivation rec {
- p_name = "thunar-archive-plugin";
- ver_maj = "0.3";
- ver_min = "1";
- name = "${p_name}-${ver_maj}.${ver_min}";
+mkXfceDerivation rec {
+ category = "thunar-plugins";
+ pname = "thunar-archive-plugin";
+ version = "0.4.0";
- src = fetchFromGitHub {
- owner = "xfce-mirror";
- repo = p_name;
- rev = "72b23eefc348bee31e06a04f968e430bc7dfa51e";
- sha256 = "0l8715x23qmk0jkywiza3qx0xxmafxi4grp7p82kkc5df5ccs8kx";
- };
+ sha256 = "1793zicm00fail4iknliwy2b668j239ndxhc9hy6jarvdyp08h38";
+
+ nativeBuildInputs = [
+ intltool
+ gettext
+ ];
- nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- xfce4-dev-tools
- thunar-bare
- exo gtk libxfce4util libxfce4ui
- xfconf udev libnotify hicolor-icon-theme
+ thunar
+ exo
+ gtk3
+ libxfce4util
];
preConfigure = ''
./autogen.sh
'';
- /*
- File roller `*.desktop` situation
- ---------------------------------
-
- For some odd reason, in nix os, gnome file-roller's desktop file has the non-standard name
- `org.gnome.FileRoller.desktop`. In order to be compatible with this odd context, create
- a `*.tap` file of the same name.
-
- IMPORTANT: Adapt or remove the symbolic link if the situation changes.
- */
- preFixup = ''
- pushd $out/libexec/thunar-archive-plugin > /dev/null
- ln -s ./file-roller.tap org.gnome.FileRoller.tap
- popd > /dev/null
- '';
-
- enableParallelBuilding = true;
-
meta = with stdenv.lib; {
- homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/;
description = "Thunar plugin providing file context menus for archives";
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
};
}
diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
index 217cecf85a8c..8674c586552c 100644
--- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
+++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
@@ -1,31 +1,39 @@
-{ stdenv, fetchurl, pkgconfig
-, gtk
-, thunar-bare, python2, hicolor-icon-theme
-, wafHook
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, gtk3
+, thunar
+, cmake
+, ninja
}:
stdenv.mkDerivation rec {
- p_name = "thunar-dropbox-plugin";
- ver_maj = "0.2";
- ver_min = "1";
- name = "${p_name}-${ver_maj}.${ver_min}";
+ pname = "thunar-dropbox";
+ version = "0.3.1";
- src = fetchurl {
- url = "http://softwarebakery.com/maato/files/thunar-dropbox/thunar-dropbox-${ver_maj}.${ver_min}.tar.bz2";
- sha256 = "08vhzzzwshyz371yl7fzfylmhvchhv3s5kml3dva4v39jhvrpnkf";
+ src = fetchFromGitHub {
+ owner = "Jeinzi";
+ repo = "thunar-dropbox";
+ rev = version;
+ sha256 = "1fshjvh542ffa8npfxv3cassgn6jclb2ix9ir997y4k0abzp1fxb";
};
- nativeBuildInputs = [ pkgconfig wafHook ];
+ nativeBuildInputs = [
+ pkgconfig
+ cmake
+ ninja
+ ];
+
buildInputs = [
- gtk
- thunar-bare python2 hicolor-icon-theme
+ thunar
+ gtk3
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = http://softwarebakery.com/maato/thunar-dropbox.html;
- description = "A plugin for thunar that adds context-menu items from dropbox";
+ homepage = "https://github.com/Jeinzi/thunar-dropbox";
+ description = "A plugin that adds context-menu items for Dropbox to Thunar";
license = licenses.gpl3;
platforms = platforms.linux;
};
diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix
deleted file mode 100644
index 0e2c8c1696b2..000000000000
--- a/pkgs/desktops/xfce4-14/default.nix
+++ /dev/null
@@ -1,116 +0,0 @@
-{ lib, makeSetupHook, newScope, gnome3, gst_all_1 }:
-
-let
- inherit (lib) makeScope;
-in
-
-makeScope newScope (self: with self; {
- mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
-
- automakeAddFlags = makeSetupHook { } ./automakeAddFlags.sh;
-
- exo = callPackage ./exo { };
-
- garcon = callPackage ./garcon { };
-
- gigolo = callPackage ./gigolo { };
-
- libxfce4util = callPackage ./libxfce4util { };
-
- libxfce4ui = callPackage ./libxfce4ui { };
-
- mousepad = callPackage ./mousepad { };
-
- orage = callPackage ./orage { };
-
- parole = callPackage ./parole {
- inherit (gst_all_1) gst-plugins-bad gst-plugins-base gst-plugins-good;
- gst-plugins-ugly = null;
- };
-
- ristretto = callPackage ./ristretto { };
-
- thunar = callPackage ./thunar { };
-
- thunar-volman = callPackage ./thunar-volman { };
-
- tumbler = callPackage ./tumbler { };
-
- xfburn = callPackage ./xfburn { };
-
- xfconf = callPackage ./xfconf { };
-
- xfdesktop = callPackage ./xfdesktop { };
-
- xfce4-appfinder = callPackage ./xfce4-appfinder { };
-
- xfce4-battery-plugin = callPackage ./xfce4-battery-plugin { };
-
- xfce4-cpufreq-plugin = callPackage ./xfce4-cpufreq-plugin { };
-
- xfce4-clipman-plugin = callPackage ./xfce4-clipman-plugin { };
-
- xfce4-dev-tools = callPackage ./xfce4-dev-tools {
- mkXfceDerivation = mkXfceDerivation.override {
- xfce4-dev-tools = null;
- };
- };
-
- xfce4-dict = callPackage ./xfce4-dict { };
-
- xfce4-netload-plugin = callPackage ./xfce4-netload-plugin { };
-
- xfce4-notifyd = callPackage ./xfce4-notifyd { };
-
- xfce4-panel = callPackage ./xfce4-panel { };
-
- xfce4-power-manager = callPackage ./xfce4-power-manager { };
-
- xfce4-pulseaudio-plugin = callPackage ./xfce4-pulseaudio-plugin { };
-
- xfce4-screenshooter = callPackage ./xfce4-screenshooter {
- inherit (gnome3) libsoup;
- };
-
- xfce4-session = callPackage ./xfce4-session { };
- xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc";
-
- xfce4-settings = callPackage ./xfce4-settings { };
-
- xfce4-taskmanager = callPackage ./xfce4-taskmanager { };
-
- xfce4-terminal = callPackage ./xfce4-terminal { };
-
- xfdashboard = callPackage ./xfdashboard { };
-
- xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { };
-
- xfce4-whiskermenu-plugin = callPackage ./xfce4-whiskermenu-plugin { };
-
- xfce4-xkb-plugin = callPackage ./xfce4-xkb-plugin { };
-
- xfwm4 = callPackage ./xfwm4 { };
-
- ## COMMON PARTS WITH XFCE 4.12
-
- xfce4-icon-theme = callPackage ../xfce/art/xfce4-icon-theme.nix { };
-
- xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { };
-
- xfce4-embed-plugin = callPackage ../xfce/panel-plugins/xfce4-embed-plugin.nix { };
-
- xfce4-hardware-monitor-plugin = callPackage ../xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix { };
-
- ## THIRD PARTY PLIGINS
-
- xfce4-dockbarx-plugin = callPackage ../xfce/panel-plugins/xfce4-dockbarx-plugin.nix { };
-
- xfce4-namebar-plugin = callPackage ../xfce/panel-plugins/xfce4-namebar-plugin.nix { };
-
- xfce4-windowck-plugin = callPackage ../xfce/panel-plugins/xfce4-windowck-plugin.nix { };
-
-
- ## ALIASES
- xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18
- gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17
-})
diff --git a/pkgs/desktops/xfce4-14/thunar/default.nix b/pkgs/desktops/xfce4-14/thunar/default.nix
deleted file mode 100644
index 12a1a62991a7..000000000000
--- a/pkgs/desktops/xfce4-14/thunar/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ mkXfceDerivation, docbook_xsl, exo, gdk-pixbuf, gtk3, libgudev
-, libnotify, libX11, libxfce4ui, libxfce4util, libxslt, xfconf, gobject-introspection, gvfs }:
-
-mkXfceDerivation {
- category = "xfce";
- pname = "thunar";
- version = "1.8.9";
-
- sha256 = "01w60csbs2nq1bhb8n1bnmjmx48fm0va3qbnq84z0h2dxpr80b1w";
-
- nativeBuildInputs = [ libxslt docbook_xsl gobject-introspection ];
-
- buildInputs = [
- exo
- gdk-pixbuf
- gtk3
- libgudev
- libnotify
- libX11
- libxfce4ui
- libxfce4util
- xfconf
- gvfs
- ];
-}
diff --git a/pkgs/desktops/xfce4-14/xfburn/default.nix b/pkgs/desktops/xfce4-14/xfburn/default.nix
deleted file mode 100644
index dd3a9af16804..000000000000
--- a/pkgs/desktops/xfce4-14/xfburn/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ mkXfceDerivation, docbook_xsl, exo, gtk2, libburn, libisofs, libxfce4ui, libxslt }:
-
-mkXfceDerivation {
- category = "apps";
- pname = "xfburn";
- version = "0.5.5";
-
- sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp";
-
- nativeBuildInputs = [ libxslt docbook_xsl ];
- buildInputs = [ exo gtk2 libburn libisofs libxfce4ui ];
- meta.broken = true;
-}
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index 6bcfcfc30235..f8be40eecab5 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -56,7 +56,7 @@ rec {
binaries = runCommand "ndk-gcc-binutils" {
isClang = true; # clang based cc, but bintools ld
nativeBuildInputs = [ makeWrapper ];
- propgatedBuildInputs = [ androidndk ];
+ propagatedBuildInputs = [ androidndk ];
} ''
mkdir -p $out/bin
diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix
index d947acc3ea68..9aebad2dabf7 100644
--- a/pkgs/development/beam-modules/build-mix.nix
+++ b/pkgs/development/beam-modules/build-mix.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, elixir, erlang, hexRegistrySnapshot, hex, lib }:
+{ stdenv, writeText, elixir, erlang, hex, lib }:
{ name
, version
@@ -43,7 +43,7 @@ let
else setupHook;
inherit buildInputs;
- propagatedBuildInputs = [ hexRegistrySnapshot hex elixir ] ++ beamDeps;
+ propagatedBuildInputs = [ hex elixir ] ++ beamDeps;
configurePhase = if configurePhase == null
then ''
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index eb9353a4a637..031f7b5dda72 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -14,16 +14,11 @@ let
defaultScope = mkScope self;
callPackage = drv: args: callPackageWithScope defaultScope drv args;
in
- import ./hex-packages.nix {
- inherit pkgs stdenv callPackage;
- } // rec {
+ rec {
inherit callPackage erlang;
beamPackages = self;
- hexRegistrySnapshot = callPackage ./hex-registry-snapshot.nix { };
-
rebar = callPackage ../tools/build-managers/rebar { };
- rebar3-open = callPackage ../tools/build-managers/rebar3 { };
rebar3 = callPackage ../tools/build-managers/rebar3 { };
# rebar3 port compiler plugin is required by buildRebar3
@@ -80,9 +75,6 @@ let
webdriver = callPackage ./webdriver {};
relxExe = callPackage ../tools/erlang/relx-exe {};
- # The tool used to upgrade hex-packages.nix.
- hex2nix = callPackage ../tools/erlang/hex2nix {};
-
# An example of Erlang/C++ package.
cuter = callPackage ../tools/erlang/cuter {};
};
diff --git a/pkgs/development/beam-modules/hex-packages.nix b/pkgs/development/beam-modules/hex-packages.nix
deleted file mode 100644
index df781d3e247c..000000000000
--- a/pkgs/development/beam-modules/hex-packages.nix
+++ /dev/null
@@ -1,37751 +0,0 @@
-/* hex-packages.nix is an auto-generated file -- DO NOT EDIT! */
-
-/* Unbuildable packages:
-
- * absinthe_relay_0_9_3
- * active_0_9_0
- * addict_0_2_5
- * address_us_0_1_1
- * airbrake_0_1_0
- * airbrake_plug_0_1_1
- * airbrakex_0_0_8
- * alembic_2_1_0
- * algolia_0_3_2
- * alice_0_3_6
- * alice_against_humanity_0_1_2
- * alice_google_images_0_1_3
- * alice_karma_0_2_0
- * alice_personable_0_0_2
- * alice_reddit_0_0_3
- * alice_shizzle_0_1_2
- * alice_tielurs_heart_rate_0_0_5
- * alice_xkcd_0_0_3
- * alphonse_0_1_0
- * amqp_0_1_1
- * amqp_0_1_4
- * amqp_client_3_5_6
- * amrita_0_4_0
- * angellist_0_0_0
- * anubis_0_1_0
- * anubis_0_3_0
- * apache_passwd_md5_1_0_0
- * apostle_0_0_3
- * arc_0_5_2
- * arc_ecto_0_4_1
- * as_nested_set_0_1_0
- * asanaficator_0_0_1
- * atlas_0_2_0
- * authable_0_3_1
- * aws_erlang_0_1_1
- * aws_http_0_2_4
- * b2_client_0_0_1
- * backoff_1_1_3
- * backy_0_0_5
- * balanced_3_1_0
- * bamboo_sendgrid_0_1_0
- * bandwidth_1_2_1
- * barrel_jiffy_0_14_4
- * barrel_jiffy_0_14_5
- * basehangul_0_2_1
- * basho_exometer_core_1_0_0
- * basic_auth_1_0_0
- * bbmustache_1_0_1
- * bbsmq_0_0_6
- * beaker_1_2_0
- * benchwarmer_0_0_2
- * bencoder_0_0_7
- * bertex_1_2_0
- * bgg_0_1_0
- * bitbucket_api_0_0_2
- * bitpay_0_2_5
- * blackbook_0_3_1
- * block_timer_0_0_1
- * bno055_0_0_1
- * boltun_1_0_1
- * booter_0_1_0
- * bottler_0_5_0
- * bouncer_0_1_5
- * brady_0_0_2
- * brod_2_1_4
- * bson_0_4_4
- * bugsnag_erl_0_1_4
- * bugsnex_0_0_1
- * bump_0_1_0
- * bureaucrat_0_1_4
- * butler_0_6_2
- * butler_0_7_1
- * butler_cage_0_0_2
- * butler_cowsay_0_2_1
- * butler_new_0_4_3
- * butler_tableflip_0_0_3
- * cache_tab_1_0_2
- * calecto_0_6_0
- * calendar_0_16_0
- * calendar_0_6_8
- * calendar_translations_0_0_3
- * can_0_0_4
- * canada_1_0_0
- * canary_0_14_1
- * carrier_1_0_4
- * cassius_0_0_1
- * cauldron_0_1_5
- * ccc_0_0_2
- * certifi_0_1_1
- * cesso_0_1_3
- * cet_0_2_3
- * channels_0_0_2
- * charlotte_0_4_0
- * charm_0_0_1
- * chatter_0_0_15
- * cipher_1_0_5
- * cldr_0_0_1
- * cleverbot_0_0_1
- * cloak_0_2_2
- * cloudi_core_1_4_0_rc_4
- * cloudi_core_1_5_1
- * cloudi_service_api_requests_1_5_1
- * cloudi_service_db_1_5_1
- * cloudi_service_db_cassandra_1_3_3
- * cloudi_service_db_cassandra_cql_1_5_1
- * cloudi_service_db_couchdb_1_5_1
- * cloudi_service_db_elasticsearch_1_3_3
- * cloudi_service_db_http_elli_1_5_1
- * cloudi_service_db_memcached_1_5_1
- * cloudi_service_db_mysql_1_5_1
- * cloudi_service_db_pgsql_1_5_1
- * cloudi_service_db_riak_1_3_3
- * cloudi_service_db_tokyotyrant_1_5_0
- * cloudi_service_filesystem_1_5_1
- * cloudi_service_http_client_1_5_1
- * cloudi_service_http_cowboy_1_5_1
- * cloudi_service_http_rest_1_5_1
- * cloudi_service_map_reduce_1_5_1
- * cloudi_service_monitoring_1_5_1
- * cloudi_service_queue_1_5_1
- * cloudi_service_quorum_1_5_1
- * cloudi_service_router_1_5_1
- * cloudi_service_tcp_1_5_1
- * cloudi_service_timers_1_5_1
- * cloudi_service_udp_1_5_1
- * cloudi_service_validate_1_5_1
- * cloudi_service_zeromq_1_5_1
- * clox_0_1_3
- * coffee_rotor_0_2_1
- * coinbase_0_0_1
- * comeonin_ecto_password_2_0_0_rc_0
- * commerce_billing_0_0_2
- * concierge_0_0_1
- * conferl_0_0_1
- * conform_0_16_0
- * conform_1_0_0_rc8
- * conform_2_0_0
- * conform_exrm_1_0_0
- * console_0_0_1
- * consul_1_0_3
- * core_0_14_1
- * couchdb_client_0_2_5
- * couchdb_connector_0_3_0
- * countries_1_1_2
- * countries_erlang_0_2_0
- * courier_web_0_0_8
- * coverex_1_4_9
- * cowboy_oauth_0_2_14
- * cowboy_routes_tree_0_2_0
- * cpg_1_4_0
- * cpg_1_5_1
- * cqrex_0_0_1
- * cqrs_0_0_7
- * cqrs_events_0_0_4
- * craterl_0_2_3
- * crudex_0_0_2
- * crypto_ext_0_1_3
- * cure_0_4_1
- * currently_0_0_3
- * datomex_0_0_5
- * datomic_gen_server_2_0_1
- * dayron_0_1_1
- * db_0_9_0
- * db_connection_1_0_0_rc_0
- * dbschema_0_2_0
- * dbus_0_5_0
- * ddb_client_0_1_17
- * ddb_client_0_1_21
- * ddb_connection_0_1_3
- * decimal_0_2_5
- * decorators_0_1_0
- * denrei_0_2_3
- * descriptive_statistics_0_0_1
- * dexts_0_2_1
- * dialyze_0_1_4
- * diane_0_0_1
- * dicer_0_8_0
- * dicks_0_1_0
- * difficult_0_0_2
- * diplomat_0_0_3
- * discount_0_7_0
- * discovery_0_5_7
- * distance_api_matrix_2_0_1
- * dns_0_0_3
- * docker_0_3_0
- * dotenv_0_0_4
- * dotenv_elixir_0_0_2
- * dpd_client_0_0_6
- * dproto_0_1_12
- * dproto_0_1_16
- * dqe_0_2_2
- * dqe_fun_0_1_1
- * dqe_idx_ddb_0_1_13
- * dqe_idx_pg_0_1_29
- * drawille_0_0_1
- * dropbox_0_0_7
- * earmark_0_1_0
- * ecc_0_1_3
- * ecdo_0_1_4
- * ecrontab_0_2_0
- * ecto_0_2_4
- * ecto_2_0_0_beta_0
- * ecto_2_0_0_rc_5
- * ecto_enum_0_3_1
- * ecto_factory_0_0_1
- * ecto_fixtures_0_0_2
- * ecto_gettext_0_1_6
- * ecto_hstore_0_0_1
- * ecto_it_0_2_0
- * ecto_lazy_float_0_1_2
- * ecto_ldap_0_2_8
- * ecto_migrate_0_6_3
- * ecto_ordered_0_0_2
- * ecto_state_machine_0_0_4
- * ecto_validation_case_0_1_1
- * ectograph_0_0_8
- * ectoo_0_0_4
- * ectophile_0_3_0
- * edeliver_1_2_9
- * eden_0_1_3
- * edgarex_0_0_2
- * efrisby_0_2_0
- * egithub_0_2_6
- * eini_1_2_1
- * ejabberd_16_4_1
- * ekstat_0_2_2
- * elastix_0_2_0
- * eleveldb_2_1_3
- * elibphonenumber_0_1_1
- * elistrix_0_0_5
- * elixilorem_0_0_1
- * elixir_ale_0_4_1
- * elixir_ale_0_5_3
- * elixir_drawille_0_0_3
- * elixir_ipfs_api_0_1_0
- * elixir_locker_0_1_4
- * elixir_nsq_1_0_3
- * elixometer_1_2_1
- * elixtagram_0_2_7
- * elixush_0_0_4
- * elli_xpblfe_0_1_1
- * elmit_0_0_1
- * email_checker_0_0_3
- * emodel_1_3_1
- * eno_0_0_1
- * enotify_0_1_0
- * ensq_0_1_6
- * env_conf_0_3_0
- * eplugin_0_1_4
- * epubnub_0_1_0
- * eql_0_1_2
- * eredis_cluster_0_5_7
- * erlang_dbus_0_2_0
- * erlang_lua_0_1_0
- * erlang_osc_1_0_1
- * erlang_tls_1_0_3
- * erlastic_search_1_2_0
- * erlcloud_0_13_4
- * erldn_1_0_5
- * erldyn_0_7_2
- * erlogger_0_1_0
- * erltrace_0_1_4
- * erocksdb_0_4_1
- * erwatch_0_3_0
- * es_0_0_1
- * escalus_2_6_4
- * esip_1_0_4
- * espec_phoenix_0_2_1
- * etcd_0_0_2
- * etude_0_1_5
- * etude_request_0_1_0
- * euler_0_0_1
- * event_source_encoder_0_0_3
- * eventstore_0_2_1
- * everex_0_1_1
- * everyoneapi_0_0_1
- * everything_location_0_0_1
- * ex_admin_0_7_6
- * ex_aerospike_0_0_1
- * ex_aws_0_4_19
- * ex_bitcask_0_1_0
- * ex_chimp_0_0_2
- * ex_cloudinary_0_2_2
- * ex_conf_0_1_2
- * ex_conf_0_1_3
- * ex_doc_0_10_0
- * ex_doc_0_11_5
- * ex_doc_0_8_4
- * ex_doc_dash_0_3_0
- * ex_doc_epub_0_0_2
- * ex_dockerapi_0_0_1
- * ex_edn_0_1_2
- * ex_hubic_0_1_0
- * ex_orient_1_3_0
- * ex_ovh_0_1_2
- * ex_parsec_0_2_1
- * ex_queb_0_1_2
- * ex_sharp_0_0_6
- * ex_slp_0_1_0
- * ex_unit_emacs_0_1_2
- * exauth_0_0_1
- * excheck_0_3_3
- * excountries_0_0_3
- * excoveralls_0_5_4
- * exdjango_0_3_1
- * exdm_0_0_4
- * exdn_2_1_2
- * exdns_0_0_1
- * exdweet_0_0_1
- * exeque_0_1_0
- * exfile_0_1_5
- * exfile_0_3_3
- * exfile_b2_0_2_2
- * exfile_encryption_0_0_2
- * exfile_imagemagick_0_1_2
- * exfile_memory_0_1_0
- * exfile_s3_0_0_1
- * exgpg_0_0_3
- * exgrid_0_3_0
- * exhal_4_12_3
- * exintercom_0_1_6
- * exjira_0_0_1
- * exjprop_0_0_5
- * exkad_0_0_2
- * exmagick_0_0_1
- * exometer_core_1_0_0
- * exometer_core_1_4_0
- * exometer_datadog_0_4_3
- * exometer_zabbix_0_0_3
- * exos_1_0_0
- * expcap_0_1_0
- * exprotobuf_0_10_2
- * exprotobuf_0_13_0
- * exprotobuf_1_0_0
- * exq_0_7_1
- * exq_ui_0_7_1
- * exquery_0_0_11
- * exrabbit_0_0_2
- * exrecaptcha_0_0_3
- * exrm_0_14_10
- * exrm_0_14_17
- * exrm_0_18_8
- * exrm_0_19_9
- * exrm_1_0_5
- * exrm_deb_0_0_6
- * exrm_docker_0_1_0
- * exrm_heroku_0_1_1
- * exrm_rpm_0_3_3
- * exrm_smartos_gz_1_0_0
- * exseed_0_0_3
- * exsentry_0_5_0
- * exsyslog_1_0_1
- * extreme_0_5_1
- * exurban_0_0_1
- * ezlib_1_0_1
- * ezmq_0_2_0
- * facebook_0_10_0
- * fast_tls_1_0_3
- * fast_xml_1_1_11
- * fast_yaml_1_0_3
- * favicon_0_0_7
- * feedistiller_2_0_2
- * feedlex_0_0_1
- * fernet_ecto_0_2_0
- * ffi_0_0_1_alpha
- * fifo_db_0_2_2
- * fifo_dt_0_1_66
- * fifo_dt_0_1_69
- * fifo_lager_0_1_4
- * fifo_spec_0_1_27
- * fifo_utils_0_1_20
- * fifo_utils_0_1_22
- * figaro_0_1_0
- * filepreviews_1_0_1
- * filtrex_0_2_0
- * finch_0_0_3
- * fintex_0_3_0
- * fireworks_0_5_1
- * fitbit_0_0_1
- * fitex_0_0_1
- * flames_0_1_0
- * fleet_api_0_0_15
- * floorplan_0_1_1
- * flower_power_0_3_2
- * flub_0_9_0
- * fluent_client_0_1_0
- * folsom_ddb_0_1_22
- * font_awesome_phoenix_0_3_2
- * form_data_0_1_1
- * forms_0_0_1
- * fqc_0_1_7
- * frank_0_0_3
- * fuentes_0_0_3
- * funnel_0_4_1
- * gcloudex_0_4_4
- * gcm_1_3_1
- * gcmex_0_0_1
- * gen_leader_0_1_0
- * gen_rpc_1_0_2
- * gen_state_machine_0_0_2
- * geo_1_0_4
- * geocoder_0_4_2
- * gil_0_0_3
- * gimei_0_0_2
- * gimei_ex_1_0_0
- * gpb_3_18_10
- * gpb_3_18_8
- * gpb_3_21_2
- * gpb_3_22_2
- * graphql_parser_0_0_3
- * graphql_relay_0_3_0
- * group_manager_0_0_8
- * guardian_0_10_1
- * guardian_0_12_0
- * guardian_0_9_1
- * guardian_db_0_4_0
- * guardian_db_0_7_0
- * hackney_1_1_0
- * hackney_1_3_1
- * hackney_1_3_2
- * hackney_1_4_10
- * hackney_1_4_4
- * hackney_1_4_8
- * hamcrest_0_1_1
- * hash_ring_ex_1_1_2
- * hdr_histogram_0_2_0
- * hedwig_flowdock_0_1_1
- * hedwig_hipchat_0_9_4
- * hedwig_irc_0_1_3
- * hedwig_slack_0_1_0
- * hedwig_sms_0_1_0
- * hedwig_xmpp_1_0_0_rc2
- * hello_world_header_0_0_1
- * hexoku_0_1_0
- * hmc5883l_0_5_0
- * honeydew_0_0_9
- * hr_0_2_2
- * hstore_0_0_2
- * htpasswd_1_0_2
- * http_0_0_1
- * httpc_aws_0_1_3
- * httpoison_0_7_1
- * httpoison_0_7_5
- * httpoison_0_8_0
- * httprot_0_1_7
- * iconv_1_0_0
- * ielixir_0_9_5
- * ifttt_oauth_0_0_1
- * inch_ex_0_5_3
- * inch_test_0_0_1
- * inflex_0_2_0
- * inquisitor_0_1_0
- * instream_0_12_0
- * intellij_elixir_0_1_2
- * iona_0_2_1
- * ipgeobase_0_0_1
- * isn_1_0_0
- * ja_serializer_0_9_0
- * japanese_holiday_0_0_2
- * jazz_0_1_1
- * jazz_0_2_1
- * jiffy_0_14_7
- * joken_0_13_1
- * joken_1_2_1
- * jsxn_0_2_1
- * kafka_protocol_0_3_2
- * kalecto_0_3_3
- * kalends_0_6_5
- * kane_0_1_1
- * katipo_0_3_4
- * kcl_0_6_2
- * keccakf1600_2_0_0
- * keelless_0_1_0
- * keenex_0_3_0
- * kerosene_0_0_1
- * kindred_0_0_1
- * kovacs_0_9_2
- * kvs_2_1_0
- * lager_2_1_1
- * lager_graylog_0_1_1
- * lager_logstash_backend_0_1_1
- * lager_watchdog_0_1_10
- * lasp_0_0_5
- * lazymaru_0_2_5
- * ledx_0_0_1
- * letsencrypt_0_5_0
- * lfe_1_0_2
- * libchunter_0_1_48
- * libdecaf_0_0_2
- * libex_config_0_2_0
- * libhowl_0_1_36
- * libleofs_0_1_2
- * librex_1_0_1
- * libsnarl_0_3_40
- * libsnarl_0_3_46
- * libsniffle_0_3_47
- * libsodium_0_0_7
- * link_shrinkex_1_0_0
- * locker_1_0_8
- * logger_json_file_backend_0_1_2
- * logger_logentries_backend_0_0_1
- * logster_0_2_0
- * lyn_0_0_16
- * mad_0_9_0
- * mailchimp_0_0_5
- * mailgun_webhook_auth_1_0_0
- * mailibex_0_1_0
- * mailman_0_2_2
- * mandrag_0_1_1
- * mandrillex_0_2_0
- * mariaex_0_7_5
- * maru_0_10_1
- * maru_swagger_0_8_0
- * marvel_1_0_0
- * marvin_0_3_0
- * mc_protocol_0_0_2
- * mcrypt_0_1_1
- * mdns_client_0_1_7
- * mdns_client_lib_0_1_33
- * mdns_client_lib_0_1_39
- * medex_0_1_2
- * merkle_0_0_4
- * message_pack_0_2_0
- * meta_0_0_1
- * migratrex_0_0_1
- * mimerl_1_0_0
- * mixstar_0_0_1
- * mmath_0_1_15
- * mobiledoc_0_0_1
- * moebius_2_0_1
- * monetized_0_4_0
- * money_1_0_0
- * mongo_0_5_4
- * mongodb_ecto_0_1_4
- * motor_hat_0_6_1
- * mstore_0_1_11
- * mt940_1_0_0
- * mustachex_0_0_1
- * mynumber_1_0_0
- * nacl_0_3_0
- * naughtygram_0_2_0
- * neo4j_0_3_0
- * neo4j_sips_0_1_26
- * neo4j_sips_models_0_1_1
- * neotoma_1_7_3
- * neotomex_0_1_4
- * nerves_0_3_2
- * nerves_interim_wifi_0_0_1
- * nerves_network_interface_0_3_1
- * nerves_system_ag150_0_5_1
- * nerves_system_alix_0_5_1
- * nerves_system_bbb_0_6_2
- * nerves_system_ev3_0_5_1
- * nerves_system_galileo_0_5_1
- * nerves_system_qemu_arm_0_5_1
- * nerves_system_rpi_0_5_2
- * nerves_system_rpi2_0_5_2
- * nerves_system_rpi3_0_5_2
- * nerves_toolchain_arm_unknown_linux_gnueabi_0_6_2
- * nerves_toolchain_arm_unknown_linux_gnueabihf_0_6_1
- * nerves_toolchain_armv6_rpi_linux_gnueabi_0_6_1
- * nerves_toolchain_i586_unknown_linux_gnu_0_6_1
- * nerves_wpa_supplicant_0_2_1
- * nested_set_0_0_2
- * new_relixir_0_1_0
- * newrelic_0_1_0
- * nice_nickname_0_0_1
- * nifty_0_0_3
- * nio_google_authenticator_1_0_1
- * nio_google_geocoder_0_7_0
- * nodefinder_1_4_0
- * nodefinder_1_5_1
- * nomad_0_6_0
- * normalixr_0_4_0
- * oauth2_0_6_0
- * oauth2_server_0_1_1
- * oauth2cli_0_0_4
- * oauth2ex_0_0_9
- * obelisk_0_10_0
- * observer_cli_1_0_5
- * okta_0_0_1
- * omise_0_2_2
- * openmaize_0_18_1
- * overpass_0_1_1
- * oxr_0_3_1
- * p1_mysql_1_0_1
- * p1_oauth2_0_6_1
- * p1_pgsql_1_1_0
- * p1_stringprep_1_0_1
- * p1_utils_1_0_0
- * p1_utils_1_0_3
- * p1_utils_1_0_4
- * p1_xml_1_1_1
- * p1_xmlrpc_1_15_1
- * params_2_0_0_beta_0
- * parse_client_0_2_3
- * parse_trans_2_9_0
- * parsex_0_0_2
- * passport_0_0_4
- * peatio_client_1_5_0
- * pet_0_1_1
- * pgpool_1_0_0
- * phoenix_0_2_6
- * phoenix_0_4_1
- * phoenix_1_2_0_rc_1
- * phoenix_active_link_0_0_1
- * phoenix_calendar_0_1_2
- * phoenix_dtl_0_0_1
- * phoenix_ecto_3_0_0_rc_0
- * phoenix_ember_0_0_1
- * phoenix_facebook_messenger_0_3_0
- * phoenix_gen_gulp_jspm_1_0_0
- * phoenix_haml_0_2_1
- * phoenix_html_2_4_0_dev
- * phoenix_html_2_5_1
- * phoenix_html_sanitizer_1_0_2
- * phoenix_html_simplified_helpers_0_3_3
- * phoenix_linguist_0_0_1
- * phoenix_live_reload_1_0_5
- * phoenix_microsoftbot_0_1_0
- * phoenix_pubsub_postgres_0_0_2
- * phoenix_pubsub_rabbitmq_0_0_1
- * phoenix_pubsub_redis_2_0_0
- * phoenix_ratchet_0_2_0
- * phoenix_reactor_0_0_3
- * phoenix_simple_form_0_0_2
- * phoenix_slim_0_4_1
- * phoenix_slime_0_6_0
- * phoenix_swoosh_0_1_2
- * phoenix_timex_1_0_1
- * phoenix_token_auth_0_4_0
- * picosat_0_1_0
- * pin_elixir_0_0_1
- * pixie_0_3_5
- * placid_0_1_3
- * plain_sitemap_0_0_1
- * plasm_0_3_0
- * plug_0_4_4
- * plug_0_5_3
- * plug_0_7_0
- * plug_abort_2_1_1
- * plug_auth_0_3_0
- * plug_basic_auth_1_1_0
- * plug_byte_serve_0_3_2
- * plug_cors_0_8_2
- * plug_exception_handler_0_0_4
- * plug_graphql_0_3_1
- * plug_json_parser_0_0_6
- * plug_jwt_0_7_1
- * plug_newrelic_0_0_5
- * plug_secure_headers_0_0_1
- * plug_session_memcached_0_3_3
- * plug_session_redis_0_1_0
- * png_0_1_1
- * poison_1_0_3
- * poison_1_1_1
- * poison_1_2_1
- * pool_0_0_2
- * pooler_1_4_0
- * portal_0_0_1
- * porterstemmer_0_0_1
- * portmidi_5_0_0
- * posterize_0_11_0
- * postgrex_0_11_1
- * postgrex_0_6_0
- * pqueue_1_4_0
- * proper_1_1_1_beta
- * protego_0_1_0
- * protobuffs_0_8_2
- * provider_asn1_0_2_1
- * pulse_0_1_3
- * pulse_libs_1_0_0
- * pusher_0_1_3
- * pushex_0_0_5
- * pynchon_0_1_1
- * quick_chex_0_2_1
- * quinn_0_0_4
- * rackla_1_0_0
- * radpath_0_0_5
- * random_0_2_2
- * ratchet_0_3_1
- * raven_0_0_5
- * raygun_0_3_0
- * reactive_0_0_1
- * readme_md_doc_0_1_2
- * reagent_0_1_9
- * reaxt_0_3_2
- * rebar3_abnfc_plugin_0_1_0
- * rebar3_auto_0_3_0
- * rebar3_auto_applications_1_0_0
- * rebar3_autotest_0_1_1
- * rebar3_cuttlefish_0_11_0
- * rebar3_diameter_compiler_0_4_0
- * rebar3_elixir_0_0_5
- * rebar3_elixirc_0_1_0
- * rebar3_eqc_0_0_10
- * rebar3_exunit_0_1_1
- * rebar3_git_vsn_1_1_0
- * rebar3_gpb_plugin_1_3_3
- * rebar3_hex_2_5_1
- * rebar3_idl_compiler_0_4_0
- * rebar3_lfe_compile_0_4_1
- * rebar3_live_0_1_3
- * rebar3_neotoma_plugin_0_2_0
- * rebar3_proper_0_6_0
- * rebar3_proper_plugin_0_1_0
- * rebar3_protobuffs_0_2_0
- * rebar3_raw_deps_2_0_0
- * rebar3_run_0_2_0
- * rebar3_shellrpc_0_1_0
- * rebar3_tsung_0_1_4
- * rebar3_vendor_0_3_0
- * rebar3_yang_plugin_0_2_1
- * rebar_alias_0_1_0
- * rebar_cmd_0_2_3
- * rebar_erl_vsn_0_1_0
- * rebar_protobuffs_0_1_0
- * rebind_0_1_3
- * recaptcha_1_1_1
- * receipt_verifier_0_0_1
- * recon_2_2_1
- * recon_2_3_1
- * recon_ex_0_9_1
- * record_translator_0_0_3
- * red_0_0_5
- * red_black_tree_1_2_0
- * reddhl_0_0_1
- * redis_pool_0_2_3
- * redis_poolex_0_0_5
- * redix_0_3_6
- * redo_2_0_1
- * redtube_1_0_0
- * ref_inspector_0_9_0
- * regdom_0_0_1
- * relax_0_3_0
- * relflow_1_0_5
- * relief_0_0_1
- * relisa_0_1_0
- * relocker_0_0_8
- * reltool_util_1_4_0
- * reltool_util_1_5_1
- * relx_3_1_0
- * relx_3_19_0
- * relx_3_5_0
- * remix_0_0_2
- * remodel_0_0_1
- * remote_ip_rewriter_0_0_2
- * rendezvous_0_0_1
- * repg2_0_0_4
- * repo_0_4_1
- * repoquery_0_0_2
- * reporter_0_5_1
- * reprise_0_5_0
- * resin_0_4_1
- * rest_1_5_0
- * rest_client_0_0_1
- * rethinkdb_0_4_0
- * rethinkdb_changefeed_0_0_1
- * retrieval_0_9_1
- * retry_0_1_0
- * reup_0_1_0
- * reverse_proxy_0_1_0
- * revision_plate_ex_0_1_0
- * rfc3339_0_9_0
- * riak_1_0_0
- * riak_core_ng_2_2_5
- * riak_dt_2_1_1
- * riak_ensemble_2_1_3
- * riak_pb_2_1_0
- * riak_sysmon_2_1_2
- * riakc_2_1_1
- * riboflavin_0_0_2
- * riemann_0_0_15
- * rlist_0_0_1
- * robotex_0_0_1
- * rogger_0_1_0
- * rollbax_0_6_0
- * rollex_0_4_0
- * roman_numerals_1_0_1
- * romanex_0_1_0
- * romeo_0_5_0
- * roombex_0_0_4
- * rop_0_5_3
- * rotor_0_2_2
- * rquote_0_0_1
- * rsa_0_0_1
- * rss_0_2_1
- * rstats_1_0_2
- * rubix_0_0_2
- * rulex_0_2_0
- * russian_0_1_0
- * rustler_0_0_7
- * safetybox_0_1_2
- * sage_0_0_1
- * salsa20_0_3_0
- * saltie_0_3_2
- * saltpack_1_0_1
- * sap_0_0_2
- * sasl_ex_0_1_0
- * sass_elixir_0_0_1
- * savory_0_0_2
- * sbroker_0_6_2
- * sbroker_0_7_0
- * sbroker_1_0_0_beta_2
- * scaffold_0_0_5
- * scarab_0_1_0
- * schedule_0_1_0
- * schizo_0_0_1
- * scientist_0_2_0
- * scientist_ex_0_1_0
- * scrape_1_0_4
- * scrivener_1_1_4
- * scrivener_1_2_1
- * scrivener_headers_1_0_1
- * scrivener_html_1_1_1
- * seasonal_0_3_0
- * seat_json_0_0_18
- * sec_cik_ticker_mapper_0_0_2
- * sec_company_filings_rss_feed_parser_0_0_2
- * sec_recent_filings_rss_feed_parser_0_0_6
- * secure_0_1_0
- * secure_compare_0_0_1
- * secure_headers_0_0_1
- * secure_password_0_4_3
- * secure_random_0_1_1
- * secure_random_0_3_0
- * seedex_0_1_2
- * seg_seg_0_0_1
- * seg_seg_0_1_0
- * segment_0_1_0
- * select_0_0_1
- * selenium_0_0_2
- * semver_0_1_2
- * sendgrid_0_1_0
- * sentient_0_0_2
- * sentinel_0_1_0
- * sentry_0_3_2
- * sequences_1_1_0
- * serial_0_1_2
- * serve_this_1_0_0
- * service_1_5_1
- * setup_1_7_0
- * setup_tag_0_1_2
- * sfmt_0_12_7
- * sfmt_0_13_0
- * sfsobject_0_0_3
- * sh_1_1_2
- * sha3_1_0_0
- * shameless_plug_1_0_0
- * shape_0_0_2
- * shell_stream_0_0_1
- * short_maps_0_1_1
- * shorter_maps_1_0_0
- * shotgun_0_3_0
- * shouldi_0_3_0
- * shove_0_0_1
- * shrivel_0_0_3
- * sidejob_2_0_0
- * sideshow_0_0_2
- * sidetask_1_1_0
- * signaturex_1_0_1
- * simetric_0_1_0
- * simple_agent_0_0_7
- * simple_bar_0_0_7
- * simple_format_0_1_0
- * simple_markdown_0_0_1
- * simple_secrets_1_0_0
- * simple_statistics_0_0_1
- * simplex_0_4_0
- * simplify_0_2_1
- * simpre_0_1_0
- * siphash_3_1_0
- * sips_downloader_0_2_2
- * sitemap_0_7_0
- * skills_0_0_1
- * skroutz_0_1_0
- * slack_0_3_0
- * slack_0_4_2
- * slack_0_5_0
- * slack_logger_backend_0_1_4
- * slack_webhook_0_0_2
- * slacker_0_0_2
- * slackex_0_0_1
- * slim_fast_0_10_0
- * slime_0_13_0
- * slp_0_0_2
- * slugerl_1_0_0
- * slugger_0_1_0
- * smex_0_0_1
- * sms506_0_2_0
- * sms_blitz_0_0_1
- * smurf_0_1_3
- * snappy_1_1_1
- * snowflake_client_0_1_1
- * socket_0_2_8
- * socket_0_3_4
- * solage_0_0_1
- * sonic_0_1_3
- * sorted_set_1_1_0
- * soundcloud_ex_0_0_1
- * spaceapi_0_1_2
- * spaced_repetitions_0_0_1
- * spacesaving_0_0_3
- * spaghetti_pool_0_1_0
- * sparkpost_0_1_0
- * spartan_0_0_1
- * spawndir_0_1_1
- * spirit_0_0_1
- * sql_dust_0_3_4
- * sqlite3_1_1_5
- * sqlite_ecto_0_5_0
- * sqlite_ecto_1_0_2
- * sqlite_ecto_1_1_0
- * ssdb_0_3_0
- * ssdb_elixir_0_2_2
- * sshex_1_1_0
- * ssl_verify_hostname_1_0_0
- * ssl_verify_hostname_1_0_5
- * ssl_verify_hostname_1_0_6
- * statman_0_5_0
- * stmd_0_0_2
- * strava_0_0_1
- * stringprep_1_0_3
- * stripe_0_0_1
- * stripe_client_0_0_3
- * stripe_eventex_1_0_0
- * stripity_stripe_1_4_0
- * structurez_0_0_1
- * stun_1_0_3
- * sugar_0_4_11
- * supermemo_1_0_0
- * supervisord_0_1_0
- * swaggerdoc_0_0_1
- * sweet_xml_0_4_0
- * switchboard_0_3_2
- * swoosh_0_3_0
- * syslog_1_0_2
- * tagplay_0_1_0
- * tarantool_0_0_2
- * tcs34725_0_0_1
- * tds_ecto_1_0_2
- * telebot_0_1_2
- * templates_0_0_5
- * texas_0_0_2
- * theriac_0_0_1
- * thesis_0_0_14
- * thing_0_0_1
- * timex_0_12_9
- * timex_0_13_5
- * timex_0_16_2
- * timex_1_0_0_rc4
- * timex_ecto_1_0_4
- * timex_ecto_1_1_3
- * timex_interval_0_6_0
- * tirerl_1_0_1
- * tomlex_0_0_4
- * topo_0_1_1
- * tracker_request_0_0_4
- * tractor_0_1_0
- * traitify_elixir_0_1_1
- * trans_0_1_0
- * translator_0_0_1
- * tributary_0_0_2
- * tuco_tuco_0_8_1
- * twittertex_0_1_0
- * twittex_0_0_4
- * u2f_0_1_3
- * u_token_0_0_2
- * ucol_2_0_0
- * ucol_nif_1_1_5
- * ueberauth_facebook_0_3_2
- * ueberauth_fitbit_0_2_1
- * ueberauth_github_0_2_0
- * ueberauth_google_0_2_0
- * ueberauth_linkedin_0_2_0
- * ueberauth_paypal_0_1_0
- * ueberauth_slack_0_2_0
- * ueberauth_spotify_0_0_1
- * ueberauth_strava_0_1_1
- * ueberauth_vk_0_1_1
- * ueberauth_vkontakte_0_1_0
- * ueberauth_weibo_0_0_3
- * ui_0_1_1
- * ulitos_0_3_0
- * unsplash_0_4_0
- * upyun_0_0_1
- * uri_template_1_2_0
- * urna_0_1_4
- * uuid_erl_1_4_0
- * uuid_erl_1_5_1
- * valid_field_0_3_0
- * velkoz_1_2_0
- * verk_0_12_0
- * verk_web_0_11_0
- * vimeo_0_0_2
- * voorhees_0_1_1
- * wayback_archiver_0_0_1
- * webdriver_0_8_1
- * weber_0_1_0
- * weebo_0_1_2
- * wifi_0_2_0
- * win_notify_0_0_4
- * wire_0_2_0
- * xlsx_parser_0_0_7
- * xref_runner_1_0_0
- * yar_0_1_0
- * yggdrasil_1_2_3
- * yodlee_0_1_4
- * yomel_0_5_0
- * zanox_0_0_1
- * zencoder_1_0_1
- * zipper_1_0_0
- * zuppler_users_client_0_0_5
-
-*/
-{ stdenv, pkgs, callPackage, overrides ? (self: super: {}) }:
-
-let
- packages = self: rec {
- abnf_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "abnf";
- version = "0.0.1";
- src = fetchHex {
- pkg = "abnf";
- version = "0.0.1";
- sha256 =
- "81e263f061ba677bda3e0d7f8884730eb51c14d7bc6526647c46cce659f1b054";
- };
-
- meta = {
- description = ''ABNF parser for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/vanstee/abnf";
- };
- } // packageOverrides)
- ) {};
-
- abnf = abnf_0_0_1;
-
- absinthe_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "absinthe";
- version = "1.0.0";
- src = fetchHex {
- pkg = "absinthe";
- version = "1.0.0";
- sha256 =
- "c5606be8b46003e7ac47e87c924908cb390b892fef0eae390deb66f8ee123a1c";
- };
-
- meta = {
- description = ''GraphQL for Elixir'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/absinthe-graphql/absinthe";
- };
- } // packageOverrides)
- ) {};
-
- absinthe_1_1_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "absinthe";
- version = "1.1.6";
- src = fetchHex {
- pkg = "absinthe";
- version = "1.1.6";
- sha256 =
- "3e83ea139967975a025850c0efc5aba7a864aded6b10d6483a60264a3523411f";
- };
-
- meta = {
- description = ''GraphQL for Elixir'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/absinthe-graphql/absinthe";
- };
- } // packageOverrides)
- ) {};
-
- absinthe = absinthe_1_1_6;
-
- absinthe_plug_1_0_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- absinthe_1_0_0
- }:
- buildMix ({
- name = "absinthe_plug";
- version = "1.0.0";
- src = fetchHex {
- pkg = "absinthe_plug";
- version = "1.0.0";
- sha256 =
- "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33";
- };
- beamDeps = [ plug_1_1_5 absinthe_1_0_0 ];
-
- meta = {
- description = ''A plug for Absinthe, an experimental GraphQL
- toolkit'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/CargoSense/absinthe_plug";
- };
- } // packageOverrides)
- ) {};
-
- absinthe_plug_1_1_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- absinthe_1_1_6
- }:
- buildMix ({
- name = "absinthe_plug";
- version = "1.1.3";
- src = fetchHex {
- pkg = "absinthe_plug";
- version = "1.1.3";
- sha256 =
- "9fa66d56b4ddbd42fc11510780ed6c9758d539b9c8e538930ff8b383ae71814e";
- };
- beamDeps = [ plug_1_1_5 absinthe_1_1_6 ];
-
- meta = {
- description = ''A plug for Absinthe, an experimental GraphQL
- toolkit'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/CargoSense/absinthe_plug";
- };
- } // packageOverrides)
- ) {};
-
- absinthe_plug = absinthe_plug_1_1_3;
-
- access_token_extractor_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "access_token_extractor";
- version = "0.1.1";
- src = fetchHex {
- pkg = "access_token_extractor";
- version = "0.1.1";
- sha256 =
- "40f76799f8fbb5b03230b31d4d55c5a169e7c3ad82d776a9d87fe0c65c85396d";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- longDescription = ''Simple Plug to extract access_token from
- request and add it to private map in Plug.Conn
- struct.'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/rohanpujaris/access_token_extractor";
- };
- } // packageOverrides)
- ) {};
-
- access_token_extractor = access_token_extractor_0_1_1;
-
- adam7_0_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, apex_0_3_7 }:
- buildMix ({
- name = "adam7";
- version = "0.4.0";
- src = fetchHex {
- pkg = "adam7";
- version = "0.4.0";
- sha256 =
- "8b540817f2fa92ba4b198d42d1ee4af348ed1edf8bd02d69691e0d8bdbecdcee";
- };
- beamDeps = [ apex_0_3_7 ];
-
- meta = {
- longDescription = ''Adam7 interlacing library for Elixir.
- Primarily used for interlacing and
- de-interlacing image data for PNGs.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/SenecaSystems/imagineer";
- };
- } // packageOverrides)
- ) {};
-
- adam7 = adam7_0_4_0;
-
- adap_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "adap";
- version = "0.0.1";
- src = fetchHex {
- pkg = "adap";
- version = "0.0.1";
- sha256 =
- "10679369764e2aa68560008c1f8bea40d5c715389e27e10b35b1ceda3fedadbb";
- };
-
- meta = {
- longDescription = '' Create a data stream across your information
- systems to query, augment and transform data
- according to Elixir matching rules. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/awetzel/adap";
- };
- } // packageOverrides)
- ) {};
-
- adap = adap_0_0_1;
-
- adt_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "adt";
- version = "0.0.2";
- src = fetchHex {
- pkg = "adt";
- version = "0.0.2";
- sha256 =
- "a5b310b1ed8093b0f786ca4facdd0c9ff073acf3e47db6a9771005b77e0d7259";
- };
-
- meta = {
- description = ''A light ADT module for Elixir.'';
-
- };
- } // packageOverrides)
- ) {};
-
- adt = adt_0_0_2;
-
- aeacus_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, comeonin_1_6_0 }:
- buildMix ({
- name = "aeacus";
- version = "0.3.0";
- src = fetchHex {
- pkg = "aeacus";
- version = "0.3.0";
- sha256 =
- "3cc138cfc7c508cfd85afddd0881632dde2e663d222c9e3749fae8c80ebb2c0b";
- };
- beamDeps = [ comeonin_1_6_0 ];
-
- meta = {
- longDescription = ''A simple, secure, and highly configurable
- Elixir identity [username | email | id |
- etc.]/password authentication module; Compatible
- with Ecto.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/zmoshansky/aeacus";
- };
- } // packageOverrides)
- ) {};
-
- aeacus = aeacus_0_3_0;
-
- ahab_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ahab";
- version = "0.1.1";
- src = fetchHex {
- pkg = "ahab";
- version = "0.1.1";
- sha256 =
- "c981c2f62dccd15a055083f9bc088aa0e4a029625ef9aa45104c4ba0ead12bd2";
- };
-
- meta = {
- description = ''A lightweight, low latency TCP acceptor pool for
- Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/jquadrin/ahab";
- };
- } // packageOverrides)
- ) {};
-
- ahab = ahab_0_1_1;
-
- airbrakify_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- plug_1_1_5,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "airbrakify";
- version = "0.0.1";
- src = fetchHex {
- pkg = "airbrakify";
- version = "0.0.1";
- sha256 =
- "973f895ba83e6dd71cf87182419e144db5c3ac23e43b7a1247e51559bf2737b6";
- };
- beamDeps = [ poison_2_1_0 plug_1_1_5 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''A simple Airbrake/Errbit library for
- Elixir/Phoenix projects. Currently only supports
- error/exception notifications via a Plug.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Diamond/airbrakify";
- };
- } // packageOverrides)
- ) {};
-
- airbrakify = airbrakify_0_0_1;
-
- alambic_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "alambic";
- version = "0.1.0";
- src = fetchHex {
- pkg = "alambic";
- version = "0.1.0";
- sha256 =
- "04dc4cc88d56539ec4006a84668186501be9be4c369f145af6a606bb63d97ce0";
- };
-
- meta = {
- longDescription = ''A collection of small elixir utilities.
- Semaphore: quick way of limiting access to a
- resource CountDown: quick way of counting fan
- in/out events'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/sdanzan/alambic";
- };
- } // packageOverrides)
- ) {};
-
- alambic = alambic_0_1_0;
-
- alchemic_avatar_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "alchemic_avatar";
- version = "0.1.2";
- src = fetchHex {
- pkg = "alchemic_avatar";
- version = "0.1.2";
- sha256 =
- "329ae15eb6a304d6d425f86e6890f1d5c3901475b3fbc9eb07ad03f1394144b4";
- };
-
- meta = {
- description = ''Creating letter avatar from user`s name(or any
- other strong / character).'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zhangsoledad/alchemic_avatar";
- };
- } // packageOverrides)
- ) {};
-
- alchemic_avatar = alchemic_avatar_0_1_2;
-
- alchemic_pinyin_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "alchemic_pinyin";
- version = "0.1.2";
- src = fetchHex {
- pkg = "alchemic_pinyin";
- version = "0.1.2";
- sha256 =
- "1fbd8300984699370b4a97ab10b64023494d2f9755eddf0abe1dcd9a5f2498c6";
- };
-
- meta = {
- description = ''中文汉字转拼音.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zhangsoledad/alchemic_pinyin";
- };
- } // packageOverrides)
- ) {};
-
- alchemic_pinyin = alchemic_pinyin_0_1_2;
-
- alchemist_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "alchemist";
- version = "0.0.2";
- src = fetchHex {
- pkg = "alchemist";
- version = "0.0.2";
- sha256 =
- "095ad9b47258b2d482b782a5794ed800df1c4024abbc126f347738be72a1aa51";
- };
-
- meta = {
- description = ''Carefully refactor critical paths'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/jkakar/alchemist";
- };
- } // packageOverrides)
- ) {};
-
- alchemist = alchemist_0_0_2;
-
- alchemy_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_4 }:
- buildMix ({
- name = "alchemy";
- version = "0.0.1";
- src = fetchHex {
- pkg = "alchemy";
- version = "0.0.1";
- sha256 =
- "109ce3f83d596a6ab9a947f472516f87da7b0df823fe2d91e27bc6594a305c3d";
- };
- beamDeps = [ uuid_1_1_4 ];
-
- meta = {
- description = ''Perform experiments in production'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/keathley/alchemy";
- };
- } // packageOverrides)
- ) {};
-
- alchemy = alchemy_0_0_1;
-
- aleppo_0_9_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "aleppo";
- version = "0.9.0";
- src = fetchHex {
- pkg = "aleppo";
- version = "0.9.0";
- sha256 =
- "2f360631d64da53f40621714e157fd33805a95d0160d5c62fcfb3e132986ce71";
- };
-
- meta = {
- description = ''Aleppo: ALternative Erlang Pre-ProcessOr'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/ErlyORM/aleppo";
- };
- } // packageOverrides)
- ) {};
-
- aleppo = aleppo_0_9_0;
-
- alexa_0_1_14 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "alexa";
- version = "0.1.14";
- src = fetchHex {
- pkg = "alexa";
- version = "0.1.14";
- sha256 =
- "a15cc63ef736f45326a3065ff59e1211365929387957f246e7b8cee76a31bbe8";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- description = ''Framework for implementing an Amazon Alexa
- Skill.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/col/alexa";
- };
- } // packageOverrides)
- ) {};
-
- alexa = alexa_0_1_14;
-
- alexa_plug_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "alexa_plug";
- version = "0.2.0";
- src = fetchHex {
- pkg = "alexa_plug";
- version = "0.2.0";
- sha256 =
- "a78f6fa5e3ba33ce0943f4cb96d6cfcc9b36637a4575314469c8a0d45fff40d0";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- longDescription = ''A simple set of plugs and utilities for
- interfacing with the Amazon Echo and the Alexa
- Skills Kit.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jordantdavis/alexa_plug";
- };
- } // packageOverrides)
- ) {};
-
- alexa_plug = alexa_plug_0_2_0;
-
- alexa_web_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4,
- alexa_0_1_14
- }:
- buildMix ({
- name = "alexa_web";
- version = "0.0.2";
- src = fetchHex {
- pkg = "alexa_web";
- version = "0.0.2";
- sha256 =
- "e60a7fa60eb52bbb91e445cf0ee3781e0e2a148855befa638b274e6720421126";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 alexa_0_1_14 ];
-
- meta = {
- description = ''A web endpoint for deploying one or a collection
- of Amazon Alexa Skills'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/col/alexa_web";
- };
- } // packageOverrides)
- ) {};
-
- alexa_web = alexa_web_0_0_2;
-
- algae_0_10_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, quark_1_0_2 }:
- buildMix ({
- name = "algae";
- version = "0.10.0";
- src = fetchHex {
- pkg = "algae";
- version = "0.10.0";
- sha256 =
- "02d89132d99da1e13271007d1109be958ef8b3b7a5e64323299b84d0aa2353e1";
- };
- beamDeps = [ quark_1_0_2 ];
-
- meta = {
- description = ''Bootstrapped algebraic data types for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/robot-overlord/algae";
- };
- } // packageOverrides)
- ) {};
-
- algae = algae_0_10_0;
-
- amazon_product_advertising_client_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_1_0_2,
- sweet_xml_0_6_1,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "amazon_product_advertising_client";
- version = "0.1.1";
- src = fetchHex {
- pkg = "amazon_product_advertising_client";
- version = "0.1.1";
- sha256 =
- "406111cedbd475cab29bdcc69f48ddc3670e57d2e3294e8d948c117ae492951c";
- };
- beamDeps = [ timex_1_0_2 sweet_xml_0_6_1 httpoison_0_8_3 ];
-
- meta = {
- description = ''An Amazon Product Advertising API client for
- Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/zachgarwood/elixir-amazon-product-advertising-client";
- };
- } // packageOverrides)
- ) {};
-
- amazon_product_advertising_client =
- amazon_product_advertising_client_0_1_1;
-
- amnesia_0_2_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exquisite_0_1_6 }:
- buildMix ({
- name = "amnesia";
- version = "0.2.4";
- src = fetchHex {
- pkg = "amnesia";
- version = "0.2.4";
- sha256 =
- "fba1e39f5c51d860b22618046a25525170530bc595d0f2dbb45f070c3b40da8f";
- };
- beamDeps = [ exquisite_0_1_6 ];
-
- meta = {
- description = ''mnesia wrapper for Elixir'';
- license = stdenv.lib.licenses.wtfpl;
- homepage = "https://github.com/meh/amnesia";
- };
- } // packageOverrides)
- ) {};
-
- amnesia = amnesia_0_2_4;
-
- anagram_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "anagram";
- version = "1.0.0";
- src = fetchHex {
- pkg = "anagram";
- version = "1.0.0";
- sha256 =
- "8c41013b8b586728adbf821fe809c277e30f99323138b8e8ccff2311317c8fac";
- };
-
- meta = {
- longDescription = ''Find anagrams of words and \"words that can
- be made with a set of letters\" (sort of a sub
- anagram)'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/ewildgoose/elixir-anagram";
- };
- } // packageOverrides)
- ) {};
-
- anagram = anagram_1_0_0;
-
- anaphora_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "anaphora";
- version = "0.1.2";
- src = fetchHex {
- pkg = "anaphora";
- version = "0.1.2";
- sha256 =
- "fb60a214b2be57d7a08aa8237cd7afb009b637563d64ed5e6ec486e36c484001";
- };
-
- meta = {
- description = ''The anaphoric macro collection for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sviridov/anaphora-elixir";
- };
- } // packageOverrides)
- ) {};
-
- anaphora = anaphora_0_1_2;
-
- anilixir_1_0_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "anilixir";
- version = "1.0.0";
- src = fetchHex {
- pkg = "anilixir";
- version = "1.0.0";
- sha256 =
- "ee5c6dfa7e5250d8ec5c9b04910e3202788ceeba231cb3ff8b22e479cc64f1c3";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Anilist API client for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sotojuan/anilixir";
- };
- } // packageOverrides)
- ) {};
-
- anilixir = anilixir_1_0_0;
-
- apex_0_3_7 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "apex";
- version = "0.3.7";
- src = fetchHex {
- pkg = "apex";
- version = "0.3.7";
- sha256 =
- "a1c8313e9c909ff2489f004b3514430293b1aafb81569b93a1822d486f56080d";
- };
-
- meta = {
- description = ''Elixir clone of Ruby`s awesome_print gem'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bjro/apex";
- };
- } // packageOverrides)
- ) {};
-
- apex_0_5_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "apex";
- version = "0.5.0";
- src = fetchHex {
- pkg = "apex";
- version = "0.5.0";
- sha256 =
- "dd8863ebef2a42be331eece2d3a2f721c4ec3c8495bc0e198703aea7927f156a";
- };
-
- meta = {
- description = ''Elixir clone of Ruby`s awesome_print gem'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bjro/apex";
- };
- } // packageOverrides)
- ) {};
-
- apex = apex_0_5_0;
-
- apix_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "apix";
- version = "0.1.0";
- src = fetchHex {
- pkg = "apix";
- version = "0.1.0";
- sha256 =
- "d1d809cf41731e39a6c23e02fb41c9375bf04db35c8ce595c99c03eea694f30e";
- };
-
- meta = {
- longDescription = ''Simple convention and DSL for transformation
- of elixir functions to a documented and ready
- for validation API.'';
-
- homepage = "https://github.com/liveforeverx/apix";
- };
- } // packageOverrides)
- ) {};
-
- apix = apix_0_1_0;
-
- apns_0_9_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- poison_2_1_0,
- connection_1_0_2
- }:
- buildMix ({
- name = "apns";
- version = "0.9.2";
- src = fetchHex {
- pkg = "apns";
- version = "0.9.2";
- sha256 =
- "7d63bd108572fadac777006957e45db5da1a8adf2e94e76f83c89942adf54f68";
- };
- beamDeps = [ poolboy_1_5_1 poison_2_1_0 connection_1_0_2 ];
-
- meta = {
- description = ''APNS (Apple Push Notification Service) library
- for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/chvanikoff/apns4ex";
- };
- } // packageOverrides)
- ) {};
-
- apns = apns_0_9_2;
-
- ar2ecto_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ar2ecto";
- version = "0.1.2";
- src = fetchHex {
- pkg = "ar2ecto";
- version = "0.1.2";
- sha256 =
- "a32322d39f1c0cff335b05b5c2252e531091565c3cf754811087edd2e115a718";
- };
-
- meta = {
- description = ''Ar2ecto is a set of mix tasks to help you migrate
- from ActiveRecord to Ecto.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/aforward/ar2ecto";
- };
- } // packageOverrides)
- ) {};
-
- ar2ecto = ar2ecto_0_1_2;
-
- argent_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "argent";
- version = "0.0.1";
- src = fetchHex {
- pkg = "argent";
- version = "0.0.1";
- sha256 =
- "dde0920308efca2c8dd9681057e5196f625b53ed8dff86a27242807c3653d645";
- };
-
- meta = {
- description = ''A currency management library for elixir.'';
-
- };
- } // packageOverrides)
- ) {};
-
- argent = argent_0_0_1;
-
- argument_parser_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "argument_parser";
- version = "0.1.3";
- src = fetchHex {
- pkg = "argument_parser";
- version = "0.1.3";
- sha256 =
- "2c56a6c9dfa9790aabdb8f9268ac501404376ffb13396ff515e66f1ebf64817d";
- };
-
- meta = {
- description = ''More powerful argument parser for creating nice
- scripts'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/jisaacstone/ex_argument_parser";
- };
- } // packageOverrides)
- ) {};
-
- argument_parser = argument_parser_0_1_3;
-
- array_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "array";
- version = "1.0.1";
- src = fetchHex {
- pkg = "array";
- version = "1.0.1";
- sha256 =
- "626ac1383566dadee3a10357cd6d192151c6d604ee3266809daf0da6b5e33bbb";
- };
-
- meta = {
- description = ''An elixir wrapper library for Erlang`s array.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/takscape/elixir-array";
- };
- } // packageOverrides)
- ) {};
-
- array = array_1_0_1;
-
- artifact_0_4_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- porcelain_2_0_1,
- poolboy_1_5_1,
- plug_1_1_5
- }:
- buildMix ({
- name = "artifact";
- version = "0.4.0";
- src = fetchHex {
- pkg = "artifact";
- version = "0.4.0";
- sha256 =
- "6c66a3c745418e1f1207940c3815828d1a0f022d8186e5da593599d1f460197f";
- };
- beamDeps = [ porcelain_2_0_1 poolboy_1_5_1 plug_1_1_5 ];
-
- meta = {
- description = ''File upload and on-the-fly processing for
- Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/doomspork/artifact";
- };
- } // packageOverrides)
- ) {};
-
- artifact = artifact_0_4_0;
-
- aruspex_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- zipper_tree_0_1_1,
- exyz_1_0_0
- }:
- buildMix ({
- name = "aruspex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "aruspex";
- version = "0.1.0";
- sha256 =
- "2effd16e1081a7af2e5ade9c58cdf4c4d90e2095749ccf733332be2924a6d771";
- };
- beamDeps = [ zipper_tree_0_1_1 exyz_1_0_0 ];
-
- meta = {
- description = ''A configurable constraint solver with an API
- based on JSR 331.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://www.github.com/dkendal/aruspex";
- };
- } // packageOverrides)
- ) {};
-
- aruspex = aruspex_0_1_0;
-
- ashes_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ashes";
- version = "0.0.3";
- src = fetchHex {
- pkg = "ashes";
- version = "0.0.3";
- sha256 =
- "2178ab8c0fa1cf53b6d6152773ae79ca6100c80861d59e55e5fa06c5979b042b";
- };
-
- meta = {
- description = ''A code generation tool for the phoenix web
- framework'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nickgartmann/ashes";
- };
- } // packageOverrides)
- ) {};
-
- ashes = ashes_0_0_3;
-
- assembla_api_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "assembla_api";
- version = "0.1.0";
- src = fetchHex {
- pkg = "assembla_api";
- version = "0.1.0";
- sha256 =
- "b4a3898de536e4820702c0f119993fd2804e91e2525d1e7eba57d8744983ef24";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Assembla API client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Assembla/ex_assembla_api";
- };
- } // packageOverrides)
- ) {};
-
- assembla_api = assembla_api_0_1_0;
-
- assembly_line_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, gproc_0_5_0 }:
- buildMix ({
- name = "assembly_line";
- version = "1.0.0";
- src = fetchHex {
- pkg = "assembly_line";
- version = "1.0.0";
- sha256 =
- "3b687890bf750cd893e8a73c261710c1014ba4d5b2247f695f7730b2a84a5473";
- };
- beamDeps = [ gproc_0_5_0 ];
-
- meta = {
- description = ''A light-weight job queue (think DAG) manager.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/LeakyBucket/assembly_line";
- };
- } // packageOverrides)
- ) {};
-
- assembly_line = assembly_line_1_0_0;
-
- assert_diff_0_0_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "assert_diff";
- version = "0.0.5";
- src = fetchHex {
- pkg = "assert_diff";
- version = "0.0.5";
- sha256 =
- "ad53a2819c33d39ad2f71404a964625691e9d6bf3d63dbc28442acda71109426";
- };
-
- meta = {
- description = ''assert_diff which fallbacks to git diff'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/ske77/assert_diff";
- };
- } // packageOverrides)
- ) {};
-
- assert_diff = assert_diff_0_0_5;
-
- atomic_map_0_9_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "atomic_map";
- version = "0.9.0";
- src = fetchHex {
- pkg = "atomic_map";
- version = "0.9.0";
- sha256 =
- "f95d5fd4e0f5e4a8ecfead77fa1957cfbcee52307692bcd632159e01326cbf78";
- };
-
- meta = {
- longDescription = ''A small utility to convert deep Elixir maps
- with mixed string/atom keys to atom-only keyed
- maps'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ruby2elixir/atomic_map";
- };
- } // packageOverrides)
- ) {};
-
- atomic_map = atomic_map_0_9_0;
-
- auth_test_support_0_0_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "auth_test_support";
- version = "0.0.6";
- src = fetchHex {
- pkg = "auth_test_support";
- version = "0.0.6";
- sha256 =
- "930596c61d237fbf74b86d87819f0a7df8da8ef79051294a1982ded403cb2401";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''Authentication and authorization test support
- functions'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/DockYard/auth_test_support";
- };
- } // packageOverrides)
- ) {};
-
- auth_test_support = auth_test_support_0_0_6;
-
- authentic_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "authentic";
- version = "0.0.1";
- src = fetchHex {
- pkg = "authentic";
- version = "0.0.1";
- sha256 =
- "2fba6e1efde9fef4866d17499907811a3957ded8c07866c7b34474f0f0d59e29";
- };
-
- meta = {
- description = ''Auth for Phoenix'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- authentic = authentic_0_0_1;
-
- auto_doc_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- plug_1_1_5
- }:
- buildMix ({
- name = "auto_doc";
- version = "0.0.2";
- src = fetchHex {
- pkg = "auto_doc";
- version = "0.0.2";
- sha256 =
- "9c4b30c526e59f63173fe2f0d0c360ac678f1e7a11adcf209dfc843a3e63e6f7";
- };
- beamDeps = [ poison_1_5_2 plug_1_1_5 ];
-
- meta = {
- description = ''A package that will create REST API docs based on
- your ExUnit tests.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/meatherly/auto_doc";
- };
- } // packageOverrides)
- ) {};
-
- auto_doc = auto_doc_0_0_2;
-
- autobots_license_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "autobots_license";
- version = "0.1.0";
- src = fetchHex {
- pkg = "autobots_license";
- version = "0.1.0";
- sha256 =
- "7cfa258ce5eff01018dfd6faf509b430d03770fb733c1b10217b9e52770014b3";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = { };
- } // packageOverrides)
- ) {};
-
- autobots_license = autobots_license_0_1_0;
-
- avex_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "avex";
- version = "0.2.0";
- src = fetchHex {
- pkg = "avex";
- version = "0.2.0";
- sha256 =
- "e63970026cc566e9aa9c24c261f43843a7553835d2009b16e838217644ded815";
- };
-
- meta = {
- description = ''Awesome validations for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jonhkr/avex";
- };
- } // packageOverrides)
- ) {};
-
- avex = avex_0_2_0;
-
- aws_0_0_11 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_2_1_6,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "aws";
- version = "0.0.11";
- src = fetchHex {
- pkg = "aws";
- version = "0.0.11";
- sha256 =
- "f9f3f9b0e02bb6aa29268a746b2110deaebe34f205d689e9d57ccb90f0caf072";
- };
- beamDeps = [ timex_2_1_6 poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''AWS clients for Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/jkakar/aws-elixir";
- };
- } // packageOverrides)
- ) {};
-
- aws = aws_0_0_11;
-
- aws_auth_0_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_2_1_6 }:
- buildMix ({
- name = "aws_auth";
- version = "0.4.0";
- src = fetchHex {
- pkg = "aws_auth";
- version = "0.4.0";
- sha256 =
- "67f28f8e4ffdd3f3155e124f20ef325ff32ea3f525cf85e2df96f2f09d245976";
- };
- beamDeps = [ timex_2_1_6 ];
-
- meta = {
- description = ''AWS Signature Version 4 Signing Library'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/bryanjos/aws_auth";
- };
- } // packageOverrides)
- ) {};
-
- aws_auth = aws_auth_0_4_0;
-
- aws_cli_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, erlexec_1_1_0 }:
- buildRebar3 ({
- name = "aws_cli";
- version = "0.1.0";
- src = fetchHex {
- pkg = "aws_cli";
- version = "0.1.0";
- sha256 =
- "14fd91c4752a5eb5b2c781c4843589824b35750d7785b57e0460ba6d96bfe8c1";
- };
-
- beamDeps = [ erlexec_1_1_0 ];
-
- meta = {
- description = ''AWS cli wrapper for Erlang'';
-
- homepage = "https://github.com/fyler/aws_cli";
- };
- } // packageOverrides)
- ) {};
-
- aws_cli = aws_cli_0_1_0;
-
- azure_push_client_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "azure_push_client";
- version = "0.0.2";
- src = fetchHex {
- pkg = "azure_push_client";
- version = "0.0.2";
- sha256 =
- "d58bbac5e5260d92ef62916e74dbb8743e413a9f69afa2d8e1940071407a2f06";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Azure Push Client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/chaione/azure_push_client";
- };
- } // packageOverrides)
- ) {};
-
- azure_push_client = azure_push_client_0_0_2;
-
- b2_0_0_6 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "b2";
- version = "0.0.6";
- src = fetchHex {
- pkg = "b2";
- version = "0.0.6";
- sha256 =
- "f8b33d1ec36576dfbca3f2f4c5fad1a9a227207d1ef63b3a388778e8fad3333a";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir B2 cloud API wrapper'';
-
- };
- } // packageOverrides)
- ) {};
-
- b2 = b2_0_0_6;
-
- bamboo_0_3_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "bamboo";
- version = "0.3.2";
- src = fetchHex {
- pkg = "bamboo";
- version = "0.3.2";
- sha256 =
- "1b4bfdddae49f6fc66616c63b4d2d9a0e99d40a08619004f5c4f4e4aebfa20ed";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''Straightforward, powerful, and adapter based
- Elixir email library. Works with Mandrill,
- Mailgun, SendGrid, SparkPost, in-memory, and
- test.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/paulcsmith/bamboo";
- };
- } // packageOverrides)
- ) {};
-
- bamboo_0_5_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- plug_1_1_5,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "bamboo";
- version = "0.5.0";
- src = fetchHex {
- pkg = "bamboo";
- version = "0.5.0";
- sha256 =
- "29e46e8c9e861e93103cde6fab9712bb077317e517af75a05e118763f7c5fc35";
- };
- beamDeps = [ poison_2_1_0 plug_1_1_5 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''Straightforward, powerful, and adapter based
- Elixir email library. Works with Mandrill,
- Mailgun, SendGrid, SparkPost, in-memory, and
- test.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/paulcsmith/bamboo";
- };
- } // packageOverrides)
- ) {};
-
- bamboo_0_6_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- plug_1_1_5,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "bamboo";
- version = "0.6.0";
- src = fetchHex {
- pkg = "bamboo";
- version = "0.6.0";
- sha256 =
- "81a48add86d8b08da8a4ca8249caa0d42cb51d0cb654bf8ed921f3055995441d";
- };
- beamDeps = [ poison_2_1_0 plug_1_1_5 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''Straightforward, powerful, and adapter based
- Elixir email library. Works with Mandrill,
- Mailgun, SendGrid, SparkPost, in-memory, and
- test.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/paulcsmith/bamboo";
- };
- } // packageOverrides)
- ) {};
-
- bamboo = bamboo_0_6_0;
-
- bamboo_smtp_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- gen_smtp_0_10_0,
- bamboo_0_5_0
- }:
- buildMix ({
- name = "bamboo_smtp";
- version = "0.0.2";
- src = fetchHex {
- pkg = "bamboo_smtp";
- version = "0.0.2";
- sha256 =
- "34c621806c8f9a2e316d5bc5f63bf85f5387418ff60222a383189611a367de4d";
- };
- beamDeps = [ gen_smtp_0_10_0 bamboo_0_5_0 ];
-
- meta = {
- description = ''A Bamboo adapter for SMTP'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/fewlinesco/bamboo_smtp";
- };
- } // packageOverrides)
- ) {};
-
- bamboo_smtp = bamboo_smtp_0_0_2;
-
- bamboo_sparkpost_0_5_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, bamboo_0_6_0 }:
- buildMix ({
- name = "bamboo_sparkpost";
- version = "0.5.1";
- src = fetchHex {
- pkg = "bamboo_sparkpost";
- version = "0.5.1";
- sha256 =
- "dc4165282d13fe431b78dbf04db5e280bc4fef9f87d3b0e20e78e008c8c6b3de";
- };
- beamDeps = [ bamboo_0_6_0 ];
-
- meta = {
- description = ''A Bamboo adapter for the SparkPost email
- service'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/andrewtimberlake/bamboo_sparkpost";
- };
- } // packageOverrides)
- ) {};
-
- bamboo_sparkpost = bamboo_sparkpost_0_5_1;
-
- bankster_0_2_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "bankster";
- version = "0.2.2";
- src = fetchHex {
- pkg = "bankster";
- version = "0.2.2";
- sha256 =
- "000df06a7701e11f1b9cba4595873f8c7d8e55afde22153fd3d6d19e55bc29f7";
- };
-
- meta = {
- description = ''Bankster is an IBAN and BIC validation tool for
- Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/railsmechanic/bankster";
- };
- } // packageOverrides)
- ) {};
-
- bankster = bankster_0_2_2;
-
- banner_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "banner";
- version = "0.1.0";
- src = fetchHex {
- pkg = "banner";
- version = "0.1.0";
- sha256 =
- "309a752cd592bd8dda3526865d050b1e20a953baed8b7480d0489001688f7a0f";
- };
-
- meta = {
- description = ''It is Elixir sysvbanner port from
- https://github.com/uffejakobsen/sysvbanner.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/winebarrel/elixir-sysvbanner";
- };
- } // packageOverrides)
- ) {};
-
- banner = banner_0_1_0;
-
- barrel_ibrowse_4_2_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "barrel_ibrowse";
- version = "4.2.0";
- src = fetchHex {
- pkg = "barrel_ibrowse";
- version = "4.2.0";
- sha256 =
- "58bd9e45932c10fd3d0ceb5c4e47952c3243ea300b388192761ac20be197b2ca";
- };
-
- meta = {
- description = ''Erlang HTTP client application'';
-
- homepage = "https://github.com/barrel-db/ibrowse";
- };
- } // packageOverrides)
- ) {};
-
- barrel_ibrowse = barrel_ibrowse_4_2_0;
-
- barrel_oauth_1_6_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "barrel_oauth";
- version = "1.6.0";
- src = fetchHex {
- pkg = "barrel_oauth";
- version = "1.6.0";
- sha256 =
- "b2a800b771d45f32a9a55d416054b3bdfab3a925b62e8000f2c08b719390d4dd";
- };
-
- meta = {
- description = ''An Erlang OAuth 1.0 implementation'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/barrel-db/erlang-oauth";
- };
- } // packageOverrides)
- ) {};
-
- barrel_oauth = barrel_oauth_1_6_0;
-
- base16_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "base16";
- version = "1.0.0";
- src = fetchHex {
- pkg = "base16";
- version = "1.0.0";
- sha256 =
- "02afd0827e61a7b07093873e063575ca3a2b07520567c7f8cec7c5d42f052d76";
- };
-
- meta = {
- description = ''Base16 encoding and decoding'';
- license = with stdenv.lib.licenses; [ bsd3 free ];
- homepage = "https://github.com/goj/base16";
- };
- } // packageOverrides)
- ) {};
-
- base16 = base16_1_0_0;
-
- base36_1_0_0 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, custom_base_0_2_0
- }:
- buildMix ({
- name = "base36";
- version = "1.0.0";
- src = fetchHex {
- pkg = "base36";
- version = "1.0.0";
- sha256 =
- "6022d73272ebd0a6f600248da05b47576b94f064c6444dd0401df67e717c189e";
- };
- beamDeps = [ custom_base_0_2_0 ];
-
- meta = {
- description = ''Base36 encoder/decoder.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nscyclone/base36";
- };
- } // packageOverrides)
- ) {};
-
- base36 = base36_1_0_0;
-
- base58_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "base58";
- version = "0.1.0";
- src = fetchHex {
- pkg = "base58";
- version = "0.1.0";
- sha256 =
- "e9746b7fa618f15d22e3098e06b35083977aff8fe0594628baae282769a2ceff";
- };
-
- meta = {
- description = ''Base58 encoding/decoding for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jrdnull/base58";
- };
- } // packageOverrides)
- ) {};
-
- base58 = base58_0_1_0;
-
- base58check_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "base58check";
- version = "0.1.0";
- src = fetchHex {
- pkg = "base58check";
- version = "0.1.0";
- sha256 =
- "29617beb2aaffe27ef40d7232a60beb5ad208667df4f2b619552367698cd4ca4";
- };
-
- meta = {
- description = ''Elixir implementation of Base58Check encoding
- meant for Bitcoin '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gjaldon/base58check";
- };
- } // packageOverrides)
- ) {};
-
- base58check = base58check_0_1_0;
-
- base62_1_2_0 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, custom_base_0_2_0
- }:
- buildMix ({
- name = "base62";
- version = "1.2.0";
- src = fetchHex {
- pkg = "base62";
- version = "1.2.0";
- sha256 =
- "14aac55c7978b7a710906ee29df65ba1cee5af2d43efe236c96311696618088b";
- };
- beamDeps = [ custom_base_0_2_0 ];
-
- meta = {
- description = ''Base62 encoder/decoder in pure Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/igas/base62";
- };
- } // packageOverrides)
- ) {};
-
- base62 = base62_1_2_0;
-
- base64url_0_0_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "base64url";
- version = "0.0.1";
- src = fetchHex {
- pkg = "base64url";
- version = "0.0.1";
- sha256 =
- "fab09b20e3f5db886725544cbcf875b8e73ec93363954eb8a1a9ed834aa8c1f9";
- };
-
- meta = {
- description = ''URL safe base64-compatible codec'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/dvv/base64url";
- };
- } // packageOverrides)
- ) {};
-
- base64url = base64url_0_0_1;
-
- basex_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "basex";
- version = "0.2.1";
- src = fetchHex {
- pkg = "basex";
- version = "0.2.1";
- sha256 =
- "190fcbb9d03fe325aee3bc1eea67e663ace1209d4515518c25098e307070f551";
- };
-
- meta = {
- description = ''BaseX - arbitrary alphabet encoding'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/basex_ex";
- };
- } // packageOverrides)
- ) {};
-
- basex = basex_0_2_1;
-
- basho_poolboy_0_8_1_p3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "basho_poolboy";
- version = "0.8.1-p3";
- src = fetchHex {
- pkg = "basho_poolboy";
- version = "0.8.1-p3";
- sha256 =
- "8e2ead104eaa80bbfcf5c688774f4ddab73733cab79230e78d097c7ba880c42d";
- };
-
- meta = {
- description = ''A hunky Erlang worker pool factory'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/basho/riak_sysmon";
- };
- } // packageOverrides)
- ) {};
-
- basho_poolboy = basho_poolboy_0_8_1_p3;
-
- basho_stats_1_0_3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "basho_stats";
- version = "1.0.3";
- src = fetchHex {
- pkg = "basho_stats";
- version = "1.0.3";
- sha256 =
- "d739e733b1c8afcaa467289fca50221753fc8cde6e7b53a79b67f98a2a261f5a";
- };
-
- meta = {
- description = ''Basic Erlang statistics library'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/basho/basho_stats";
- };
- } // packageOverrides)
- ) {};
-
- basho_stats = basho_stats_1_0_3;
-
- batcher_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "batcher";
- version = "0.0.1";
- src = fetchHex {
- pkg = "batcher";
- version = "0.0.1";
- sha256 =
- "738a930f809603dc21e6612c1df38cbc452887ddf34670d20f05e136231f3671";
- };
-
- meta = {
- longDescription = ''Process a backlog of items after it has grown
- to a certain size or a defined time has
- passed'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/behe/batcher";
- };
- } // packageOverrides)
- ) {};
-
- batcher = batcher_0_0_1;
-
- battlenet_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "battlenet";
- version = "0.0.2";
- src = fetchHex {
- pkg = "battlenet";
- version = "0.0.2";
- sha256 =
- "cdd4e182da5a2db478e0da9ac1a467fc8f2b8ec638e3e38dd7962ff3fe8c9342";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir library for the Battle.net API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/cazrin/battlenet";
- };
- } // packageOverrides)
- ) {};
-
- battlenet = battlenet_0_0_2;
-
- bbmustache_1_0_3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "bbmustache";
- version = "1.0.3";
- src = fetchHex {
- pkg = "bbmustache";
- version = "1.0.3";
- sha256 =
- "d79d9f3f90d14e20bda0c801063801ce9b72b71f5831d70b8d36065fb1a52208";
- };
-
- meta = {
- description = ''Binary pattern match Based Mustache template
- engine for Erlang/OTP'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/soranoba/bbmustache";
- };
- } // packageOverrides)
- ) {};
-
- bbmustache_1_0_4 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "bbmustache";
- version = "1.0.4";
- src = fetchHex {
- pkg = "bbmustache";
- version = "1.0.4";
- sha256 =
- "03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12";
- };
-
- meta = {
- description = ''Binary pattern match Based Mustache template
- engine for Erlang/OTP'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/soranoba/bbmustache";
- };
- } // packageOverrides)
- ) {};
-
- bbmustache_1_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "bbmustache";
- version = "1.1.0";
- src = fetchHex {
- pkg = "bbmustache";
- version = "1.1.0";
- sha256 =
- "aa22469836bb8a9928ad741bdd2038d49116228bfbe0c2d6c792e1bdd4b256d9";
- };
-
- meta = {
- description = ''Binary pattern match Based Mustache template
- engine for Erlang/OTP'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/soranoba/bbmustache";
- };
- } // packageOverrides)
- ) {};
-
- bbmustache = bbmustache_1_1_0;
-
- bcrypt_0_5_0_p3a = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "bcrypt";
- version = "0.5.0-p3a";
- src = fetchHex {
- pkg = "bcrypt";
- version = "0.5.0-p3a";
- sha256 =
- "492decdc633399b356a3bbfe8279c10a49b1040fc082c8cbf2d30b41ff88f310";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''An Erlang wrapper (NIF or port program) for the
- OpenBSD password scheme, bcrypt.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/chef/erlang-bcrypt";
- };
- } // packageOverrides)
- ) {};
-
- bcrypt = bcrypt_0_5_0_p3a;
-
- beam_analyzer_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "beam_analyzer";
- version = "0.0.3";
- src = fetchHex {
- pkg = "beam_analyzer";
- version = "0.0.3";
- sha256 =
- "acfb7b4d92c1147401f2de8e0fe5ad33236814a57fdcfbcb184e9292e43c7d27";
- };
-
- meta = {
- description = ''Get information about Erlang/Elixir modules and
- BEAM files'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/joeyates/beam_analyzer";
- };
- } // packageOverrides)
- ) {};
-
- beam_analyzer = beam_analyzer_0_0_3;
-
- bear_0_8_3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "bear";
- version = "0.8.3";
- src = fetchHex {
- pkg = "bear";
- version = "0.8.3";
- sha256 =
- "0a04ce4702e00e0a43c0fcdd63e38c9c7d64dceb32b27ffed261709e7c3861ad";
- };
-
- meta = {
- description = ''Statistics functions for Erlang'';
-
- homepage = "https://github.com/puzza007/bear";
- };
- } // packageOverrides)
- ) {};
-
- bear = bear_0_8_3;
-
- beersearch_0_0_6 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpotion_2_2_2,
- floki_0_8_1
- }:
- buildMix ({
- name = "beersearch";
- version = "0.0.6";
- src = fetchHex {
- pkg = "beersearch";
- version = "0.0.6";
- sha256 =
- "d830a7e1a6384d62b1dca430b6ab7dd99467f4ca1555a2ce7fed9422c3c86c6a";
- };
- beamDeps = [ httpotion_2_2_2 floki_0_8_1 ];
-
- meta = {
- description = ''A simple Elixir module that searches for beers on
- Untappd.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nicksergeant/elixir-beersearch";
- };
- } // packageOverrides)
- ) {};
-
- beersearch = beersearch_0_0_6;
-
- bees_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- plug_1_1_5,
- jsx_2_8_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "bees";
- version = "0.0.2";
- src = fetchHex {
- pkg = "bees";
- version = "0.0.2";
- sha256 =
- "3b6c0eee9359a87aff7b7e625a571a646d1932f8b4835fc18cc14f07cf0810fc";
- };
- beamDeps = [ poison_2_1_0 plug_1_1_5 jsx_2_8_0 httpoison_0_8_3
- ];
-
- meta = {
- description = ''Foursquare API client for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/danieltomlinson/bees";
- };
- } // packageOverrides)
- ) {};
-
- bees = bees_0_0_2;
-
- belixir_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "belixir";
- version = "0.2.0";
- src = fetchHex {
- pkg = "belixir";
- version = "0.2.0";
- sha256 =
- "1d4cea63bf593f8ccdbad32270158704d65aa6f88ee2df48422aced2566465e3";
- };
-
- meta = {
- longDescription = ''Benchmark ips tool for elixir-lang. Runs
- given codes in given seconds and compares
- them.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/meinac/belixir";
- };
- } // packageOverrides)
- ) {};
-
- belixir = belixir_0_2_0;
-
- belvedere_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "belvedere";
- version = "0.0.1";
- src = fetchHex {
- pkg = "belvedere";
- version = "0.0.1";
- sha256 =
- "b222f5c3ab855655b7950681542e2c3941c52533bd8b6cbb08be60f91427113e";
- };
-
- meta = {
- description = ''An example Elixir project with CircleCI, Docker,
- Dialyzer integration.'';
- license = stdenv.lib.licenses.mit;
- homepage = "http://nirvana.io";
- };
- } // packageOverrides)
- ) {};
-
- belvedere = belvedere_0_0_1;
-
- benchee_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "benchee";
- version = "0.2.0";
- src = fetchHex {
- pkg = "benchee";
- version = "0.2.0";
- sha256 =
- "892b4463b3add8cb0a1c68fc45e03c6297895979bd0c77283460bad90d029dc3";
- };
-
- meta = {
- longDescription = ''Versatile (micro) benchmarking that is
- extensible. Get statistics such as: average,
- iterations per second, standard deviation and
- the median.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/PragTob/benchee";
- };
- } // packageOverrides)
- ) {};
-
- benchee = benchee_0_2_0;
-
- benchee_csv_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- csv_1_4_1,
- benchee_0_2_0
- }:
- buildMix ({
- name = "benchee_csv";
- version = "0.2.0";
- src = fetchHex {
- pkg = "benchee_csv";
- version = "0.2.0";
- sha256 =
- "43a864f1be2e9755a7cfed9e7a26aec466887773a76d1a9ef04f8737fe5b3968";
- };
- beamDeps = [ csv_1_4_1 benchee_0_2_0 ];
-
- meta = {
- description = ''Get CSV from your benchee benchmarks to them into
- graphs or whatever!'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/PragTob/benchee_csv";
- };
- } // packageOverrides)
- ) {};
-
- benchee_csv = benchee_csv_0_2_0;
-
- benchfella_0_3_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "benchfella";
- version = "0.3.2";
- src = fetchHex {
- pkg = "benchfella";
- version = "0.3.2";
- sha256 =
- "322270993f38246b02c8a98d64491a2b46a4efef5667a479d55a49ec53ea6dcf";
- };
-
- meta = {
- description = ''Microbenchmarking tool for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/alco/benchfella";
- };
- } // packageOverrides)
- ) {};
-
- benchfella = benchfella_0_3_2;
-
- benchmark_ips_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "benchmark_ips";
- version = "0.2.0";
- src = fetchHex {
- pkg = "benchmark_ips";
- version = "0.2.0";
- sha256 =
- "7c55c4317dae5b8dae6a655e25a7aa491acd076e36efb9c9852a789a3592b703";
- };
-
- meta = {
- description = ''A tool to run benchmarks to determine iteration
- per second.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mxhold/benchmark_ips";
- };
- } // packageOverrides)
- ) {};
-
- benchmark_ips = benchmark_ips_0_2_0;
-
- bencode_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, eqc_ex_1_2_4 }:
- buildMix ({
- name = "bencode";
- version = "0.3.0";
- src = fetchHex {
- pkg = "bencode";
- version = "0.3.0";
- sha256 =
- "98d397fd0a13ba47bfb51927fede25c780539d38946e6d53c6b83c998636a002";
- };
- beamDeps = [ eqc_ex_1_2_4 ];
-
- meta = {
- longDescription = ''A complete and correct Bencode encoder and
- decoder written in pure Elixir. The decoder will
- return the info hash with along with the decoded
- data, and the encoder is implemented as a
- protocol, allowing any data structure to be
- bcode encoded.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/gausby/bencode";
- };
- } // packageOverrides)
- ) {};
-
- bencode_0_3_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, eqc_ex_1_2_4 }:
- buildMix ({
- name = "bencode";
- version = "0.3.1";
- src = fetchHex {
- pkg = "bencode";
- version = "0.3.1";
- sha256 =
- "a66ba85941c0115fae4f96309d6a1eeeee12571aef72a53bf2c990f236b895be";
- };
- beamDeps = [ eqc_ex_1_2_4 ];
-
- meta = {
- longDescription = ''A complete and correct Bencode encoder and
- decoder written in pure Elixir. The decoder will
- return the info hash with along with the decoded
- data, and the encoder is implemented as a
- protocol, allowing any data structure to be
- bcode encoded.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/gausby/bencode";
- };
- } // packageOverrides)
- ) {};
-
- bencode = bencode_0_3_1;
-
- bencodex_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "bencodex";
- version = "1.0.0";
- src = fetchHex {
- pkg = "bencodex";
- version = "1.0.0";
- sha256 =
- "a70c319eed907d4d0520bf2ed6eedc77cbf1312274b144341dc4ecc74136124d";
- };
-
- meta = {
- description = ''Encoder and decoder for the bencode format'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/patrickgombert/bencodex";
- };
- } // packageOverrides)
- ) {};
-
- bencodex = bencodex_1_0_0;
-
- bento_0_9_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "bento";
- version = "0.9.2";
- src = fetchHex {
- pkg = "bento";
- version = "0.9.2";
- sha256 =
- "8be4312c4eacf57ef0c319f5ddd0b31872b510dc8ca02c64206ee648ec0f91d1";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- description = ''An incredibly fast, pure Elixir Bencoding
- library.'';
- license = stdenv.lib.licenses.mpl20;
- homepage = "https://github.com/folz/bento";
- };
- } // packageOverrides)
- ) {};
-
- bento = bento_0_9_2;
-
- bert_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "bert";
- version = "0.1.0";
- src = fetchHex {
- pkg = "bert";
- version = "0.1.0";
- sha256 =
- "2a561521ec3529b248658a3e2d3d4bfe6729b0ab8291c701bf15ef413eda1506";
- };
-
- meta = {
- description = ''BERT Encoder/Decoder'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/yuce/bert.erl";
- };
- } // packageOverrides)
- ) {};
-
- bert = bert_0_1_0;
-
- big_query_0_0_5 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- jose_1_4_2,
- httpoison_0_8_2
- }:
- buildMix ({
- name = "big_query";
- version = "0.0.5";
- src = fetchHex {
- pkg = "big_query";
- version = "0.0.5";
- sha256 =
- "f15795ee81245699d2d7a5cbf667637cbfc56a6b52143cacdfa145c0c4c11fbf";
- };
- beamDeps = [ poison_2_1_0 jose_1_4_2 httpoison_0_8_2 ];
-
- meta = {
- description = ''A Google BigQuery API client.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/companykitchen/big_query";
- };
- } // packageOverrides)
- ) {};
-
- big_query = big_query_0_0_5;
-
- bigflake_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, base62_1_2_0 }:
- buildMix ({
- name = "bigflake";
- version = "0.3.0";
- src = fetchHex {
- pkg = "bigflake";
- version = "0.3.0";
- sha256 =
- "18505f0ca3a7b77fe267840b9172ec5000e118587cb36d148d73c5e642c400a5";
- };
- beamDeps = [ base62_1_2_0 ];
-
- meta = {
- description = ''128-bit, k-ordered, conflict-free IDs Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/stevedomin/bigflake";
- };
- } // packageOverrides)
- ) {};
-
- bigflake = bigflake_0_3_0;
-
- billiards_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "billiards";
- version = "0.0.1";
- src = fetchHex {
- pkg = "billiards";
- version = "0.0.1";
- sha256 =
- "5b8d8eab12e35c0c7eff5be02a4adf0a7aa4cf10688a5faeec9b10f2c2f04046";
- };
- meta = { };
- } // packageOverrides)
- ) {};
-
- billiards = billiards_0_0_1;
-
- bin_format_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "bin_format";
- version = "0.0.1";
- src = fetchHex {
- pkg = "bin_format";
- version = "0.0.1";
- sha256 =
- "f73b9d1691499964d248b4a19b56284b2c51652015a63b77c2688b92cb55d66a";
- };
-
- meta = {
- longDescription = ''Automatically generate the boilerplate to
- convert between binaries and Elixir structs.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/willpenington/bin_format";
- };
- } // packageOverrides)
- ) {};
-
- bin_format = bin_format_0_0_1;
-
- bing_translator_0_2_7 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_2_1_6,
- poison_1_5_2,
- httpoison_0_8_3,
- floki_0_8_1
- }:
- buildMix ({
- name = "bing_translator";
- version = "0.2.7";
- src = fetchHex {
- pkg = "bing_translator";
- version = "0.2.7";
- sha256 =
- "6dc4e9680f93ebc3f63bce85cbadf592145e635279dc23da87b2cb83d93b08ff";
- };
- beamDeps = [
- timex_2_1_6 poison_1_5_2 httpoison_0_8_3 floki_0_8_1
- ];
-
- meta = {
- longDescription = ''Translate strings using the Bing HTTP API.
- Requires that you have a Client ID and Secret.
- See README.md for information.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ikeikeikeike/bing_translator";
- };
- } // packageOverrides)
- ) {};
-
- bing_translator = bing_translator_0_2_7;
-
- binstructor_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "binstructor";
- version = "0.0.1";
- src = fetchHex {
- pkg = "binstructor";
- version = "0.0.1";
- sha256 =
- "ab6e619628d4308a47744dcf9dd0c9ff48f4a5cc5e00ce6bb3852d92e654ba74";
- };
-
- meta = {
- longDescription = ''Automatically generate the boilerplate to
- convert between binaries and Elixir structs.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/willpenington/binstructor";
- };
- } // packageOverrides)
- ) {};
-
- binstructor = binstructor_0_0_1;
-
- biometrics_facade_1_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "biometrics_facade";
- version = "1.2.0";
- src = fetchHex {
- pkg = "biometrics_facade";
- version = "1.2.0";
- sha256 =
- "b0b40c11fc884229936e6547a31c44eae3fedea0bd47355e33153c8b8c7dd81b";
- };
- beamDeps = [ poison_1_5_2 httpotion_2_2_2 ];
-
- meta = {
- description = ''An API facade for a private biometrics
- service.'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- biometrics_facade = biometrics_facade_1_2_0;
-
- bit_field_set_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, eqc_ex_1_2_4 }:
- buildMix ({
- name = "bit_field_set";
- version = "0.1.0";
- src = fetchHex {
- pkg = "bit_field_set";
- version = "0.1.0";
- sha256 =
- "63a9c8eb05dc0f9cd79590d718db56ccc1b41cd48d91457d94754a44a2663044";
- };
- beamDeps = [ eqc_ex_1_2_4 ];
-
- meta = {
- longDescription = ''Store and manipulate a set of bit flags,
- mostly used for syncing the state between peers
- in a peer to peer network, such as
- BitTorrent.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/gausby/bit_field_set";
- };
- } // packageOverrides)
- ) {};
-
- bit_field_set = bit_field_set_0_1_0;
-
- bitcask_2_0_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "bitcask";
- version = "2.0.2";
- src = fetchHex {
- pkg = "bitcask";
- version = "2.0.2";
- sha256 =
- "666bd79d17faabd62a626ed6fc98176b818266f7bb9639d76244f003ed5b2fe2";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''Bitcask key value store'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/basho/bitcask";
- };
- } // packageOverrides)
- ) {};
-
- bitcask = bitcask_2_0_2;
-
- bitfield_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "bitfield";
- version = "1.0.0";
- src = fetchHex {
- pkg = "bitfield";
- version = "1.0.0";
- sha256 =
- "0f1ca3f3e9f8661cc2686561717c326309541f95e4f82f7b7d927e150f5f7b5a";
- };
-
- meta = {
- description = ''Simple bitfields for erlang/elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/bitfield.erl";
- };
- } // packageOverrides)
- ) {};
-
- bitfield = bitfield_1_0_0;
-
- bitmap_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "bitmap";
- version = "1.0.0";
- src = fetchHex {
- pkg = "bitmap";
- version = "1.0.0";
- sha256 =
- "c33ca1dd28d6979e61f3517140ef71e80f8ded4029debabbb6482ef650384b34";
- };
-
- meta = {
- longDescription = ''Package to help you create and work with
- bitmaps
- (https://en.wikipedia.org/wiki/Bitmap)'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hashd/bitmap-elixir";
- };
- } // packageOverrides)
- ) {};
-
- bitmap = bitmap_1_0_0;
-
- blacksmith_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, faker_0_6_0 }:
- buildMix ({
- name = "blacksmith";
- version = "0.1.3";
- src = fetchHex {
- pkg = "blacksmith";
- version = "0.1.3";
- sha256 =
- "d070295cac13fef8d05cc50b900413e8e6dd863f4958bd55986b56d3874a20b4";
- };
- beamDeps = [ faker_0_6_0 ];
-
- meta = {
- description = ''Elixir fake data generation for testing and
- development'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/batate/blacksmith";
- };
- } // packageOverrides)
- ) {};
-
- blacksmith = blacksmith_0_1_3;
-
- blaguth_1_2_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "blaguth";
- version = "1.2.1";
- src = fetchHex {
- pkg = "blaguth";
- version = "1.2.1";
- sha256 =
- "2900dc5b7c6f7810bdf5e0ede8749632997811ae5b72ada34f59699b4310a65a";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''Basic Access Authentication in Plug
- applications.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/lexmag/blaguth";
- };
- } // packageOverrides)
- ) {};
-
- blaguth = blaguth_1_2_1;
-
- blake2_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "blake2";
- version = "0.1.0";
- src = fetchHex {
- pkg = "blake2";
- version = "0.1.0";
- sha256 =
- "5d1ac81724568d173ef9fa198b37abe39eb54ecd1f4871d8c62aabaf5d1ace25";
- };
-
- meta = {
- description = ''BLAKE2 hash functions'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/blake2_ex";
- };
- } // packageOverrides)
- ) {};
-
- blake2 = blake2_0_1_0;
-
- blanket_0_3_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "blanket";
- version = "0.3.1";
- src = fetchHex {
- pkg = "blanket";
- version = "0.3.1";
- sha256 =
- "9d7f382c1254b83ba3334d143b942afd4a03c0ae1d32f7fee5fd3de184f4c016";
- };
-
- meta = {
- description = ''Blanket covers your tables ! Don`t loose your ETS
- tables with Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/niahoo/blanket";
- };
- } // packageOverrides)
- ) {};
-
- blanket = blanket_0_3_1;
-
- blast_furnace_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "blast_furnace";
- version = "0.0.1";
- src = fetchHex {
- pkg = "blast_furnace";
- version = "0.0.1";
- sha256 =
- "361bff3352803779f481ce56662228825c74ef45d34d05c79df5f56a37a2adb2";
- };
-
- meta = {
- description = ''Elixir port of invaluable blast furnace
- functionality'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/markryall/blast_furnace_exs";
- };
- } // packageOverrides)
- ) {};
-
- blast_furnace = blast_furnace_0_0_1;
-
- blaze_cloud_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_0_1,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "blaze_cloud";
- version = "0.0.1";
- src = fetchHex {
- pkg = "blaze_cloud";
- version = "0.0.1";
- sha256 =
- "c5a26f194691d7c40a008c5aded034ca0a43d4fa6a9173952333479cf2661b2b";
- };
- beamDeps = [ poison_2_0_1 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir Library for Backblaze B2 Cloud Storage.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/PerishableDave/blaze_cloud";
- };
- } // packageOverrides)
- ) {};
-
- blaze_cloud = blaze_cloud_0_0_1;
-
- blazon_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "blazon";
- version = "0.2.0";
- src = fetchHex {
- pkg = "blazon";
- version = "0.2.0";
- sha256 =
- "ef63180cafb9241602feb79155919e18eebd8da62e79544e4dae4273522f58c7";
- };
-
- meta = {
- description = ''Declarative abstract serializers.'';
- license = stdenv.lib.licenses.publicDomain;
- homepage = "https://github.com/mtwilliams/blazon";
- };
- } // packageOverrides)
- ) {};
-
- blazon = blazon_0_2_0;
-
- blockchain_info_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "blockchain_info";
- version = "0.0.2";
- src = fetchHex {
- pkg = "blockchain_info";
- version = "0.0.2";
- sha256 =
- "81593db73e409e008a785798ee7e5482d4274fd5e748e8d74f458c1e187e822b";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''WIP BlockchainInfo API wrapper for Elixir.
- Provides access to bitcoin blockchain data.'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/cyberpunk-ventures/blockchain_info_ex";
- };
- } // packageOverrides)
- ) {};
-
- blockchain_info = blockchain_info_0_0_2;
-
- blocking_queue_1_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "blocking_queue";
- version = "1.3.0";
- src = fetchHex {
- pkg = "blocking_queue";
- version = "1.3.0";
- sha256 =
- "10f2b942a29f83c3bfef6285096d7f42028201c89f317c731e708b528a7fc17d";
- };
-
- meta = {
- longDescription = ''BlockingQueue is a simple queue implemented
- as a GenServer. It has a fixed maximum length
- established when it is created.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/joekain/BlockingQueue";
- };
- } // packageOverrides)
- ) {};
-
- blocking_queue = blocking_queue_1_3_0;
-
- bloodhound_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "bloodhound";
- version = "0.1.1";
- src = fetchHex {
- pkg = "bloodhound";
- version = "0.1.1";
- sha256 =
- "6aaab638fe90fc3714b650b659df774c7cdb12d098fee3910952e0a0f8fcd6ec";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''An ElasticSearch library for Elixir that can be
- easily integrated with Ecto'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ianwalter/bloodhound";
- };
- } // packageOverrides)
- ) {};
-
- bloodhound = bloodhound_0_1_1;
-
- bloom_filter_1_0_1 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, math_0_2_0, fnv_0_3_2
- }:
- buildMix ({
- name = "bloom_filter";
- version = "1.0.1";
- src = fetchHex {
- pkg = "bloom_filter";
- version = "1.0.1";
- sha256 =
- "324d819a3901c0318e9cea51cc4a5555cc15ad6243c7150676e6e1b76d7aa081";
- };
- beamDeps = [ math_0_2_0 fnv_0_3_2 ];
-
- meta = {
- longDescription = ''Bloom Filter implementation in Elixir. Bloom
- filters are probabilistic data structures
- designed to efficiently tell you whether an
- element is present in a set.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Leventhan/bloom_filter";
- };
- } // packageOverrides)
- ) {};
-
- bloom_filter = bloom_filter_1_0_1;
-
- bloomex_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "bloomex";
- version = "1.0.1";
- src = fetchHex {
- pkg = "bloomex";
- version = "1.0.1";
- sha256 =
- "2d8424142550f226043e4e6fc05c10552022dfb8f5fe3e5f131252c8da45f6e9";
- };
-
- meta = {
- description = ''Bloomex is a pure Elixir implementation of
- Scalable Bloom Filters.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gmcabrita/bloomex";
- };
- } // packageOverrides)
- ) {};
-
- bloomex = bloomex_1_0_1;
-
- blume_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "blume";
- version = "0.1.0";
- src = fetchHex {
- pkg = "blume";
- version = "0.1.0";
- sha256 =
- "8a87a43607d9dab1e3138052c18355bc1fc2a98bbcc4cb1657494c395aca0fd6";
- };
-
- meta = {
- description = ''Pure erlang bloom Filters'';
- license = stdenv.lib.licenses.free;
- };
- } // packageOverrides)
- ) {};
-
- blume = blume_0_1_0;
-
- bmark_1_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "bmark";
- version = "1.0.3";
- src = fetchHex {
- pkg = "bmark";
- version = "1.0.3";
- sha256 =
- "243b04d2e2431d01d93f442896d5e6ee52396782c161ef0a0e4f51a353393d93";
- };
-
- meta = {
- longDescription = ''A benchmarking tool for Elixir with a focus
- on comparing results with confidence.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/joekain/bmark";
- };
- } // packageOverrides)
- ) {};
-
- bmark = bmark_1_0_3;
-
- bmfont_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, tonic_0_0_1 }:
- buildMix ({
- name = "bmfont";
- version = "0.0.1";
- src = fetchHex {
- pkg = "bmfont";
- version = "0.0.1";
- sha256 =
- "5b52d65c0345e64b2a72c54641593de19dcd33b0e8af6c80ebc29485a98bd279";
- };
- beamDeps = [ tonic_0_0_1 ];
-
- meta = {
- description = ''A BMFont file format parser'';
- license = stdenv.lib.licenses.bsd2;
- homepage = "https://github.com/ScrimpyCat/BMFontEx";
- };
- } // packageOverrides)
- ) {};
-
- bmfont = bmfont_0_0_1;
-
- bookingsync_api_client_v3_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- json_0_3_3,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "bookingsync_api_client_v3";
- version = "0.0.1";
- src = fetchHex {
- pkg = "bookingsync_api_client_v3";
- version = "0.0.1";
- sha256 =
- "7f0625828f7c38dd37f5ea0f2054b5b902851dbc9679bd354bb928a1f66c5db0";
- };
- beamDeps = [ json_0_3_3 httpotion_2_2_2 ];
-
- meta = {
- longDescription = ''Elixir BookingSync
- (https://www.bookingsync.com) API v3 client.
- Find more at:
- http://developers.bookingsync.com'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/Azdaroth/ex_bookingsync_api_client_v3";
- };
- } // packageOverrides)
- ) {};
-
- bookingsync_api_client_v3 = bookingsync_api_client_v3_0_0_1;
-
- botan_0_1_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "botan";
- version = "0.1.2";
- src = fetchHex {
- pkg = "botan";
- version = "0.1.2";
- sha256 =
- "43541b5c52c91e46295a015f58857c347c85a7753d7c3cd3a1f835b25fdedaa9";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir wrapper for Botan.io'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mendab1e/exBotan";
- };
- } // packageOverrides)
- ) {};
-
- botan = botan_0_1_2;
-
- bowfish_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "bowfish";
- version = "0.1.0";
- src = fetchHex {
- pkg = "bowfish";
- version = "0.1.0";
- sha256 =
- "fcf3cccddd5d39adf5c5aceae924854d500f99bb45af97e118695db1cb633f67";
- };
-
- meta = {
- longDescription = ''A fun, positional pipe operator macro >>> for
- when piping to the first arg just won`t cut
- it.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/coconaut/bowfish";
- };
- } // packageOverrides)
- ) {};
-
- bowfish = bowfish_0_1_0;
-
- braintree_0_5_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "braintree";
- version = "0.5.0";
- src = fetchHex {
- pkg = "braintree";
- version = "0.5.0";
- sha256 =
- "9610f2c63e76732e733ee7a97d6971fb0698ae7425cb9b3faba83acfa8734fac";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- description = ''Native Braintree client library for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sorentwo/braintree-elixir";
- };
- } // packageOverrides)
- ) {};
-
- braintree = braintree_0_5_0;
-
- braise_0_3_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_3_1 }:
- buildMix ({
- name = "braise";
- version = "0.3.4";
- src = fetchHex {
- pkg = "braise";
- version = "0.3.4";
- sha256 =
- "10325449af9365e886b2731a7709efded8e3443253c10c9af7a50fcfe5597707";
- };
- beamDeps = [ poison_1_3_1 ];
-
- meta = {
- description = ''A library that converts JSON Schema into ember
- models/adapters.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/IoraHealth/braise";
- };
- } // packageOverrides)
- ) {};
-
- braise = braise_0_3_4;
-
- brcpfcnpj_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "brcpfcnpj";
- version = "0.1.0";
- src = fetchHex {
- pkg = "brcpfcnpj";
- version = "0.1.0";
- sha256 =
- "19ba4d572c93c70d571a36d6ada2fca4d03330d8f96c6b7d8e4c47fa9f809c90";
- };
-
- meta = {
- longDescription = ''Valida Cpf/Cnpj e Formatar em String caso
- necessario Number format and Validate, to the
- documents brazilians (CPF/CNPJ)'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/williamgueiros/Brcpfcnpj";
- };
- } // packageOverrides)
- ) {};
-
- brcpfcnpj = brcpfcnpj_0_1_0;
-
- breadcrumble_1_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "breadcrumble";
- version = "1.0.3";
- src = fetchHex {
- pkg = "breadcrumble";
- version = "1.0.3";
- sha256 =
- "f1d3ec0d3bf74670c58d4ff6c1d10cad0757c003b56ba9f77e3d76a05ac68be3";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''Elixir port of Breadcrumble library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ma2gedev/breadcrumble_ex";
- };
- } // packageOverrides)
- ) {};
-
- breadcrumble = breadcrumble_1_0_3;
-
- briefly_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "briefly";
- version = "0.3.0";
- src = fetchHex {
- pkg = "briefly";
- version = "0.3.0";
- sha256 =
- "c6ebf8fc3dcd4950dd10c03e953fb4f553a8bcf0ff4c8c40d71542434cd7e046";
- };
-
- meta = {
- description = ''Simple, robust temporary file support'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/CargoSense/briefly";
- };
- } // packageOverrides)
- ) {};
-
- briefly = briefly_0_3_0;
-
- brighterx_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "brighterx";
- version = "0.0.2";
- src = fetchHex {
- pkg = "brighterx";
- version = "0.0.2";
- sha256 =
- "f05d90a6e01e6244aa0adfc68e9a5c92bf2a3d740f3093929557c043fc6b87b8";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''A simple brighterlink api implementation'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Brightergy/brighterx";
- };
- } // packageOverrides)
- ) {};
-
- brighterx = brighterx_0_0_2;
-
- browser_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "browser";
- version = "0.1.3";
- src = fetchHex {
- pkg = "browser";
- version = "0.1.3";
- sha256 =
- "e009b1af32a665393eb3e81b812e87f29f9e606426e30ae73507bf5c4c592af1";
- };
-
- meta = {
- description = ''Browser detection library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tuvistavie/elixir-browser";
- };
- } // packageOverrides)
- ) {};
-
- browser = browser_0_1_3;
-
- bstr_0_3_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "bstr";
- version = "0.3.0";
- src = fetchHex {
- pkg = "bstr";
- version = "0.3.0";
- sha256 =
- "0fb4e05619663d48dabcd21023915741277ba392f2a5710dde7ab6034760284d";
- };
-
- meta = {
- description = ''Erlang library that uses binaries as strings'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/jcomellas/bstr";
- };
- } // packageOverrides)
- ) {};
-
- bstr = bstr_0_3_0;
-
- buffer_0_3_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "buffer";
- version = "0.3.6";
- src = fetchHex {
- pkg = "buffer";
- version = "0.3.6";
- sha256 =
- "409f4d725b69bd36635ec18df9e2c3b6e78ef6ebc14a0e55a98dc58b4c65b7c3";
- };
-
- meta = {
- description = ''Provide read and write buffers for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/adrienmo/buffer";
- };
- } // packageOverrides)
- ) {};
-
- buffer = buffer_0_3_6;
-
- bugsnag_1_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "bugsnag";
- version = "1.2.0";
- src = fetchHex {
- pkg = "bugsnag";
- version = "1.2.0";
- sha256 =
- "23c6e8eb827ec1294684b5fe788d4d1cd670804ddfb74bb2bd427aed44a68f05";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''An Elixir interface to the Bugsnag API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jarednorman/bugsnag-elixir";
- };
- } // packageOverrides)
- ) {};
-
- bugsnag = bugsnag_1_2_0;
-
- build_client_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "build_client";
- version = "0.0.1";
- src = fetchHex {
- pkg = "build_client";
- version = "0.0.1";
- sha256 =
- "ee28ca64db404b76316fa578f30888b7725cbde91d6f89fa7dfc384a32b9c095";
- };
-
- meta = {
- description = ''AX Deployment Client'';
-
- homepage = "https://github.com/dapdizzy/build_client";
- };
- } // packageOverrides)
- ) {};
-
- build_client = build_client_0_0_1;
-
- bunt_0_1_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "bunt";
- version = "0.1.6";
- src = fetchHex {
- pkg = "bunt";
- version = "0.1.6";
- sha256 =
- "4fb7b2f7b04af13cf210b132f8d10db52d4a57d36cb974e8025d7fdb12ca97fc";
- };
-
- meta = {
- description = ''256 color ANSI coloring in the terminal'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rrrene/bunt";
- };
- } // packageOverrides)
- ) {};
-
- bunt = bunt_0_1_6;
-
- bus_bar_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "bus_bar";
- version = "0.0.1";
- src = fetchHex {
- pkg = "bus_bar";
- version = "0.0.1";
- sha256 =
- "1781eebe238d7106cecaf947062684a0658033898282a4a0ab15f037a92ab985";
- };
-
- meta = {
- description = ''A simple event bus.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/JonRowe/busbar";
- };
- } // packageOverrides)
- ) {};
-
- bus_bar = bus_bar_0_0_1;
-
- bypass_0_5_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "bypass";
- version = "0.5.1";
- src = fetchHex {
- pkg = "bypass";
- version = "0.5.1";
- sha256 =
- "bbff87f453cd98a81c9caeb305e5bcee25fe4fe31089cb19127a36dd224c2454";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- longDescription = ''Bypass provides a quick way to create a
- custom plug that can be put in place instead of
- an actual HTTP server to return prebaked
- responses to client requests. This is most
- useful in tests, when you want to create a mock
- HTTP server and test how your HTTP client
- handles different types of responses from the
- server.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pspdfkit-labs/bypass";
- };
- } // packageOverrides)
- ) {};
-
- bypass = bypass_0_5_1;
-
- cachex_1_1_1 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, gen_delegate_1_0_0
- }:
- buildMix ({
- name = "cachex";
- version = "1.1.1";
- src = fetchHex {
- pkg = "cachex";
- version = "1.1.1";
- sha256 =
- "b9f179ee6f61cbaec9d4be604b0001ff035158923aa4d53b56de495ebf025683";
- };
- beamDeps = [ gen_delegate_1_0_0 ];
-
- meta = {
- description = ''Powerful in-memory key/value storage for
- Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zackehh/cachex";
- };
- } // packageOverrides)
- ) {};
-
- cachex = cachex_1_1_1;
-
- calendar_0_12_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, tzdata_0_0_1 }:
- buildMix ({
- name = "calendar";
- version = "0.12.4";
- src = fetchHex {
- pkg = "calendar";
- version = "0.12.4";
- sha256 =
- "1df7cc23b7dfa3228498fff3bd298495d8431433be94db62a60e93ffa455a060";
- };
- beamDeps = [ tzdata_0_0_1 ];
-
- meta = {
- longDescription = ''Calendar is a datetime library for Elixir.
- Providing explicit types for datetimes, dates
- and times. Full timezone support via its sister
- package `tzdata`. Safe parsing and formatting of
- standard formats (ISO, RFC, Unix, JS etc.) plus
- strftime formatting. Easy and safe
- interoperability with erlang style datetime
- tuples. Extendable through protocols. Related
- packages are available for i18n, Ecto and
- Phoenix interoperability.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lau/calendar";
- };
- } // packageOverrides)
- ) {};
-
- calendar_0_13_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, tzdata_0_0_1 }:
- buildMix ({
- name = "calendar";
- version = "0.13.2";
- src = fetchHex {
- pkg = "calendar";
- version = "0.13.2";
- sha256 =
- "5be3a69db1a177ed39d24d582ac7be3dab59ee8aeae41ee17c36a263a9818460";
- };
- beamDeps = [ tzdata_0_0_1 ];
-
- meta = {
- longDescription = ''Calendar is a datetime library for Elixir.
- Providing explicit types for datetimes, dates
- and times. Full timezone support via its sister
- package `tzdata`. Safe parsing and formatting of
- standard formats (ISO, RFC, Unix, JS etc.) plus
- strftime formatting. Easy and safe
- interoperability with erlang style datetime
- tuples. Extendable through protocols. Related
- packages are available for i18n, Ecto and
- Phoenix interoperability.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lau/calendar";
- };
- } // packageOverrides)
- ) {};
-
- calendar_0_14_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, tzdata_0_0_1 }:
- buildMix ({
- name = "calendar";
- version = "0.14.2";
- src = fetchHex {
- pkg = "calendar";
- version = "0.14.2";
- sha256 =
- "8b76c5bcfbe77b454c4e38696ea0fb77d52fc212e377a4299884073012960f27";
- };
- beamDeps = [ tzdata_0_0_1 ];
-
- meta = {
- longDescription = ''Calendar is a datetime library for Elixir.
- Providing explicit types for datetimes, dates
- and times. Full timezone support via its sister
- package `tzdata`. Safe parsing and formatting of
- standard formats (ISO, RFC, Unix, JS etc.) plus
- strftime formatting. Easy and safe
- interoperability with erlang style datetime
- tuples. Extendable through protocols. Related
- packages are available for i18n, Ecto and
- Phoenix interoperability.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lau/calendar";
- };
- } // packageOverrides)
- ) {};
-
- calliope_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "calliope";
- version = "0.3.0";
- src = fetchHex {
- pkg = "calliope";
- version = "0.3.0";
- sha256 =
- "0a0ccf87616459c36ff1f1551701da38485eb601500e74cffd7e42fe9862f74d";
- };
-
- meta = {
- description = ''An Elixir library for parsing haml templates.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nurugger07/calliope";
- };
- } // packageOverrides)
- ) {};
-
- calliope_0_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "calliope";
- version = "0.4.0";
- src = fetchHex {
- pkg = "calliope";
- version = "0.4.0";
- sha256 =
- "4b5d6c87da9f635e8596f9ebb63f51aa10c6884a1898b308219281c8a897ff3a";
- };
-
- meta = {
- description = ''An Elixir library for parsing haml templates.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nurugger07/calliope";
- };
- } // packageOverrides)
- ) {};
-
- calliope = calliope_0_4_0;
-
- campminder_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_2_1_6,
- poison_2_1_0,
- httpoison_0_8_3,
- hackney_1_6_0
- }:
- buildMix ({
- name = "campminder";
- version = "0.1.0";
- src = fetchHex {
- pkg = "campminder";
- version = "0.1.0";
- sha256 =
- "bd54e1c20b5cf566f28a827bcc0e32adb4aaf86206f4d9f90415adee2e9e5189";
- };
- beamDeps = [
- timex_2_1_6 poison_2_1_0 httpoison_0_8_3 hackney_1_6_0
- ];
-
- meta = {
- description = ''A CampMinder API library for Elixir.'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/GimliLongBow/campminder-elixir";
- };
- } // packageOverrides)
- ) {};
-
- campminder = campminder_0_1_0;
-
- cartel_0_6_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- httpotion_2_2_2,
- poison_2_1_0
- }:
- buildMix ({
- name = "cartel";
- version = "0.6.0";
- src = fetchHex {
- pkg = "cartel";
- version = "0.6.0";
- sha256 =
- "04615b867d257b6cb9a32da568666f9e490b80f020a069be38fe261a60734fb8";
- };
- beamDeps = [ poolboy_1_5_1 httpotion_2_2_2 poison_2_1_0 ];
-
- meta = {
- description = ''Multi platform, multi app push notifications'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lucacorti/cartel";
- };
- } // packageOverrides)
- ) {};
-
- cartel = cartel_0_6_0;
-
- cartographer_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cartographer";
- version = "0.0.1";
- src = fetchHex {
- pkg = "cartographer";
- version = "0.0.1";
- sha256 =
- "8f070615ca221b94a22e846303a3b9cc7ae31c2dea5c3d8f39a116f0d8c4b18f";
- };
-
- meta = {
- description = ''Geohash algorithm implementation in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/afronski/cartographer";
- };
- } // packageOverrides)
- ) {};
-
- cartographer = cartographer_0_0_1;
-
- cassette_1_2_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- exml_0_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "cassette";
- version = "1.2.4";
- src = fetchHex {
- pkg = "cassette";
- version = "1.2.4";
- sha256 =
- "945a595edbaeaab781910bba0defedda2c6fc40fc5b35fdd7214dfae8c375137";
- };
- beamDeps = [ exml_0_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''A CAS client and validation library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/locaweb/elixir-cassette";
- };
- } // packageOverrides)
- ) {};
-
- cassette = cassette_1_2_4;
-
- cassette_plug_1_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cassette_1_2_4
- }:
- buildMix ({
- name = "cassette_plug";
- version = "1.0.1";
- src = fetchHex {
- pkg = "cassette_plug";
- version = "1.0.1";
- sha256 =
- "7c6ca0bacb3660efd1367b95c8a2d70e485e2842b9bfc87bdeb85c33882dc164";
- };
- beamDeps = [ plug_1_1_5 cassette_1_2_4 ];
-
- meta = {
- description = ''An auth Plug using Cassette'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/locaweb/cassette-plug";
- };
- } // packageOverrides)
- ) {};
-
- cassette_plug = cassette_plug_1_0_1;
-
- caylir_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- poison_1_5_2,
- hackney_1_6_0
- }:
- buildMix ({
- name = "caylir";
- version = "0.2.0";
- src = fetchHex {
- pkg = "caylir";
- version = "0.2.0";
- sha256 =
- "b3699171f2bef699ce1968394cb2aee3b5ec7db529a395d8bf7d85163067f888";
- };
- beamDeps = [ poolboy_1_5_1 poison_1_5_2 hackney_1_6_0 ];
-
- meta = {
- description = ''Cayley driver for Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/mneudert/caylir";
- };
- } // packageOverrides)
- ) {};
-
- caylir = caylir_0_2_0;
-
- cep_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- sweet_xml_0_6_1,
- poolboy_1_5_1,
- poison_2_1_0,
- httpoison_0_8_3,
- codepagex_0_1_2
- }:
- buildMix ({
- name = "cep";
- version = "0.0.1";
- src = fetchHex {
- pkg = "cep";
- version = "0.0.1";
- sha256 =
- "f76e67e1d989fc2edbfbd265f79e4a33a0aa7f9ff06934a1f2d49903df72b79f";
- };
- beamDeps = [
- sweet_xml_0_6_1
- poolboy_1_5_1
- poison_2_1_0
- httpoison_0_8_3
- codepagex_0_1_2
- ];
-
- meta = {
- longDescription = ''A package to query Brazilian CEP codes. Has
- support for multiple source APIs (Correios,
- ViaCep, Postmon, etc). It can query one specific
- source or query until one source returns a valid
- result.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/douglascamata/cep";
- };
- } // packageOverrides)
- ) {};
-
- cep = cep_0_0_1;
-
- certifi_0_3_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "certifi";
- version = "0.3.0";
- src = fetchHex {
- pkg = "certifi";
- version = "0.3.0";
- sha256 =
- "42ae85fe91c038a634a5fb8d0c77f4fc581914c508f087c7138e9366a1517f6a";
- };
-
- meta = {
- description = ''An OTP library'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/certifi/erlang-certifi";
- };
- } // packageOverrides)
- ) {};
-
- certifi_0_4_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "certifi";
- version = "0.4.0";
- src = fetchHex {
- pkg = "certifi";
- version = "0.4.0";
- sha256 =
- "1cc233bee2d6990e7b0ff4c5824d7f401edda8a3cfad04d3328e35ad97de7611";
- };
-
- meta = {
- description = ''An OTP library'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/certifi/erlang-certifi";
- };
- } // packageOverrides)
- ) {};
-
- certifi = certifi_0_4_0;
-
- cf_0_1_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "cf";
- version = "0.1.2";
- src = fetchHex {
- pkg = "cf";
- version = "0.1.2";
- sha256 =
- "c86f56bca74dd3616057b28574d920973fe665ecb064aa458dc6a2447f3f4924";
- };
-
- meta = {
- description = ''Terminal colour helper'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- cf_0_2_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "cf";
- version = "0.2.1";
- src = fetchHex {
- pkg = "cf";
- version = "0.2.1";
- sha256 =
- "baee9aa7ec2dfa3cb4486b67211177caa293f876780f0b313b45718edef6a0a5";
- };
-
- meta = {
- description = ''Terminal colour helper'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- cf = cf_0_2_1;
-
- chacha20_0_3_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "chacha20";
- version = "0.3.2";
- src = fetchHex {
- pkg = "chacha20";
- version = "0.3.2";
- sha256 =
- "26882c84da45dd1158a0249031f5a67329a6c4cd89e075d409324eee30444410";
- };
-
- meta = {
- description = ''Chacha20 symmetric stream cipher'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/chacha20_ex";
- };
- } // packageOverrides)
- ) {};
-
- chacha20 = chacha20_0_3_2;
-
- changeset_0_2_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, defmemo_0_1_1 }:
- buildMix ({
- name = "changeset";
- version = "0.2.2";
- src = fetchHex {
- pkg = "changeset";
- version = "0.2.2";
- sha256 =
- "81aebf1c232620193fb4eab90962e4a69bbb84709fa4296bdc5593578d7d2758";
- };
- beamDeps = [ defmemo_0_1_1 ];
-
- meta = {
- description = ''A package for calculating between-list edit
- distances.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/erwald/elixir-changeset";
- };
- } // packageOverrides)
- ) {};
-
- changeset = changeset_0_2_2;
-
- changex_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "changex";
- version = "0.1.1";
- src = fetchHex {
- pkg = "changex";
- version = "0.1.1";
- sha256 =
- "e087a4c3cc8eb3e94eba6050c5b1cc24dba3427eb4e4e15cebdb4000582c9851";
- };
-
- meta = {
- description = ''Automatically generate a CHANGELOG.md file based
- on git commit history. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Gazler/changex";
- };
- } // packageOverrides)
- ) {};
-
- changex = changex_0_1_1;
-
- chaos_spawn_0_7_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_0_19_5,
- exactor_2_2_0
- }:
- buildMix ({
- name = "chaos_spawn";
- version = "0.7.0";
- src = fetchHex {
- pkg = "chaos_spawn";
- version = "0.7.0";
- sha256 =
- "c4c8e985e750706fb4351d6eb036b513a4b7ea3e689a9aecd424251991f21eaa";
- };
- beamDeps = [ timex_0_19_5 exactor_2_2_0 ];
-
- meta = {
- longDescription = ''Providing tools to randomly kill proceses.
- With the goal of creating robust supevision
- trees.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/meadsteve/chaos-spawn";
- };
- } // packageOverrides)
- ) {};
-
- chaos_spawn = chaos_spawn_0_7_0;
-
- chartkick_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- uuid_1_1_4,
- poison_1_5_2
- }:
- buildMix ({
- name = "chartkick";
- version = "0.0.2";
- src = fetchHex {
- pkg = "chartkick";
- version = "0.0.2";
- sha256 =
- "6a4f4170b162117f3be9d0a9d98b63b58da8ec2cea4e29155d14441a0b12ac6c";
- };
- beamDeps = [ uuid_1_1_4 poison_1_5_2 ];
-
- meta = { };
- } // packageOverrides)
- ) {};
-
- chartkick = chartkick_0_0_2;
-
- chash_0_1_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "chash";
- version = "0.1.1";
- src = fetchHex {
- pkg = "chash";
- version = "0.1.1";
- sha256 =
- "607d369e56016a51218c42f2692312cd116834193805c99debbe02889013c84a";
- };
-
- meta = {
- description = ''Riaks CHash implementation'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/project-fifo/chash";
- };
- } // packageOverrides)
- ) {};
-
- chash = chash_0_1_1;
-
- chinese_translation_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "chinese_translation";
- version = "0.1.0";
- src = fetchHex {
- pkg = "chinese_translation";
- version = "0.1.0";
- sha256 =
- "d5e4f59421bad59e465322ce7a8f366179e5f6a732d7e06435e8a7c01f42e7ab";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''ChineseTranslation provides traditional
- chinese <-> simplified chinese translation, as
- well as pinyin translation and slugify for
- chinese phrases/characters. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tyrchen/chinese_translation";
- };
- } // packageOverrides)
- ) {};
-
- chinese_translation = chinese_translation_0_1_0;
-
- chronos_0_3_9 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "chronos";
- version = "0.3.9";
- src = fetchHex {
- pkg = "chronos";
- version = "0.3.9";
- sha256 =
- "973e1273088677a12afc1a72aad78fe5070fb0ad6f9b1c648d79dd251292dee4";
- };
-
- meta = {
- longDescription = ''An Elixir library for handling dates. It can
- be used to quickly determine a date. In a human
- readable format.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nurugger07/chronos";
- };
- } // packageOverrides)
- ) {};
-
- chronos_1_5_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "chronos";
- version = "1.5.1";
- src = fetchHex {
- pkg = "chronos";
- version = "1.5.1";
- sha256 =
- "015d881b1d095b53f626dc32f8db05e5faca8635b199d3cc2022a057c469904b";
- };
-
- meta = {
- longDescription = ''An Elixir library for handling dates. It can
- be used to quickly determine a date. In a human
- readable format.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nurugger07/chronos";
- };
- } // packageOverrides)
- ) {};
-
- chronos = chronos_1_5_1;
-
- chunky_svg_0_0_4 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, xml_builder_0_0_8
- }:
- buildMix ({
- name = "chunky_svg";
- version = "0.0.4";
- src = fetchHex {
- pkg = "chunky_svg";
- version = "0.0.4";
- sha256 =
- "c8d7212148d72b03b6ed102410017a2cf77987a09fb889320fc381d383e68c75";
- };
- beamDeps = [ xml_builder_0_0_8 ];
-
- meta = {
- description = '' A library for drawing things with SVG '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mmmries/chunky_svg";
- };
- } // packageOverrides)
- ) {};
-
- chunky_svg = chunky_svg_0_0_4;
-
- cidr_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cidr";
- version = "1.0.0";
- src = fetchHex {
- pkg = "cidr";
- version = "1.0.0";
- sha256 =
- "3bffa78af48cfbcd89461144bd2e1990b4f2631a8328c42cb033fa71c14b8f46";
- };
-
- meta = {
- description = ''Classless Inter-Domain Routing (CIDR) for
- Elixir'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/c-rack/cidr-elixir";
- };
- } // packageOverrides)
- ) {};
-
- cidr = cidr_1_0_0;
-
- cirru_parser_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cirru_parser";
- version = "0.0.1";
- src = fetchHex {
- pkg = "cirru_parser";
- version = "0.0.1";
- sha256 =
- "259f533ee97805c50eb12fa8472b5553eaca5bfd58216d54a734dfa1c4d0c678";
- };
-
- meta = {
- description = ''Cirru Parser in Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Cirru/parser.ex";
- };
- } // packageOverrides)
- ) {};
-
- cirru_parser = cirru_parser_0_0_1;
-
- ckan_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "ckan";
- version = "0.0.2";
- src = fetchHex {
- pkg = "ckan";
- version = "0.0.2";
- sha256 =
- "471a58f1d38df7a6ff36af9a1e9d4c6cb9d310c5acb2db95ff3184717d7762a0";
- };
- beamDeps = [ poison_1_5_2 httpotion_2_2_2 ];
-
- meta = {
- description = ''A small library for interacting with CKAN
- (ckan.org) instances'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/rossjones/ckan_ex";
- };
- } // packageOverrides)
- ) {};
-
- ckan = ckan_0_0_2;
-
- clicksign_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- httpoison_0_8_3,
- exjsx_3_2_0,
- cowboy_1_0_4,
- bypass_0_5_1
- }:
- buildMix ({
- name = "clicksign";
- version = "0.0.2";
- src = fetchHex {
- pkg = "clicksign";
- version = "0.0.2";
- sha256 =
- "e6e9335c86298d5d5af6c18b85f3533554eca74d6129e1aea7dae17849b48ed2";
- };
- beamDeps = [
- plug_1_1_5
- httpoison_0_8_3
- exjsx_3_2_0
- cowboy_1_0_4
- bypass_0_5_1
- ];
-
- meta = {
- description = ''Clicksign client'';
-
- };
- } // packageOverrides)
- ) {};
-
- clicksign = clicksign_0_0_2;
-
- clint_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_0_11_3,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "clint";
- version = "0.0.1";
- src = fetchHex {
- pkg = "clint";
- version = "0.0.1";
- sha256 =
- "41c6781b5f4b986bce14c3578d39c497bcb8427f1d36d8cde5fcaa6e03cae2b1";
- };
- beamDeps = [ plug_0_11_3 cowboy_1_0_4 ];
-
- meta = {
- description = ''An Elixir web micro-framework, inspired by
- Sinatra'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lpil/clint";
- };
- } // packageOverrides)
- ) {};
-
- clint = clint_0_0_1;
-
- clique_3_0_1 = callPackage
- (
- {
- buildRebar3, packageOverrides ? {}, fetchHex, cuttlefish_2_0_7
- }:
- buildRebar3 ({
- name = "clique";
- version = "3.0.1";
- src = fetchHex {
- pkg = "clique";
- version = "3.0.1";
- sha256 =
- "f26bd1d293a88223b9dc21dc5a2643e64823f3e8e178536fb66e97c4ff4a2ac2";
- };
-
- beamDeps = [ cuttlefish_2_0_7 ];
-
- meta = {
- description = ''A CLI library for erlang'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/basho/clique";
- };
- } // packageOverrides)
- ) {};
-
- clique = clique_3_0_1;
-
- close_enough_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "close_enough";
- version = "0.0.1";
- src = fetchHex {
- pkg = "close_enough";
- version = "0.0.1";
- sha256 =
- "cbd73a651bffc50259035a311e5a03cb01176667b76aece059778dda9bd72079";
- };
-
- meta = {
- description = ''Forget typos in function names name, CloseEnough
- handles them.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sivsushruth/close_enough";
- };
- } // packageOverrides)
- ) {};
-
- close_enough = close_enough_0_0_1;
-
- cloudex_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- tzdata_0_5_8,
- timex_0_19_5,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "cloudex";
- version = "0.0.2";
- src = fetchHex {
- pkg = "cloudex";
- version = "0.0.2";
- sha256 =
- "eb424a8e6610de6f7a2f2be074937c571a86d11e4b942d2ea39900855a66b306";
- };
- beamDeps = [
- tzdata_0_5_8 timex_0_19_5 poison_1_5_2 httpoison_0_8_3
- ];
-
- meta = {
- longDescription = ''A library that helps with uploading image
- files and urls to cloudinary. Also provides an
- helper to generate transformations and
- cloudinary urls pointing to your images'';
- license = stdenv.lib.licenses.wtfpl;
- homepage = "https://github.com/smeevil/cloudex";
- };
- } // packageOverrides)
- ) {};
-
- cloudex = cloudex_0_0_2;
-
- cloudinary_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_4_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "cloudinary";
- version = "0.0.2";
- src = fetchHex {
- pkg = "cloudinary";
- version = "0.0.2";
- sha256 =
- "9e32b21717b193f90a526203725811b96294d7c88391e5ad4a57bf178678cc4c";
- };
- beamDeps = [ poison_1_4_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Library to upload to Cloudinary'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- cloudinary = cloudinary_0_0_2;
-
- cloudinaryex_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_1_0_2,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "cloudinaryex";
- version = "0.0.2";
- src = fetchHex {
- pkg = "cloudinaryex";
- version = "0.0.2";
- sha256 =
- "31518baacfcca428e30ee8f1c411d76568344e7032ed93cf34535e279c8472fc";
- };
- beamDeps = [ timex_1_0_2 poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''A library for connecting with Cloudinary in
- Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/micahwedemeyer/cloudinaryex";
- };
- } // packageOverrides)
- ) {};
-
- cloudinaryex = cloudinaryex_0_0_2;
-
- cmark_0_6_10 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cmark";
- version = "0.6.10";
- src = fetchHex {
- pkg = "cmark";
- version = "0.6.10";
- sha256 =
- "df6dd77f8fe0774b6e4cdedcadef56c1c7cb478c6aaed7445535ec87dba3a608";
- };
-
- meta = {
- longDescription = ''Elixir NIF for cmark (C), a parser library
- following the CommonMark spec, a compatible
- implementation of Markdown.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/asaaki/cmark.ex";
- };
- } // packageOverrides)
- ) {};
-
- cmark = cmark_0_6_10;
-
- cobertura_cover_0_9_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cobertura_cover";
- version = "0.9.0";
- src = fetchHex {
- pkg = "cobertura_cover";
- version = "0.9.0";
- sha256 =
- "870bc4658cacc5c80d13f1206b688925234d2dc4e00278e8a3e72fbbd6bea0b1";
- };
-
- meta = {
- longDescription = ''A plugin for `mix test --cover` that writes a
- `coverage.xml` file compatible with Jenkins`
- Cobertura plugin. '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/PSPDFKit-labs/cobertura_cover";
- };
- } // packageOverrides)
- ) {};
-
- cobertura_cover = cobertura_cover_0_9_0;
-
- codepagex_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "codepagex";
- version = "0.1.2";
- src = fetchHex {
- pkg = "codepagex";
- version = "0.1.2";
- sha256 =
- "cb6fbd1ebf1b1748aee9d956fb15115af407db3348efc26bc9d3d637c6441074";
- };
-
- meta = {
- longDescription = ''Codepagex is an elixir library to convert
- between string encodings to and from utf-8. Like
- iconv, but written in pure Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/tallakt/codepagex";
- };
- } // packageOverrides)
- ) {};
-
- codepagex = codepagex_0_1_2;
-
- coincap_io_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3,
- exconstructor_1_0_2
- }:
- buildMix ({
- name = "coincap_io";
- version = "0.0.2";
- src = fetchHex {
- pkg = "coincap_io";
- version = "0.0.2";
- sha256 =
- "23492902655cfff97d9988278dc1478562e236be631608a50d4d47106f132664";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 exconstructor_1_0_2 ];
-
- meta = {
- longDescription = ''WIP, unstable Elixir API wrapper for
- coincap.io. Provides access to market
- capitalization data of bitcoin, altcoins and
- cryptotokens.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/cyberpunk-ventures/coincap_io_ex";
- };
- } // packageOverrides)
- ) {};
-
- coincap_io = coincap_io_0_0_2;
-
- colixir_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "colixir";
- version = "0.0.1";
- src = fetchHex {
- pkg = "colixir";
- version = "0.0.1";
- sha256 =
- "38dc49351419c6fcfdb76bbc785e07c3acf83cc29f632719dd601ecadbfb73b8";
- };
-
- meta = {
- description = ''Colixir creates colorized text for terminal
- output'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/mondok/colixir";
- };
- } // packageOverrides)
- ) {};
-
- colixir = colixir_0_0_1;
-
- color_stream_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "color_stream";
- version = "0.0.2";
- src = fetchHex {
- pkg = "color_stream";
- version = "0.0.2";
- sha256 =
- "b1181f32b310311016006f4f8d52b3418d1af6f06e71903daabafdcaa602a29d";
- };
-
- meta = {
- description = ''Generate random colors that are fairly spaced out
- and look nice.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/code-lever/color-stream-elixir";
- };
- } // packageOverrides)
- ) {};
-
- color_stream = color_stream_0_0_2;
-
- color_utils_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "color_utils";
- version = "0.2.0";
- src = fetchHex {
- pkg = "color_utils";
- version = "0.2.0";
- sha256 =
- "bf16a1a9de7d837a68ede139c6e06bc9d57f9eccedff302f730105bd80d98647";
- };
-
- meta = {
- description = ''A Color Util library for Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/barakyo/color_utils";
- };
- } // packageOverrides)
- ) {};
-
- color_utils = color_utils_0_2_0;
-
- colorful_0_6_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "colorful";
- version = "0.6.0";
- src = fetchHex {
- pkg = "colorful";
- version = "0.6.0";
- sha256 =
- "6b00225f137efdde7901d3ddc7626a3b33031c20ea145097b2442680e72adc3d";
- };
-
- meta = {
- description = ''Modules which manage colors'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Joe-noh/colorful";
- };
- } // packageOverrides)
- ) {};
-
- colorful = colorful_0_6_0;
-
- colorize_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "colorize";
- version = "0.2.0";
- src = fetchHex {
- pkg = "colorize";
- version = "0.2.0";
- sha256 =
- "d43757bae49d6da310d641cf7ec809bdc0b6a9eb40fb7ac4c57c1dbbb7d4e32e";
- };
-
- meta = {
- description = ''Colorize your text in the console'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/shiroyasha/colorize";
- };
- } // packageOverrides)
- ) {};
-
- colorize = colorize_0_2_0;
-
- colors_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "colors";
- version = "1.0.1";
- src = fetchHex {
- pkg = "colors";
- version = "1.0.1";
- sha256 =
- "960aa874a3cbbf4356c64ef8194d5215c8373537a720fc0ab46c90400ecf8949";
- };
-
- meta = {
- description = ''a colors util'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/lidashuang/colors";
- };
- } // packageOverrides)
- ) {};
-
- colors = colors_1_0_1;
-
- combination_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "combination";
- version = "0.0.2";
- src = fetchHex {
- pkg = "combination";
- version = "0.0.2";
- sha256 =
- "f3e4934d2077d161e4ec8c6e54a2c4b6b39d8189a1434866ca3e2afedd38be04";
- };
-
- meta = {
- description = ''Elixir library computing simple combination and
- permutation on Enumerables.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/seantanly/elixir-combination";
- };
- } // packageOverrides)
- ) {};
-
- combination = combination_0_0_2;
-
- combine_0_7_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "combine";
- version = "0.7.0";
- src = fetchHex {
- pkg = "combine";
- version = "0.7.0";
- sha256 =
- "3ac1b6622e6149204899c7069b850a53ed38d1a749cc7357aeffe86e8bfc593c";
- };
-
- meta = {
- description = ''A parser combinator library for Elixir
- projects.'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- combine_0_8_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "combine";
- version = "0.8.0";
- src = fetchHex {
- pkg = "combine";
- version = "0.8.0";
- sha256 =
- "3adc5354d03ef96bc494850e5014e11150ddf16b3feee9ff3292a0da55f64301";
- };
-
- meta = {
- description = ''A parser combinator library for Elixir
- projects.'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- combine = combine_0_8_0;
-
- comeonin_1_6_0 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, comeonin_i18n_0_1_3
- }:
- buildMix ({
- name = "comeonin";
- version = "1.6.0";
- src = fetchHex {
- pkg = "comeonin";
- version = "1.6.0";
- sha256 =
- "40dd0da2c33696d19515888fd86b9ffdcad92d49e9a6b3b13df98e824897a1b1";
- };
- beamDeps = [ comeonin_i18n_0_1_3 ];
-
- meta = {
- description = ''Password hashing (bcrypt, pbkdf2_sha512) library
- for Elixir.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/elixircnx/comeonin";
- };
- } // packageOverrides)
- ) {};
-
- comeonin_2_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "comeonin";
- version = "2.0.3";
- src = fetchHex {
- pkg = "comeonin";
- version = "2.0.3";
- sha256 =
- "a9a6f87107ebf6898adeca7130adb1b9e421c1be7e8b30b13ac1e0354ea15198";
- };
-
- meta = {
- description = ''Password hashing (bcrypt, pbkdf2_sha512) library
- for Elixir.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/elixircnx/comeonin";
- };
- } // packageOverrides)
- ) {};
-
- comeonin_2_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "comeonin";
- version = "2.1.1";
- src = fetchHex {
- pkg = "comeonin";
- version = "2.1.1";
- sha256 =
- "7f85774ae5d453f664d0e7809cc1ab32ff22855d16ff6a2edd68c6d36cb1a1aa";
- };
-
- meta = {
- description = ''Password hashing (bcrypt, pbkdf2_sha512) library
- for Elixir.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/elixircnx/comeonin";
- };
- } // packageOverrides)
- ) {};
-
- comeonin_2_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "comeonin";
- version = "2.4.0";
- src = fetchHex {
- pkg = "comeonin";
- version = "2.4.0";
- sha256 =
- "b326290a3143fdf4847a735f272ebd16d15216e97e968266a7b24125af4620be";
- };
-
- meta = {
- description = ''Password hashing (bcrypt, pbkdf2_sha512) library
- for Elixir.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/elixircnx/comeonin";
- };
- } // packageOverrides)
- ) {};
-
- comeonin = comeonin_2_4_0;
-
- comeonin_i18n_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, gettext_0_11_0 }:
- buildMix ({
- name = "comeonin_i18n";
- version = "0.1.3";
- src = fetchHex {
- pkg = "comeonin_i18n";
- version = "0.1.3";
- sha256 =
- "4b45ca5af3cbf20bf7d3f7e874629041a2a921ad5a62ca9b94546a1e559023a6";
- };
- beamDeps = [ gettext_0_11_0 ];
-
- meta = {
- description = ''Internationalization support for the Comeonin
- password hashing library.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/elixircnx/comeonin_i18n";
- };
- } // packageOverrides)
- ) {};
-
- comeonin_i18n = comeonin_i18n_0_1_3;
-
- commander_0_1_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "commander";
- version = "0.1.4";
- src = fetchHex {
- pkg = "commander";
- version = "0.1.4";
- sha256 =
- "091cd4de551771fed7eb258dbf1918875822896d44a730414fc6ac268e9ad3e4";
- };
-
- meta = {
- description = ''A macro library to help create telegram bot'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/carlo-colombo/commander";
- };
- } // packageOverrides)
- ) {};
-
- commander = commander_0_1_4;
-
- complex_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- exprintf_0_1_6,
- earmark_0_2_1
- }:
- buildMix ({
- name = "complex";
- version = "0.2.0";
- src = fetchHex {
- pkg = "complex";
- version = "0.2.0";
- sha256 =
- "6db6a2850ed907c4d9e062591110dc70c35c3818ccf609f1268052a3f4bf10b0";
- };
- beamDeps = [ exprintf_0_1_6 earmark_0_2_1 ];
-
- meta = {
- description = ''Complex is a library for types and mathematical
- functions for complex numbers.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/twist-vector/elixir-complex.git";
- };
- } // packageOverrides)
- ) {};
-
- complex = complex_0_2_0;
-
- comredis_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "comredis";
- version = "1.0.1";
- src = fetchHex {
- pkg = "comredis";
- version = "1.0.1";
- sha256 =
- "03aa3a9235f39c666854027b88915b9f256c357ce6e0a493da54d6dec7b3a207";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- description = ''Comredis is your comrade for Redis command
- generation in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/iurifq/comredis";
- };
- } // packageOverrides)
- ) {};
-
- comredis = comredis_1_0_1;
-
- con_cache_0_11_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exactor_2_2_0 }:
- buildMix ({
- name = "con_cache";
- version = "0.11.0";
- src = fetchHex {
- pkg = "con_cache";
- version = "0.11.0";
- sha256 =
- "cd6d3dd4f6900520e3975592e1bbb57ac217e15f1f350f5bcba0c63578cb0a49";
- };
- beamDeps = [ exactor_2_2_0 ];
-
- meta = {
- longDescription = ''ETS based key-value storage with support for
- row-level isolated writes, TTL auto-purge, and
- modification callbacks.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sasa1977/con_cache";
- };
- } // packageOverrides)
- ) {};
-
- con_cache = con_cache_0_11_0;
-
- con_cache_0_9_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exactor_2_2_0 }:
- buildMix ({
- name = "con_cache";
- version = "0.9.0";
- src = fetchHex {
- pkg = "con_cache";
- version = "0.9.0";
- sha256 =
- "600b122653d7e5f6414bb0728fa6133c656e2d24fad7f0a31bb89c1c70ec68bb";
- };
- beamDeps = [ exactor_2_2_0 ];
-
- meta = {
- longDescription = ''ETS based key-value storage with support for
- row-level isolated writes, TTL auto-purge, and
- modification callbacks.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sasa1977/con_cache";
- };
- } // packageOverrides)
- ) {};
-
- concerto_0_1_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "concerto";
- version = "0.1.4";
- src = fetchHex {
- pkg = "concerto";
- version = "0.1.4";
- sha256 =
- "3c8337ecc810f8812ab9dec8a63b4aa8feaed6142b24acbb89ad7938481ae912";
- };
-
- meta = {
- description = ''file-based routing library for elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/exstruct/concerto";
- };
- } // packageOverrides)
- ) {};
-
- concerto = concerto_0_1_4;
-
- config_values_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "config_values";
- version = "1.0.0";
- src = fetchHex {
- pkg = "config_values";
- version = "1.0.0";
- sha256 =
- "cdbd33fd68cf7fa4fe88dfc1f73e5d26f69d86132650dfba9a636dc75f6cb26c";
- };
-
- meta = {
- description = ''Interpolated configuration values'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hassox/config_values";
- };
- } // packageOverrides)
- ) {};
-
- config_values = config_values_1_0_0;
-
- configparser_ex_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "configparser_ex";
- version = "0.2.1";
- src = fetchHex {
- pkg = "configparser_ex";
- version = "0.2.1";
- sha256 =
- "3319861498f5e711058b1b3b54f88275af85e1bf9493bd0b904393d5971f117e";
- };
-
- meta = {
- description = ''A module that parses INI-like files. Not unlike
- Python configparser package.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/easco/configparser_ex";
- };
- } // packageOverrides)
- ) {};
-
- configparser_ex = configparser_ex_0_2_1;
-
- connection_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "connection";
- version = "1.0.2";
- src = fetchHex {
- pkg = "connection";
- version = "1.0.2";
- sha256 =
- "b4ffd56c0ad3caac8dc6125a007e416ba2dab54a1d4b380766bb9e87c56120fb";
- };
-
- meta = {
- description = ''Connection behaviour for connection processes'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/fishcakez/connection";
- };
- } // packageOverrides)
- ) {};
-
- connection = connection_1_0_2;
-
- conqueuer_0_5_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- inflex_1_5_0
- }:
- buildMix ({
- name = "conqueuer";
- version = "0.5.1";
- src = fetchHex {
- pkg = "conqueuer";
- version = "0.5.1";
- sha256 =
- "7370e2a0201f73ced6b202877b4dcb6872e1b6bbb0c024b1edee3a058dd653ab";
- };
- beamDeps = [ poolboy_1_5_1 inflex_1_5_0 ];
-
- meta = {
- description = ''An Elixir in memory work queue.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/midas/conqueuer";
- };
- } // packageOverrides)
- ) {};
-
- conqueuer = conqueuer_0_5_1;
-
- console_tree_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "console_tree";
- version = "0.0.1";
- src = fetchHex {
- pkg = "console_tree";
- version = "0.0.1";
- sha256 =
- "c7dea20c14fd8bc6697a68f2917def38d20c772eb4b5715b18197672e7ddc0eb";
- };
-
- meta = {
- longDescription = ''A simple library to print a text
- representation of a tree structure, intended for
- use in a terminal environment.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ciaran/console_tree";
- };
- } // packageOverrides)
- ) {};
-
- console_tree = console_tree_0_0_1;
-
- consolex_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- exjsx_3_2_0,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "consolex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "consolex";
- version = "0.1.0";
- sha256 =
- "d258becb7d14295e4df337ca1f5466de55c54d0be2761b9a93003814427c0ec1";
- };
- beamDeps = [ exjsx_3_2_0 cowboy_1_0_4 ];
-
- meta = {
- description = ''An IEx web console'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sivsushruth/consolex";
- };
- } // packageOverrides)
- ) {};
-
- consolex = consolex_0_1_0;
-
- control_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "control";
- version = "0.0.4";
- src = fetchHex {
- pkg = "control";
- version = "0.0.4";
- sha256 =
- "c806da1d82614a27f876aea5d222edb1cdb52d883553ada03f1ff79c09c024d9";
- };
-
- meta = {
- description = ''An exploratory look into functors, applicatives,
- and monads for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/slogsdon/elixir-control";
- };
- } // packageOverrides)
- ) {};
-
- control = control_0_0_4;
-
- convertat_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "convertat";
- version = "1.1.0";
- src = fetchHex {
- pkg = "convertat";
- version = "1.1.0";
- sha256 =
- "603229c43df6769f2166c78c5c3f31316390bf6e19fa8e15f02026170ab51a79";
- };
-
- meta = {
- description = ''Provides functions for converting from and to
- arbitrary bases. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/whatyouhide/convertat";
- };
- } // packageOverrides)
- ) {};
-
- convertat = convertat_1_1_0;
-
- core_data_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, floki_0_1_1 }:
- buildMix ({
- name = "core_data";
- version = "0.1.0";
- src = fetchHex {
- pkg = "core_data";
- version = "0.1.0";
- sha256 =
- "09b308a42f0697053c68f253e7f687c0f6b5f96bb1b114a7b1852c5b6804122e";
- };
- beamDeps = [ floki_0_1_1 ];
-
- meta = {
- description = ''iOS Core Data parser'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/evolet-project/core_data";
- };
- } // packageOverrides)
- ) {};
-
- core_data = core_data_0_1_0;
-
- cors_plug_1_1_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "cors_plug";
- version = "1.1.2";
- src = fetchHex {
- pkg = "cors_plug";
- version = "1.1.2";
- sha256 =
- "2604f8352d3c072a8fd94dd1b6ed076b74f0952710c4a58269ffea56bfb6b2a7";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- longDescription = ''An elixir plug that adds CORS headers to
- requests and responds to preflight requests
- (OPTIONS)'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/mschae/cors_plug";
- };
- } // packageOverrides)
- ) {};
-
- cors_plug = cors_plug_1_1_2;
-
- corsica_0_4_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "corsica";
- version = "0.4.2";
- src = fetchHex {
- pkg = "corsica";
- version = "0.4.2";
- sha256 =
- "6a06d3ffb4395cec11f253618d6411db4b14edb6e76e700abc757722deaf0f8d";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''Plug-based swiss-army knife for CORS requests.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/whatyouhide/corsica";
- };
- } // packageOverrides)
- ) {};
-
- corsica = corsica_0_4_2;
-
- couch_factory_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "couch_factory";
- version = "0.1.1";
- src = fetchHex {
- pkg = "couch_factory";
- version = "0.1.1";
- sha256 =
- "79b2e2c48bf6b036f959ff70c14b0d4da767e4bca7efae8f6c758eefab1a28d5";
- };
-
- meta = {
- description = ''Factory Girl implementation with CouchDb
- persistence.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/javierg/couch_factory";
- };
- } // packageOverrides)
- ) {};
-
- couch_factory = couch_factory_0_1_1;
-
- couchbeam_1_3_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- jsx_2_8_0,
- hackney_1_5_7
- }:
- buildMix ({
- name = "couchbeam";
- version = "1.3.0";
- src = fetchHex {
- pkg = "couchbeam";
- version = "1.3.0";
- sha256 =
- "5d94bfc80532999e4f8e7f5da3abff74fbf3b59d5e02e0a99eb0dc3697c97a50";
- };
- beamDeps = [ jsx_2_8_0 hackney_1_5_7 ];
-
- meta = {
- description = ''Erlang CouchDB client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/benoitc/couchbeam";
- };
- } // packageOverrides)
- ) {};
-
- couchbeam = couchbeam_1_3_0;
-
- couchex_0_6_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "couchex";
- version = "0.6.0";
- src = fetchHex {
- pkg = "couchex";
- version = "0.6.0";
- sha256 =
- "44e02558dc29d739cf27dad76bfc8e8632c4779ce2c701a418409912641b7c3b";
- };
-
- meta = {
- description = ''CouchDB client, wrapping couchbeam erlang
- client.'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/ringling/couchex";
- };
- } // packageOverrides)
- ) {};
-
- couchex = couchex_0_6_0;
-
- count_buffer_0_1_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, pool_ring_0_1_5 }:
- buildMix ({
- name = "count_buffer";
- version = "0.1.5";
- src = fetchHex {
- pkg = "count_buffer";
- version = "0.1.5";
- sha256 =
- "6e78dc0458dac8dae9d41d7857c7185b3164cecd9992a1407265ebfa3455544e";
- };
- beamDeps = [ pool_ring_0_1_5 ];
-
- meta = {
- description = ''buffer a large set of counters and flush
- periodically'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/count_buffer";
- };
- } // packageOverrides)
- ) {};
-
- count_buffer = count_buffer_0_1_5;
-
- courier_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- mail_0_0_4,
- gen_smtp_0_9_0
- }:
- buildMix ({
- name = "courier";
- version = "0.0.3";
- src = fetchHex {
- pkg = "courier";
- version = "0.0.3";
- sha256 =
- "8c8c560da7011c8846ed5ee60af867124ff043a7d37773156b6d8a08390b73fc";
- };
- beamDeps = [ mail_0_0_4 gen_smtp_0_9_0 ];
-
- meta = {
- description = ''Adapter based email delivery'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/DockYard/courier";
- };
- } // packageOverrides)
- ) {};
-
- courier = courier_0_0_3;
-
- cowbell_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "cowbell";
- version = "0.1.0";
- src = fetchHex {
- pkg = "cowbell";
- version = "0.1.0";
- sha256 =
- "8a75f73afd29421150cc4dbe2993b5a2a7e3fe5fa5628a06ddb22adc2c36c998";
- };
-
- meta = {
- description = ''A node connection manager.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ostinelli/cowbell";
- };
- } // packageOverrides)
- ) {};
-
- cowbell = cowbell_0_1_0;
-
- cowboy_1_0_4 = callPackage
- (
- {
- buildErlangMk,
- packageOverrides ? {},
- fetchHex,
- cowlib_1_0_2,
- ranch_1_2_1
- }:
- buildErlangMk ({
- name = "cowboy";
- version = "1.0.4";
- src = fetchHex {
- pkg = "cowboy";
- version = "1.0.4";
- sha256 =
- "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac";
- };
- beamDeps = [ cowlib_1_0_2 ranch_1_2_1 ];
-
- meta = {
- description = ''Small, fast, modular HTTP server written in
- Erlang.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/ninenines/cowboy";
- };
- } // packageOverrides)
- ) {};
-
- cowboy = cowboy_1_0_4;
-
- cowgirl_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cowgirl";
- version = "0.0.1";
- src = fetchHex {
- pkg = "cowgirl";
- version = "0.0.1";
- sha256 =
- "3b06ca6bb82fa3674ddad182cc479d9ab1538b83a4cf616c666e0d6f873c44e5";
- };
-
- meta = {
- description = ''Small, fast, modular HTTP server written in
- Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/larrylv/cowgirl";
- };
- } // packageOverrides)
- ) {};
-
- cowgirl = cowgirl_0_0_1;
-
- cowlib_1_0_0 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "cowlib";
- version = "1.0.0";
- src = fetchHex {
- pkg = "cowlib";
- version = "1.0.0";
- sha256 =
- "4dacd60356177ec8cf93dbff399de17435b613f3318202614d3d5acbccee1474";
- };
-
- meta = {
- description = ''Support library for manipulating Web
- protocols.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/ninenines/cowlib";
- };
- } // packageOverrides)
- ) {};
-
- cowlib_1_0_2 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "cowlib";
- version = "1.0.2";
- src = fetchHex {
- pkg = "cowlib";
- version = "1.0.2";
- sha256 =
- "db622da03aa039e6366ab953e31186cc8190d32905e33788a1acb22744e6abd2";
- };
-
- meta = {
- description = ''Support library for manipulating Web
- protocols.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/ninenines/cowlib";
- };
- } // packageOverrides)
- ) {};
-
- cowlib_1_3_0 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "cowlib";
- version = "1.3.0";
- src = fetchHex {
- pkg = "cowlib";
- version = "1.3.0";
- sha256 =
- "2b1ac020ec92e7a59cb7322779870c2d3adc7c904ecb3b9fa406f04dc9816b73";
- };
-
- meta = {
- description = ''Support library for manipulating Web
- protocols.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/ninenines/cowlib";
- };
- } // packageOverrides)
- ) {};
-
- cowlib = cowlib_1_3_0;
-
- cowsay_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cowsay";
- version = "0.0.1";
- src = fetchHex {
- pkg = "cowsay";
- version = "0.0.1";
- sha256 =
- "9f8a6634710974787751279b22ef5d7cb3c6a74db42636540ae5db37c4632e2a";
- };
-
- meta = {
- description = ''A cow-friend who will speak your mind'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bbrock25/cowsay";
- };
- } // packageOverrides)
- ) {};
-
- cowsay = cowsay_0_0_1;
-
- cqex_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cqex";
- version = "0.2.0";
- src = fetchHex {
- pkg = "cqex";
- version = "0.2.0";
- sha256 =
- "2180cb8083d38765bd3912f128b603826686300aef6f61adf9dc89fde3bb5429";
- };
-
- meta = {
- description = ''Idiomatic Elixir client for Cassandra.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/matehat/cqex";
- };
- } // packageOverrides)
- ) {};
-
- cqex = cqex_0_2_0;
-
- cqrs_commands_0_0_6 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- vex_0_5_5,
- uuid_1_1_4,
- poison_2_0_1,
- plug_1_1_5,
- exconstructor_1_0_2
- }:
- buildMix ({
- name = "cqrs_commands";
- version = "0.0.6";
- src = fetchHex {
- pkg = "cqrs_commands";
- version = "0.0.6";
- sha256 =
- "3bc8419a057daf10db5a0a8895d7b917948e6e901f3e8286163f829b2f5652f3";
- };
- beamDeps = [
- vex_0_5_5
- uuid_1_1_4
- poison_2_0_1
- plug_1_1_5
- exconstructor_1_0_2
- ];
-
- meta = {
- description = ''This is not production ready yet but I want your
- feedback.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/amberbit/cqrs_commands";
- };
- } // packageOverrides)
- ) {};
-
- cqrs_commands = cqrs_commands_0_0_6;
-
- crazy_pants_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "crazy_pants";
- version = "0.0.1";
- src = fetchHex {
- pkg = "crazy_pants";
- version = "0.0.1";
- sha256 =
- "46e50adccb0d858e5a540c834d4e358ffa43ed9cdcac20ae36569fc7eaffa532";
- };
-
- meta = {
- description = ''These pretzels are making me thirsty'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/whodat/crazy_pants";
- };
- } // packageOverrides)
- ) {};
-
- crazy_pants = crazy_pants_0_0_1;
-
- crc_0_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "crc";
- version = "0.4.0";
- src = fetchHex {
- pkg = "crc";
- version = "0.4.0";
- sha256 =
- "4f0d872d46faea966aeb687158b7e02bfc61c49c4f2fb33f5e52e3d167f4faeb";
- };
-
- meta = {
- description = ''A library used to calculate CRC checksums for
- binary data'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/TattdCodeMonkey/crc";
- };
- } // packageOverrides)
- ) {};
-
- crc = crc_0_4_0;
-
- credit_card_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "credit_card";
- version = "1.0.0";
- src = fetchHex {
- pkg = "credit_card";
- version = "1.0.0";
- sha256 =
- "c7dee15035f4ff925f08bc806c4bd1817209c64d8ba089d0731808ee35e97ba0";
- };
-
- meta = {
- description = ''A library for validating credit card numbers'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/abakhi/credit_card";
- };
- } // packageOverrides)
- ) {};
-
- credit_card = credit_card_1_0_0;
-
- credo_0_4_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, bunt_0_1_6 }:
- buildMix ({
- name = "credo";
- version = "0.4.3";
- src = fetchHex {
- pkg = "credo";
- version = "0.4.3";
- sha256 =
- "2ab51e2446ebad5abc327fb18a4410f41bbab311cd760379e75d696dea8ed6ee";
- };
- beamDeps = [ bunt_0_1_6 ];
-
- meta = {
- longDescription = ''A static code analysis tool for the Elixir
- language with a focus on code consistency and
- teaching.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rrrene/credo";
- };
- } // packageOverrides)
- ) {};
-
- credo = credo_0_4_3;
-
- croma_0_4_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "croma";
- version = "0.4.4";
- src = fetchHex {
- pkg = "croma";
- version = "0.4.4";
- sha256 =
- "8dbcf50e925aa765f521d948250cafd5409fd4dbd5f23b2db6d6032e9397e312";
- };
-
- meta = {
- description = ''Elixir macro utilities'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- croma = croma_0_4_4;
-
- cronitor_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cronitor";
- version = "1.0.0";
- src = fetchHex {
- pkg = "cronitor";
- version = "1.0.0";
- sha256 =
- "d1353c83d1949b60e824ed934be02e7a4cc536fb5b7c912618b0052e0e01d490";
- };
-
- meta = {
- description = ''An extremely simple wrapper for the cronitor.io
- ping endpoints.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/jordan0day/cronitor";
- };
- } // packageOverrides)
- ) {};
-
- cronitor = cronitor_1_0_0;
-
- crutches_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "crutches";
- version = "1.0.0";
- src = fetchHex {
- pkg = "crutches";
- version = "1.0.0";
- sha256 =
- "cfd97962a22fe30820e6ca6d0671c763232a7edf149aa11bd62ee77dff0ffff0";
- };
-
- meta = {
- description = ''An Elixir toolbelt freely inspired from Ruby`s
- ActiveSupport'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mykewould/crutches";
- };
- } // packageOverrides)
- ) {};
-
- crutches = crutches_1_0_0;
-
- cryptex_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cryptex";
- version = "0.0.1";
- src = fetchHex {
- pkg = "cryptex";
- version = "0.0.1";
- sha256 =
- "19d709c6ffbda3c74ec811190d168170db0435720cbe788c0233bea4afee1d16";
- };
-
- meta = {
- description = ''An Elixir library for encrypting/decrypting,
- signing/verifying data. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/scrogson/cryptex";
- };
- } // packageOverrides)
- ) {};
-
- cryptex = cryptex_0_0_1;
-
- crypto_rsassa_pss_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "crypto_rsassa_pss";
- version = "1.0.0";
- src = fetchHex {
- pkg = "crypto_rsassa_pss";
- version = "1.0.0";
- sha256 =
- "d8f48874dbef940a8954126249499714e702d8ae0a8f23230a6c2f4a92833313";
- };
-
- meta = {
- description = ''RSASSA-PSS Public Key Cryptographic Signature
- Algorithm for Erlang'';
- license = stdenv.lib.licenses.mpl20;
- homepage =
- "https://github.com/potatosalad/erlang-crypto_rsassa_pss";
- };
- } // packageOverrides)
- ) {};
-
- crypto_rsassa_pss = crypto_rsassa_pss_1_0_0;
-
- cspex_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cspex";
- version = "1.1.0";
- src = fetchHex {
- pkg = "cspex";
- version = "1.1.0";
- sha256 =
- "1eb6d83e0f4c43c68fe14ede5bb711654a6a653e94aa39d75ad67cf53ba79df1";
- };
-
- meta = {
- description = ''A library that brings all the CSP joy to the
- Elixir land.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/vidalraphael/cspex";
- };
- } // packageOverrides)
- ) {};
-
- cspex = cspex_1_1_0;
-
- csv_1_4_1 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, parallel_stream_1_0_3
- }:
- buildMix ({
- name = "csv";
- version = "1.4.1";
- src = fetchHex {
- pkg = "csv";
- version = "1.4.1";
- sha256 =
- "167e5d3dd2e7716e5865f5a8d064d7a9f7004516c796684083f1cd180c2d4296";
- };
- beamDeps = [ parallel_stream_1_0_3 ];
-
- meta = {
- description = ''CSV Decoding and Encoding for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/beatrichartz/csv";
- };
- } // packageOverrides)
- ) {};
-
- csv = csv_1_4_1;
-
- csvlixir_2_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "csvlixir";
- version = "2.0.3";
- src = fetchHex {
- pkg = "csvlixir";
- version = "2.0.3";
- sha256 =
- "8539326c9a484f94f9443878f5df21b3ed12d5a00be069b8b8346dff8cf35436";
- };
-
- meta = {
- longDescription = ''CSVLixir is a CSV reader/writer for Elixir.
- It operates on files and strings. The reader can
- read CSV files or CSV strings. Reading from
- files returns a stream of lists. Reading from
- strings returns a list of lists. The writer
- transforms a (possibly lazy) list of lists into
- a stream of CSV strings. It can also take a
- single list and return a single CSV string.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/jimm/csvlixir";
- };
- } // packageOverrides)
- ) {};
-
- csvlixir = csvlixir_2_0_3;
-
- cth_readable_1_2_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, cf_0_2_1 }:
- buildRebar3 ({
- name = "cth_readable";
- version = "1.2.2";
- src = fetchHex {
- pkg = "cth_readable";
- version = "1.2.2";
- sha256 =
- "77585432b98b45b9ee086399cefa97b2191b6d780c4e795bf43c529412d9694d";
- };
-
- beamDeps = [ cf_0_2_1 ];
-
- meta = {
- description = ''Common Test hooks for more readable logs'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/ferd/cth_readable";
- };
- } // packageOverrides)
- ) {};
-
- cth_readable = cth_readable_1_2_2;
-
- cuckoo_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, murmur_1_0_0 }:
- buildMix ({
- name = "cuckoo";
- version = "1.0.0";
- src = fetchHex {
- pkg = "cuckoo";
- version = "1.0.0";
- sha256 =
- "18f31763c50c20bb89e1fbc4b9eb5b97f6ffc23e3a90ba4cf5e97ccd96da8df2";
- };
- beamDeps = [ murmur_1_0_0 ];
-
- meta = {
- description = ''Cuckoo is a pure Elixir implementation of Cuckoo
- Filters.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gmcabrita/cuckoo";
- };
- } // packageOverrides)
- ) {};
-
- cuckoo = cuckoo_1_0_0;
-
- cucumberl_0_0_10 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cucumberl";
- version = "0.0.10";
- src = fetchHex {
- pkg = "cucumberl";
- version = "0.0.10";
- sha256 =
- "53bd73d016602c8c46883dbcc5a57ee814fe4708b14e4406d566b5ca9d119110";
- };
-
- meta = {
- longDescription = ''A pure-erlang, open-source, implementation of
- Cucumber (http://cukes.info). This provides a
- subset of the Cucumber feature definition
- language.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ericbmerritt/cucumberl";
- };
- } // packageOverrides)
- ) {};
-
- cucumberl = cucumberl_0_0_10;
-
- cuid_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cuid";
- version = "0.1.0";
- src = fetchHex {
- pkg = "cuid";
- version = "0.1.0";
- sha256 =
- "80cd46bd323e05b706c60008368e631b559307b554c0acc54292ab2c73a3340b";
- };
-
- meta = {
- description = ''Generate collision-resistant ids, in Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/duailibe/cuid";
- };
- } // packageOverrides)
- ) {};
-
- cuid = cuid_0_1_0;
-
- curl2httpoison_0_2_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "curl2httpoison";
- version = "0.2.6";
- src = fetchHex {
- pkg = "curl2httpoison";
- version = "0.2.6";
- sha256 =
- "d22fda1a85db812e9f6e0c8770f004cb7942f463bc59b07ad272c01330a7bfca";
- };
-
- meta = {
- description = ''Curl2HTTPoison transform your curl request to
- HTTPPoison request code'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/edgurgel/httpoison";
- };
- } // packageOverrides)
- ) {};
-
- curl2httpoison = curl2httpoison_0_2_6;
-
- currency_formatter_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "currency_formatter";
- version = "0.0.1";
- src = fetchHex {
- pkg = "currency_formatter";
- version = "0.0.1";
- sha256 =
- "dab55279ae6377f00a9d01a0a7ab015d380d550d71f303900ae554f8d0065606";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- description = ''A function to format a number to a currency using
- iso standards'';
- license = stdenv.lib.licenses.wtfpl;
- homepage = "https://github.com/smeevil/currency_formatter";
- };
- } // packageOverrides)
- ) {};
-
- currency_formatter = currency_formatter_0_0_1;
-
- current_streak_ex_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- floki_0_8_1
- }:
- buildMix ({
- name = "current_streak_ex";
- version = "0.1.1";
- src = fetchHex {
- pkg = "current_streak_ex";
- version = "0.1.1";
- sha256 =
- "1c62bcd7bdd69818dc05f0602e03a5aca6b21554206cb6634bedb807ee27d5a7";
- };
- beamDeps = [ httpoison_0_8_3 floki_0_8_1 ];
-
- meta = {
- description = ''Get github current streak which support only
- public repositories.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KazuCocoa/current_streak_ex";
- };
- } // packageOverrides)
- ) {};
-
- current_streak_ex = current_streak_ex_0_1_1;
-
- current_user_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "current_user";
- version = "0.0.1";
- src = fetchHex {
- pkg = "current_user";
- version = "0.0.1";
- sha256 =
- "8a400d8cbd02da89bccf67a357733b682e0d6d4c421b7230405ac16b1988809c";
- };
-
- meta = {
- description = ''Configurable user authentication for Phoenix'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/halogenandtoast/current_user";
- };
- } // packageOverrides)
- ) {};
-
- current_user = current_user_0_0_1;
-
- curry_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "curry";
- version = "0.0.1";
- src = fetchHex {
- pkg = "curry";
- version = "0.0.1";
- sha256 =
- "e8f56fee1cb82ae2616c36021d4dd8c2b4169490e224dea84f63feb47475d6f0";
- };
-
- meta = {
- description = ''A simple currying macro allowing to define
- curried functions in Elixir modules.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/niahoo/elixir-curry";
- };
- } // packageOverrides)
- ) {};
-
- curry = curry_0_0_1;
-
- curtail_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "curtail";
- version = "0.1.0";
- src = fetchHex {
- pkg = "curtail";
- version = "0.1.0";
- sha256 =
- "0d43f4bcecf91c935a89cd52af62efa62e264b4c82a07e29e9945988735fdc1f";
- };
-
- meta = {
- description = ''HTML-safe string truncation.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/seankay/curtail";
- };
- } // packageOverrides)
- ) {};
-
- curtail = curtail_0_1_0;
-
- curtains_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_0_3 }:
- buildMix ({
- name = "curtains";
- version = "0.0.1";
- src = fetchHex {
- pkg = "curtains";
- version = "0.0.1";
- sha256 =
- "d547bd024049630fd072994a759befaab908fa69f5e200b2b584e12f12e9842f";
- };
- beamDeps = [ plug_1_0_3 ];
-
- meta = {
- longDescription = ''Curtains is a Elixir package that \"takes
- over\" your Elixir website by returning content
- of a specified file (if it exists). This makes
- it perfect for \"Under construction\" and
- \"Maintenance\" pages. At it`s heart, it`s just
- a Plug.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/fteem/curtains";
- };
- } // packageOverrides)
- ) {};
-
- curtains = curtains_0_0_1;
-
- curve25519_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "curve25519";
- version = "0.1.0";
- src = fetchHex {
- pkg = "curve25519";
- version = "0.1.0";
- sha256 =
- "786f9ede0aa9503f65015c19d9cd1b9263c5e7523cd215ee23d6d94ba16473d1";
- };
-
- meta = {
- description = ''Curve25519 Diffie-Hellman functions'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/curve25519_ex";
- };
- } // packageOverrides)
- ) {};
-
- curve25519 = curve25519_0_1_0;
-
- cushion_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpotion_2_2_2 }:
- buildMix ({
- name = "cushion";
- version = "0.0.3";
- src = fetchHex {
- pkg = "cushion";
- version = "0.0.3";
- sha256 =
- "1371ab210bd3b7ef7381dbe3f53fedb8afbbb0c562f45d614e4849373919482b";
- };
- beamDeps = [ httpotion_2_2_2 ];
-
- meta = {
- longDescription = ''A really simple Buffer API client for sending
- updates. Right now it only supports sending text
- updates, but hopefully will support more in the
- future.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ryanbillingsley/cushion";
- };
- } // packageOverrides)
- ) {};
-
- cushion = cushion_0_0_3;
-
- custom_base_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "custom_base";
- version = "0.2.0";
- src = fetchHex {
- pkg = "custom_base";
- version = "0.2.0";
- sha256 =
- "d7c26409eb22b00d69f591fd89cc4e84550656862c655c7ae3edf63f7381899b";
- };
-
- meta = {
- description = ''Allow you to make custom base conversion in
- Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/igas/custom_base";
- };
- } // packageOverrides)
- ) {};
-
- custom_base = custom_base_0_2_0;
-
- cuttlefish_2_0_7 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- lager_3_0_2,
- getopt_0_8_2
- }:
- buildRebar3 ({
- name = "cuttlefish";
- version = "2.0.7";
- src = fetchHex {
- pkg = "cuttlefish";
- version = "2.0.7";
- sha256 =
- "57589747ba40a75c53872002cd251a2933102457cdcc99b8ed72823ba1288869";
- };
-
- beamDeps = [ lager_3_0_2 getopt_0_8_2 ];
-
- meta = {
- description = ''cuttlefish configuration abstraction'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/tsloughter/cuttlefish";
- };
- } // packageOverrides)
- ) {};
-
- cuttlefish = cuttlefish_2_0_7;
-
- cypher_query_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "cypher_query";
- version = "0.0.1";
- src = fetchHex {
- pkg = "cypher_query";
- version = "0.0.1";
- sha256 =
- "068bee4f13275d3448a4676bf113d5b2e414b47a9f84bb6e1614a009104c3f30";
- };
-
- meta = {
- description = ''A dumb string-based query builder for neo4j
- Cypher queries'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/collin/cypher_query";
- };
- } // packageOverrides)
- ) {};
-
- cypher_query = cypher_query_0_0_1;
-
- damm_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "damm";
- version = "0.1.0";
- src = fetchHex {
- pkg = "damm";
- version = "0.1.0";
- sha256 =
- "2d2d0adbf0ffe5888d0aaee784a25b3bb9b99acf33b6de350aee9f58c588cbd5";
- };
-
- meta = {
- description = ''Damm algorithm implementation'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mururu/damm";
- };
- } // packageOverrides)
- ) {};
-
- damm = damm_0_1_0;
-
- data_leaf_walker_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "data_leaf_walker";
- version = "0.1.0";
- src = fetchHex {
- pkg = "data_leaf_walker";
- version = "0.1.0";
- sha256 =
- "9d3a8688c3751765453f04e8f60f3826757396dce66baf7e2cf7335c9c373bbd";
- };
-
- meta = {
- longDescription = ''Traverse and map values of deeply nested data
- structures: Provides a `map_deeply/2` function
- for Maps and Lists and Keyword Lists'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gutschilla/elixir-map-deeply";
- };
- } // packageOverrides)
- ) {};
-
- data_leaf_walker = data_leaf_walker_0_1_0;
-
- data_pool_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, e_queue_1_0_1 }:
- buildMix ({
- name = "data_pool";
- version = "1.0.1";
- src = fetchHex {
- pkg = "data_pool";
- version = "1.0.1";
- sha256 =
- "ad5a2bdf81215d71e47f87624142f58d32a808ea98f4837fc1d28dc971124613";
- };
- beamDeps = [ e_queue_1_0_1 ];
-
- meta = {
- longDescription = ''Utility to buffer items into a queue that
- follow a simple block pattern on calls to push
- and pop when the queue at a max size or
- empty.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/benfalk/data_pool";
- };
- } // packageOverrides)
- ) {};
-
- data_pool = data_pool_1_0_1;
-
- database_url_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "database_url";
- version = "0.1.0";
- src = fetchHex {
- pkg = "database_url";
- version = "0.1.0";
- sha256 =
- "273c8c926761d5716fee17c8a8494583d729a4419e30479a292eb6cea3d9a756";
- };
-
- meta = {
- description = ''Parse database URL and renturn keyword list for
- use with Ecto.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/s-m-i-t-a/database_url";
- };
- } // packageOverrides)
- ) {};
-
- database_url = database_url_0_1_0;
-
- datastructures_0_2_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "datastructures";
- version = "0.2.5";
- src = fetchHex {
- pkg = "datastructures";
- version = "0.2.5";
- sha256 =
- "ef4387043ecaa635995832f32473e8b6708044a6bc73983168eee4ab71b01f92";
- };
-
- meta = {
- description = ''Elixir protocols and implementations for various
- data structures.'';
- license = stdenv.lib.licenses.wtfpl;
- homepage = "https://github.com/meh/elixir-datastructures";
- };
- } // packageOverrides)
- ) {};
-
- datastructures = datastructures_0_2_5;
-
- dbg_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dbg";
- version = "1.0.1";
- src = fetchHex {
- pkg = "dbg";
- version = "1.0.1";
- sha256 =
- "866159f496a1ad9b959501f16db3d1338bb6cef029a75a67ca5615d25b38345f";
- };
-
- meta = {
- description = ''Distributed tracing'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/fishcakez/dbg";
- };
- } // packageOverrides)
- ) {};
-
- dbg = dbg_1_0_1;
-
- dbux_1_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, connection_1_0_2 }:
- buildMix ({
- name = "dbux";
- version = "1.0.3";
- src = fetchHex {
- pkg = "dbux";
- version = "1.0.3";
- sha256 =
- "79d01f620dd32ec4ed11423e0724bf7d8a46353e56f8d28cbdbf499a352caa1e";
- };
- beamDeps = [ connection_1_0_2 ];
-
- meta = {
- description = ''Bindings for the D-Bus IPC protocol.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mspanc/dbux";
- };
- } // packageOverrides)
- ) {};
-
- dbux = dbux_1_0_3;
-
- dealer_0_8_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "dealer";
- version = "0.8.0";
- src = fetchHex {
- pkg = "dealer";
- version = "0.8.0";
- sha256 =
- "c8c72d38e1cff6a181a6b6f627fb6fd5998279827519e598eb28bcef2be721ee";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''An API Client for Stockfighter.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/larrylv/dealer";
- };
- } // packageOverrides)
- ) {};
-
- dealer = dealer_0_8_0;
-
- decimal_1_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "decimal";
- version = "1.1.2";
- src = fetchHex {
- pkg = "decimal";
- version = "1.1.2";
- sha256 =
- "7a6dfa1f4d389497acd7b807bf38c55022487c68b73d339d5114e3a691e006c5";
- };
-
- meta = {
- description = ''Arbitrary precision decimal arithmetic for
- Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/ericmj/decimal";
- };
- } // packageOverrides)
- ) {};
-
- decimal = decimal_1_1_2;
-
- decimal_arithmetic_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_2 }:
- buildMix ({
- name = "decimal_arithmetic";
- version = "0.1.1";
- src = fetchHex {
- pkg = "decimal_arithmetic";
- version = "0.1.1";
- sha256 =
- "b9c5dc722cc770aa5b905418d56e23eaa16e64659da0ccb552341a75068e0cfe";
- };
- beamDeps = [ decimal_1_1_2 ];
-
- meta = {
- description = ''Extended arithmetic for Decimal library.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jacek-adamek/decimal_arithmetic";
- };
- } // packageOverrides)
- ) {};
-
- decimal_arithmetic = decimal_arithmetic_0_1_1;
-
- decks_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "decks";
- version = "0.0.1";
- src = fetchHex {
- pkg = "decks";
- version = "0.0.1";
- sha256 =
- "de75b96c66f23c365935949ec53efab1f2f5d187803c26d733dd3b2df535af7d";
- };
-
- meta = {
- description = ''Implements standard card decks for Elixir-based
- card games.'';
-
- };
- } // packageOverrides)
- ) {};
-
- decks = decks_0_0_1;
-
- decoction_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "decoction";
- version = "0.0.1";
- src = fetchHex {
- pkg = "decoction";
- version = "0.0.1";
- sha256 =
- "cdf7ad35cdf87962e153bb56d9c68f8dd061469d58cae8923cbdcd2980d7adc0";
- };
-
- meta = {
- description = ''Decoction is a static site generator written in
- Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/aarvay/decoction";
- };
- } // packageOverrides)
- ) {};
-
- decoction = decoction_0_0_1;
-
- defmemo_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "defmemo";
- version = "0.1.1";
- src = fetchHex {
- pkg = "defmemo";
- version = "0.1.1";
- sha256 =
- "8fefc49ff64b06fdb1ee15292419c16919a7a3c6b8e5cac6afd7a13919715e0f";
- };
-
- meta = {
- description = '' A memoization macro (defmemo) for elixir using a
- genserver backing store. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/os6sense/DefMemo";
- };
- } // packageOverrides)
- ) {};
-
- defmemo = defmemo_0_1_1;
-
- delayed_otp_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "delayed_otp";
- version = "0.0.2";
- src = fetchHex {
- pkg = "delayed_otp";
- version = "0.0.2";
- sha256 =
- "22fe457d78fe1f216dcfca8c84431ac1f31e93267fdd563a5ca86c8289e2620f";
- };
-
- meta = {
- longDescription = ''Delay death of supervisor children or
- gen_server : for instance Erlang supervisor with
- exponential backoff restart strategy.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/awetzel/delayed_otp";
- };
- } // packageOverrides)
- ) {};
-
- delayed_otp = delayed_otp_0_0_2;
-
- delegate_behaviour_0_1_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "delegate_behaviour";
- version = "0.1.5";
- src = fetchHex {
- pkg = "delegate_behaviour";
- version = "0.1.5";
- sha256 =
- "d46e9c39d5be4e6b1ee62a9419d1a44d138aca5af0161f42f78b4eb24659ca58";
- };
-
- meta = {
- description = ''Macros to define modules that delegate to
- concrete implementations of behaviours'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- delegate_behaviour = delegate_behaviour_0_1_5;
-
- deltek_0_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- sweet_xml_0_6_1,
- html_entities_0_3_0
- }:
- buildMix ({
- name = "deltek";
- version = "0.0.4";
- src = fetchHex {
- pkg = "deltek";
- version = "0.0.4";
- sha256 =
- "274eecc6aba76e19e30e5850746ee81241ac8cc334d9729588b2ba770ac53988";
- };
- beamDeps = [ sweet_xml_0_6_1 html_entities_0_3_0 ];
-
- meta = {
- description = ''An Elixir wrapper for the SOAP Deltek API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lucidstack/elixir-deltek";
- };
- } // packageOverrides)
- ) {};
-
- deltek = deltek_0_0_4;
-
- demacro_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "demacro";
- version = "0.0.1";
- src = fetchHex {
- pkg = "demacro";
- version = "0.0.1";
- sha256 =
- "e2a83d48f6b3e03764baf2e149dd5420e632d0d4daa77c5226697a3755a89d16";
- };
- meta = { };
- } // packageOverrides)
- ) {};
-
- demacro = demacro_0_0_1;
-
- depcache_1_2_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "depcache";
- version = "1.2.2";
- src = fetchHex {
- pkg = "depcache";
- version = "1.2.2";
- sha256 =
- "0e70807140d485f1bf5ac50cd9a87b71ba5c5496a8ad02029847e569af80ed91";
- };
-
- meta = {
- description = ''In-memory cache with cache key dependencies'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/zotonic/depcache";
- };
- } // packageOverrides)
- ) {};
-
- depcache = depcache_1_2_2;
-
- deppie_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "deppie";
- version = "1.0.0";
- src = fetchHex {
- pkg = "deppie";
- version = "1.0.0";
- sha256 =
- "6712dbae54f274d7f4f92979d82cec2d4636a0598e2474e47b190fc3c0ed378a";
- };
-
- meta = {
- description = ''Elixir`s coolest deprecation logger'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zackehh/deppie";
- };
- } // packageOverrides)
- ) {};
-
- deppie = deppie_1_0_0;
-
- detergent_0_3_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "detergent";
- version = "0.3.0";
- src = fetchHex {
- pkg = "detergent";
- version = "0.3.0";
- sha256 =
- "510cfb5d35b4b344762f074b73c8696b4bdde654ea046b3365cf92760ae33362";
- };
-
- meta = {
- description = ''An emulsifying Erlang SOAP library'';
- license = with stdenv.lib.licenses; [ unlicense bsd3 ];
- homepage = "https://github.com/devinus/detergent";
- };
- } // packageOverrides)
- ) {};
-
- detergent = detergent_0_3_0;
-
- detergentex_0_0_7 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, detergent_0_3_0 }:
- buildMix ({
- name = "detergentex";
- version = "0.0.7";
- src = fetchHex {
- pkg = "detergentex";
- version = "0.0.7";
- sha256 =
- "6bb1bc2fe9228f97e512ef012c473ed822263dc38c3dbaa727fcd111ce1c4771";
- };
- beamDeps = [ detergent_0_3_0 ];
-
- meta = {
- description = ''Elixir binding to Detergent erlang library used
- to call WSDL SOAP Services'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/r-icarus/detergentex";
- };
- } // packageOverrides)
- ) {};
-
- detergentex = detergentex_0_0_7;
-
- deviant_elixir_0_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- feeder_ex_0_0_2
- }:
- buildMix ({
- name = "deviant_elixir";
- version = "0.0.4";
- src = fetchHex {
- pkg = "deviant_elixir";
- version = "0.0.4";
- sha256 =
- "42473969889a47edab66384988e70ab6b4da158043e9231deab822743e3d9943";
- };
- beamDeps = [ httpoison_0_8_3 feeder_ex_0_0_2 ];
-
- meta = {
- longDescription = ''WIP. Unstable alpha. Elixir API wrapper for
- Deviant Art. At this moment provides only RSS
- feeds intergac.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/vdaniuk/deviant-elixir";
- };
- } // packageOverrides)
- ) {};
-
- deviant_elixir = deviant_elixir_0_0_4;
-
- dflow_0_1_5 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "dflow";
- version = "0.1.5";
- src = fetchHex {
- pkg = "dflow";
- version = "0.1.5";
- sha256 =
- "f08e73f22d4c620ef5f358a0b40f8fe3b91219ca3922fbdbe7e42f1cb58f737e";
- };
-
- meta = {
- description = ''Pipelined flow processing engine'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/dalmatinerdb/dflow";
- };
- } // packageOverrides)
- ) {};
-
- dflow = dflow_0_1_5;
-
- di_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "di";
- version = "0.1.0";
- src = fetchHex {
- pkg = "di";
- version = "0.1.0";
- sha256 =
- "d7a89568c986c98399667faeb618d5cc42a89965717e758323aa5370d1547260";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir wrapper for DI.FM'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/JoshuaThompson/di";
- };
- } // packageOverrides)
- ) {};
-
- di = di_0_1_0;
-
- dialyxir_0_3_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dialyxir";
- version = "0.3.3";
- src = fetchHex {
- pkg = "dialyxir";
- version = "0.3.3";
- sha256 =
- "8851d7c582ce9db43b0564f026b2f6a461df62e139a7891fde50f9b6a7fc496c";
- };
-
- meta = {
- description = ''Mix tasks to simplify use of Dialyzer in Elixir
- projects.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/jeremyjh/dialyxir";
- };
- } // packageOverrides)
- ) {};
-
- dialyxir = dialyxir_0_3_3;
-
- dialyze_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dialyze";
- version = "0.2.1";
- src = fetchHex {
- pkg = "dialyze";
- version = "0.2.1";
- sha256 =
- "f485181fa53229356621261a384963cb47511cccf1454e82ca4fde53274fcd48";
- };
-
- meta = {
- description = ''Dialyzer Mix task'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/fishcakez/dialyze";
- };
- } // packageOverrides)
- ) {};
-
- dialyze = dialyze_0_2_1;
-
- dice_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dice";
- version = "0.0.1";
- src = fetchHex {
- pkg = "dice";
- version = "0.0.1";
- sha256 =
- "975795636d6374bf120669cdbd6008a64bdd193a2ff202ffbdeefaa03d11bb9c";
- };
-
- meta = {
- description = ''Library and CLI app for rolling dice '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/stocks29/dice";
- };
- } // packageOverrides)
- ) {};
-
- dice = dice_0_0_1;
-
- dice_roller_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dice_roller";
- version = "1.1.0";
- src = fetchHex {
- pkg = "dice_roller";
- version = "1.1.0";
- sha256 =
- "90e3485951605338f23686dcc001599354cb6eff7df851b1a1f6514b1c7fbd5c";
- };
-
- meta = {
- description = ''An Elixir library for simulating dice rolls'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KevinGreene/DiceRoller";
- };
- } // packageOverrides)
- ) {};
-
- dice_roller = dice_roller_1_1_0;
-
- dicon_0_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dicon";
- version = "0.4.0";
- src = fetchHex {
- pkg = "dicon";
- version = "0.4.0";
- sha256 =
- "d6a5c56e376b13dcfd721bc2571fbabcb41409ac5f2b8fa243a0f14393e6b145";
- };
-
- meta = {
- description = ''Simple release deliverer for Elixir'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/lexmag/dicon";
- };
- } // packageOverrides)
- ) {};
-
- dicon = dicon_0_4_0;
-
- diff_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "diff";
- version = "1.0.0";
- src = fetchHex {
- pkg = "diff";
- version = "1.0.0";
- sha256 =
- "0dbd7abbf558031ccb8d703c751a20349326191026b07b53f4a3c603817728fb";
- };
-
- meta = {
- description = ''A simple diff library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bryanjos/diff";
- };
- } // packageOverrides)
- ) {};
-
- diff = diff_1_0_0;
-
- digoc_0_3_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_3_1,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "digoc";
- version = "0.3.3";
- src = fetchHex {
- pkg = "digoc";
- version = "0.3.3";
- sha256 =
- "23d5c2f1b977b1f3e12567879a20bc211898efdfcac9a0b6802324bc42ea0605";
- };
- beamDeps = [ poison_1_3_1 httpoison_0_8_3 ];
-
- meta = {
- description = ''An Elixir client for the Digital Ocean API v2.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kevinmontuori/digoc";
- };
- } // packageOverrides)
- ) {};
-
- digoc = digoc_0_3_3;
-
- dir_walker_0_0_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dir_walker";
- version = "0.0.6";
- src = fetchHex {
- pkg = "dir_walker";
- version = "0.0.6";
- sha256 =
- "5bf891b970cca8df7d6e7d94857c508d2f5b48c615903427edbcbc483358fc92";
- };
-
- meta = {
- longDescription = ''DirWalker lazily traverses one or more
- directory trees, depth first, returning
- successive file names. Initialize the walker
- using {:ok, walker} = DirWalker.start_link(path)
- # or [path, path...] Then return the next `n`
- path names using paths = DirWalker.next(walker
- <, n \\ 1>) Successive calls to `next` will
- return successive file names, until all file
- names have been returned. These methods have
- also been wrapped into a Stream resource. paths
- = DirWalker.stream(path) # or [path,path...] '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/pragdave/dir_walker";
- };
- } // packageOverrides)
- ) {};
-
- dir_walker = dir_walker_0_0_6;
-
- disc_union_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "disc_union";
- version = "0.1.0";
- src = fetchHex {
- pkg = "disc_union";
- version = "0.1.0";
- sha256 =
- "017f5532d1b444f3e0950771a80ed34b82aa405ca650174529706b8587ea23da";
- };
-
- meta = {
- description = ''Discriminated unions for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/X4lldux/disc_union";
- };
- } // packageOverrides)
- ) {};
-
- disc_union = disc_union_0_1_0;
-
- discourse_as_sso_erlang_0_7_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, cowlib_1_3_0 }:
- buildRebar3 ({
- name = "discourse_as_sso_erlang";
- version = "0.7.0";
- src = fetchHex {
- pkg = "discourse_as_sso_erlang";
- version = "0.7.0";
- sha256 =
- "be569178e6b0cb49d3fc48457b5233f9e82dc447bd452e5708a071412c24bc2d";
- };
-
- beamDeps = [ cowlib_1_3_0 ];
-
- meta = {
- longDescription = ''Low-level erlang library to encode/decode
- payloads for using the forum software Discourse
- as an SSO endpoint.'';
- license = stdenv.lib.licenses.apsl20;
- homepage =
- "https://github.com/reverendpaco/discourse-as-sso-erlang";
- };
- } // packageOverrides)
- ) {};
-
- discourse_as_sso_erlang = discourse_as_sso_erlang_0_7_0;
-
- dismake_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dismake";
- version = "1.0.0";
- src = fetchHex {
- pkg = "dismake";
- version = "1.0.0";
- sha256 =
- "7eeff4a362ed4b4250e4090caa6861ee7b27a524919f574b9f836067b63ac058";
- };
-
- meta = {
- description = ''Dismake is a \"compiler\" (as in Mix.compilers)
- that just runs make. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jarednorman/dismake";
- };
- } // packageOverrides)
- ) {};
-
- dismake = dismake_1_0_0;
-
- distance_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "distance";
- version = "0.2.1";
- src = fetchHex {
- pkg = "distance";
- version = "0.2.1";
- sha256 =
- "847cf16e80c6905adc7f359b845358bbfbeb3383459f2bc1e9b310cfa1e917ec";
- };
-
- meta = {
- description = ''Various distance functions for geometric or
- geographic calculations'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pkinney/distance";
- };
- } // packageOverrides)
- ) {};
-
- distance = distance_0_2_1;
-
- distancex_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
- buildMix ({
- name = "distancex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "distancex";
- version = "0.1.0";
- sha256 =
- "62d78de83026d809dc93c1ea92452cffc6e905f157e9dfa25cbc51b44e54d6f4";
- };
- beamDeps = [ poison_1_5_2 ];
-
- meta = {
- longDescription = ''Elixir-wrapper for Google Directions API. Can
- return the drive time and driving distance
- between two places.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/vysakh0/distancex";
- };
- } // packageOverrides)
- ) {};
-
- distancex = distancex_0_1_0;
-
- diver_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "diver";
- version = "0.1.1";
- src = fetchHex {
- pkg = "diver";
- version = "0.1.1";
- sha256 =
- "6860e05da87741be919e0b4264178e0ca1b50a108bcaeb1a2a51c9e1726d3079";
- };
-
- meta = {
- longDescription = ''A HBase driver for Erlang/Elixir using
- jinterface and the Asynchbase Java client to
- query the database. '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/novabyte/diver";
- };
- } // packageOverrides)
- ) {};
-
- diver = diver_0_1_1;
-
- dlist_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dlist";
- version = "0.0.1";
- src = fetchHex {
- pkg = "dlist";
- version = "0.0.1";
- sha256 =
- "51c9d4a9e02c9a8892450876939d1e18b7f9ae78b237a683f0efad47d46e5f9a";
- };
-
- meta = {
- description = ''Deque implementations '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/stocks29/dlist.git";
- };
- } // packageOverrides)
- ) {};
-
- dlist = dlist_0_0_1;
-
- dnsimple_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "dnsimple";
- version = "0.1.0";
- src = fetchHex {
- pkg = "dnsimple";
- version = "0.1.0";
- sha256 =
- "f10326124aeabcfdcb388100d480413314609cbabfa5de31d0c486150ab28ebc";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''An (experimental) Elixir client for the DNSimple
- API v2.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/aetrion/dnsimple-elixir";
- };
- } // packageOverrides)
- ) {};
-
- dnsimple = dnsimple_0_1_0;
-
- doc_first_formatter_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "doc_first_formatter";
- version = "0.0.2";
- src = fetchHex {
- pkg = "doc_first_formatter";
- version = "0.0.2";
- sha256 =
- "88500d55349571173f88d0f691e1ac7908b9663bfc06f9f0862e60ea8378313c";
- };
-
- meta = {
- longDescription = ''An ExUnit formatter that puts a list of tests
- first, distinguishes pending from failed tests,
- and saves detailed error information for once
- the test suite is finished.'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/bkerley/doc_first_formatter";
- };
- } // packageOverrides)
- ) {};
-
- doc_first_formatter = doc_first_formatter_0_0_2;
-
- doc_plug_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "doc_plug";
- version = "1.0.2";
- src = fetchHex {
- pkg = "doc_plug";
- version = "1.0.2";
- sha256 =
- "2813f85dcd4f7228d54c277898d3d7483d03ef27ed4f9abc9eae6f57b00e79b8";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''Plug to automatically generate and serve project
- documentation.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hild/doc_plug";
- };
- } // packageOverrides)
- ) {};
-
- doc_plug = doc_plug_1_0_2;
-
- dogma_0_1_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "dogma";
- version = "0.1.6";
- src = fetchHex {
- pkg = "dogma";
- version = "0.1.6";
- sha256 =
- "cd50b91d8b9ef53ee688d1e437bf4b186ec6bc6e922de7dbf7a7df7aea6dde45";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- description = ''A code style linter for Elixir, powered by
- shame.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lpil/dogma";
- };
- } // packageOverrides)
- ) {};
-
- dogma = dogma_0_1_6;
-
- dogstatsd_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dogstatsd";
- version = "0.0.3";
- src = fetchHex {
- pkg = "dogstatsd";
- version = "0.0.3";
- sha256 =
- "4632886c61e928f57359790ad345d3cc58c37b0f82fb7d35d485a8e2385cf887";
- };
-
- meta = {
- description = ''A client for DogStatsd, an extension of the
- StatsD metric server for Datadog.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/adamkittelson/dogstatsd-elixir";
- };
- } // packageOverrides)
- ) {};
-
- dogstatsd = dogstatsd_0_0_3;
-
- dogstatsde_0_6_0 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- worker_pool_1_0_4,
- stillir_1_0_0
- }:
- buildRebar3 ({
- name = "dogstatsde";
- version = "0.6.0";
- src = fetchHex {
- pkg = "dogstatsde";
- version = "0.6.0";
- sha256 =
- "7d24f8a5573fcbdc3f072ff93685e5277900236df4a7d49d73d8579cf566eb45";
- };
-
- beamDeps = [ worker_pool_1_0_4 stillir_1_0_0 ];
-
- meta = {
- description = ''Send StatsD metrics to Datadog'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/WhoopInc/dogstatsde";
- };
- } // packageOverrides)
- ) {};
-
- dogstatsde = dogstatsde_0_6_0;
-
- domainr_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "domainr";
- version = "0.0.1";
- src = fetchHex {
- pkg = "domainr";
- version = "0.0.1";
- sha256 =
- "f66ccfe9fdc6b388ce7633974313826f9acffe96b4b369bb904d519e4aa26039";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''Domainr is an [Domainr wrapper
- for](https://domainr.build) in Elixir that makes
- it easy to search and find available domains and
- TLDs.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/e-fu/domainr";
- };
- } // packageOverrides)
- ) {};
-
- domainr = domainr_0_0_1;
-
- doorman_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- comeonin_2_4_0
- }:
- buildMix ({
- name = "doorman";
- version = "0.0.3";
- src = fetchHex {
- pkg = "doorman";
- version = "0.0.3";
- sha256 =
- "07c9e7569ec6a8bf26702b6d6a201840b4e11213c5dc42aaecd23d2e169b8c85";
- };
- beamDeps = [ plug_1_1_5 comeonin_2_4_0 ];
-
- meta = {
- description = ''Tools to make Elixir authentication simple and
- flexible'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/BlakeWilliams/doorman";
- };
- } // packageOverrides)
- ) {};
-
- doorman = doorman_0_0_3;
-
- dot_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dot";
- version = "0.0.3";
- src = fetchHex {
- pkg = "dot";
- version = "0.0.3";
- sha256 =
- "3411bf1f70bb8ea0caa64515054a4a161b711667a5cdb0e7c14e766ce04b06ae";
- };
- meta = { };
- } // packageOverrides)
- ) {};
-
- dot = dot_0_0_3;
-
- dot_notes_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dot_notes";
- version = "1.0.0";
- src = fetchHex {
- pkg = "dot_notes";
- version = "1.0.0";
- sha256 =
- "0689a006ca36716eadac9f8f83699aff6d56520a15403610d08e2f397fd60996";
- };
-
- meta = {
- description = ''Simple dot/bracket notation parsing/conversion
- for Maps/Lists'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zackehh/dot-notes-elixir";
- };
- } // packageOverrides)
- ) {};
-
- dot_notes = dot_notes_1_0_0;
-
- dotenv_2_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dotenv";
- version = "2.1.0";
- src = fetchHex {
- pkg = "dotenv";
- version = "2.1.0";
- sha256 =
- "caddac72cac4955ae346306b210608dd6cf380a439b4e18bcdc3d6021f3e4d6b";
- };
-
- meta = {
- description = ''A port of dotenv to Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/avdi/dotenv_elixir";
- };
- } // packageOverrides)
- ) {};
-
- dotenv = dotenv_2_1_0;
-
- dovetail_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dovetail";
- version = "0.0.3";
- src = fetchHex {
- pkg = "dovetail";
- version = "0.0.3";
- sha256 =
- "01b6c3085ebb9cb7d43115c7a2d9780a840017e521daeb7d0a2233f61f8b0306";
- };
-
- meta = {
- description = ''Dovetail provides a harness for running test
- dovecot servers.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/thusfresh/dovetail";
- };
- } // packageOverrides)
- ) {};
-
- dovetail = dovetail_0_0_3;
-
- dp_decoder_0_2_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "dp_decoder";
- version = "0.2.1";
- src = fetchHex {
- pkg = "dp_decoder";
- version = "0.2.1";
- sha256 =
- "66449f7691e4f4c8041d82d910c2c86b8ec1bdc6dd2b008d9b9169fda86b22e0";
- };
-
- meta = {
- description = ''Collection of decoders for different metric
- protocols'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/dalmatinerdb/dp_decoder";
- };
- } // packageOverrides)
- ) {};
-
- dp_decoder = dp_decoder_0_2_1;
-
- dqe_idx_0_1_18 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "dqe_idx";
- version = "0.1.18";
- src = fetchHex {
- pkg = "dqe_idx";
- version = "0.1.18";
- sha256 =
- "6af4897e3e5fdff5055179dd765778450cdf8a43c61b5e2a2aeec483c4309c6c";
- };
-
- meta = {
- description = ''Dalmatiner QE indexing'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- dqe_idx = dqe_idx_0_1_18;
-
- druuid_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "druuid";
- version = "0.3.0";
- src = fetchHex {
- pkg = "druuid";
- version = "0.3.0";
- sha256 =
- "238dfa36cbb4f1277e44cd9ed5900ff3045c4c19724412bb94173ed2659d0ec8";
- };
-
- meta = {
- longDescription = ''Date-relative (and relatively universally
- unique) UUID generation. Based on
- https://github.com/recurly/druuid'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bhelx/druuid";
- };
- } // packageOverrides)
- ) {};
-
- druuid = druuid_0_3_0;
-
- dublin_bus_api_0_1_8 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- floki_0_8_1
- }:
- buildMix ({
- name = "dublin_bus_api";
- version = "0.1.8";
- src = fetchHex {
- pkg = "dublin_bus_api";
- version = "0.1.8";
- sha256 =
- "b373da947594dfc4b3a2ef11e77f7e3a1ce7875d6aab90fc39a4f285b1e77e63";
- };
- beamDeps = [ httpoison_0_8_3 floki_0_8_1 ];
-
- meta = {
- description = ''Access to the Real Time Passenger Information
- (RTPI) for Dublin Bus services.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/carlo-colombo/dublin-bus-api";
- };
- } // packageOverrides)
- ) {};
-
- dublin_bus_api = dublin_bus_api_0_1_8;
-
- duckduckgo_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "duckduckgo";
- version = "0.1.0";
- src = fetchHex {
- pkg = "duckduckgo";
- version = "0.1.0";
- sha256 =
- "349fd4b837634507a8e11280c244b064d1eb4e0d3333994f79e5341eec522c2f";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''An Elixir client for the DuckDuckGo Instant
- Answer API.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/pjhampton/DuckDuckElixir";
- };
- } // packageOverrides)
- ) {};
-
- duckduckgo = duckduckgo_0_1_0;
-
- durga_transport_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "durga_transport";
- version = "1.0.1";
- src = fetchHex {
- pkg = "durga_transport";
- version = "1.0.1";
- sha256 =
- "42db857eba0e78c4eb15823b5137e8ccad13711cc2c873b6f1b469c4c0771009";
- };
- meta = { };
- } // packageOverrides)
- ) {};
-
- durga_transport = durga_transport_1_0_1;
-
- dye_0_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "dye";
- version = "0.4.0";
- src = fetchHex {
- pkg = "dye";
- version = "0.4.0";
- sha256 =
- "95c11e5baafc79531f37bee1256066a8fef63739707723ac1e349739a3217003";
- };
-
- meta = {
- description = ''Dyeing your terminal!'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Kabie/dye";
- };
- } // packageOverrides)
- ) {};
-
- dye = dye_0_4_0;
-
- dynamic_compile_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "dynamic_compile";
- version = "1.0.0";
- src = fetchHex {
- pkg = "dynamic_compile";
- version = "1.0.0";
- sha256 =
- "eb73d8e9a6334914f79c15ee8214acad9659c42222d49beda3e8b6f6789a980a";
- };
-
- meta = {
- description = ''compile and load erlang modules from string
- input'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/okeuday/dynamic_compile";
- };
- } // packageOverrides)
- ) {};
-
- dynamic_compile = dynamic_compile_1_0_0;
-
- e2qc_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "e2qc";
- version = "0.1.0";
- src = fetchHex {
- pkg = "e2qc";
- version = "0.1.0";
- sha256 =
- "3a97f9b3c60ec723002a816c041ac224dc5aba3360bd922c5e38cfd40f59c65b";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''2q cache'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/project-fifo/e2qc";
- };
- } // packageOverrides)
- ) {};
-
- e2qc = e2qc_0_1_0;
-
- e_queue_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "e_queue";
- version = "1.0.1";
- src = fetchHex {
- pkg = "e_queue";
- version = "1.0.1";
- sha256 =
- "aff37843191c1229ec49d0d067b18d5e0871a28fe049a4a82c7884e66320b7e8";
- };
-
- meta = {
- longDescription = ''An Elixir wrapper around the Erlang optimized
- `queue` that supports the FIFO, first-in
- first-out, pattern. This is useful is when you
- can`t predict when an item needs to be taken or
- added to the queue. Use this instead of using
- `++` or double reversing lists to add items to
- the \"back\" of a queue.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/benfalk/e_queue";
- };
- } // packageOverrides)
- ) {};
-
- e_queue = e_queue_1_0_1;
-
- e_quip_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "e_quip";
- version = "0.0.1";
- src = fetchHex {
- pkg = "e_quip";
- version = "0.0.1";
- sha256 =
- "e6fe9eeb96dbc863b527a792e730ea41aea43caef2a5db68ea2c4c9fc21f552a";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Simple Quip API Client'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/mmartinson/e_quip";
- };
- } // packageOverrides)
- ) {};
-
- e_quip = e_quip_0_0_1;
-
- earmark_0_1_19 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "earmark";
- version = "0.1.19";
- src = fetchHex {
- pkg = "earmark";
- version = "0.1.19";
- sha256 =
- "db85f989ba3030d40d3a901d7eebbf926ee07355bf6113d730b8aaf9404a6bd7";
- };
-
- meta = {
- longDescription = ''Earmark is a pure-Elixir Markdown converter.
- It is intended to be used as a library (just
- call Earmark.to_html), but can also be used as a
- command-line tool (just run mix escript.build
- first). Output generation is pluggable.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/pragdave/earmark";
- };
- } // packageOverrides)
- ) {};
-
- earmark_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "earmark";
- version = "0.2.1";
- src = fetchHex {
- pkg = "earmark";
- version = "0.2.1";
- sha256 =
- "c86afb8d22a5aa8315afd4257c7512011c0c9a48b0fea43af7612836b958098b";
- };
-
- meta = {
- longDescription = ''Earmark is a pure-Elixir Markdown converter.
- It is intended to be used as a library (just
- call Earmark.to_html), but can also be used as a
- command-line tool (just run mix escript.build
- first). Output generation is pluggable.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/pragdave/earmark";
- };
- } // packageOverrides)
- ) {};
-
- earmark = earmark_0_2_1;
-
- eastar_0_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "eastar";
- version = "0.4.0";
- src = fetchHex {
- pkg = "eastar";
- version = "0.4.0";
- sha256 =
- "21a74b1ac6da2a24eb5e6e14e5537389dd671fa2fc94a4594e0e7ddcf4b4c87a";
- };
-
- meta = {
- longDescription = ''Eastar is a pure-Elixir implementation of A*
- graph pathfinding algorithm. All graph
- environment, like nodes connectivity, distance &
- H-metric are abstracted away - you provide them
- as functions.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/herenowcoder/eastar";
- };
- } // packageOverrides)
- ) {};
-
- eastar = eastar_0_4_0;
-
- easy_server_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "easy_server";
- version = "0.0.1";
- src = fetchHex {
- pkg = "easy_server";
- version = "0.0.1";
- sha256 =
- "af9faac0c7c440cf04bbb5d1f8aea1fc00b0c60da384c8103fafdaf0df00a0bb";
- };
-
- meta = {
- description = ''Easier GenServer for Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/termoose/EasyServer";
- };
- } // packageOverrides)
- ) {};
-
- easy_server = easy_server_0_0_1;
-
- easypost_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
- buildMix ({
- name = "easypost";
- version = "0.0.1";
- src = fetchHex {
- pkg = "easypost";
- version = "0.0.1";
- sha256 =
- "8339fcfb60a1d4833b99aa611d194bf1ae94f22509dc81cf90d07ee2db0e074e";
- };
- beamDeps = [ poison_1_5_2 ];
-
- meta = {
- description = ''Elixir Easypost Client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Dania02525/easypost";
- };
- } // packageOverrides)
- ) {};
-
- easypost = easypost_0_0_1;
-
- ec2_0_9_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, jsx_2_8_0 }:
- buildMix ({
- name = "ec2";
- version = "0.9.1";
- src = fetchHex {
- pkg = "ec2";
- version = "0.9.1";
- sha256 =
- "ae857fe633bca078fd1ee54232dd3bc74566ff46b93aa53e38d74c546c3d9b6f";
- };
- beamDeps = [ jsx_2_8_0 ];
-
- meta = {
- description = ''helper library for working with aws ec2
- metadata'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/talentdeficit/ec2";
- };
- } // packageOverrides)
- ) {};
-
- ec2 = ec2_0_9_1;
-
- echo_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "echo";
- version = "0.2.0";
- src = fetchHex {
- pkg = "echo";
- version = "0.2.0";
- sha256 =
- "e03b37ada0457fbf3e91b2e721c9367b1590a17a5fb9be35672a46206309f1a4";
- };
-
- meta = {
- longDescription = ''A simple & highly extendable,
- meta-notification system; Echo checks
- notification preferences & dispatch
- notifications to different adapters (ex. email,
- logger, analytics, sms, etc.)'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/zmoshansky/echo";
- };
- } // packageOverrides)
- ) {};
-
- echo = echo_0_2_0;
-
- echo_bot_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- telegram_0_0_3,
- poison_2_1_0,
- gproc_0_5_0
- }:
- buildMix ({
- name = "echo_bot";
- version = "0.0.2";
- src = fetchHex {
- pkg = "echo_bot";
- version = "0.0.2";
- sha256 =
- "f353984ab5ea36b423b2a18d788d5eeeb6ae45aca254129b99c5bbab9865b38c";
- };
- beamDeps = [ telegram_0_0_3 poison_2_1_0 gproc_0_5_0 ];
-
- meta = {
- description = ''A demo telegram bot'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/col/echo_bot";
- };
- } // packageOverrides)
- ) {};
-
- echo_bot = echo_bot_0_0_2;
-
- echonest_ex_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "echonest_ex";
- version = "0.0.2";
- src = fetchHex {
- pkg = "echonest_ex";
- version = "0.0.2";
- sha256 =
- "d8b3d7f2b04eb48b689877aaf9db30f33acea3ea02daca5aad8d105ac785bd98";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Echonest api wrapper for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/desmondhume/echonest_ex";
- };
- } // packageOverrides)
- ) {};
-
- echonest_ex = echonest_ex_0_0_2;
-
- econfig_0_7_3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "econfig";
- version = "0.7.3";
- src = fetchHex {
- pkg = "econfig";
- version = "0.7.3";
- sha256 =
- "bddff19a757209d3e98b6952897fbf8790f6cf33d9e5caf2501263ea4ad46e3c";
- };
-
- meta = {
- description = ''simple Erlang config handler using INI files'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/benoitc/econfig";
- };
- } // packageOverrides)
- ) {};
-
- econfig = econfig_0_7_3;
-
- ecs_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ecs";
- version = "0.3.0";
- src = fetchHex {
- pkg = "ecs";
- version = "0.3.0";
- sha256 =
- "266fe69adcb3772352bc47b1312e00e8ec0a15a03c412be1b63b147a916f6156";
- };
-
- meta = {
- description = ''An experimental Entity-Component System (ECS)
- game engine.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/joshforisha/ecs";
- };
- } // packageOverrides)
- ) {};
-
- ecs = ecs_0_3_0;
-
- ecto_audit_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ecto_audit";
- version = "0.0.1";
- src = fetchHex {
- pkg = "ecto_audit";
- version = "0.0.1";
- sha256 =
- "04829a9670d4258b96c6218043093b68a1d3b03c37ee316a1c19366a59dbbd59";
- };
-
- meta = {
- description = ''Ecto extension to support auditing data changes
- in your Schema.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mattweldon/ecto_audit";
- };
- } // packageOverrides)
- ) {};
-
- ecto_audit = ecto_audit_0_0_1;
-
- ed25519_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ed25519";
- version = "0.2.0";
- src = fetchHex {
- pkg = "ed25519";
- version = "0.2.0";
- sha256 =
- "ddd159c41eea85a2fc198a0a8ed06d69ef42b4657f7122610d5e0a5653d2ef03";
- };
-
- meta = {
- description = ''Ed25519 signature functions'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/ed25519_ex";
- };
- } // packageOverrides)
- ) {};
-
- ed25519 = ed25519_0_2_0;
-
- edib_0_7_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "edib";
- version = "0.7.0";
- src = fetchHex {
- pkg = "edib";
- version = "0.7.0";
- sha256 =
- "4ff16e9397a14d13a0a4bcef30634393999c24ed17e6f90817f5f115e09db5a2";
- };
-
- meta = {
- longDescription = ''Mix task to create a docker image of your
- application release. More detailed information
- about release image building at:
- https://github.com/edib-tool/elixir-docker-image-builder'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/edib-tool/mix-edib";
- };
- } // packageOverrides)
- ) {};
-
- edib = edib_0_7_0;
-
- edip_0_4_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "edip";
- version = "0.4.3";
- src = fetchHex {
- pkg = "edip";
- version = "0.4.3";
- sha256 =
- "b0b9f34b2048b3f03c1f25b6dc60a1567b6f3ec8c6ad945de30dc313d7608800";
- };
-
- meta = {
- longDescription = ''Mix task to create a docker image of your
- application release. More detailed information
- about release image packaging at:
- https://github.com/asaaki/elixir-docker-image-packager'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/asaaki/mix-edip";
- };
- } // packageOverrides)
- ) {};
-
- edip = edip_0_4_3;
-
- edown_0_7_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "edown";
- version = "0.7.0";
- src = fetchHex {
- pkg = "edown";
- version = "0.7.0";
- sha256 =
- "6d7365a7854cd724e8d1fd005f5faa4444eae6a87eb6df9b789b6e7f6f09110a";
- };
-
- meta = {
- description = ''Markdown generated from Edoc.'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/uwiger/edown";
- };
- } // packageOverrides)
- ) {};
-
- edown = edown_0_7_0;
-
- eeb_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- tzdata_0_1_201603,
- timex_1_0_2,
- plug_0_14_0,
- earmark_0_1_19,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "eeb";
- version = "0.2.0";
- src = fetchHex {
- pkg = "eeb";
- version = "0.2.0";
- sha256 =
- "0615ccea012507ae35f6f1f4f8a46eac6d9eceba0cdface2df5c0d70b7caddbc";
- };
- beamDeps = [
- tzdata_0_1_201603
- timex_1_0_2
- plug_0_14_0
- earmark_0_1_19
- cowboy_1_0_4
- ];
-
- meta = {
- description = ''Elixir extendable blog.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/aborn/eeb";
- };
- } // packageOverrides)
- ) {};
-
- eeb = eeb_0_2_0;
-
- efirebirdsql_0_1_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "efirebirdsql";
- version = "0.1.1";
- src = fetchHex {
- pkg = "efirebirdsql";
- version = "0.1.1";
- sha256 =
- "dff29bcd6f5f99baa18dd339c01f441b498030e88ac4a1d7c4524da79b0a4cb7";
- };
-
- meta = {
- description = ''Firebird Client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nakagami/efirebirdsql";
- };
- } // packageOverrides)
- ) {};
-
- efirebirdsql = efirebirdsql_0_1_1;
-
- egaugex_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- floki_0_8_1
- }:
- buildMix ({
- name = "egaugex";
- version = "0.0.2";
- src = fetchHex {
- pkg = "egaugex";
- version = "0.0.2";
- sha256 =
- "307c0a21c196db45431e5472ad090548f956ccb0e02f97491fba07a2a52d0c51";
- };
- beamDeps = [ httpoison_0_8_3 floki_0_8_1 ];
-
- meta = {
- description = ''A simple egauge parser to retrieve and parse data
- from egauge devices'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Brightergy/egaugex";
- };
- } // packageOverrides)
- ) {};
-
- egaugex = egaugex_0_0_2;
-
- eh_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "eh";
- version = "0.2.0";
- src = fetchHex {
- pkg = "eh";
- version = "0.2.0";
- sha256 =
- "91013c78138c8854c5699ef42324e66286fed0048c4d4212c4dc3012d764c628";
- };
-
- meta = {
- description = ''Lookup Elixir documentation from the command line
- '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/Frost/eh.git";
- };
- } // packageOverrides)
- ) {};
-
- eh = eh_0_2_0;
-
- eight_ball_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "eight_ball";
- version = "0.0.1";
- src = fetchHex {
- pkg = "eight_ball";
- version = "0.0.1";
- sha256 =
- "1ba1b2b5f3dfaba751b51f101c3c526a09f0c989768f265e82a6a065447a6aa4";
- };
-
- meta = {
- description = ''Library that acts like a real life Magic 8
- Ball.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/fteem/eight_ball";
- };
- } // packageOverrides)
- ) {};
-
- eight_ball = eight_ball_0_0_1;
-
- eight_ball_dj_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "eight_ball_dj";
- version = "0.0.2";
- src = fetchHex {
- pkg = "eight_ball_dj";
- version = "0.0.2";
- sha256 =
- "5b0d4f92a76f3d48d5541936ae8540154ed2a14ccda1a45e250d6a577bb541f5";
- };
-
- meta = {
- description = ''Ask a question to the Magic Eight Ball'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/djkianoosh/eight_ball";
- };
- } // packageOverrides)
- ) {};
-
- eight_ball_dj = eight_ball_dj_0_0_2;
-
- eikon_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "eikon";
- version = "0.0.2";
- src = fetchHex {
- pkg = "eikon";
- version = "0.0.2";
- sha256 =
- "fc624850b69504dd3f05e65ce40b4480aef70b605045f3d79d218c39c443a205";
- };
-
- meta = {
- description = ''Eikōn is an Elixir library providing a read-only
- interface for image files.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tchoutri/eikon";
- };
- } // packageOverrides)
- ) {};
-
- eikon = eikon_0_0_2;
-
- eio_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "eio";
- version = "0.1.0";
- src = fetchHex {
- pkg = "eio";
- version = "0.1.0";
- sha256 =
- "f39f017c73713b36ee27d8a0635634ac2e96b4d540f28db9dd358d8744dccd88";
- };
- beamDeps = [ poison_1_5_2 plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''Engine.io server for Elixir.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/falood/eio";
- };
- } // packageOverrides)
- ) {};
-
- eio = eio_0_1_0;
-
- ejabberd_dev_15_9_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ejabberd_dev";
- version = "15.9.0";
- src = fetchHex {
- pkg = "ejabberd_dev";
- version = "15.9.0";
- sha256 =
- "4c4ca5b3ee1900bd7e5babed76cae361b6350ed5793ce013cbfccc06208c291e";
- };
-
- meta = {
- longDescription = ''A package to help with building ejabberd
- modules. This package includes source and header
- files from the ejabberd project that are
- necessary in order to build a gen_mod module.'';
- license = stdenv.lib.licenses.gpl3;
- homepage = "https://github.com/scrogson/ejabberd_dev";
- };
- } // packageOverrides)
- ) {};
-
- ejabberd_dev = ejabberd_dev_15_9_0;
-
- ejwt_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, jsx_2_8_0 }:
- buildRebar3 ({
- name = "ejwt";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ejwt";
- version = "0.1.0";
- sha256 =
- "c316a4b7fd21b07b401a3a01db9039b7006f5a1c7e96a981b6cbcb36da1a4a84";
- };
-
- beamDeps = [ jsx_2_8_0 ];
-
- meta = {
- description = ''Encode/decode JSON Web Token'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/artefactop/ejwt";
- };
- } // packageOverrides)
- ) {};
-
- ejwt = ejwt_0_1_0;
-
- elastex_0_1_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "elastex";
- version = "0.1.2";
- src = fetchHex {
- pkg = "elastex";
- version = "0.1.2";
- sha256 =
- "eaab5305db3d5d326e471dc1799606b7055971dfb7d9a27571850d2ce7e97f9b";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Data driven elixir client for Elasticsearch.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/michaeldoaty/elastex";
- };
- } // packageOverrides)
- ) {};
-
- elastex = elastex_0_1_2;
-
- elaxtic_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "elaxtic";
- version = "0.0.1";
- src = fetchHex {
- pkg = "elaxtic";
- version = "0.0.1";
- sha256 =
- "a912a0327bfe1c6443cec47a03d11450fed2e649bfdcd4e77bdb9176baa8cd45";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- description = ''ElasticSearch client for Elixir and Ecto
- driver.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/vic/elaxtic";
- };
- } // packageOverrides)
- ) {};
-
- elaxtic = elaxtic_0_0_1;
-
- elixir_ami_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "elixir_ami";
- version = "0.0.3";
- src = fetchHex {
- pkg = "elixir_ami";
- version = "0.0.3";
- sha256 =
- "781171af1bcc20466117fb119646b55ad473c93ce57549ffec4c65f7ba8a1ede";
- };
-
- meta = {
- longDescription = ''Elixir client for the Asterisk AMI protocol.
- Find the user guide in the github repo at:
- https://github.com/marcelog/elixir_ami.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/marcelog/elixir_ami";
- };
- } // packageOverrides)
- ) {};
-
- elixir_ami = elixir_ami_0_0_3;
-
- elixir_authorizenet_0_2_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- xml_builder_0_0_8,
- exmerl_0_1_1
- }:
- buildMix ({
- name = "elixir_authorizenet";
- version = "0.2.2";
- src = fetchHex {
- pkg = "elixir_authorizenet";
- version = "0.2.2";
- sha256 =
- "10111f4fe073d69a5ae817838377ba52bf6b04199c8386f48ca13804db6e2f70";
- };
- beamDeps = [ xml_builder_0_0_8 exmerl_0_1_1 ];
-
- meta = {
- longDescription = ''Elixir client for the Authorize.Net merchant
- API. This should help you integrate using the
- AIM. A nice number of features are implemented
- (probably most of the ones used on a daily basis
- are already there), but since the API offers a
- big number of features and combinations, I still
- consider this as WIP, and pull requests,
- suggestions, or other kind of feedback are very
- welcome! Find the user guide in the github repo
- at:
- https://github.com/marcelog/elixir_authorizenet.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/marcelog/elixir_authorizenet";
- };
- } // packageOverrides)
- ) {};
-
- elixir_authorizenet = elixir_authorizenet_0_2_2;
-
- elixir_bencode_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "elixir_bencode";
- version = "1.0.0";
- src = fetchHex {
- pkg = "elixir_bencode";
- version = "1.0.0";
- sha256 =
- "2c4c86843b2377182da7cff125784a227c7bc63ef9e92ce7257f14b132667ebe";
- };
-
- meta = {
- description = ''Bencode encoder / decoder in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/AntonFagerberg/elixir_bencode";
- };
- } // packageOverrides)
- ) {};
-
- elixir_bencode = elixir_bencode_1_0_0;
-
- elixir_exif_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "elixir_exif";
- version = "0.1.1";
- src = fetchHex {
- pkg = "elixir_exif";
- version = "0.1.1";
- sha256 =
- "a491a3e134c00f2a1f59c8e3a1bd62b9b94c1ce4179a20d737903f3edcc9bd78";
- };
-
- meta = {
- description = ''Parse exif and thumbnail data from jpeg/tiff
- images.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sschneider1207/ElixirExif";
- };
- } // packageOverrides)
- ) {};
-
- elixir_exif = elixir_exif_0_1_1;
-
- elixir_feed_parser_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_2_1_6 }:
- buildMix ({
- name = "elixir_feed_parser";
- version = "1.1.0";
- src = fetchHex {
- pkg = "elixir_feed_parser";
- version = "1.1.0";
- sha256 =
- "d623eaf020971979601ff135b56776d1b4a73da7eb75d7ae757a8ea18fd41ca0";
- };
- beamDeps = [ timex_2_1_6 ];
-
- meta = {
- description = ''An Elixir Atom/RSS2 feed parser.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/fdietz/elixir-feed-parser";
- };
- } // packageOverrides)
- ) {};
-
- elixir_feed_parser = elixir_feed_parser_1_1_0;
-
- elixir_freshbooks_0_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- xml_builder_0_0_8,
- exmerl_0_1_1
- }:
- buildMix ({
- name = "elixir_freshbooks";
- version = "0.0.4";
- src = fetchHex {
- pkg = "elixir_freshbooks";
- version = "0.0.4";
- sha256 =
- "404ba66129bb1a756f6c06460d483d72d59990bc460616a1e61bd87af4108628";
- };
- beamDeps = [ xml_builder_0_0_8 exmerl_0_1_1 ];
-
- meta = {
- description = ''Elixir client for FreshBooks.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/marcelog/elixir_freshbooks";
- };
- } // packageOverrides)
- ) {};
-
- elixir_freshbooks = elixir_freshbooks_0_0_4;
-
- elixir_gravatar_url_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "elixir_gravatar_url";
- version = "1.0.0";
- src = fetchHex {
- pkg = "elixir_gravatar_url";
- version = "1.0.0";
- sha256 =
- "e298fbfc6c4ebf401cf4e62739d79696eff3ce454f037055523c08f2cf815db1";
- };
-
- meta = {
- description = ''An Elixir module for generating Gravatar urls'';
-
- };
- } // packageOverrides)
- ) {};
-
- elixir_gravatar_url = elixir_gravatar_url_1_0_0;
-
- elixir_make_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "elixir_make";
- version = "0.1.0";
- src = fetchHex {
- pkg = "elixir_make";
- version = "0.1.0";
- sha256 =
- "940d1a8e6f6ed8f8bc5c349371b200416bcb657e3a7d0fc64e7292263bf02de6";
- };
-
- meta = {
- description = ''A Make compiler for Mix'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/elixir-lang/elixir_make";
- };
- } // packageOverrides)
- ) {};
-
- elixir_make = elixir_make_0_1_0;
-
- elixir_mbcs_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "elixir_mbcs";
- version = "0.1.2";
- src = fetchHex {
- pkg = "elixir_mbcs";
- version = "0.1.2";
- sha256 =
- "45d2572ed4c2bae10e961ddf95846ffd64f83ed7427898b8fdf3221607f610b5";
- };
-
- meta = {
- description = ''Convert the character encoding'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/woxtu/elixir-mbcs";
- };
- } // packageOverrides)
- ) {};
-
- elixir_mbcs = elixir_mbcs_0_1_2;
-
- elixir_mod_event_0_0_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_4 }:
- buildMix ({
- name = "elixir_mod_event";
- version = "0.0.5";
- src = fetchHex {
- pkg = "elixir_mod_event";
- version = "0.0.5";
- sha256 =
- "d38fe29a32107e889c52f849ceec6267709591b7db98db14bd3890683ca78b0f";
- };
- beamDeps = [ uuid_1_1_4 ];
-
- meta = {
- longDescription = ''Elixir client for FreeSWITCH
- mod_event_socket. Find the user guide in the
- github repo at:
- https://github.com/marcelog/elixir_mod_event.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/marcelog/elixir_mod_event";
- };
- } // packageOverrides)
- ) {};
-
- elixir_mod_event = elixir_mod_event_0_0_5;
-
- elixir_prelude_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "elixir_prelude";
- version = "0.2.1";
- src = fetchHex {
- pkg = "elixir_prelude";
- version = "0.2.1";
- sha256 =
- "178d8de9762447e8f8271bd6af356a171af9fb7c20fcd4fa510a05e19b24240d";
- };
-
- meta = {
- description = ''Small set of useful utility functions'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ruby2elixir/elixir_prelude";
- };
- } // packageOverrides)
- ) {};
-
- elixir_prelude = elixir_prelude_0_2_1;
-
- elixir_radius_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "elixir_radius";
- version = "0.1.0";
- src = fetchHex {
- pkg = "elixir_radius";
- version = "0.1.0";
- sha256 =
- "40f4c2a792c5967e21d4e7914a91a62fbed3712bf9c6ec5f0a549e659e4ddc94";
- };
-
- meta = {
- description = ''Decode & encode RADIUS packets '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bearice/elixir-radius";
- };
- } // packageOverrides)
- ) {};
-
- elixir_radius = elixir_radius_0_1_0;
-
- elixir_script_0_20_0 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2, estree_2_3_0
- }:
- buildMix ({
- name = "elixir_script";
- version = "0.20.0";
- src = fetchHex {
- pkg = "elixir_script";
- version = "0.20.0";
- sha256 =
- "259c8ff57f171eda4a9ac15fe6307063b76630168fd582f27e3dfb1c621e0533";
- };
- beamDeps = [ fs_0_9_2 estree_2_3_0 ];
-
- meta = {
- description = ''ElixirScript: compiles Elixir code to
- JavaScript'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bryanjos/elixirscript";
- };
- } // packageOverrides)
- ) {};
-
- elixir_script = elixir_script_0_20_0;
-
- elixir_talk_1_1_1 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, yaml_elixir_1_0_0
- }:
- buildMix ({
- name = "elixir_talk";
- version = "1.1.1";
- src = fetchHex {
- pkg = "elixir_talk";
- version = "1.1.1";
- sha256 =
- "29735f954662da43179de5af018e22b54eb44b5680dd526a5a158b3201324b47";
- };
- beamDeps = [ yaml_elixir_1_0_0 ];
-
- meta = {
- description = ''ElixirTalk is an Elixir client for beanstalkd.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jsvisa/elixir_talk";
- };
- } // packageOverrides)
- ) {};
-
- elixir_talk = elixir_talk_1_1_1;
-
- elixir_tea_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "elixir_tea";
- version = "1.0.0";
- src = fetchHex {
- pkg = "elixir_tea";
- version = "1.0.0";
- sha256 =
- "c1e46d2d7b07a926ba8730452f517db45cf4f8f35d119b84aa0f0f676048cdcc";
- };
-
- meta = {
- description = ''A TEA (Tiny Encryption Algorithm) implemented in
- pure Elixir. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/keichan34/elixir_tea";
- };
- } // packageOverrides)
- ) {};
-
- elixir_tea = elixir_tea_1_0_0;
-
- elixir_v8_0_2_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "elixir_v8";
- version = "0.2.2";
- src = fetchHex {
- pkg = "elixir_v8";
- version = "0.2.2";
- sha256 =
- "71034e37c2b8113156b19b1ca5b9b772fb454fe11c1cba33567fb61d3c8cedbe";
- };
- beamDeps = [ poolboy_1_5_1 exjsx_3_2_0 ];
-
- meta = {
- description = ''V8 engine for Elixir with pools.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/le0pard/elixir_v8";
- };
- } // packageOverrides)
- ) {};
-
- elixir_v8 = elixir_v8_0_2_2;
-
- elixir_wit_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- uuid_1_1_4,
- poison_2_1_0,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "elixir_wit";
- version = "0.1.0";
- src = fetchHex {
- pkg = "elixir_wit";
- version = "0.1.0";
- sha256 =
- "75b9046cd41146c4e3b486541cf37a5e27eea42d179af7fda127bdb391855224";
- };
- beamDeps = [ uuid_1_1_4 poison_2_1_0 httpotion_2_2_2 ];
-
- meta = {
- longDescription = ''Elixir client for the Wit API. Wit is the
- natural language engine for creating Bots.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zabirauf/elixir_wit";
- };
- } // packageOverrides)
- ) {};
-
- elixir_wit = elixir_wit_0_1_0;
-
- elixlsx_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "elixlsx";
- version = "0.0.3";
- src = fetchHex {
- pkg = "elixlsx";
- version = "0.0.3";
- sha256 =
- "baa903f52efd18705bc4f11f25674249e38ba22d111f49321b8f750c063fb932";
- };
-
- meta = {
- description = ''a writer for XLSX spreadsheet files'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/xou/elixlsx";
- };
- } // packageOverrides)
- ) {};
-
- elixlsx = elixlsx_0_0_3;
-
- elli_1_0_5 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "elli";
- version = "1.0.5";
- src = fetchHex {
- pkg = "elli";
- version = "1.0.5";
- sha256 =
- "fb55bab884f1d921f2e86c00738909a9e56aca14604e617b138e163093609c97";
- };
-
- meta = {
- description = ''Fast and robust web server for building
- high-throughput, low-latency apps'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/knutin/elli";
- };
- } // packageOverrides)
- ) {};
-
- elli = elli_1_0_5;
-
- elmer_0_0_11 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "elmer";
- version = "0.0.11";
- src = fetchHex {
- pkg = "elmer";
- version = "0.0.11";
- sha256 =
- "cefb6a31a8e4ab5de698cd24f9a02c1fef690f0111f49ffa3e3d57c027c5160c";
- };
-
- meta = {
- description = ''Helper mix tasks for generating elm files like
- Main, Ports, Models, Msgs, etc.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nathanjohnson320/elmer";
- };
- } // packageOverrides)
- ) {};
-
- elmer = elmer_0_0_11;
-
- elmxir_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "elmxir";
- version = "0.0.1";
- src = fetchHex {
- pkg = "elmxir";
- version = "0.0.1";
- sha256 =
- "65ad59b4922b75fb7b6c888f3e5c7dea1d01a4a085a376261bcaa3cfd6ce0845";
- };
-
- meta = {
- description = ''Helper functions for working with Elm + Elixir'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/NoRedInk/elmxir";
- };
- } // packageOverrides)
- ) {};
-
- elmxir = elmxir_0_0_1;
-
- eministat_0_10_1 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "eministat";
- version = "0.10.1";
- src = fetchHex {
- pkg = "eministat";
- version = "0.10.1";
- sha256 =
- "1e581fe282e8851c036fb6e4908add91956eba62ce0cce97fceee66067157d5f";
- };
-
- meta = {
- description = ''Basic statistics for comparing datasets from
- benchmarks'';
-
- };
- } // packageOverrides)
- ) {};
-
- eministat = eministat_0_10_1;
-
- eml_0_7_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "eml";
- version = "0.7.1";
- src = fetchHex {
- pkg = "eml";
- version = "0.7.1";
- sha256 =
- "f03a35e2684455ee9e8b641f9550d41893f5b013c1277751685414f56cee9c0a";
- };
-
- meta = {
- longDescription = ''Eml makes markup a first class citizen in
- Elixir. It provides a flexible and modular
- toolkit for generating, parsing and manipulating
- markup. It`s main focus is html, but other
- markup languages could be implemented as well.
- '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/zambal/eml";
- };
- } // packageOverrides)
- ) {};
-
- eml = eml_0_7_1;
-
- env_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "env";
- version = "0.1.0";
- src = fetchHex {
- pkg = "env";
- version = "0.1.0";
- sha256 =
- "befbc0d4a4fc368c05a693a5d29860932c812f8dff2cd14dd62a590ba49b8875";
- };
-
- meta = {
- description = ''Env is an improved application configuration
- reader for Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/michalmuskala/env";
- };
- } // packageOverrides)
- ) {};
-
- env = env_0_1_0;
-
- env_helper_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "env_helper";
- version = "0.0.2";
- src = fetchHex {
- pkg = "env_helper";
- version = "0.0.2";
- sha256 =
- "36bb88f51ea9a967a9c86d0c9de790f1d88f8b25863c03e4a733d75b9bfb9f54";
- };
-
- meta = {
- description = ''A simple add on to make working with environment
- variables slightly easier.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/manheim/env_helper";
- };
- } // packageOverrides)
- ) {};
-
- env_helper = env_helper_0_0_2;
-
- envy_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "envy";
- version = "0.0.2";
- src = fetchHex {
- pkg = "envy";
- version = "0.0.2";
- sha256 =
- "01e20425b7b5acfa1f43d7431601015e059d9363bf9d50b00f2aeb6b0e3fa03f";
- };
-
- meta = {
- description = ''A package for managing env files'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/BlakeWilliams/envy";
- };
- } // packageOverrides)
- ) {};
-
- envy = envy_0_0_2;
-
- eon_3_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "eon";
- version = "3.0.0";
- src = fetchHex {
- pkg = "eon";
- version = "3.0.0";
- sha256 =
- "a19006b99ffbe846fe064adfb128cbb6b49c85d08becb60d1e204e1d1f0db94e";
- };
-
- meta = {
- description = ''Use Elixir maps as a document storage format.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/supernintendo/eon";
- };
- } // packageOverrides)
- ) {};
-
- eon = eon_3_0_0;
-
- eper_0_94_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "eper";
- version = "0.94.0";
- src = fetchHex {
- pkg = "eper";
- version = "0.94.0";
- sha256 =
- "8d853792fa61a7fd068fe9c113a8a44bc839e11ad70cb8d5d2884566e3bede39";
- };
-
- meta = {
- longDescription = ''Erlang Performance and Debugging Tools sherk
- - a profiler, similar to Linux oprofile or MacOs
- shark gperf - a graphical performance monitor;
- shows CPU, memory and network usage dtop -
- similar to unix top redbug- similar to the OTP
- dbg application, but safer, better etc.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/massemanet/eper";
- };
- } // packageOverrides)
- ) {};
-
- eper = eper_0_94_0;
-
- epgpool_1_0_1 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_4_2,
- lager_3_0_2,
- epgsql_3_2_0
- }:
- buildRebar3 ({
- name = "epgpool";
- version = "1.0.1";
- src = fetchHex {
- pkg = "epgpool";
- version = "1.0.1";
- sha256 =
- "23435ebb6b6c8615b1e6ccd6277eb1e6b69b57d0a2079b536b0aaa60ddb094bd";
- };
-
- beamDeps = [ poolboy_1_4_2 lager_3_0_2 epgsql_3_2_0 ];
-
- meta = {
- description = ''Erlang postgresql pool application'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/egobrain/epgpool";
- };
- } // packageOverrides)
- ) {};
-
- epgpool = epgpool_1_0_1;
-
- epgsql_3_1_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "epgsql";
- version = "3.1.1";
- src = fetchHex {
- pkg = "epgsql";
- version = "3.1.1";
- sha256 =
- "4b3f478ad090aed7200b2a8c9f2d5ef45c3aaa167be896b5237bba4b40f461d8";
- };
-
- meta = {
- description = ''PostgreSQL Client'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/epgsql/epgsql";
- };
- } // packageOverrides)
- ) {};
-
- epgsql_3_2_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "epgsql";
- version = "3.2.0";
- src = fetchHex {
- pkg = "epgsql";
- version = "3.2.0";
- sha256 =
- "ff88a419df7b3084e8358538ade8b1844f5d6d18e9fa8c2124acea889720665a";
- };
-
- meta = {
- description = ''PostgreSQL Client'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/epgsql/epgsql";
- };
- } // packageOverrides)
- ) {};
-
- epgsql = epgsql_3_2_0;
-
- epiphany_0_1_0_dev = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, connection_1_0_2 }:
- buildMix ({
- name = "epiphany";
- version = "0.1.0-dev";
- src = fetchHex {
- pkg = "epiphany";
- version = "0.1.0-dev";
- sha256 =
- "38b15e762a4bb8c57a3ef238531dd465113b1019fb5aa63d7c8b38ed579f15f9";
- };
- beamDeps = [ connection_1_0_2 ];
-
- meta = {
- description = ''Cassandra driver for Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/vptheron/epiphany";
- };
- } // packageOverrides)
- ) {};
-
- epiphany = epiphany_0_1_0_dev;
-
- episcina_1_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, gproc_0_3_1 }:
- buildRebar3 ({
- name = "episcina";
- version = "1.1.0";
- src = fetchHex {
- pkg = "episcina";
- version = "1.1.0";
- sha256 =
- "16238717bfbc8cb226342f6b098bb1fafb48c7547265a10ad3e6e83899abc46f";
- };
-
- beamDeps = [ gproc_0_3_1 ];
-
- meta = {
- description = ''Erlang Connection Pool'';
-
- };
- } // packageOverrides)
- ) {};
-
- episcina = episcina_1_1_0;
-
- eqc_ex_1_2_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "eqc_ex";
- version = "1.2.4";
- src = fetchHex {
- pkg = "eqc_ex";
- version = "1.2.4";
- sha256 =
- "2d2895bedf784ffaf11144d25e6ca11a4cfff5b73c35ec6bedd3c5ec5cabc5e9";
- };
-
- meta = {
- description = ''Wrappers to facilitate using Quviq QuickCheck
- with Elixir.'';
- license = stdenv.lib.licenses.bsd3;
- };
- } // packageOverrides)
- ) {};
-
- eqc_ex = eqc_ex_1_2_4;
-
- equery_0_6_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "equery";
- version = "0.6.1";
- src = fetchHex {
- pkg = "equery";
- version = "0.6.1";
- sha256 =
- "4a492b7cb64c0014c6be8fc763df665ec129bd56c7350e00cbd3d6fd556a8c60";
- };
-
- meta = {
- description = ''Sql generator library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/egobrain/equery";
- };
- } // packageOverrides)
- ) {};
-
- equery = equery_0_6_1;
-
- equivalex_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "equivalex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "equivalex";
- version = "0.1.0";
- sha256 =
- "8c5cd7fb186085ce088839098a98366f798674a4018cb328978a5e0b2f55ad7d";
- };
-
- meta = {
- description = ''constant time polymorphic comparisons'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/equivalex";
- };
- } // packageOverrides)
- ) {};
-
- equivalex = equivalex_0_1_0;
-
- eredis_1_0_8 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "eredis";
- version = "1.0.8";
- src = fetchHex {
- pkg = "eredis";
- version = "1.0.8";
- sha256 =
- "f303533e72129b264a2d8217c4ddc977c7527ff4b8a6a55f92f62b7fcc099334";
- };
-
- meta = {
- description = ''Erlang Redis client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/wooga/eredis";
- };
- } // packageOverrides)
- ) {};
-
- eredis = eredis_1_0_8;
-
- erl2ex_0_0_9 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "erl2ex";
- version = "0.0.9";
- src = fetchHex {
- pkg = "erl2ex";
- version = "0.0.9";
- sha256 =
- "4e49c461ecffc33986bb72a43ae87211fb33fed39077fb522c381b884d189514";
- };
-
- meta = {
- longDescription = ''Erl2ex is an Erlang to Elixir transpiler,
- converting well-formed Erlang source to Elixir
- source with equivalent functionality.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/dazuma/erl2ex";
- };
- } // packageOverrides)
- ) {};
-
- erl2ex = erl2ex_0_0_9;
-
- erlang_localtime_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlang_localtime";
- version = "1.0.0";
- src = fetchHex {
- pkg = "erlang_localtime";
- version = "1.0.0";
- sha256 =
- "46e3f7b18477b377ec71f9dcd91c4d30fe82a128ffa9f89be1595d4d08414844";
- };
-
- meta = {
- description = ''Erlang library for conversion from one local time
- to another'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/choptastic/erlang_localtime";
- };
- } // packageOverrides)
- ) {};
-
- erlang_localtime = erlang_localtime_1_0_0;
-
- erlang_term_1_4_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlang_term";
- version = "1.4.0";
- src = fetchHex {
- pkg = "erlang_term";
- version = "1.4.0";
- sha256 =
- "1a4d491dbd13b7a714815af10fc658948a5a440de23755a32b741ca07d8ba592";
- };
-
- meta = {
- description = ''Provide the in-memory size of Erlang terms'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/okeuday/erlang_term";
- };
- } // packageOverrides)
- ) {};
-
- erlang_term_1_5_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlang_term";
- version = "1.5.1";
- src = fetchHex {
- pkg = "erlang_term";
- version = "1.5.1";
- sha256 =
- "88bae81a80306e82fd3fc43e2d8228049e666f3cfe4627687832cd7edb878e06";
- };
-
- meta = {
- description = ''Provide the in-memory size of Erlang terms'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/okeuday/erlang_term";
- };
- } // packageOverrides)
- ) {};
-
- erlang_term = erlang_term_1_5_1;
-
- erlang_version_0_2_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlang_version";
- version = "0.2.0";
- src = fetchHex {
- pkg = "erlang_version";
- version = "0.2.0";
- sha256 =
- "74daddba65a247ec57913e5de8f243af42bbbc3d6a0c411a1252da81c09ae661";
- };
-
- meta = {
- description = ''Retrieve Erlang/OTP version like `18.1`'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sapporo-beam/erlang_version";
- };
- } // packageOverrides)
- ) {};
-
- erlang_version = erlang_version_0_2_0;
-
- erlaudio_0_2_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "erlaudio";
- version = "0.2.3";
- src = fetchHex {
- pkg = "erlaudio";
- version = "0.2.3";
- sha256 =
- "cb9efb0ce80faae003ab39f8cc2d3fccbb4bd1c8f5f525aea392f28662517032";
- };
-
- meta = {
- description = ''Erlang audio bindings to portaudio'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/asonge/erlaudio";
- };
- } // packageOverrides)
- ) {};
-
- erlaudio = erlaudio_0_2_3;
-
- erlcloud_0_11_0 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- meck_0_8_3,
- lhttpc_1_3_0,
- jsx_2_6_2
- }:
- buildRebar3 ({
- name = "erlcloud";
- version = "0.11.0";
- src = fetchHex {
- pkg = "erlcloud";
- version = "0.11.0";
- sha256 =
- "ca9876dab57ed8fb5fb75ab6ce11e59a346387d357d7a038a2e18d1d31a30716";
- };
-
- beamDeps = [ meck_0_8_3 lhttpc_1_3_0 jsx_2_6_2 ];
-
- meta = {
- description = ''Erlang cloud computing library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/erlcloud/erlcloud";
- };
- } // packageOverrides)
- ) {};
-
- erlcloud_0_13_2 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- lhttpc_1_4_0,
- jsx_2_8_0
- }:
- buildRebar3 ({
- name = "erlcloud";
- version = "0.13.2";
- src = fetchHex {
- pkg = "erlcloud";
- version = "0.13.2";
- sha256 =
- "568d464760802322b7dc81e95f9c7bfb2fa8121423e67b2db6ed1c80697e1277";
- };
-
- beamDeps = [ lhttpc_1_4_0 jsx_2_8_0 ];
-
- meta = {
- description = ''Erlang cloud computing library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/erlcloud/erlcloud";
- };
- } // packageOverrides)
- ) {};
-
- erlexec_1_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlexec";
- version = "1.1.0";
- src = fetchHex {
- pkg = "erlexec";
- version = "1.1.0";
- sha256 =
- "772162f0f0349f89ea11b9f27401cb437ccaabf480320284a13f2259bb63cb87";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''OS Process Manager'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/saleyn/erlexec";
- };
- } // packageOverrides)
- ) {};
-
- erlexec_1_1_3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlexec";
- version = "1.1.3";
- src = fetchHex {
- pkg = "erlexec";
- version = "1.1.3";
- sha256 =
- "a4e62b46796a1b1b5e77798346e553e1460b4f97670c868f29d1e2853c02ae33";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''OS Process Manager'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/saleyn/erlexec";
- };
- } // packageOverrides)
- ) {};
-
- erlexec_1_2_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlexec";
- version = "1.2.1";
- src = fetchHex {
- pkg = "erlexec";
- version = "1.2.1";
- sha256 =
- "47846ec5bcff158468bcbe4a0608c9c89e3822d1ba10ea4d2f04b0395dc03880";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''OS Process Manager'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/saleyn/erlexec";
- };
- } // packageOverrides)
- ) {};
-
- erlexec = erlexec_1_2_1;
-
- erlsh_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlsh";
- version = "0.1.0";
- src = fetchHex {
- pkg = "erlsh";
- version = "0.1.0";
- sha256 =
- "94ef1492dd59fef211f01ffd40c47b6e51c0f59e2a3d0739366e4890961332d9";
- };
- compilePorts = true;
-
- meta = {
- longDescription = ''Family of functions and ports involving
- interacting with the system shell, paths and
- external programs.'';
-
- };
- } // packageOverrides)
- ) {};
-
- erlsh = erlsh_0_1_0;
-
- erlsom_1_4_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlsom";
- version = "1.4.1";
- src = fetchHex {
- pkg = "erlsom";
- version = "1.4.1";
- sha256 =
- "57b777fe2522e342badfa35873b2266c6961e3a9f4d2ac195d761985c40c3247";
- };
-
- meta = {
- longDescription = ''XML parser. Supports SAX style parsing as
- well as XML Schema based data mapping: create
- records from XML (and vice versa)'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/willemdj/erlsom";
- };
- } // packageOverrides)
- ) {};
-
- erlsom = erlsom_1_4_1;
-
- erlware_commons_0_13_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlware_commons";
- version = "0.13.0";
- src = fetchHex {
- pkg = "erlware_commons";
- version = "0.13.0";
- sha256 =
- "d083bbb622a5df09857464f45e1b20a34c66c1376870ece6f9b093a236bbea27";
- };
-
- meta = {
- description = ''Additional standard library for Erlang'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/erlware/erlware_commons";
- };
- } // packageOverrides)
- ) {};
-
- erlware_commons_0_15_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlware_commons";
- version = "0.15.0";
- src = fetchHex {
- pkg = "erlware_commons";
- version = "0.15.0";
- sha256 =
- "5f38cb1df90148a7b21d48b221f399244ce86256584e6ea7986f2de732dee3c6";
- };
-
- meta = {
- description = ''Additional standard library for Erlang'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/erlware/erlware_commons";
- };
- } // packageOverrides)
- ) {};
-
- erlware_commons_0_18_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, cf_0_2_1 }:
- buildRebar3 ({
- name = "erlware_commons";
- version = "0.18.0";
- src = fetchHex {
- pkg = "erlware_commons";
- version = "0.18.0";
- sha256 =
- "e71dda7cd5dcf34c9d07255d49c67e1d229dd230c101fdb996820bcdb5b03c49";
- };
-
- beamDeps = [ cf_0_2_1 ];
-
- meta = {
- description = ''Additional standard library for Erlang'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/erlware/erlware_commons";
- };
- } // packageOverrides)
- ) {};
-
- erlware_commons_0_19_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, cf_0_2_1 }:
- buildRebar3 ({
- name = "erlware_commons";
- version = "0.19.0";
- src = fetchHex {
- pkg = "erlware_commons";
- version = "0.19.0";
- sha256 =
- "5bbff9402cd9e973af81745a8a40177d245b55b4c239f80a236949b856f2dabd";
- };
-
- beamDeps = [ cf_0_2_1 ];
-
- meta = {
- description = ''Additional standard library for Erlang'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/erlware/erlware_commons";
- };
- } // packageOverrides)
- ) {};
-
- erlware_commons_0_20_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, cf_0_2_1 }:
- buildRebar3 ({
- name = "erlware_commons";
- version = "0.20.0";
- src = fetchHex {
- pkg = "erlware_commons";
- version = "0.20.0";
- sha256 =
- "bff981dbd0acb12ac9d10b41ca96ba76a26e2a1f2714d1e0cb0112f4a67d956a";
- };
-
- beamDeps = [ cf_0_2_1 ];
-
- meta = {
- description = ''Additional standard library for Erlang'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/erlware/erlware_commons";
- };
- } // packageOverrides)
- ) {};
-
- erlware_commons_0_21_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, cf_0_2_1 }:
- buildRebar3 ({
- name = "erlware_commons";
- version = "0.21.0";
- src = fetchHex {
- pkg = "erlware_commons";
- version = "0.21.0";
- sha256 =
- "e70a95762458a489dc37fe869f41517bd43c130e156ef08462f90c534300ab3f";
- };
-
- beamDeps = [ cf_0_2_1 ];
-
- meta = {
- description = ''Additional standard library for Erlang'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/erlware/erlware_commons";
- };
- } // packageOverrides)
- ) {};
-
- erlware_commons = erlware_commons_0_21_0;
-
- erlydtl_0_11_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlydtl";
- version = "0.11.1";
- src = fetchHex {
- pkg = "erlydtl";
- version = "0.11.1";
- sha256 =
- "b1958c0ec95de69458c6af8b5bffbdde0070d5042710a63b1616cacdf39ae188";
- };
-
- meta = {
- description = ''Django Template Language for Erlang'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/project-fifo/fifo_spec";
- };
- } // packageOverrides)
- ) {};
-
- erlydtl = erlydtl_0_11_1;
-
- erlydtl2_0_11_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlydtl2";
- version = "0.11.1";
- src = fetchHex {
- pkg = "erlydtl2";
- version = "0.11.1";
- sha256 =
- "ae0d9f293ce8a2eeaabedf2b5f950d21e14570e67e5a38c11fe1e4ca598e6d5b";
- };
-
- meta = {
- description = ''Django Template Language for Erlang'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/erlydtl/erlydtl";
- };
- } // packageOverrides)
- ) {};
-
- erlydtl2 = erlydtl2_0_11_1;
-
- erlzk_0_6_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "erlzk";
- version = "0.6.2";
- src = fetchHex {
- pkg = "erlzk";
- version = "0.6.2";
- sha256 =
- "b9b8e85e34f33550078e58e13fcb29c6bfe75e0585ee94f809d434fce546c246";
- };
-
- meta = {
- description = ''A Pure Erlang ZooKeeper Client (no C
- dependency)'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/huaban/erlzk";
- };
- } // packageOverrides)
- ) {};
-
- erlzk = erlzk_0_6_2;
-
- esel_0_1_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "esel";
- version = "0.1.2";
- src = fetchHex {
- pkg = "esel";
- version = "0.1.2";
- sha256 =
- "874d1775c86d27d9e88486a37351ffc09f826ef062c8ea211e65d08e103f946c";
- };
-
- meta = {
- description = ''An wrapper around openssl'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- esel = esel_0_1_2;
-
- espec_0_8_21 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, meck_0_8_4 }:
- buildMix ({
- name = "espec";
- version = "0.8.21";
- src = fetchHex {
- pkg = "espec";
- version = "0.8.21";
- sha256 =
- "147d91a367d6bca9772b064195fd64f373a03e2d0bf57be5664ae780fd3508f5";
- };
- beamDeps = [ meck_0_8_4 ];
-
- meta = {
- description = ''BDD testing framework for Elixir inspired by
- RSpec.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/antonmi/espec";
- };
- } // packageOverrides)
- ) {};
-
- espec = espec_0_8_21;
-
- esqlcipher_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "esqlcipher";
- version = "1.0.0";
- src = fetchHex {
- pkg = "esqlcipher";
- version = "1.0.0";
- sha256 =
- "f3a47df8cf7277b9352054e96a9745c77aa475a51ea36a18692a437b2af79b0b";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''sqlcipher nif interface'';
-
- };
- } // packageOverrides)
- ) {};
-
- esqlcipher = esqlcipher_1_0_0;
-
- esqlite_0_2_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "esqlite";
- version = "0.2.2";
- src = fetchHex {
- pkg = "esqlite";
- version = "0.2.2";
- sha256 =
- "5f15f8014baa9d31ee83817afe9164b3ecd76f77b2de7515f2cca2ca75b642e0";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''A Sqlite3 NIF'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/mmzeeman/esqlite";
- };
- } // packageOverrides)
- ) {};
-
- esqlite = esqlite_0_2_2;
-
- estree_2_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "estree";
- version = "2.3.0";
- src = fetchHex {
- pkg = "estree";
- version = "2.3.0";
- sha256 =
- "f73bf510523aac5518845d4d844a9690ba30450fc666ac138e8965a6c88b26ae";
- };
-
- meta = {
- longDescription = ''Represents the JavaScript AST from the ESTree
- spec. Includes tools for building an AST and
- generating code from it.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bryanjos/elixir-estree";
- };
- } // packageOverrides)
- ) {};
-
- estree = estree_2_3_0;
-
- esync_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "esync";
- version = "0.0.1";
- src = fetchHex {
- pkg = "esync";
- version = "0.0.1";
- sha256 =
- "28a59a0cbe885ec39dec4992aac8495147d1ec9b623883b01e8aa775cb334f03";
- };
-
- meta = {
- description = ''Concurrently sync two or more directories so that
- their contents are identical'';
-
- homepage = "https://github.com/GrahamGoudeau21/ElixirSync";
- };
- } // packageOverrides)
- ) {};
-
- esync = esync_0_0_1;
-
- ether_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ether";
- version = "0.0.1";
- src = fetchHex {
- pkg = "ether";
- version = "0.0.1";
- sha256 =
- "867752143aa09e07d0a50ae9526b7c8f620e189f509326a635c304b453496f16";
- };
-
- meta = {
- description = ''Elixir Debugger '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/maarek/ether";
- };
- } // packageOverrides)
- ) {};
-
- ether = ether_0_0_1;
-
- etherchain_org_0_0_5 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- vex_0_5_5,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "etherchain_org";
- version = "0.0.5";
- src = fetchHex {
- pkg = "etherchain_org";
- version = "0.0.5";
- sha256 =
- "2ff545b4d78b507a664a5c246bb351be110cc647d960e39e65f2d9ce08669752";
- };
- beamDeps = [ vex_0_5_5 poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''WIP Elixir API wrapper for etherchain.org.
- Provides access to ethereum blockchain data.'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/cyberpunk-ventures/etherchain_org_ex";
- };
- } // packageOverrides)
- ) {};
-
- etherchain_org = etherchain_org_0_0_5;
-
- ets_map_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ets_map";
- version = "0.0.1";
- src = fetchHex {
- pkg = "ets_map";
- version = "0.0.1";
- sha256 =
- "c33d714212c56d99b2472d522e24db808cd8a407101051d407be310412d61eae";
- };
-
- meta = {
- description = ''A Map-like Elixir data structure that is backed
- by an ETS table.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/antipax/ets_map";
- };
- } // packageOverrides)
- ) {};
-
- ets_map = ets_map_0_0_1;
-
- ets_owner_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ets_owner";
- version = "1.0.0";
- src = fetchHex {
- pkg = "ets_owner";
- version = "1.0.0";
- sha256 =
- "54c0228a9134f4afe5c2a5418712a8b010bbc3f3e4864f3c854110f6cb65bca9";
- };
-
- meta = {
- description = ''A simple GenServer that owns your ETS tables and
- won`t die, even if you do.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/meyercm/ets_owner";
- };
- } // packageOverrides)
- ) {};
-
- ets_owner = ets_owner_1_0_0;
-
- etude_1_0_0_beta_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- nile_0_1_3
- }:
- buildMix ({
- name = "etude";
- version = "1.0.0-beta.0";
- src = fetchHex {
- pkg = "etude";
- version = "1.0.0-beta.0";
- sha256 =
- "f5a2896982cd062fe188dcb0216ef5c960959aa2ba77f4d31b00d0dda56890dd";
- };
- beamDeps = [ poison_2_1_0 nile_0_1_3 ];
-
- meta = {
- description = ''parallel computation coordination utilities for
- erlang/elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/etude";
- };
- } // packageOverrides)
- ) {};
-
- etude_1_0_0_beta_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- nile_0_1_3
- }:
- buildMix ({
- name = "etude";
- version = "1.0.0-beta.2";
- src = fetchHex {
- pkg = "etude";
- version = "1.0.0-beta.2";
- sha256 =
- "f05d1c5b191a19a3828a89be221b4a8f7bf9fb2227ebc05b7116dc1965872cef";
- };
- beamDeps = [ poison_2_1_0 nile_0_1_3 ];
-
- meta = {
- description = ''parallel computation coordination utilities for
- erlang/elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/etude";
- };
- } // packageOverrides)
- ) {};
-
- etude = etude_1_0_0_beta_2;
-
- eunit_formatters_0_3_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "eunit_formatters";
- version = "0.3.1";
- src = fetchHex {
- pkg = "eunit_formatters";
- version = "0.3.1";
- sha256 =
- "64a40741429b7aff149c605d5a6135a48046af394a7282074e6003b3b56ae931";
- };
-
- meta = {
- description = ''Better output for eunit suites'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/seancribbs/eunit_formatters";
- };
- } // packageOverrides)
- ) {};
-
- eunit_formatters = eunit_formatters_0_3_1;
-
- eunit_sugar_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "eunit_sugar";
- version = "0.1.0";
- src = fetchHex {
- pkg = "eunit_sugar";
- version = "0.1.0";
- sha256 =
- "f30c41d711650270d8654f9067a3b5d16d73242e0eed19082b70676e9f05bb6e";
- };
-
- meta = {
- description = ''Helpers and sugars for eunit tests'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/xenolinguist/eunit_sugar";
- };
- } // packageOverrides)
- ) {};
-
- eunit_sugar = eunit_sugar_0_1_0;
-
- evel_0_1_1 = callPackage
- (
- {
- buildRebar3, packageOverrides ? {}, fetchHex, hash_ring_0_4_0
- }:
- buildRebar3 ({
- name = "evel";
- version = "0.1.1";
- src = fetchHex {
- pkg = "evel";
- version = "0.1.1";
- sha256 =
- "b849699912f797e2b0082b43d0f58b18de838379b499c47dc24194d9fec03e6e";
- };
-
- beamDeps = [ hash_ring_0_4_0 ];
-
- meta = {
- description = ''An Eventual Leader Election Library for Erlang'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sile/evel";
- };
- } // packageOverrides)
- ) {};
-
- evel = evel_0_1_1;
-
- event_nanny_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "event_nanny";
- version = "0.1.1";
- src = fetchHex {
- pkg = "event_nanny";
- version = "0.1.1";
- sha256 =
- "4d46b285e5187fc8e63f7911087dcff54fb46ca347b457013e9bd9901f9cc9d1";
- };
-
- meta = {
- description = ''Nanny for GenEvent restart handler when it exit
- abnormally'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/ammbot/event-nanny.git";
- };
- } // packageOverrides)
- ) {};
-
- event_nanny = event_nanny_0_1_1;
-
- eventstore_client_0_1_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- uuid_1_1_4,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "eventstore_client";
- version = "0.1.4";
- src = fetchHex {
- pkg = "eventstore_client";
- version = "0.1.4";
- sha256 =
- "fa77e1a7906b3ed27c0dfa0bd41f27b3129285857948aa23a3f888b0dd531109";
- };
- beamDeps = [ uuid_1_1_4 poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''HTTP Client for EventStore (geteventstore.com)'';
-
- homepage =
- "https://github.com/tbug/elixir-eventstore-http-client";
- };
- } // packageOverrides)
- ) {};
-
- eventstore_client = eventstore_client_0_1_4;
-
- ewebmachine_2_0_12 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "ewebmachine";
- version = "2.0.12";
- src = fetchHex {
- pkg = "ewebmachine";
- version = "2.0.12";
- sha256 =
- "66a4ca701594da9396d6bab03f074f1ab56080a62e6545e6e455a24296c96a1a";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- longDescription = ''Ewebmachine contains macros and plugs to
- allow you to compose HTTP decision handlers and
- run the HTTP decision tree to get your HTTP
- response. This project is a rewrite for Elixir
- and Plug of basho webmachine.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/awetzel/ewebmachine";
- };
- } // packageOverrides)
- ) {};
-
- ewebmachine = ewebmachine_2_0_12;
-
- ex2ms_1_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex2ms";
- version = "1.4.0";
- src = fetchHex {
- pkg = "ex2ms";
- version = "1.4.0";
- sha256 =
- "8a743796d9f067f047e50d9726dfd8eb2791e6ce00c79edbd5ced6a06fe5e388";
- };
-
- meta = {
- description = ''Translates Elixir functions to match
- specifications for use with `ets`.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/ericmj/ex2ms";
- };
- } // packageOverrides)
- ) {};
-
- ex2ms = ex2ms_1_4_0;
-
- ex_abnf_0_2_7 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_abnf";
- version = "0.2.7";
- src = fetchHex {
- pkg = "ex_abnf";
- version = "0.2.7";
- sha256 =
- "2ca070a97b392a142619f0a126e48c7e27d39353be9a76fb358c401821495e1a";
- };
-
- meta = {
- longDescription = ''A parser and interpreter for ABNF grammars.
- This is not a parser generator, but an
- interpreter. It will load up an ABNF grammar,
- and generate an AST for it. Then one can apply
- any of the rules to an input and the interpreter
- will parse the input according to the rule.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/marcelog/ex_abnf";
- };
- } // packageOverrides)
- ) {};
-
- ex_abnf = ex_abnf_0_2_7;
-
- ex_bcrypt_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, bcrypt_0_5_0_p3a }:
- buildMix ({
- name = "ex_bcrypt";
- version = "0.0.1";
- src = fetchHex {
- pkg = "ex_bcrypt";
- version = "0.0.1";
- sha256 =
- "c6c91e333f3e84733bb8fca08af9fda01b20f3b2a8801e456b31103118418e81";
- };
- beamDeps = [ bcrypt_0_5_0_p3a ];
-
- meta = {
- description = ''Elixir wrapper for the OpenBSD bcrypt password
- hashing algorithm'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/manelli/ex_bcrypt";
- };
- } // packageOverrides)
- ) {};
-
- ex_bcrypt = ex_bcrypt_0_0_1;
-
- ex_blocktrail_0_2_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- yuri_1_0_0,
- vex_0_5_5,
- exconstructor_1_0_2,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "ex_blocktrail";
- version = "0.2.1";
- src = fetchHex {
- pkg = "ex_blocktrail";
- version = "0.2.1";
- sha256 =
- "96a4090676a01f6644b95e8f65b1bd19f4142435d2f1b3cb2dbd79d883579f42";
- };
- beamDeps = [
- yuri_1_0_0
- vex_0_5_5
- exconstructor_1_0_2
- poison_2_1_0
- httpoison_0_8_3
- ];
-
- meta = {
- longDescription = ''WIP. Alpha. Elixir wrapper for blocktrail.com
- Bitcoin api and some utility functions.'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- ex_blocktrail = ex_blocktrail_0_2_1;
-
- ex_brace_expansion_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_brace_expansion";
- version = "0.0.2";
- src = fetchHex {
- pkg = "ex_brace_expansion";
- version = "0.0.2";
- sha256 =
- "d7470a00cffe4425f89e83d7288c24b641c3f6cbde136a08089e7420467cd237";
- };
-
- meta = {
- longDescription = ''Brace expansion, as known from sh/bash, in
- Elixir. Quick example:
- ExBraceExpansion.expand(\"file-{a,b,c}.jpg\") =>
- [\"file-a.jpg\", \"file-b.jpg\", \"file-c.jpg\"]
- '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gniquil/ex_brace_expansion";
- };
- } // packageOverrides)
- ) {};
-
- ex_brace_expansion = ex_brace_expansion_0_0_2;
-
- ex_clacks_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "ex_clacks";
- version = "0.1.2";
- src = fetchHex {
- pkg = "ex_clacks";
- version = "0.1.2";
- sha256 =
- "8299396f26982bbaed7f12988277174d3d3e92e0a5efe685c8d0133e08e013cc";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''A Plug that pays homage to Terry Pratchett'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/polymetis/ex_clacks";
- };
- } // packageOverrides)
- ) {};
-
- ex_clacks = ex_clacks_0_1_2;
-
- ex_cli_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_cli";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ex_cli";
- version = "0.1.0";
- sha256 =
- "81e42a05730752f891b8fc1cbced2e5733d48df144ab91aeb41a8093cb42264e";
- };
-
- meta = {
- description = ''Library to build CLI applications'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tuvistavie/ex_cli";
- };
- } // packageOverrides)
- ) {};
-
- ex_cli = ex_cli_0_1_0;
-
- ex_closeio_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "ex_closeio";
- version = "0.1.1";
- src = fetchHex {
- pkg = "ex_closeio";
- version = "0.1.1";
- sha256 =
- "0bf03085e9ac1d548a73f5e8fa91d78c201c8fa46b3e65b89aca82f887af9cce";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Close.io client library for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/taylorbrooks/ex_closeio";
- };
- } // packageOverrides)
- ) {};
-
- ex_closeio = ex_closeio_0_1_1;
-
- ex_cron_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_cron";
- version = "0.0.2";
- src = fetchHex {
- pkg = "ex_cron";
- version = "0.0.2";
- sha256 =
- "2d0be58e834bdadd69336f0dd9d61d5e678d99b4de9a766ed45ea85fc87a97cb";
- };
-
- meta = {
- description = ''Cron schedule generator for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/codestuffers/ex-cron";
- };
- } // packageOverrides)
- ) {};
-
- ex_cron = ex_cron_0_0_2;
-
- ex_crypto_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- pipe_0_0_2
- }:
- buildMix ({
- name = "ex_crypto";
- version = "0.1.1";
- src = fetchHex {
- pkg = "ex_crypto";
- version = "0.1.1";
- sha256 =
- "6686151799d3fb5be28e43a05ef3689e1d1144a0d97e4ff3b41fb039265146cb";
- };
- beamDeps = [ poison_2_1_0 pipe_0_0_2 ];
-
- meta = {
- longDescription = ''A wrapper around the Erlang Crypto module
- with sensible defaults for common tasks.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ntrepid8/ex_crypto";
- };
- } // packageOverrides)
- ) {};
-
- ex_crypto = ex_crypto_0_1_1;
-
- ex_csv_0_1_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_csv";
- version = "0.1.4";
- src = fetchHex {
- pkg = "ex_csv";
- version = "0.1.4";
- sha256 =
- "56ee6b70564aa1762f5bfc2b205e55caa83aef046d974614a22b8ec0f839005e";
- };
-
- meta = {
- description = ''CSV for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/CargoSense/ex_csv";
- };
- } // packageOverrides)
- ) {};
-
- ex_csv = ex_csv_0_1_4;
-
- ex_enum_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, gettext_0_11_0 }:
- buildMix ({
- name = "ex_enum";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ex_enum";
- version = "0.1.0";
- sha256 =
- "f6685959ef337018e42c4baccdce98cc9618974759d1fdb969fcf9a266e590ea";
- };
- beamDeps = [ gettext_0_11_0 ];
-
- meta = {
- description = ''Enum library for Elixir inspired by
- ActiveHash::Enum.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kenta-aktsk/ex_enum";
- };
- } // packageOverrides)
- ) {};
-
- ex_enum = ex_enum_0_1_0;
-
- ex_fabricators_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_fabricators";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ex_fabricators";
- version = "0.1.0";
- sha256 =
- "edde1017f8a8fc3dbb3915c8791a6d0801f06fbe72f69ec50222dc47930c57d9";
- };
-
- meta = {
- description = ''Easy way to cook your structs for tests'';
-
- homepage = "https://github.com/alterego-labs/ex_fabricators";
- };
- } // packageOverrides)
- ) {};
-
- ex_fabricators = ex_fabricators_0_1_0;
-
- ex_guard_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2 }:
- buildMix ({
- name = "ex_guard";
- version = "1.1.0";
- src = fetchHex {
- pkg = "ex_guard";
- version = "1.1.0";
- sha256 =
- "5f990eb24b673c782b4e742351bab14ce466146f3ea1e5324b6b7c34122bd4f9";
- };
- beamDeps = [ fs_0_9_2 ];
-
- meta = {
- longDescription = ''ExGuard automates various tasks by running
- custom rules whenever file or directories are
- modified.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/slashmili/ex_guard";
- };
- } // packageOverrides)
- ) {};
-
- ex_guard = ex_guard_1_1_0;
-
- ex_hl7_0_2_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_hl7";
- version = "0.2.2";
- src = fetchHex {
- pkg = "ex_hl7";
- version = "0.2.2";
- sha256 =
- "b6653fd28949f5dc37f18af4320f13dcdea796553e0c429a8260d5c4bf481b0f";
- };
-
- meta = {
- description = ''HL7 Parser for Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/jcomellas/ex_hl7";
- };
- } // packageOverrides)
- ) {};
-
- ex_hl7 = ex_hl7_0_2_2;
-
- ex_ical_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
- buildMix ({
- name = "ex_ical";
- version = "0.0.3";
- src = fetchHex {
- pkg = "ex_ical";
- version = "0.0.3";
- sha256 =
- "435bade398c8b72e2515f91eef89f6309951800e8bd30a0a616c1039502c8c95";
- };
- beamDeps = [ timex_1_0_2 ];
-
- meta = {
- description = ''ICalendar parser.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/fazibear/ex_ical";
- };
- } // packageOverrides)
- ) {};
-
- ex_ical = ex_ical_0_0_3;
-
- ex_iss_1_0_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "ex_iss";
- version = "1.0.0";
- src = fetchHex {
- pkg = "ex_iss";
- version = "1.0.0";
- sha256 =
- "8b2b2eebbd75593e814e712555c7f69138864317cf2f0093a82ca305138baa83";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''This package is for interfacing with the Open
- Notify API to information such as the ISS`s
- current location, crew, and when it will pass
- over a location.'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/cryptobird/ex_iss";
- };
- } // packageOverrides)
- ) {};
-
- ex_iss = ex_iss_1_0_0;
-
- ex_json_schema_0_4_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_json_schema";
- version = "0.4.1";
- src = fetchHex {
- pkg = "ex_json_schema";
- version = "0.4.1";
- sha256 =
- "4acefaa5da4de55d984d1e86be40f6af2173e744cc4f77e70a701a0ea1604328";
- };
-
- meta = {
- longDescription = ''A JSON Schema validator with full support for
- the draft 4 specification and zero
- dependencies.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jonasschmidt/ex_json_schema";
- };
- } // packageOverrides)
- ) {};
-
- ex_json_schema = ex_json_schema_0_4_1;
-
- ex_link_header_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_link_header";
- version = "0.0.4";
- src = fetchHex {
- pkg = "ex_link_header";
- version = "0.0.4";
- sha256 =
- "4ced0014c98703184c1afaf390298593a88503f7fc26b138b20c0a53cc614558";
- };
-
- meta = {
- description = ''Parse HTTP link headers in Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/simonrand/ex_link_header";
- };
- } // packageOverrides)
- ) {};
-
- ex_link_header = ex_link_header_0_0_4;
-
- ex_machina_0_6_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_machina";
- version = "0.6.1";
- src = fetchHex {
- pkg = "ex_machina";
- version = "0.6.1";
- sha256 =
- "f55476400ca109d24f216ee961a6d04be4a932429ecd3ae6a948d5d04f4fa2ea";
- };
-
- meta = {
- description = ''A factory library by the creators of
- FactoryGirl'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/thoughtbot/ex_machina";
- };
- } // packageOverrides)
- ) {};
-
- ex_machina = ex_machina_0_6_1;
-
- ex_mark2pdf_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, earmark_0_1_19 }:
- buildMix ({
- name = "ex_mark2pdf";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ex_mark2pdf";
- version = "0.1.0";
- sha256 =
- "d1458c9b01bc53b9c365d4d12ac8187b09e06f02667639d4a63c4543427dfb1d";
- };
- beamDeps = [ earmark_0_1_19 ];
-
- meta = {
- description = ''Generate a PDF from Markdown file.'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/darui00kara/ex_mark2pdf";
- };
- } // packageOverrides)
- ) {};
-
- ex_mark2pdf = ex_mark2pdf_0_1_0;
-
- ex_marshal_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_2 }:
- buildMix ({
- name = "ex_marshal";
- version = "0.0.3";
- src = fetchHex {
- pkg = "ex_marshal";
- version = "0.0.3";
- sha256 =
- "28eaf18799bca83519d0ac517a4fd0a9a2211bea7f96c74b27952a20be2938a8";
- };
- beamDeps = [ decimal_1_1_2 ];
-
- meta = {
- description = ''Ruby Marshal format implemented in Elixir.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/gaynetdinov/ex_marshal";
- };
- } // packageOverrides)
- ) {};
-
- ex_marshal = ex_marshal_0_0_3;
-
- ex_microsoftbot_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "ex_microsoftbot";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ex_microsoftbot";
- version = "0.1.0";
- sha256 =
- "638a30cab3f9bc85b76beb0dacd3e5d71724ad10de73170f00df12a29eed8d0a";
- };
- beamDeps = [ poison_2_1_0 httpotion_2_2_2 ];
-
- meta = {
- description = ''This library provides Elixir API wrapper for the
- Microsoft Bot Framework.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zabirauf/ex_microsoftbot";
- };
- } // packageOverrides)
- ) {};
-
- ex_microsoftbot = ex_microsoftbot_0_1_0;
-
- ex_minimatch_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- ex_brace_expansion_0_0_2
- }:
- buildMix ({
- name = "ex_minimatch";
- version = "0.0.1";
- src = fetchHex {
- pkg = "ex_minimatch";
- version = "0.0.1";
- sha256 =
- "3255bb8496635d3ef5d86ec6829958a3573ff730ca01534b0fead9c2e3af7de4";
- };
- beamDeps = [ ex_brace_expansion_0_0_2 ];
-
- meta = {
- longDescription = ''Globbing paths without walking the tree!
- Elixir and Erlang provide `wildcard` functions
- in the stdlib. But these will walk the directory
- tree. If you simply want to test whether a file
- path matches a glob, ExMinimatch is for you. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gniquil/ex_minimatch";
- };
- } // packageOverrides)
- ) {};
-
- ex_minimatch = ex_minimatch_0_0_1;
-
- ex_modbus_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_modbus";
- version = "0.0.3";
- src = fetchHex {
- pkg = "ex_modbus";
- version = "0.0.3";
- sha256 =
- "bdfd52c43e690a9af041f34b7cd1f6c2843e39fe51b9afcc2a83fbf4d254fd50";
- };
-
- meta = {
- description = ''An Elixir ModbusTCP client implementation.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hirschenberger/ex_modbus";
- };
- } // packageOverrides)
- ) {};
-
- ex_modbus = ex_modbus_0_0_3;
-
- ex_parametarized_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_parametarized";
- version = "1.0.0";
- src = fetchHex {
- pkg = "ex_parametarized";
- version = "1.0.0";
- sha256 =
- "daa04087cc41608f1604f2cc52dfe3e3c3ee4612c3b6091d7b6025d10d79f31a";
- };
-
- meta = {
- description = ''Simple macro for parametarized testing'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KazuCocoa/ex_parametarized";
- };
- } // packageOverrides)
- ) {};
-
- ex_parametarized = ex_parametarized_1_0_0;
-
- ex_parameterized_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_parameterized";
- version = "1.0.2";
- src = fetchHex {
- pkg = "ex_parameterized";
- version = "1.0.2";
- sha256 =
- "c3a9b2471060a7f2cfc4cac4617125d4272991315d6223156d67c10abd055b10";
- };
-
- meta = {
- description = ''Simple macro for parameterized testing'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KazuCocoa/ex_parameterized";
- };
- } // packageOverrides)
- ) {};
-
- ex_parameterized = ex_parameterized_1_0_2;
-
- ex_pool_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_pool";
- version = "0.1.1";
- src = fetchHex {
- pkg = "ex_pool";
- version = "0.1.1";
- sha256 =
- "0e2a945acefa067f902dbfa6cb683884838099d6be496dc43cb7dccf31df978d";
- };
-
- meta = {
- description = ''A generic pooling library for Elixir'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/jcabotc/ex_pool";
- };
- } // packageOverrides)
- ) {};
-
- ex_pool = ex_pool_0_1_1;
-
- ex_prima_toolbox_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, ex_cli_0_1_0 }:
- buildMix ({
- name = "ex_prima_toolbox";
- version = "0.0.2";
- src = fetchHex {
- pkg = "ex_prima_toolbox";
- version = "0.0.2";
- sha256 =
- "7fc93cf69afba247bbd97118fc56b6d3d79dc6767126581a262b97bff2ffd045";
- };
- beamDeps = [ ex_cli_0_1_0 ];
-
- meta = {
- description = ''elixir toolbox for prima.it'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/primait/ex_toolbox";
- };
- } // packageOverrides)
- ) {};
-
- ex_prima_toolbox = ex_prima_toolbox_0_0_2;
-
- ex_prometheus_io_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
- buildMix ({
- name = "ex_prometheus_io";
- version = "0.0.3";
- src = fetchHex {
- pkg = "ex_prometheus_io";
- version = "0.0.3";
- sha256 =
- "7c2baaf0eef43d3e68d822532e0ca22daea41f6cce85de6b0ba538819fdb3832";
- };
- beamDeps = [ poison_1_5_2 ];
-
- meta = {
- description = ''Prometheus.io Elixir client API library'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/kennyballou/ex_prometheus_io";
- };
- } // packageOverrides)
- ) {};
-
- ex_prometheus_io = ex_prometheus_io_0_0_3;
-
- ex_rated_1_2_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, ex2ms_1_4_0 }:
- buildMix ({
- name = "ex_rated";
- version = "1.2.2";
- src = fetchHex {
- pkg = "ex_rated";
- version = "1.2.2";
- sha256 =
- "65f7e9aaba3ba5bf8995b34a29c9572652b051cfdd7988e5f9b7ea329bb71ca1";
- };
- beamDeps = [ ex2ms_1_4_0 ];
-
- meta = {
- longDescription = ''ExRated, the OTP GenServer with the naughty
- name that allows you to rate-limit calls to any
- service that requires it. For example,
- rate-limit calls to your favorite API which
- requires no more than `limit` API calls within a
- `scale` milliseconds time window. You can
- enforce limits for windows as narrow as
- milliseconds, or as broad as you like.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/grempe/ex_rated";
- };
- } // packageOverrides)
- ) {};
-
- ex_rated = ex_rated_1_2_2;
-
- ex_rfc3966_0_2_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, ex_abnf_0_2_7 }:
- buildMix ({
- name = "ex_rfc3966";
- version = "0.2.3";
- src = fetchHex {
- pkg = "ex_rfc3966";
- version = "0.2.3";
- sha256 =
- "730e14d9670ab0d2b2b24c2d3bfabe861bf21d4163c01db747a91c54090cc0d5";
- };
- beamDeps = [ ex_abnf_0_2_7 ];
-
- meta = {
- longDescription = ''A \"tel\" URI parser trying to be strictly
- compatible with RFC3966. Uses official ABNF
- grammar and ex_abnf as interpreter.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/marcelog/ex_rfc3966";
- };
- } // packageOverrides)
- ) {};
-
- ex_rfc3966 = ex_rfc3966_0_2_3;
-
- ex_rfc3986_0_2_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, ex_abnf_0_2_7 }:
- buildMix ({
- name = "ex_rfc3986";
- version = "0.2.6";
- src = fetchHex {
- pkg = "ex_rfc3986";
- version = "0.2.6";
- sha256 =
- "bfc8ce510f910dbbd1f4a8433de85090375d1701e0b9a488ba7afd8efae98bfa";
- };
- beamDeps = [ ex_abnf_0_2_7 ];
-
- meta = {
- longDescription = ''An URI parser trying to be strictly
- compatible with RFC3986. Uses official ABNF
- grammar and ex_abnf as interpreter.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/marcelog/ex_rfc3986";
- };
- } // packageOverrides)
- ) {};
-
- ex_rfc3986 = ex_rfc3986_0_2_6;
-
- ex_sider_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_sider";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ex_sider";
- version = "0.1.0";
- sha256 =
- "00e1fba7bf19e4e072a98941c7ef11cc171e3ed44fdfd0c9bd0c110babf80e34";
- };
-
- meta = {
- description = ''Elixir Map/List/Set interfaces for Redis
- datastructures.'';
- license = stdenv.lib.licenses.wtfpl;
- homepage = "https://github.com/ephe-meral/ex_sider";
- };
- } // packageOverrides)
- ) {};
-
- ex_sider = ex_sider_0_1_0;
-
- ex_sonar_0_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- floki_0_8_1,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "ex_sonar";
- version = "0.0.4";
- src = fetchHex {
- pkg = "ex_sonar";
- version = "0.0.4";
- sha256 =
- "a0e83e87ae58522ed6f37bb8742a0873be0870e6a60673efa615551b68d5bd4b";
- };
- beamDeps = [ floki_0_8_1 poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''A Send Sonar API interface for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/enilsen16/ex_sonar";
- };
- } // packageOverrides)
- ) {};
-
- ex_sonar = ex_sonar_0_0_4;
-
- ex_spec_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_spec";
- version = "1.0.0";
- src = fetchHex {
- pkg = "ex_spec";
- version = "1.0.0";
- sha256 =
- "e5f4b6ee0a918015d1d190ead7807f31ec62a8d8920fc93602bf722c171e7ae8";
- };
-
- meta = {
- description = ''BDD-like syntax for ExUnit'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/drewolson/ex_spec";
- };
- } // packageOverrides)
- ) {};
-
- ex_spec = ex_spec_1_0_0;
-
- ex_sshd_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_sshd";
- version = "0.0.2";
- src = fetchHex {
- pkg = "ex_sshd";
- version = "0.0.2";
- sha256 =
- "9c7f73aab2d7697ef81eea582dfbde8033e8266dd6de2d34c36bd7e4905b7de4";
- };
-
- meta = {
- longDescription = ''Simple Elixir SSH worker that provides an
- Elixir shell over SSH into your application.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tverlaan/ex_sshd";
- };
- } // packageOverrides)
- ) {};
-
- ex_sshd = ex_sshd_0_0_2;
-
- ex_statsd_0_5_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_statsd";
- version = "0.5.3";
- src = fetchHex {
- pkg = "ex_statsd";
- version = "0.5.3";
- sha256 =
- "357c616a327a40133e49a54db1d46b0d7c9ab2de186f7bfecdc0efca6394adf6";
- };
-
- meta = {
- description = ''A StatsD client for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/CargoSense/ex_statsd";
- };
- } // packageOverrides)
- ) {};
-
- ex_statsd = ex_statsd_0_5_3;
-
- ex_sync_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- connection_1_0_2
- }:
- buildMix ({
- name = "ex_sync";
- version = "0.0.3";
- src = fetchHex {
- pkg = "ex_sync";
- version = "0.0.3";
- sha256 =
- "bccd72623f75430ca10d5660c7316a6439921161beb7aa65b686713503ea147a";
- };
- beamDeps = [ poolboy_1_5_1 connection_1_0_2 ];
-
- meta = {
- longDescription = ''A library to handle [Differential
- Synchroniazation](https://neil.fraser.name/writing/sync/)
- in an Elixir app.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/invrs/exsync";
- };
- } // packageOverrides)
- ) {};
-
- ex_sync = ex_sync_0_0_3;
-
- ex_test_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_test";
- version = "0.0.2";
- src = fetchHex {
- pkg = "ex_test";
- version = "0.0.2";
- sha256 =
- "fdc33e0fa2fdab921fa54f0484645681ed0695f69439a6f40430e31fbc589756";
- };
-
- meta = {
- description = ''Wrapper around ExUnit to support BBD (rspec) like
- syntax'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mcb/ex_test";
- };
- } // packageOverrides)
- ) {};
-
- ex_test = ex_test_0_0_2;
-
- ex_tumblr_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- oauther_1_0_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "ex_tumblr";
- version = "0.0.1";
- src = fetchHex {
- pkg = "ex_tumblr";
- version = "0.0.1";
- sha256 =
- "9517b1ca411c91ad7e9776f7e2783908b400fee1779e497fdb1b3c515f61a253";
- };
- beamDeps = [ poison_2_1_0 oauther_1_0_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''A client for the Tumblr API v2.'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- ex_tumblr = ex_tumblr_0_0_1;
-
- ex_twilio_0_1_8 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- inflex_1_5_0,
- poison_2_1_0,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "ex_twilio";
- version = "0.1.8";
- src = fetchHex {
- pkg = "ex_twilio";
- version = "0.1.8";
- sha256 =
- "0c7aed748ff4bfb9d8e1f43422d36d41433caa6cf19dc2fa208031d9f8240077";
- };
- beamDeps = [ inflex_1_5_0 poison_2_1_0 httpotion_2_2_2 ];
-
- meta = {
- description = ''Twilio API library for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/danielberkompas/ex_twilio";
- };
- } // packageOverrides)
- ) {};
-
- ex_twilio = ex_twilio_0_1_8;
-
- ex_twiml_2_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_twiml";
- version = "2.1.0";
- src = fetchHex {
- pkg = "ex_twiml";
- version = "2.1.0";
- sha256 =
- "7515c90ea4342e178b2894ca4cf8f03225a20c35e94c1f19e47bb839cc5f627d";
- };
-
- meta = {
- description = ''Generate TwiML with Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/danielberkompas/ex_twiml";
- };
- } // packageOverrides)
- ) {};
-
- ex_twiml = ex_twiml_2_1_0;
-
- ex_unit_fixtures_0_3_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_unit_fixtures";
- version = "0.3.1";
- src = fetchHex {
- pkg = "ex_unit_fixtures";
- version = "0.3.1";
- sha256 =
- "b4b988211bf4cd08a26eb76756e4563c94c6648c195e45af26ea62e4d37a65f6";
- };
-
- meta = {
- description = ''A modular fixture system for ExUnit, inspired by
- py.test fixtures.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/obmarg/ex_unit_fixtures";
- };
- } // packageOverrides)
- ) {};
-
- ex_unit_fixtures = ex_unit_fixtures_0_3_1;
-
- ex_unit_notifier_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_unit_notifier";
- version = "0.1.1";
- src = fetchHex {
- pkg = "ex_unit_notifier";
- version = "0.1.1";
- sha256 =
- "78afb11d6a470b379de113bde1ff9e0537f5243bc957614961d8e8dadc062268";
- };
-
- meta = {
- description = ''Show status notifications for ExUnit test runs'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/navinpeiris/ex_unit_notifier";
- };
- } // packageOverrides)
- ) {};
-
- ex_unit_notifier = ex_unit_notifier_0_1_1;
-
- ex_victor_ops_0_3_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "ex_victor_ops";
- version = "0.3.1";
- src = fetchHex {
- pkg = "ex_victor_ops";
- version = "0.3.1";
- sha256 =
- "7a8065e44c105952a843f532ab6b1cb59209e886f0770e20bf917fb742f0b9af";
- };
- beamDeps = [ poison_2_1_0 httpotion_2_2_2 ];
-
- meta = {
- description = ''VictorOps API library for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/cagedata/ex_victor_ops";
- };
- } // packageOverrides)
- ) {};
-
- ex_victor_ops = ex_victor_ops_0_3_1;
-
- ex_vmstats_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ex_vmstats";
- version = "0.0.1";
- src = fetchHex {
- pkg = "ex_vmstats";
- version = "0.0.1";
- sha256 =
- "587d088696b51b0e053b2626c6de51ca7be67b5e3a49c7320da5b4e7cd96d347";
- };
-
- meta = {
- description = ''An Elixir package for pushing Erlang VM stats
- into StatsD.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/fanduel/ex_vmstats";
- };
- } // packageOverrides)
- ) {};
-
- ex_vmstats = ex_vmstats_0_0_1;
-
- exactor_2_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exactor";
- version = "2.2.0";
- src = fetchHex {
- pkg = "exactor";
- version = "2.2.0";
- sha256 =
- "c60cd68899db3ec0bdbd41c7ccf3ae3b52391a18704040461763f052e97b5e15";
- };
-
- meta = {
- description = ''Simplified creation of GenServer based processes
- in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sasa1977/exactor";
- };
- } // packageOverrides)
- ) {};
-
- exactor = exactor_2_2_0;
-
- exalgebra_0_0_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exalgebra";
- version = "0.0.5";
- src = fetchHex {
- pkg = "exalgebra";
- version = "0.0.5";
- sha256 =
- "b84a96ffb7a2dd0c497f176c2e9d0ef07c719f09702d71fb8a801a3f2db1ab50";
- };
-
- meta = {
- longDescription = ''The ExAlgebra library is a collection of
- functions that are commonly used in linear
- algebra.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/leighshepperson/exalgebra";
- };
- } // packageOverrides)
- ) {};
-
- exalgebra = exalgebra_0_0_5;
-
- exalice_0_0_6_alpha = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- tirexs_0_8_0_beta6,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "exalice";
- version = "0.0.6-alpha";
- src = fetchHex {
- pkg = "exalice";
- version = "0.0.6-alpha";
- sha256 =
- "b5f95ddebb9def3efb926fc7e4c639bbad008e5e19073b56e13d684417520922";
- };
- beamDeps = [ tirexs_0_8_0_beta6 poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''ExAlice, a geocoder with swappable storage'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/kpanic/exalice";
- };
- } // packageOverrides)
- ) {};
-
- exalice = exalice_0_0_6_alpha;
-
- example_files_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "example_files";
- version = "0.2.0";
- src = fetchHex {
- pkg = "example_files";
- version = "0.2.0";
- sha256 =
- "5454a42e421f5b35669fa80aeac067ca010dfb4fd7f834a530070e2a95d71689";
- };
-
- meta = {
- longDescription = ''Mix tasks for managing example files in your
- project. Your project may contain files that are
- intended to serve as explanatory samples of
- files provided by a project contributor or user,
- such as configuration and the like. The Mix
- tasks provided here enable you to easily find,
- copy, and check the freshness of example files
- and your copies of them.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/njonsson/example_files";
- };
- } // packageOverrides)
- ) {};
-
- example_files = example_files_0_2_0;
-
- exbackoff_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exbackoff";
- version = "0.0.3";
- src = fetchHex {
- pkg = "exbackoff";
- version = "0.0.3";
- sha256 =
- "dc3df168c73800c0978d732c121cd934ce2e5564d6addb953f8601e3010ae225";
- };
-
- meta = {
- description = ''Simple exponential backoffs in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mingchuno/exbackoff";
- };
- } // packageOverrides)
- ) {};
-
- exbackoff = exbackoff_0_0_3;
-
- exbouncer_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exbouncer";
- version = "0.0.1";
- src = fetchHex {
- pkg = "exbouncer";
- version = "0.0.1";
- sha256 =
- "1152124b31dd00eddfb59fff015d92632744fa5cd4630a7eb8976a82aa012e41";
- };
-
- meta = {
- longDescription = ''An authorization library in Elixir for Plug
- applications that restricts what resources the
- current user/admin or any role is allowed to
- access,'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/vysakh0/exbouncer";
- };
- } // packageOverrides)
- ) {};
-
- exbouncer = exbouncer_0_0_1;
-
- excaliper_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "excaliper";
- version = "0.0.1";
- src = fetchHex {
- pkg = "excaliper";
- version = "0.0.1";
- sha256 =
- "d43430518ffcf8de60a1d44355f6a200f348ec1ca8bc4287ca17c97543e86732";
- };
-
- meta = {
- description = ''Fast image dimension detector inspired by the
- Node.JS module Calipers.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mgartner/excaliper";
- };
- } // packageOverrides)
- ) {};
-
- excaliper = excaliper_0_0_1;
-
- excellent_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "excellent";
- version = "0.0.1";
- src = fetchHex {
- pkg = "excellent";
- version = "0.0.1";
- sha256 =
- "a0628dce02de6a33cf441883723c480b0f07fdacade46f6d608465bb717491bd";
- };
-
- meta = {
- description = ''A OpenXL (Excel files ending with .xlsx) parser
- for Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/leifg/excellent";
- };
- } // packageOverrides)
- ) {};
-
- excellent = excellent_0_0_1;
-
- excetera_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "excetera";
- version = "0.0.3";
- src = fetchHex {
- pkg = "excetera";
- version = "0.0.3";
- sha256 =
- "e127e4f553c3925ce301b782cd8e8f123c72cf2463f7f032042f59892e5f37c3";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir bindings for etcd`s HTTP API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mingchuno/excetera";
- };
- } // packageOverrides)
- ) {};
-
- excetera = excetera_0_0_3;
-
- excoap_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "excoap";
- version = "0.0.1";
- src = fetchHex {
- pkg = "excoap";
- version = "0.0.1";
- sha256 =
- "06caae698590da85aded80db7996300127d48a4e9cf7bdca8d35113c094e5094";
- };
-
- meta = {
- description = ''CoAP implementation for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mbialon/excoap";
- };
- } // packageOverrides)
- ) {};
-
- excoap = excoap_0_0_1;
-
- excollections_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "excollections";
- version = "0.0.2";
- src = fetchHex {
- pkg = "excollections";
- version = "0.0.2";
- sha256 =
- "1924fd5bd3c1c7418a9150ca8fcb2d2700a82671f3a76972edc9bc51d32a2093";
- };
-
- meta = {
- longDescription = ''A collection of data-structures and related
- algorithms for Elixir, implemented in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/metabrain/elixir-playground/tree/master/excollections";
- };
- } // packageOverrides)
- ) {};
-
- excollections = excollections_0_0_2;
-
- exconstructor_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exconstructor";
- version = "1.0.2";
- src = fetchHex {
- pkg = "exconstructor";
- version = "1.0.2";
- sha256 =
- "e8cd1c88d5ea044a340fed75deb1fda2edc71afaac157dce561288a6bf733035";
- };
-
- meta = {
- longDescription = ''ExConstructor generates constructor functions
- for your structs, handling map-vs-keyword-list,
- string-vs-atom-keys, and
- camelCase-vs-under_score issues
- automatically.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/appcues/exconstructor";
- };
- } // packageOverrides)
- ) {};
-
- exconstructor = exconstructor_1_0_2;
-
- exdash_0_3_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exdash";
- version = "0.3.1";
- src = fetchHex {
- pkg = "exdash";
- version = "0.3.1";
- sha256 =
- "6a2a3e3c8ea80e5a9e6641db4a109a0a1e0a09c6b7bf190a8b98fa9a650325c5";
- };
-
- meta = {
- description = ''Lodash implementation for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/TFarla/exdash";
- };
- } // packageOverrides)
- ) {};
-
- exdash = exdash_0_3_1;
-
- exdatauri_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exdatauri";
- version = "0.1.0";
- src = fetchHex {
- pkg = "exdatauri";
- version = "0.1.0";
- sha256 =
- "46d064019d4d785428226baafbc3f11fc8621838b0d633768f18182d2cf4a719";
- };
-
- meta = {
- description = ''A RFC 2397 URI parser for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/flupke/exdatauri";
- };
- } // packageOverrides)
- ) {};
-
- exdatauri = exdatauri_0_1_0;
-
- exddb_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, erlcloud_0_11_0 }:
- buildMix ({
- name = "exddb";
- version = "0.1.3";
- src = fetchHex {
- pkg = "exddb";
- version = "0.1.3";
- sha256 =
- "e57bd285110585476a457a843fdcff3cce6923c9472b6bec95ac9bf986dd27e4";
- };
- beamDeps = [ erlcloud_0_11_0 ];
-
- meta = {
- description = ''Simple library for working with data in
- DynamoDB.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/muhmi/exddb";
- };
- } // packageOverrides)
- ) {};
-
- exddb = exddb_0_1_3;
-
- exdesk_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "exdesk";
- version = "0.2.0";
- src = fetchHex {
- pkg = "exdesk";
- version = "0.2.0";
- sha256 =
- "0c1e02bb4aef9075ff4affb3354c0e318dc3be1817faae8b450ef590c7d67688";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Desk.com client library for elixir.'';
-
- homepage = "https://github.com/deadkarma/exdesk";
- };
- } // packageOverrides)
- ) {};
-
- exdesk = exdesk_0_2_0;
-
- exdisque_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, eredis_1_0_8 }:
- buildMix ({
- name = "exdisque";
- version = "0.0.1";
- src = fetchHex {
- pkg = "exdisque";
- version = "0.0.1";
- sha256 =
- "c3b7ec89217df46ae6cf1adadb81118877c66272266f0ee5e2c7ff45d048fb31";
- };
- beamDeps = [ eredis_1_0_8 ];
-
- meta = {
- description = ''Elixir client library for Disque:
- https://github.com/antirez/disque'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mosic/exdisque";
- };
- } // packageOverrides)
- ) {};
-
- exdisque = exdisque_0_0_1;
-
- exec_1_0_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "exec";
- version = "1.0.1";
- src = fetchHex {
- pkg = "exec";
- version = "1.0.1";
- sha256 =
- "87c7ef2dea2bb503bb0eec8cb34776172999aecc6e12d90f7629796a7a3ccb1f";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''OS Process Manager'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/saleyn/erlexec";
- };
- } // packageOverrides)
- ) {};
-
- exec = exec_1_0_1;
-
- execjs_1_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
- buildMix ({
- name = "execjs";
- version = "1.1.3";
- src = fetchHex {
- pkg = "execjs";
- version = "1.1.3";
- sha256 =
- "a0992d14ccc3458563be305d70fd6f6f6e9db6e8b62dd4e15bf69aeb382eb074";
- };
- beamDeps = [ poison_1_5_2 ];
-
- meta = {
- description = ''Run JavaScript code from Elixir'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/devinus/execjs";
- };
- } // packageOverrides)
- ) {};
-
- execjs = execjs_1_1_3;
-
- exelli_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exelli";
- version = "0.1.0";
- src = fetchHex {
- pkg = "exelli";
- version = "0.1.0";
- sha256 =
- "9777493429d5b4e3f3a9391ede7706deba65b253aa0d810efa9e26859b6f269c";
- };
-
- meta = {
- longDescription = ''Elli wrapper in elixir, with some sugar
- syntax. (even 2 times faster than Plug on
- Cowboy) '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/pigmej/exelli";
- };
- } // packageOverrides)
- ) {};
-
- exelli = exelli_0_1_0;
-
- exexec_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, erlexec_1_1_3 }:
- buildMix ({
- name = "exexec";
- version = "0.0.1";
- src = fetchHex {
- pkg = "exexec";
- version = "0.0.1";
- sha256 =
- "890122cae91cc739f84dad66b7358c9e7961dadbebeb650e71ccdeab8963ff91";
- };
- beamDeps = [ erlexec_1_1_3 ];
-
- meta = {
- description = ''An idiomatic Elixir wrapper for erlexec.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/antipax/exexec";
- };
- } // packageOverrides)
- ) {};
-
- exexec = exexec_0_0_1;
-
- exexif_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exexif";
- version = "0.0.1";
- src = fetchHex {
- pkg = "exexif";
- version = "0.0.1";
- sha256 =
- "48db21d8a77a9f922046ad6018266c0df32efb82331113ccb787e08fb7464a74";
- };
-
- meta = {
- longDescription = ''Read TIFF and EXIF information from a
- JPEG-format image. 1. Retrieve data from a file:
- iex> {:ok, info} =
- Exexif.exif_from_jpeg_file(path) Retrieve data
- from a binary containing the JPEG (you don`t
- need the whole thing—the exif is near the
- beginning of a JPEG, so 100k or so should do
- fine). iex> {:ok, info} =
- Exexif.exif_from_jpeg_buffer(buffer) 2. Access
- the high level TIFF data: iex> info.x_resolution
- 72 iex> info.model \"DSC-RX100M2\" 3. The exif
- data is in there, too. iex>
- info.exif.color_space \"sRGB\" iex> info.exif |>
- Dict.keys [:brightness_value, :color_space,
- :component_configuration,
- :compressed_bits_per_pixel, :contrast,
- :custom_rendered, :datetime_original,
- :datetime_tigitized, :digital_zoom_ratio,
- :exif_image_height, :exif_image_width,
- :exif_version, :exposure_bias_value,
- :exposure_mode, :exposure_program,
- :exposure_time, :f_number, :file_source, :flash,
- :flash_pix_persion, :focal_length,
- :focal_length_in_35mm_film, :iso_speed_ratings,
- :lens_info, :light_source, :max_aperture_value,
- :metering_mode, :recommended_exposure,
- :saturation, :scene_capture_type, :scene_type,
- :sensitivity_type, :sharpness, :white_balance]
- '';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/pragdave/exexif";
- };
- } // packageOverrides)
- ) {};
-
- exexif = exexif_0_0_1;
-
- exfavicon_0_3_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- floki_0_8_1
- }:
- buildMix ({
- name = "exfavicon";
- version = "0.3.3";
- src = fetchHex {
- pkg = "exfavicon";
- version = "0.3.3";
- sha256 =
- "f1c5aa3506c90ba28e6f3ddcf3e9feda8518af1b4b12a6d2f518f86a10d1719b";
- };
- beamDeps = [ httpoison_0_8_3 floki_0_8_1 ];
-
- meta = {
- description = ''A exfavicon to detect a site`s favicon.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ikeikeikeike/exfavicon";
- };
- } // packageOverrides)
- ) {};
-
- exfavicon = exfavicon_0_3_3;
-
- exfirebase_0_4_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpotion_2_2_2,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "exfirebase";
- version = "0.4.0";
- src = fetchHex {
- pkg = "exfirebase";
- version = "0.4.0";
- sha256 =
- "acd2f1fe87e83437a5d52b811b3e86bc75933bc29b0daa2da836a97ddd60b478";
- };
- beamDeps = [ httpotion_2_2_2 exjsx_3_2_0 ];
-
- meta = {
- description = ''An elixir library for accessing the Firebase REST
- API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/parroty/exfirebase";
- };
- } // packageOverrides)
- ) {};
-
- exfirebase = exfirebase_0_4_0;
-
- exfoaas_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "exfoaas";
- version = "0.0.2";
- src = fetchHex {
- pkg = "exfoaas";
- version = "0.0.2";
- sha256 =
- "521f355f8c38c056f66cd8ac236f561c2a3502e451c07a88761e05c22c8848aa";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''brings the utility of FOAAS to elixir.'';
- license = stdenv.lib.licenses.wtfpl;
- homepage = "https://github.com/cryptobird/ExFOAAS.git";
- };
- } // packageOverrides)
- ) {};
-
- exfoaas = exfoaas_0_0_2;
-
- exfsm_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exfsm";
- version = "0.1.3";
- src = fetchHex {
- pkg = "exfsm";
- version = "0.1.3";
- sha256 =
- "6535a0565d6013ca728c10e11c9ac85216d995652892469f7380147da8c3d727";
- };
-
- meta = {
- longDescription = ''Simple elixir library to define composable
- FSM as function (not related at all with
- `:gen_fsm`, no state/process management)'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/awetzel/exfsm";
- };
- } // packageOverrides)
- ) {};
-
- exfsm = exfsm_0_1_3;
-
- exfswatch_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2 }:
- buildMix ({
- name = "exfswatch";
- version = "0.1.1";
- src = fetchHex {
- pkg = "exfswatch";
- version = "0.1.1";
- sha256 =
- "b97d5e120dc9efbf31e182625e1382f09202cf66863161570221bb4e1bfa82a1";
- };
- beamDeps = [ fs_0_9_2 ];
-
- meta = {
- description = ''A file change watcher wrapper based on
- [fs](https://github.com/synrc/fs)'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/falood/exfswatch";
- };
- } // packageOverrides)
- ) {};
-
- exfswatch = exfswatch_0_1_1;
-
- exfuck_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exfuck";
- version = "0.1.0";
- src = fetchHex {
- pkg = "exfuck";
- version = "0.1.0";
- sha256 =
- "c71358ae7a31682d84f89f7f5fdc1c6b545ea93f70391a9ec15987458d70dbe8";
- };
-
- meta = {
- description = ''Brainfuck interpreter written in elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/shiroyasha/exfuck";
- };
- } // packageOverrides)
- ) {};
-
- exfuck = exfuck_0_1_0;
-
- exgenius_0_0_5 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "exgenius";
- version = "0.0.5";
- src = fetchHex {
- pkg = "exgenius";
- version = "0.0.5";
- sha256 =
- "f0f4463ac9ad79a102a1bf0ded91d77ed87ce262da6045990be51450ef240fd5";
- };
- beamDeps = [ httpoison_0_8_3 exjsx_3_2_0 ];
-
- meta = {
- longDescription = '' Elixir library for the (undocumented) Rap
- Genius (and also Rock, Tech, Pop, Country, etc)
- API '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jeffweiss/exgenius";
- };
- } // packageOverrides)
- ) {};
-
- exgenius = exgenius_0_0_5;
-
- exgingerapi_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_0_1,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "exgingerapi";
- version = "0.0.3";
- src = fetchHex {
- pkg = "exgingerapi";
- version = "0.0.3";
- sha256 =
- "7375b282a1b290e851bbbb7de499c099ff0310443e8a51d8741554b92d4a08f1";
- };
- beamDeps = [ poison_2_0_1 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir wrapper for ginger proofreading API
- (english)'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/nathanjohnson320/exgingerapi";
- };
- } // packageOverrides)
- ) {};
-
- exgingerapi = exgingerapi_0_0_3;
-
- exgravatar_2_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exgravatar";
- version = "2.0.0";
- src = fetchHex {
- pkg = "exgravatar";
- version = "2.0.0";
- sha256 =
- "ddfcfc899f24fd98c811a6824964c85b5c87a60f41fe034380081680d5c8e765";
- };
-
- meta = {
- description = ''An Elixir module for generating Gravatar urls.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/scrogson/exgravatar";
- };
- } // packageOverrides)
- ) {};
-
- exgravatar = exgravatar_2_0_0;
-
- exhcl_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exhcl";
- version = "0.2.1";
- src = fetchHex {
- pkg = "exhcl";
- version = "0.2.1";
- sha256 =
- "9c7ab6216cd978b2dd3f6573dd3ccf0a9d5055b36008a0ada01d9431198c17f7";
- };
-
- meta = {
- description = ''Configuration language inspired by HCL'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/asakura/exhcl";
- };
- } // packageOverrides)
- ) {};
-
- exhcl = exhcl_0_2_1;
-
- exiban_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exiban";
- version = "0.0.4";
- src = fetchHex {
- pkg = "exiban";
- version = "0.0.4";
- sha256 =
- "c1d1da991db264ca99b9e9245bb09d69f6297050b18329be1e4c01d5106778b5";
- };
-
- meta = {
- description = ''Library for manipulating and validating IBAN
- account numbers.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kkempin/exiban";
- };
- } // packageOverrides)
- ) {};
-
- exiban = exiban_0_0_4;
-
- exirc_0_10_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exirc";
- version = "0.10.0";
- src = fetchHex {
- pkg = "exirc";
- version = "0.10.0";
- sha256 =
- "f2382ad3d97e791cc38ce54558296bb0afe7d222dc5f248ec72c6a0ca9c494a8";
- };
-
- meta = {
- description = ''An IRC client library for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bitwalker/exirc";
- };
- } // packageOverrides)
- ) {};
-
- exirc_0_11_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exirc";
- version = "0.11.0";
- src = fetchHex {
- pkg = "exirc";
- version = "0.11.0";
- sha256 =
- "797a91fd92ca93d639bf323ea4b31a42ed4ac2d67d3096100df7b1b615a88ace";
- };
-
- meta = {
- description = ''An IRC client library for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bitwalker/exirc";
- };
- } // packageOverrides)
- ) {};
-
- exirc = exirc_0_11_0;
-
- exjson_0_5_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exjson";
- version = "0.5.0";
- src = fetchHex {
- pkg = "exjson";
- version = "0.5.0";
- sha256 =
- "749422adf4381c8089a910d0ca545282ff0bd506cd4e17a6a08f4f9e7799fa94";
- };
-
- meta = {
- description = ''A simple Elixir implementation of JSON with an
- Erlang parser.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/guedes/exjson";
- };
- } // packageOverrides)
- ) {};
-
- exjson = exjson_0_5_0;
-
- exjsx_3_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, jsx_2_5_3 }:
- buildMix ({
- name = "exjsx";
- version = "3.0.2";
- src = fetchHex {
- pkg = "exjsx";
- version = "3.0.2";
- sha256 =
- "2cd67240a54e9cd2616bc83c0c352d47f87bccd2ec599eceedc00bcbe9063f07";
- };
- beamDeps = [ jsx_2_5_3 ];
-
- meta = {
- description = ''json for elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/talentdeficit/exjsx";
- };
- } // packageOverrides)
- ) {};
-
- exjsx_3_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, jsx_2_5_3 }:
- buildMix ({
- name = "exjsx";
- version = "3.1.0";
- src = fetchHex {
- pkg = "exjsx";
- version = "3.1.0";
- sha256 =
- "588a0b67ed0c45b21f018515fc478efac83c088661bd588831e41c9073a818fb";
- };
- beamDeps = [ jsx_2_5_3 ];
-
- meta = {
- description = ''json for elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/talentdeficit/exjsx";
- };
- } // packageOverrides)
- ) {};
-
- exjsx_3_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, jsx_2_6_2 }:
- buildMix ({
- name = "exjsx";
- version = "3.2.0";
- src = fetchHex {
- pkg = "exjsx";
- version = "3.2.0";
- sha256 =
- "9c8600822e894e3c31bed800c78a5a04812b71a6e5a5656426c6ce01ebe2cf1c";
- };
- beamDeps = [ jsx_2_6_2 ];
-
- meta = {
- description = ''json for elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/talentdeficit/exjsx";
- };
- } // packageOverrides)
- ) {};
-
- exjsx = exjsx_3_2_0;
-
- exkanji_0_2_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exromaji_0_3_0 }:
- buildMix ({
- name = "exkanji";
- version = "0.2.6";
- src = fetchHex {
- pkg = "exkanji";
- version = "0.2.6";
- sha256 =
- "2de4907764e9f1f2c67d9bc6b49a44d50fd0cbc86b5848cbada14438616636d1";
- };
- beamDeps = [ exromaji_0_3_0 ];
-
- meta = {
- longDescription = ''A Elixir library for translating between
- hiragana, katakana, romaji and kanji. It uses
- Mecab.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ikeikeikeike/exkanji";
- };
- } // packageOverrides)
- ) {};
-
- exkanji = exkanji_0_2_6;
-
- exkismet_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "exkismet";
- version = "0.0.2";
- src = fetchHex {
- pkg = "exkismet";
- version = "0.0.2";
- sha256 =
- "3648f010eb80891b0195f9ced0e02a5a08860a9d96e8f7bbe328c68f27b85b64";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''A client (completely unofficial) for the
- Akismet.com comment-spam detection API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/cameronp/exkismet";
- };
- } // packageOverrides)
- ) {};
-
- exkismet = exkismet_0_0_2;
-
- exldap_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exldap";
- version = "0.2.0";
- src = fetchHex {
- pkg = "exldap";
- version = "0.2.0";
- sha256 =
- "7e2d1e96dacaddd6b515cc2033b5c9e21d23d1897e3a9f8ca2b6f31d091d72a6";
- };
-
- meta = {
- description = ''A module for working with LDAP from Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jmerriweather/exldap";
- };
- } // packageOverrides)
- ) {};
-
- exldap = exldap_0_2_0;
-
- exleveldb_0_7_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exleveldb";
- version = "0.7.0";
- src = fetchHex {
- pkg = "exleveldb";
- version = "0.7.0";
- sha256 =
- "90ff2b76b58c889e60203951c1cf5072cf24fd1fad9faad3dce6c96bf34330fc";
- };
-
- meta = {
- longDescription = ''Exleveldb is a thin wrapper around Basho`s
- eleveldb (github.com/basho/eleveldb). At the
- moment, Exleveldb exposes functions for the
- following features of LevelDB: - Opening a new
- datastore. - Closing an open datastore. -
- Getting values by key. - Storing individual
- key-value pairs. - Deleting stored key-value
- pairs. - Checking if a datastore is empty. -
- Folding over key-value pairs in the datastore. -
- Folding over keys in the datastore. - Batch
- writes to the datastore (put or delete). -
- Destroying a datastore. Additionally, the option
- of streaming key-value pairs or keys from the
- datastore has been added in v0.5.0. Note:
- Because eleveldb is not a hex package, you will
- need to include it as a separate dependency in
- your project (See `README.md`).'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/skovsgaard/exleveldb.git";
- };
- } // packageOverrides)
- ) {};
-
- exleveldb = exleveldb_0_7_0;
-
- exlibris_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exlibris";
- version = "0.0.1";
- src = fetchHex {
- pkg = "exlibris";
- version = "0.0.1";
- sha256 =
- "c6f957233b464eeddf590bad43368427ee9c715470e89d2f348d7d01935ad7be";
- };
-
- meta = {
- longDescription = ''A collection of random library functions I
- use across multiple projects: pipe_while_ok:
- Create pipelines that terminate early if any
- step fails to return a tuple that starts {:ok,
- ...} before_returning: Like Ruby`s returning, it
- evaluates its first argument, then evalates the
- do block. It always returns the value of its
- first argument. '';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/pragdave/exlibris";
- };
- } // packageOverrides)
- ) {};
-
- exlibris = exlibris_0_0_1;
-
- exlingr_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exlingr";
- version = "0.0.1";
- src = fetchHex {
- pkg = "exlingr";
- version = "0.0.1";
- sha256 =
- "b45acd0e10f719b88c943b3194b7fded6ece9874c7da2c1f18b2ce2425581701";
- };
-
- meta = {
- description = ''Lingr client library for elixir. '';
- license = stdenv.lib.licenses.wtfpl;
- homepage = "https://github.com/mtwtkman/exlingr";
- };
- } // packageOverrides)
- ) {};
-
- exlingr = exlingr_0_0_1;
-
- exmatrix_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, benchfella_0_3_2 }:
- buildMix ({
- name = "exmatrix";
- version = "0.0.1";
- src = fetchHex {
- pkg = "exmatrix";
- version = "0.0.1";
- sha256 =
- "58fe316b1ee31f9394f246ec91a6a9157dfae0c38ea649a4c11f70976ca1d13b";
- };
- beamDeps = [ benchfella_0_3_2 ];
-
- meta = {
- longDescription = ''ExMatrix is a small library for working with
- matrices, originally developed for testing
- matrix multiplication in parallel.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/a115/exmatrix";
- };
- } // packageOverrides)
- ) {};
-
- exmatrix = exmatrix_0_0_1;
-
- exmerl_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exmerl";
- version = "0.1.1";
- src = fetchHex {
- pkg = "exmerl";
- version = "0.1.1";
- sha256 =
- "4bb5d6c1863c5e381b460416c9b517a211db9abd9abf0f32c99b07e128b842aa";
- };
-
- meta = {
- description = ''An Elixir wrapper for parsing XML through the
- xmerl_* suite of modules '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/pwoolcoc/exmerl";
- };
- } // packageOverrides)
- ) {};
-
- exmerl = exmerl_0_1_1;
-
- exmetrics_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exmetrics";
- version = "1.1.0";
- src = fetchHex {
- pkg = "exmetrics";
- version = "1.1.0";
- sha256 =
- "1f4645ca0e9ef9b1815c0b301ff2f9a5b5548bc45adb68386cb6529998513d1b";
- };
-
- meta = {
- longDescription = ''Exmetrics provides counters, gauges and
- histograms for instrumenting an elixir
- application.'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- exmetrics = exmetrics_1_1_0;
-
- exml_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exml";
- version = "0.1.0";
- src = fetchHex {
- pkg = "exml";
- version = "0.1.0";
- sha256 =
- "aeed2cc53cae303180fa18eb552241af32e7f05af94ac82de9b81d67b71dee78";
- };
-
- meta = {
- description = ''Most simple Elixir wrapper for xmerl xpath'';
-
- };
- } // packageOverrides)
- ) {};
-
- exml = exml_0_1_0;
-
- exmoji_0_2_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
- buildMix ({
- name = "exmoji";
- version = "0.2.2";
- src = fetchHex {
- pkg = "exmoji";
- version = "0.2.2";
- sha256 =
- "d0123ec6fd14506da93b0e8fdb7c2efa819cc69addeb56a78f3c1e0b8a09d015";
- };
- beamDeps = [ poison_1_5_2 ];
-
- meta = {
- description = ''Emoji encoding swiss army knife for dealing with
- Unicode and other gotchas.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mroth/exmoji";
- };
- } // packageOverrides)
- ) {};
-
- exmoji = exmoji_0_2_2;
-
- exns_0_3_5_beta = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- uuid_1_1_4,
- poolboy_1_5_1,
- poison_1_5_2,
- msgpax_0_8_2
- }:
- buildMix ({
- name = "exns";
- version = "0.3.5-beta";
- src = fetchHex {
- pkg = "exns";
- version = "0.3.5-beta";
- sha256 =
- "2c5b1f263ebfe9636802cca5559e74009ae4384418e44820f0ff05130dbcb593";
- };
- beamDeps = [ uuid_1_1_4 poolboy_1_5_1 poison_1_5_2 msgpax_0_8_2
- ];
-
- meta = {
- longDescription = ''A library for writing clients to communicate
- with Python nanoservices via nanomsg.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/walkr/exns";
- };
- } // packageOverrides)
- ) {};
-
- exns = exns_0_3_5_beta;
-
- exnumerable_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exnumerable";
- version = "0.0.1";
- src = fetchHex {
- pkg = "exnumerable";
- version = "0.0.1";
- sha256 =
- "ea6041540da09b96176a37bdd71e3c6fbacb8353aca3b084deedb17cee265e2e";
- };
-
- meta = {
- description = ''Enumerable type definition in a simple way to be
- used with any database.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KamilLelonek/exnumerable";
- };
- } // packageOverrides)
- ) {};
-
- exnumerable = exnumerable_0_0_1;
-
- exnumerator_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exnumerator";
- version = "1.1.0";
- src = fetchHex {
- pkg = "exnumerator";
- version = "1.1.0";
- sha256 =
- "1c52033471dfae7b32c897cb0034eb1d3602bcb14342ca08090c42b02001b2fd";
- };
-
- meta = {
- description = ''Enumerable type definition in a simple way to be
- used with any database.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KamilLelonek/exnumerator";
- };
- } // packageOverrides)
- ) {};
-
- exnumerator = exnumerator_1_1_0;
-
- exnumterator_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exnumterator";
- version = "1.0.0";
- src = fetchHex {
- pkg = "exnumterator";
- version = "1.0.0";
- sha256 =
- "895b1dfff48d0459e66338ca8a8b831c2f31654fc0758a24e11a2f54a9cb1106";
- };
-
- meta = {
- description = ''Enumerable type definition in a simple way to be
- used with any database.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KamilLelonek/exnumterator";
- };
- } // packageOverrides)
- ) {};
-
- exnumterator = exnumterator_1_0_0;
-
- exoddic_1_3_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exoddic";
- version = "1.3.1";
- src = fetchHex {
- pkg = "exoddic";
- version = "1.3.1";
- sha256 =
- "e244c4aab1a25836300973f8afd42aef41dea19121c748c4b6d7b447db842194";
- };
-
- meta = {
- description = ''Odds and probability handling and conversions'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/exoddic";
- };
- } // packageOverrides)
- ) {};
-
- exoddic = exoddic_1_3_1;
-
- expand_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "expand";
- version = "0.0.3";
- src = fetchHex {
- pkg = "expand";
- version = "0.0.3";
- sha256 =
- "5f2ce07ba074392100fc5f6b8e8af9ec728ce4716e592422c510997d543efa63";
- };
-
- meta = {
- description = ''A pretty printer'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/joeyates/expand";
- };
- } // packageOverrides)
- ) {};
-
- expand = expand_0_0_3;
-
- exparticle_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "exparticle";
- version = "0.0.2";
- src = fetchHex {
- pkg = "exparticle";
- version = "0.0.2";
- sha256 =
- "ce70b77da48e84307791af00143ad4b9677d39765459865976d459d3b1bdcaf2";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''ExParticle is an elixir client to communicate
- with Particle Cloud API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mtanzi/exparticle";
- };
- } // packageOverrides)
- ) {};
-
- exparticle = exparticle_0_0_2;
-
- experiment_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "experiment";
- version = "0.0.3";
- src = fetchHex {
- pkg = "experiment";
- version = "0.0.3";
- sha256 =
- "5acb6c232aff08719f97254ca27ed1eb165c3f2d229e03cda85e4d31ad7b3156";
- };
-
- meta = {
- description = ''Experiment is a library for carefully refactoring
- critical paths in production.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/andrewvy/experiment";
- };
- } // packageOverrides)
- ) {};
-
- experiment = experiment_0_0_3;
-
- expinboard_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- ibrowse_4_2_2,
- httpotion_2_2_2,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "expinboard";
- version = "0.0.1";
- src = fetchHex {
- pkg = "expinboard";
- version = "0.0.1";
- sha256 =
- "3ff152d837293c0f53ead6cba4180ced55308d2869faa698e459abbe23d59bdc";
- };
- beamDeps = [ ibrowse_4_2_2 httpotion_2_2_2 exjsx_3_2_0 ];
-
- meta = {
- description = ''A simple elixir pinboard client.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/thilko/expinboard";
- };
- } // packageOverrides)
- ) {};
-
- expinboard = expinboard_0_0_1;
-
- expletive_0_1_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "expletive";
- version = "0.1.4";
- src = fetchHex {
- pkg = "expletive";
- version = "0.1.4";
- sha256 =
- "dfb9ac919526bcb7f28b5acadad634b7e9d220203874ef124a87264a078f24b4";
- };
-
- meta = {
- description = ''Profanity detection and sanitization library'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/xavier/expletive";
- };
- } // packageOverrides)
- ) {};
-
- expletive = expletive_0_1_4;
-
- expool_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "expool";
- version = "0.2.0";
- src = fetchHex {
- pkg = "expool";
- version = "0.2.0";
- sha256 =
- "f0cc61c365d1950522ad5816cf638353602db5a5d74feb7c96748dfa2b6f9d07";
- };
-
- meta = {
- description = ''Simple process pooling and task submission'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zackehh/expool";
- };
- } // packageOverrides)
- ) {};
-
- expool = expool_0_2_0;
-
- export_0_0_7 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "export";
- version = "0.0.7";
- src = fetchHex {
- pkg = "export";
- version = "0.0.7";
- sha256 =
- "76c2a174b01f0fac1c3bc5083a7982fb8d41778518e279a526b40e4ced05d1d0";
- };
-
- meta = {
- description = ''Erlport wrapper for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/fazibear/export";
- };
- } // packageOverrides)
- ) {};
-
- export = export_0_0_7;
-
- expr_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "expr";
- version = "0.1.0";
- src = fetchHex {
- pkg = "expr";
- version = "0.1.0";
- sha256 =
- "5076c73cb6beaafeab5fab4731170c29dca5581eec44df3be363660a872abb97";
- };
-
- meta = {
- description = ''An Elixir library for parsing and evaluating
- mathematical expressions '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Rob-bie/Expr";
- };
- } // packageOverrides)
- ) {};
-
- expr = expr_0_1_0;
-
- exprintf_0_1_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exprintf";
- version = "0.1.6";
- src = fetchHex {
- pkg = "exprintf";
- version = "0.1.6";
- sha256 =
- "7acb31f93cef83effd3aa1f0572f9e29d7d1b4f50a6d456e2830fa7594c16182";
- };
-
- meta = {
- description = ''A printf / sprintf library for Elixir. It works
- as a wrapper for :io.format. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/parroty/exprintf";
- };
- } // packageOverrides)
- ) {};
-
- exprintf = exprintf_0_1_6;
-
- exprof_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exprintf_0_1_6 }:
- buildMix ({
- name = "exprof";
- version = "0.2.0";
- src = fetchHex {
- pkg = "exprof";
- version = "0.2.0";
- sha256 =
- "2b3b8c623873172a6c7ba1707981f51feea6b6edbabd5347752030803ad0c954";
- };
- beamDeps = [ exprintf_0_1_6 ];
-
- meta = {
- description = ''A simple code profiler for Elixir using eprof.
- '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/parroty/exprof";
- };
- } // packageOverrides)
- ) {};
-
- exprof = exprof_0_2_0;
-
- exql_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, tds_0_5_4 }:
- buildMix ({
- name = "exql";
- version = "0.0.3";
- src = fetchHex {
- pkg = "exql";
- version = "0.0.3";
- sha256 =
- "0dea2cd0f6cb1ba6c1cd4298716131fafb4271f2c076df0dd6e73e37cecb4705";
- };
- beamDeps = [ tds_0_5_4 ];
-
- meta = {
- description = ''A functional query tool for MSSQL.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mattweldon/exql";
- };
- } // packageOverrides)
- ) {};
-
- exql = exql_0_0_3;
-
- exquisite_0_1_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exquisite";
- version = "0.1.6";
- src = fetchHex {
- pkg = "exquisite";
- version = "0.1.6";
- sha256 =
- "8bd974eea0ef20d841f999818e4b6f0edd8e52b6723e8c5b2c4ba7a22fa07c7a";
- };
-
- meta = {
- description = ''DSL to match_spec'';
- license = stdenv.lib.licenses.wtfpl;
- homepage = "https://github.com/meh/exquisite";
- };
- } // packageOverrides)
- ) {};
-
- exquisite = exquisite_0_1_6;
-
- exredis_0_2_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, eredis_1_0_8 }:
- buildMix ({
- name = "exredis";
- version = "0.2.4";
- src = fetchHex {
- pkg = "exredis";
- version = "0.2.4";
- sha256 =
- "fe43dc6e39220af9c06d575b86c24513dcb1c3ba48f31881a3708cdafe7d3188";
- };
- beamDeps = [ eredis_1_0_8 ];
-
- meta = {
- description = ''Redis client for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/artemeff/exredis";
- };
- } // packageOverrides)
- ) {};
-
- exredis = exredis_0_2_4;
-
- exref_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exref";
- version = "0.1.1";
- src = fetchHex {
- pkg = "exref";
- version = "0.1.1";
- sha256 =
- "92d73f1eff56f2d0493a2dbf5e932b48b99a2cdd2e3cc3fc0ffeb9c1ae5ed86c";
- };
-
- meta = {
- description = ''Damn simple mix integration of xref.'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- exref = exref_0_1_1;
-
- exrequester_0_5_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "exrequester";
- version = "0.5.2";
- src = fetchHex {
- pkg = "exrequester";
- version = "0.5.2";
- sha256 =
- "9c55974b2f9a4294dd9a53ebed8f9b1c2788cd0845dccbc9471cf6869201903a";
- };
- beamDeps = [ poison_1_5_2 httpotion_2_2_2 ];
-
- meta = {
- description = ''Quickly create API clients using module
- attributes.'';
-
- homepage = "https://github.com/oarrabi/exrequester";
- };
- } // packageOverrides)
- ) {};
-
- exrequester = exrequester_0_5_2;
-
- exrethinkdb_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_4_0 }:
- buildMix ({
- name = "exrethinkdb";
- version = "0.0.3";
- src = fetchHex {
- pkg = "exrethinkdb";
- version = "0.0.3";
- sha256 =
- "c48a25a613de9f4c8ffe490044e448f01d816e0f6806af018494c3a19890ed1a";
- };
- beamDeps = [ poison_1_4_0 ];
-
- meta = {
- description = ''RethinkDB driver for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hamiltop/exrethinkdb";
- };
- } // packageOverrides)
- ) {};
-
- exrethinkdb = exrethinkdb_0_0_3;
-
- exromaji_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exromaji";
- version = "0.3.0";
- src = fetchHex {
- pkg = "exromaji";
- version = "0.3.0";
- sha256 =
- "d1b820b3de05bb3729b3b1d8b3e22ee965899a90abbec44ed6d18507a5f174d3";
- };
-
- meta = {
- description = ''A Elixir library for translating between
- hiragana, katakana, and romaji.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ikeikeikeike/exromaji";
- };
- } // packageOverrides)
- ) {};
-
- exromaji = exromaji_0_3_0;
-
- exrun_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exrun";
- version = "0.1.2";
- src = fetchHex {
- pkg = "exrun";
- version = "0.1.2";
- sha256 =
- "db9ea4befa015d7abe88ca610501187f12956d6fe6e527f02f8e4d9e630decf5";
- };
-
- meta = {
- longDescription = ''Elixir - save and easy to use standalone,
- tracing tools for running elixir and erlang
- applications'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/liveforeverx/exrun";
- };
- } // packageOverrides)
- ) {};
-
- exrun = exrun_0_1_2;
-
- exsamples_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exsamples";
- version = "0.1.0";
- src = fetchHex {
- pkg = "exsamples";
- version = "0.1.0";
- sha256 =
- "92acafe7e8a5d6b1c1b5ca937b9dab887f9a4474cfd6510a7117690a6c6da86d";
- };
-
- meta = {
- longDescription = ''Initializes lists of maps, structs or keyword
- lists using tabular data in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/msaraiva/exsamples";
- };
- } // packageOverrides)
- ) {};
-
- exsamples = exsamples_0_1_0;
-
- exscript_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exscript";
- version = "0.0.1";
- src = fetchHex {
- pkg = "exscript";
- version = "0.0.1";
- sha256 =
- "56360c7f6063df2088deb0ec7683dee90c4bfede861ef85b81fa94cc0abe302b";
- };
-
- meta = {
- description = ''Escript generator '';
-
- homepage = "https://github.com/liveforeverx/exscript";
- };
- } // packageOverrides)
- ) {};
-
- exscript = exscript_0_0_1;
-
- exsolr_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "exsolr";
- version = "0.0.1";
- src = fetchHex {
- pkg = "exsolr";
- version = "0.0.1";
- sha256 =
- "dcd26d0301730cb1746702bfacf31de10be5d1b15475a1a7ec4da8c7c49e55d1";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Thin Wrapper around Solr api.'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/dcarneiro/exsolr";
- };
- } // packageOverrides)
- ) {};
-
- exsolr = exsolr_0_0_1;
-
- exstatic_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "exstatic";
- version = "0.1.0";
- src = fetchHex {
- pkg = "exstatic";
- version = "0.1.0";
- sha256 =
- "e063b91c0b2995e4a1a2c1aa56cdd578374320a8755844cc6471b58fa3874d0d";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- longDescription = ''Serve static files from memory in the Phoenix
- Framework. This extension compiles all of a
- project`s static assets (e.g. Javascript, HTML,
- images, etc) into Erlang modules and loads them
- into the Erlang VM, with the purpose of serving
- them fast and without a dependency on a
- filesystem.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/arjan/exstatic";
- };
- } // packageOverrides)
- ) {};
-
- exstatic = exstatic_0_1_0;
-
- exstatsd_0_1_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exactor_2_2_0 }:
- buildMix ({
- name = "exstatsd";
- version = "0.1.5";
- src = fetchHex {
- pkg = "exstatsd";
- version = "0.1.5";
- sha256 =
- "4fcad707df57fdb91338dae212355704924bea8db10207715b95e3c110e7b219";
- };
- beamDeps = [ exactor_2_2_0 ];
-
- meta = {
- description = ''An Elixir ports client for StatsD'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/upbit/ExStatsD";
- };
- } // packageOverrides)
- ) {};
-
- exstatsd = exstatsd_0_1_5;
-
- exsync_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exfswatch_0_1_1 }:
- buildMix ({
- name = "exsync";
- version = "0.1.2";
- src = fetchHex {
- pkg = "exsync";
- version = "0.1.2";
- sha256 =
- "21a1106d5e62ced84a567bde2acbdff73ddf06d2a78fbd80ffa488fae4bde48b";
- };
- beamDeps = [ exfswatch_0_1_1 ];
-
- meta = {
- description = ''Yet another Elixir reloader.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/falood/exsync";
- };
- } // packageOverrides)
- ) {};
-
- exsync = exsync_0_1_2;
-
- extripe_0_3_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "extripe";
- version = "0.3.2";
- src = fetchHex {
- pkg = "extripe";
- version = "0.3.2";
- sha256 =
- "4df5dd859ad780bdb4dc0d1c823a8df82cf7421037f1ed40adf20b426d6729a1";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Stripe API wrapper'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/princemaple/extripe";
- };
- } // packageOverrides)
- ) {};
-
- extripe = extripe_0_3_2;
-
- exts_0_3_1 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, datastructures_0_2_5
- }:
- buildMix ({
- name = "exts";
- version = "0.3.1";
- src = fetchHex {
- pkg = "exts";
- version = "0.3.1";
- sha256 =
- "428226945831d77083cab2a7f9a1f818e6554d789ed7183c215390d7f43cfa40";
- };
- beamDeps = [ datastructures_0_2_5 ];
-
- meta = {
- description = ''ets wrapper'';
- license = stdenv.lib.licenses.wtfpl;
- homepage = "https://github.com/meh/exts";
- };
- } // packageOverrides)
- ) {};
-
- exts = exts_0_3_1;
-
- extwitter_0_7_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
- buildMix ({
- name = "extwitter";
- version = "0.7.1";
- src = fetchHex {
- pkg = "extwitter";
- version = "0.7.1";
- sha256 =
- "9cc83932fbe77d47f0fafc2000574805aa42341eed07a8867b1c27df27c3554a";
- };
- beamDeps = [ poison_1_5_2 ];
-
- meta = {
- description = ''Twitter client library for elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/parroty/extwitter";
- };
- } // packageOverrides)
- ) {};
-
- extwitter = extwitter_0_7_1;
-
- exvcr_0_3_9 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- meck_0_8_4,
- httpotion_2_2_2,
- httpoison_0_8_3,
- exjsx_3_2_0,
- exactor_2_2_0
- }:
- buildMix ({
- name = "exvcr";
- version = "0.3.9";
- src = fetchHex {
- pkg = "exvcr";
- version = "0.3.9";
- sha256 =
- "25645f6598111ba76ed30b4a2079169ae1aed0795ef87bf74d70a3a7ca8f2112";
- };
- beamDeps = [
- meck_0_8_4
- httpotion_2_2_2
- httpoison_0_8_3
- exjsx_3_2_0
- exactor_2_2_0
- ];
-
- meta = {
- description = ''HTTP request/response recording library for
- elixir, inspired by VCR.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/parroty/exvcr";
- };
- } // packageOverrides)
- ) {};
-
- exvcr_0_7_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- meck_0_8_4,
- httpotion_2_2_2,
- httpoison_0_8_3,
- exjsx_3_2_0,
- exactor_2_2_0
- }:
- buildMix ({
- name = "exvcr";
- version = "0.7.4";
- src = fetchHex {
- pkg = "exvcr";
- version = "0.7.4";
- sha256 =
- "620eac79a63426340d31dcc44b66a0d8be89ce4c2dc59b09986e83114bd4c525";
- };
- beamDeps = [
- meck_0_8_4
- httpotion_2_2_2
- httpoison_0_8_3
- exjsx_3_2_0
- exactor_2_2_0
- ];
-
- meta = {
- description = ''HTTP request/response recording library for
- elixir, inspired by VCR.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/parroty/exvcr";
- };
- } // packageOverrides)
- ) {};
-
- exvcr = exvcr_0_7_4;
-
- exyelp_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- oauther_1_0_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "exyelp";
- version = "0.0.2";
- src = fetchHex {
- pkg = "exyelp";
- version = "0.0.2";
- sha256 =
- "1be8553ea0369a092eac1b6a0b47652b7c0570911483aa3ca454bef05ddd4d5d";
- };
- beamDeps = [ poison_2_1_0 oauther_1_0_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''An Elixir Yelp API client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gaslight/exyelp";
- };
- } // packageOverrides)
- ) {};
-
- exyelp = exyelp_0_0_2;
-
- exyz_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "exyz";
- version = "1.0.0";
- src = fetchHex {
- pkg = "exyz";
- version = "1.0.0";
- sha256 =
- "b1d53964ca72f70dd71c91327bf912858619d0357a53765ed3a08671e6769ef5";
- };
-
- meta = {
- description = ''Z-combinator in elixir: recursive anonymous
- functions.'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/Dkendal/exyz";
- };
- } // packageOverrides)
- ) {};
-
- exyz = exyz_1_0_0;
-
- eye_drops_1_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2 }:
- buildMix ({
- name = "eye_drops";
- version = "1.2.0";
- src = fetchHex {
- pkg = "eye_drops";
- version = "1.2.0";
- sha256 =
- "0e0fe7ccf1fc4208ae0811c60a0f0d1e37ef9a60dfaefc8ff235a8be51fa9ae7";
- };
- beamDeps = [ fs_0_9_2 ];
-
- meta = {
- longDescription = ''A configurable mix task to watch file changes
- Watch file changes in a project and run the
- corresponding command when a change happens.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rkotze/eye_drops";
- };
- } // packageOverrides)
- ) {};
-
- eye_drops = eye_drops_1_2_0;
-
- ezcryptex_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, cryptex_0_0_1 }:
- buildMix ({
- name = "ezcryptex";
- version = "0.0.1";
- src = fetchHex {
- pkg = "ezcryptex";
- version = "0.0.1";
- sha256 =
- "0c1c295cf5500106f7288949021ccbdc0d3a9276c2ae9938e45254b7500017b5";
- };
- beamDeps = [ cryptex_0_0_1 ];
-
- meta = {
- longDescription = ''Thin layer on top of Cryptex for more easily
- encrypting/decrypting, signing/verifying data in
- elixir. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/stocks29/ezcryptex";
- };
- } // packageOverrides)
- ) {};
-
- ezcryptex = ezcryptex_0_0_1;
-
- facebook_messenger_0_3_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- plug_1_1_5,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "facebook_messenger";
- version = "0.3.0";
- src = fetchHex {
- pkg = "facebook_messenger";
- version = "0.3.0";
- sha256 =
- "30b1f7334649b671a4844dfcf7af1df00ad3082e8d42399466003636d95902ab";
- };
- beamDeps = [ poison_2_1_0 plug_1_1_5 httpotion_2_2_2 ];
-
- meta = {
- longDescription = ''ExFacebookMessenger is a library that easy
- the creation of facebook messenger bots.'';
-
- homepage = "https://github.com/oarrabi/facebook_messenger";
- };
- } // packageOverrides)
- ) {};
-
- facebook_messenger = facebook_messenger_0_3_0;
-
- factory_girl_elixir_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "factory_girl_elixir";
- version = "0.1.1";
- src = fetchHex {
- pkg = "factory_girl_elixir";
- version = "0.1.1";
- sha256 =
- "2e07de9813089c6e6a45f0584eb2bfd28d3acbf654073b9e2ed6d0fd531b8f7e";
- };
-
- meta = {
- description = ''Minimal implementation of Ruby`s factory_girl in
- Elixir. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sinetris/factory_girl_elixir";
- };
- } // packageOverrides)
- ) {};
-
- factory_girl_elixir = factory_girl_elixir_0_1_1;
-
- fake_cas_1_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4,
- bypass_0_5_1
- }:
- buildMix ({
- name = "fake_cas";
- version = "1.1.0";
- src = fetchHex {
- pkg = "fake_cas";
- version = "1.1.0";
- sha256 =
- "2e3ce97b181f9de122fd7dc07bffdbe2a6f6439524407b976c9d1b70332206ae";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 bypass_0_5_1 ];
-
- meta = {
- description = ''A Cas server stub'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rhruiz/elixir-fake_cas";
- };
- } // packageOverrides)
- ) {};
-
- fake_cas = fake_cas_1_1_0;
-
- faker_0_6_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "faker";
- version = "0.6.0";
- src = fetchHex {
- pkg = "faker";
- version = "0.6.0";
- sha256 =
- "4f305a9ec9a2645bf4777dda1b56643d04333b7ff601145bf4b80acca030c2a0";
- };
-
- meta = {
- description = ''Faker is a pure Elixir library for generating
- fake data.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/igas/faker";
- };
- } // packageOverrides)
- ) {};
-
- faker = faker_0_6_0;
-
- fasta_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, parallel_0_0_3 }:
- buildMix ({
- name = "fasta";
- version = "0.1.0";
- src = fetchHex {
- pkg = "fasta";
- version = "0.1.0";
- sha256 =
- "ebacba161985bf3d1bc5cf35e6ab0c01ce7f1f0fcc52151a35605eb9a6fac44b";
- };
- beamDeps = [ parallel_0_0_3 ];
-
- meta = {
- description = ''FASTA is a tool for parsing FASTA-formatted
- strings in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/annejohnson/FASTA";
- };
- } // packageOverrides)
- ) {};
-
- fasta = fasta_0_1_0;
-
- faust_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "faust";
- version = "0.1.0";
- src = fetchHex {
- pkg = "faust";
- version = "0.1.0";
- sha256 =
- "0ab347a6f377a97e621db0f659841436d6dbb31f1b7c8309e3fb543bec0c473e";
- };
-
- meta = {
- description = ''A Markov chain text generator for Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/jquadrin/faust";
- };
- } // packageOverrides)
- ) {};
-
- faust = faust_0_1_0;
-
- fdg_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "fdg";
- version = "0.0.4";
- src = fetchHex {
- pkg = "fdg";
- version = "0.0.4";
- sha256 =
- "a5ec0f8214e52c63186e620a3556a3d61c6fa9118bf4a6b84b67ff236b8a98da";
- };
-
- meta = {
- longDescription = ''This project aims to be a simple library with
- which to build force directed graphs. Ideally,
- FDG will be used to produce visualiations of
- networks and static analysis of code.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/johnhamelink/elixir-fdg";
- };
- } // packageOverrides)
- ) {};
-
- fdg = fdg_0_0_4;
-
- feature_toggler_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exredis_0_2_4 }:
- buildMix ({
- name = "feature_toggler";
- version = "0.0.1";
- src = fetchHex {
- pkg = "feature_toggler";
- version = "0.0.1";
- sha256 =
- "dac607aa67971e87b9d8fb8eb3057246d4480c99e11951faa1ed9f204b7f48ae";
- };
- beamDeps = [ exredis_0_2_4 ];
-
- meta = {
- description = ''This is a simple feature toggler/switch with
- redis database written in elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/aravindgd/feature_toggler";
- };
- } // packageOverrides)
- ) {};
-
- feature_toggler = feature_toggler_0_0_1;
-
- feeder_1_4_7 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "feeder";
- version = "1.4.7";
- src = fetchHex {
- pkg = "feeder";
- version = "1.4.7";
- sha256 =
- "1ac4696d0801c5e433caedeb38001341a9e22120998dcb0ee6d358266260c3da";
- };
-
- meta = {
- description = ''Stream parse RSS and Atom formatted XML feeds.
- '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/michaelnisi/feeder";
- };
- } // packageOverrides)
- ) {};
-
- feeder_2_0_0 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "feeder";
- version = "2.0.0";
- src = fetchHex {
- pkg = "feeder";
- version = "2.0.0";
- sha256 =
- "9780c5f032d3480cf7d9fd71d3f0c5f73211e0d3a8d9cdabcb1327b3a4ff758e";
- };
-
- meta = {
- description = ''Stream parse RSS and Atom formatted XML feeds.
- '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/michaelnisi/feeder";
- };
- } // packageOverrides)
- ) {};
-
- feeder = feeder_2_0_0;
-
- feeder_ex_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, feeder_1_4_7 }:
- buildMix ({
- name = "feeder_ex";
- version = "0.0.2";
- src = fetchHex {
- pkg = "feeder_ex";
- version = "0.0.2";
- sha256 =
- "0816c5c2757098d02727dcba55dfb8b4ecff66736d0f74d4bd36ffe93f033c31";
- };
- beamDeps = [ feeder_1_4_7 ];
-
- meta = {
- description = ''RSS feed parser. Simple wrapper for feeder.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/manukall/feeder_ex";
- };
- } // packageOverrides)
- ) {};
-
- feeder_ex = feeder_ex_0_0_2;
-
- feederer_0_6_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
- buildMix ({
- name = "feederer";
- version = "0.6.0";
- src = fetchHex {
- pkg = "feederer";
- version = "0.6.0";
- sha256 =
- "c5041617fc7e71db9a0763f36fbda3fa41598203ab8b47972e3e9dae81039861";
- };
- beamDeps = [ poolboy_1_5_1 ];
-
- meta = {
- longDescription = ''Parses XML syndication feeds such as RSS,
- Atom, etc. Elixir feedparser wrapper using
- erlport.'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/draftli/feederer";
- };
- } // packageOverrides)
- ) {};
-
- feederer = feederer_0_6_0;
-
- feedme_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_0_19_5 }:
- buildMix ({
- name = "feedme";
- version = "0.0.1";
- src = fetchHex {
- pkg = "feedme";
- version = "0.0.1";
- sha256 =
- "021621981bbb03b317e4a948a39d269ab1a2dc6d9ec6ee1c744e565000da680d";
- };
- beamDeps = [ timex_0_19_5 ];
-
- meta = {
- description = ''Elixir RSS/Atom parser built on erlang`s xmerl
- xml parser'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/umurgdk/elixir-feedme";
- };
- } // packageOverrides)
- ) {};
-
- feedme = feedme_0_0_1;
-
- feedparser_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "feedparser";
- version = "0.0.3";
- src = fetchHex {
- pkg = "feedparser";
- version = "0.0.3";
- sha256 =
- "ef19d82d5d0db4ca10e1a83c8eefe82678538cdeb143e707bf7ef738177c3eeb";
- };
-
- meta = {
- description = ''Discover and parse RSS and Atom feeds'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/l3kn/Elixir-Feedparser";
- };
- } // packageOverrides)
- ) {};
-
- feedparser = feedparser_0_0_3;
-
- fernetex_0_2_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
- buildMix ({
- name = "fernetex";
- version = "0.2.3";
- src = fetchHex {
- pkg = "fernetex";
- version = "0.2.3";
- sha256 =
- "cf8ac1334cd1937e448bb0c873c1df94dc8bb38cb2320966ba69d9ff8f755805";
- };
- beamDeps = [ timex_1_0_2 ];
-
- meta = {
- description = ''Elixir implementation of Fernet library based on
- https://github.com/fernet/spec'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kennyp/fernetex";
- };
- } // packageOverrides)
- ) {};
-
- fernetex = fernetex_0_2_3;
-
- fifo_s3_0_2_2 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- lager_3_0_2,
- hackney_1_6_0,
- erlcloud_0_13_2,
- base16_1_0_0
- }:
- buildRebar3 ({
- name = "fifo_s3";
- version = "0.2.2";
- src = fetchHex {
- pkg = "fifo_s3";
- version = "0.2.2";
- sha256 =
- "871809a49fdb22ad7e9ee04fa7a53368e216072cf473046d8f74ee956e735b19";
- };
-
- beamDeps = [
- poolboy_1_5_1
- lager_3_0_2
- hackney_1_6_0
- erlcloud_0_13_2
- base16_1_0_0
- ];
-
- meta = {
- description = ''S3 storange client library for erlang'';
-
- };
- } // packageOverrides)
- ) {};
-
- fifo_s3 = fifo_s3_0_2_2;
-
- fifocache_1_0_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "fifocache";
- version = "1.0.1";
- src = fetchHex {
- pkg = "fifocache";
- version = "1.0.1";
- sha256 =
- "363f03e2871b8d8c7564a47133162ce18c362bd70897f5bd58fa246a0e169a43";
- };
-
- meta = {
- description = ''Fixed size FIFO cache implementation'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/mururu/fifocache";
- };
- } // packageOverrides)
- ) {};
-
- fifocache = fifocache_1_0_1;
-
- figaro_elixir_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "figaro_elixir";
- version = "1.0.0";
- src = fetchHex {
- pkg = "figaro_elixir";
- version = "1.0.0";
- sha256 =
- "98a7690c60fc32874e73b025b7deb5887d7cdff4556178af1849bde38a7ba104";
- };
-
- meta = {
- description = ''Environmental variables manager and configuration
- management tool.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KamilLelonek/figaro-elixir";
- };
- } // packageOverrides)
- ) {};
-
- figaro_elixir = figaro_elixir_1_0_0;
-
- file_info_0_0_2 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, mimetype_parser_0_1_2
- }:
- buildMix ({
- name = "file_info";
- version = "0.0.2";
- src = fetchHex {
- pkg = "file_info";
- version = "0.0.2";
- sha256 =
- "f28456aafd014c01a4188fee36c1571e9669b0506eb22c830db357084c0c9cb2";
- };
- beamDeps = [ mimetype_parser_0_1_2 ];
-
- meta = {
- description = ''Get MIME-type of a file by its magic number
- (linux only)'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/NobbZ/file_info";
- };
- } // packageOverrides)
- ) {};
-
- file_info = file_info_0_0_2;
-
- finance_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
- buildMix ({
- name = "finance";
- version = "0.0.1";
- src = fetchHex {
- pkg = "finance";
- version = "0.0.1";
- sha256 =
- "fe08fc521e65605d54fd8b68fbdfdbd233b408e8330cf8038337214b553c2c17";
- };
- beamDeps = [ timex_1_0_2 ];
-
- meta = {
- longDescription = ''A library to calculate Xirr through the
- bisection method using parallel processes.'';
-
- };
- } // packageOverrides)
- ) {};
-
- finance = finance_0_0_1;
-
- finicity_0_0_5 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- xml_builder_0_0_8,
- httpotion_2_2_2,
- floki_0_8_1
- }:
- buildMix ({
- name = "finicity";
- version = "0.0.5";
- src = fetchHex {
- pkg = "finicity";
- version = "0.0.5";
- sha256 =
- "b58ef39987976cf50851311a95b40504ba763c0d82256b012f5b1246bd92d9b4";
- };
- beamDeps = [ xml_builder_0_0_8 httpotion_2_2_2 floki_0_8_1 ];
-
- meta = {
- description = ''Client library for Finicity.'';
-
- };
- } // packageOverrides)
- ) {};
-
- finicity = finicity_0_0_5;
-
- firmata_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "firmata";
- version = "0.0.1";
- src = fetchHex {
- pkg = "firmata";
- version = "0.0.1";
- sha256 =
- "c3f928839c32e366389b3f9d34cfc73505952f854dd13c52eff56b9e5853ea6c";
- };
-
- meta = {
- longDescription = ''This package implements the Firmata protocol.
- Firmata is a MIDI-based protocol for
- communicating with microcontrollers.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/kfatehi/firmata";
- };
- } // packageOverrides)
- ) {};
-
- firmata = firmata_0_0_1;
-
- fixby_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "fixby";
- version = "0.0.1";
- src = fetchHex {
- pkg = "fixby";
- version = "0.0.1";
- sha256 =
- "e361bb9324c616e397fc78bda81a3629a39189f4675aefdeb54e85dfa74a629f";
- };
-
- meta = {
- description = ''FIXBY comments that raise after a given version
- of Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/CoderDennis/fixby-elixir";
- };
- } // packageOverrides)
- ) {};
-
- fixby = fixby_0_0_1;
-
- fixme_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "fixme";
- version = "0.0.4";
- src = fetchHex {
- pkg = "fixme";
- version = "0.0.4";
- sha256 =
- "e5e36db0c083a96a459723d89c151fc1f33f9873122e6c4924e06d18d20f9e84";
- };
-
- meta = {
- description = ''FIXME comments that raise after a certain point
- in time.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/henrik/fixme-elixir";
- };
- } // packageOverrides)
- ) {};
-
- fixme = fixme_0_0_4;
-
- flasked_0_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "flasked";
- version = "0.4.0";
- src = fetchHex {
- pkg = "flasked";
- version = "0.4.0";
- sha256 =
- "8499535ce20f8e9d2e38ce7e9ecac1a9fc5f402f3f0ab58661c1ed8795f3178c";
- };
-
- meta = {
- longDescription = ''Flasked injects application environment
- configuration at runtime based on given ENV
- variables and a mapping. This is pretty useful
- for applications following the 12factor app
- principle or which are deployed in
- containerization infrastructures like Docker.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/asaaki/flasked";
- };
- } // packageOverrides)
- ) {};
-
- flasked = flasked_0_4_0;
-
- flock_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "flock";
- version = "0.0.1";
- src = fetchHex {
- pkg = "flock";
- version = "0.0.1";
- sha256 =
- "3a533d32a450cb0e5b78880c421080fb34fb95d4cf3c1ee053b4e97c6cadd4c8";
- };
-
- meta = {
- description = ''Distributed Services '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/chrismccord/flock";
- };
- } // packageOverrides)
- ) {};
-
- flock = flock_0_0_1;
-
- floki_0_0_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "floki";
- version = "0.0.5";
- src = fetchHex {
- pkg = "floki";
- version = "0.0.5";
- sha256 =
- "05044b8dade147bc0390300eefe48c3118eb61d94a57bd73966549a24c76e795";
- };
-
- meta = {
- description = ''Floki is a simple HTML parser that enables search
- for nodes using CSS selectors.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/philss/floki";
- };
- } // packageOverrides)
- ) {};
-
- floki_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, mochiweb_2_12_2 }:
- buildMix ({
- name = "floki";
- version = "0.1.1";
- src = fetchHex {
- pkg = "floki";
- version = "0.1.1";
- sha256 =
- "b608415520f6701acdbbffed86b62291b00ce695f7f3b067919594534c9858a9";
- };
- beamDeps = [ mochiweb_2_12_2 ];
-
- meta = {
- description = ''Floki is a simple HTML parser that enables search
- for nodes using CSS selectors.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/philss/floki";
- };
- } // packageOverrides)
- ) {};
-
- floki_0_7_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, mochiweb_2_12_2 }:
- buildMix ({
- name = "floki";
- version = "0.7.2";
- src = fetchHex {
- pkg = "floki";
- version = "0.7.2";
- sha256 =
- "c7078ac2a54501a16ff469c78292bac5013e457ffa8801b74bc293616aa5b0d0";
- };
- beamDeps = [ mochiweb_2_12_2 ];
-
- meta = {
- description = ''Floki is a simple HTML parser that enables search
- for nodes using CSS selectors.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/philss/floki";
- };
- } // packageOverrides)
- ) {};
-
- floki_0_8_1 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, mochiweb_html_2_15_0
- }:
- buildMix ({
- name = "floki";
- version = "0.8.1";
- src = fetchHex {
- pkg = "floki";
- version = "0.8.1";
- sha256 =
- "40da7fa2ae84a7e662d169ff375f745ae3d50200bba7262567d75e97a8b44485";
- };
- beamDeps = [ mochiweb_html_2_15_0 ];
-
- meta = {
- description = ''Floki is a simple HTML parser that enables search
- for nodes using CSS selectors.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/philss/floki";
- };
- } // packageOverrides)
- ) {};
-
- floki = floki_0_8_1;
-
- fluxter_0_3_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "fluxter";
- version = "0.3.1";
- src = fetchHex {
- pkg = "fluxter";
- version = "0.3.1";
- sha256 =
- "0d0fd8497bd83e6c5552c7eff30a87be75da835f55874c3b2c8a36f5cc784337";
- };
-
- meta = {
- description = ''An InfluxDB writer for Elixir'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/lexmag/fluxter";
- };
- } // packageOverrides)
- ) {};
-
- fluxter = fluxter_0_3_1;
-
- fn_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "fn";
- version = "1.0.0";
- src = fetchHex {
- pkg = "fn";
- version = "1.0.0";
- sha256 =
- "1433b353c8739bb28ac0d6826c9f6a05033f158e8c8195faf01a863668b3bbc7";
- };
-
- meta = {
- description = ''More functional Erlang'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/artemeff/fn";
- };
- } // packageOverrides)
- ) {};
-
- fn = fn_1_0_0;
-
- fnv_0_3_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, hexate_0_5_1 }:
- buildMix ({
- name = "fnv";
- version = "0.3.2";
- src = fetchHex {
- pkg = "fnv";
- version = "0.3.2";
- sha256 =
- "1993ca598fe7ca402f89ed1836c4a5de320330177104ca7eaac230312e069fe5";
- };
- beamDeps = [ hexate_0_5_1 ];
-
- meta = {
- longDescription = ''Some string transformation functions for
- Elixir. Heavily inspired by ActiveSupport`s
- String extensions (Ruby).'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/asaaki/strinx.ex";
- };
- } // packageOverrides)
- ) {};
-
- fnv = fnv_0_3_2;
-
- folsom_0_8_3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, bear_0_8_3 }:
- buildRebar3 ({
- name = "folsom";
- version = "0.8.3";
- src = fetchHex {
- pkg = "folsom";
- version = "0.8.3";
- sha256 =
- "afaa1ea4cd2a10a32242ac5d76fa7b17e98d202883859136b791d9a383b26820";
- };
-
- beamDeps = [ bear_0_8_3 ];
-
- meta = {
- description = ''Erlang based metrics system'';
-
- };
- } // packageOverrides)
- ) {};
-
- folsom = folsom_0_8_3;
-
- folsomite_1_2_8 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, folsom_0_8_3 }:
- buildRebar3 ({
- name = "folsomite";
- version = "1.2.8";
- src = fetchHex {
- pkg = "folsomite";
- version = "1.2.8";
- sha256 =
- "9ce64603cdffb8ad55e950142146b3fe05533020906a81aa9c2f524635d813dc";
- };
-
- beamDeps = [ folsom_0_8_3 ];
-
- meta = {
- description = ''Blow up your Graphite server with Folsom
- metrics'';
-
- };
- } // packageOverrides)
- ) {};
-
- folsomite = folsomite_1_2_8;
-
- forcex_0_4_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_2_1_6,
- httpoison_0_8_3,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "forcex";
- version = "0.4.1";
- src = fetchHex {
- pkg = "forcex";
- version = "0.4.1";
- sha256 =
- "82d1c772a369dfb8c705beaf1dae55853402cab06c2dfac1b3e056dbc4cb2c21";
- };
- beamDeps = [ timex_2_1_6 httpoison_0_8_3 exjsx_3_2_0 ];
-
- meta = {
- description = ''Elixir library for the Force.com / SalesForce /
- SFDC REST API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jeffweiss/forcex";
- };
- } // packageOverrides)
- ) {};
-
- forcex = forcex_0_4_1;
-
- forecast_io_0_2_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- json_0_3_3,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "forecast_io";
- version = "0.2.2";
- src = fetchHex {
- pkg = "forecast_io";
- version = "0.2.2";
- sha256 =
- "d76c4f1839cb77038404c3d291e2449495e81469ddf05bef0dc01ed8544917ca";
- };
- beamDeps = [ json_0_3_3 httpotion_2_2_2 ];
-
- meta = {
- description = ''Simple wrapper for Forecast.IO API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/r-icarus/forecast_io";
- };
- } // packageOverrides)
- ) {};
-
- forecast_io = forecast_io_0_2_2;
-
- fox_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "fox";
- version = "1.0.1";
- src = fetchHex {
- pkg = "fox";
- version = "1.0.1";
- sha256 =
- "e790c4dec0f840283c3e93825db259075ee45953ff1c29758a2aec22164c6865";
- };
-
- meta = {
- longDescription = ''Collection of support utility functions and
- extensions for day-to-day web development with
- Elixir. Includes utility extension to strings,
- uri, dicts, integers, functions, parallel,
- records, random, and time'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/foxnewsnetwork/fox";
- };
- } // packageOverrides)
- ) {};
-
- fox = fox_1_0_1;
-
- freegeoip_0_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "freegeoip";
- version = "0.0.4";
- src = fetchHex {
- pkg = "freegeoip";
- version = "0.0.4";
- sha256 =
- "6776938ddc1318ee8a34ef6e3a5dcb85013bbb27feeae3c7d65487ff17e2b558";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Simple Elixir wrapper for freegeoip.net HTTP
- API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/juljimm/freegeoip-elixir";
- };
- } // packageOverrides)
- ) {};
-
- freegeoip = freegeoip_0_0_4;
-
- friendly_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, floki_0_8_1 }:
- buildMix ({
- name = "friendly";
- version = "1.0.1";
- src = fetchHex {
- pkg = "friendly";
- version = "1.0.1";
- sha256 =
- "5bacdeba9a6752613c037f7ffacd4f7185cf9b348b3b41c73497e539bbb17602";
- };
- beamDeps = [ floki_0_8_1 ];
-
- meta = {
- longDescription = ''HTML and XML parser with the most friendly
- API in Elixir land. CSS selector in, list of
- elements out.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/qertoip/friendly/";
- };
- } // packageOverrides)
- ) {};
-
- friendly = friendly_1_0_1;
-
- fs_0_9_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "fs";
- version = "0.9.2";
- src = fetchHex {
- pkg = "fs";
- version = "0.9.2";
- sha256 =
- "9a00246e8af58cdf465ae7c48fd6fd7ba2e43300413dfcc25447ecd3bf76f0c1";
- };
- compilePorts = true;
-
- meta = {
- description = ''FS VXZ Listener'';
-
- };
- } // packageOverrides)
- ) {};
-
- fs = fs_0_9_2;
-
- fsm_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "fsm";
- version = "0.2.0";
- src = fetchHex {
- pkg = "fsm";
- version = "0.2.0";
- sha256 =
- "dbc7b316d37f258db4f1a897109da14c2c76aa706fe85859532eff2ea30986bf";
- };
-
- meta = {
- description = ''Finite state machine as a functional data
- structure.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sasa1977/fsm";
- };
- } // packageOverrides)
- ) {};
-
- fsm = fsm_0_2_0;
-
- fugue_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "fugue";
- version = "0.1.3";
- src = fetchHex {
- pkg = "fugue";
- version = "0.1.3";
- sha256 =
- "de7fcfbbe261e189de894773c9332591a7ab42311972d8685bdb0524057c72f1";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''Extendable testing utilities for Plug'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/fugue";
- };
- } // packageOverrides)
- ) {};
-
- fugue = fugue_0_1_3;
-
- fulcrum_0_0_6 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "fulcrum";
- version = "0.0.6";
- src = fetchHex {
- pkg = "fulcrum";
- version = "0.0.6";
- sha256 =
- "9cddd3906bad693cad791841d19b2be089e064a5f2dd35d340f46e6cd15d7930";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''Fulcrum library for Elixir. The aim is to
- present the Fulcrum API as a replacement for an
- Ecto Repo. So, instead of Repo.all(Form), you
- can write Fulcrum.all(Form). In this way, you
- only have to make minor changes to your
- controllers, to work with Fulcrum.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pinx/fulcrum";
- };
- } // packageOverrides)
- ) {};
-
- fulcrum = fulcrum_0_0_6;
-
- fumanchu_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "fumanchu";
- version = "0.0.1";
- src = fetchHex {
- pkg = "fumanchu";
- version = "0.0.1";
- sha256 =
- "3ae3f825b598d2af9ace3f9ef25ff23b7724507cddb2dddb2176e4a49afabc89";
- };
-
- meta = {
- description = ''An (almost) spec-compliant Mustache parser
- written in Elixir'';
-
- };
- } // packageOverrides)
- ) {};
-
- fumanchu = fumanchu_0_0_1;
-
- funchaku_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "funchaku";
- version = "0.1.0";
- src = fetchHex {
- pkg = "funchaku";
- version = "0.1.0";
- sha256 =
- "621ed289eadcc5333d11b698c2d7c459143ff11036f3eedc0d79d3df76a5fd43";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir client for the Nu HTML Checker'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sitevalidator/funchaku";
- };
- } // packageOverrides)
- ) {};
-
- funchaku = funchaku_0_1_0;
-
- function_decorating_0_0_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "function_decorating";
- version = "0.0.6";
- src = fetchHex {
- pkg = "function_decorating";
- version = "0.0.6";
- sha256 =
- "8faf5588f98c833a25c9463df27e709cc5c645083a592b1a5add25fbb9e68d9a";
- };
-
- meta = {
- longDescription = ''A function decorator macro for Elixir. Used
- mainly for adding log statements to the function
- calls.'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/elpddev/elixir-function-decorating";
- };
- } // packageOverrides)
- ) {};
-
- function_decorating = function_decorating_0_0_6;
-
- funkspector_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- floki_0_8_1,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "funkspector";
- version = "0.0.1";
- src = fetchHex {
- pkg = "funkspector";
- version = "0.0.1";
- sha256 =
- "709574d5b5612c6188764b72b36c4eb2b85f3e27d859d1fe5631f31d17e79695";
- };
- beamDeps = [ floki_0_8_1 httpoison_0_8_3 ];
-
- meta = {
- description = ''Web page inspector for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sitevalidator/funkspector";
- };
- } // packageOverrides)
- ) {};
-
- funkspector = funkspector_0_0_1;
-
- fuse_2_3_1 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "fuse";
- version = "2.3.1";
- src = fetchHex {
- pkg = "fuse";
- version = "2.3.1";
- sha256 =
- "580b6279115b74058982d58a898ac9e2e8fdb1884287d565f1ad987cacf1f8e7";
- };
-
- meta = {
- description = ''A Circuit breaker implementation for Erlang'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jlouis/fuse";
- };
- } // packageOverrides)
- ) {};
-
- fuse = fuse_2_3_1;
-
- fuzzyurl_0_8_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "fuzzyurl";
- version = "0.8.1";
- src = fetchHex {
- pkg = "fuzzyurl";
- version = "0.8.1";
- sha256 =
- "8229d3d14bcbaf792a550ee68347662efd93022e7fc0221f7681c104b3356900";
- };
-
- meta = {
- longDescription = ''Fuzzyurl is a library for non-strict parsing,
- construction, and fuzzy-matching of URLs.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/gamache/fuzzyurl.ex";
- };
- } // packageOverrides)
- ) {};
-
- fuzzyurl = fuzzyurl_0_8_1;
-
- fwatch_0_5_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- fs_0_9_2,
- earmark_0_2_1
- }:
- buildMix ({
- name = "fwatch";
- version = "0.5.0";
- src = fetchHex {
- pkg = "fwatch";
- version = "0.5.0";
- sha256 =
- "1cd46bcae7074c10a4a4d25989ef20ab515d075d762af8e6c86e8d50c011604c";
- };
- beamDeps = [ fs_0_9_2 earmark_0_2_1 ];
-
- meta = {
- description = ''A file watcher for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ryo33/fwatch-ex";
- };
- } // packageOverrides)
- ) {};
-
- fwatch = fwatch_0_5_0;
-
- game_of_life_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "game_of_life";
- version = "1.0.0";
- src = fetchHex {
- pkg = "game_of_life";
- version = "1.0.0";
- sha256 =
- "4a7e64722d5841d91152352a19db51476fa3e950d7316aba089870248019958b";
- };
-
- meta = {
- description = ''Distributed Game of Life with Board Server API.
- Run it on multiple nodes.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/BeyondScheme/elixir-game_of_life";
- };
- } // packageOverrides)
- ) {};
-
- game_of_life = game_of_life_1_0_0;
-
- gardien_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gardien";
- version = "0.0.3";
- src = fetchHex {
- pkg = "gardien";
- version = "0.0.3";
- sha256 =
- "3b4f69bee6359789e57e6c7efb01358fa94ae52d48b9fced8ee22c8cc99740df";
- };
-
- meta = {
- description = ''Authorization for Phoenix projects'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rpelyush/gardien";
- };
- } // packageOverrides)
- ) {};
-
- gardien = gardien_0_0_3;
-
- garph_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "garph";
- version = "0.0.1";
- src = fetchHex {
- pkg = "garph";
- version = "0.0.1";
- sha256 =
- "32829d25bdc8cf78256c8fdf1e7294707f94b683ec6ce6d1da0a6a8cd4d77c9e";
- };
-
- meta = {
- longDescription = ''Garph is a simple way to implement complex
- decision trees by using graphs. It can be used
- with plain elixir or beneath a phoenix
- project.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/faber-lotto/garph";
- };
- } // packageOverrides)
- ) {};
-
- garph = garph_0_0_1;
-
- gatekeeper_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gatekeeper";
- version = "0.0.1";
- src = fetchHex {
- pkg = "gatekeeper";
- version = "0.0.1";
- sha256 =
- "d1ad9549998054c6ca4d4c7954687937e46b97f2ca4176c7e1d5bfdaf683ac2c";
- };
-
- meta = {
- description = ''An opinionated authorization framework for Elixir
- projects.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/austinsmorris/gatekeeper";
- };
- } // packageOverrides)
- ) {};
-
- gatekeeper = gatekeeper_0_0_1;
-
- gateway_0_0_6 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3,
- fox_1_0_1
- }:
- buildMix ({
- name = "gateway";
- version = "0.0.6";
- src = fetchHex {
- pkg = "gateway";
- version = "0.0.6";
- sha256 =
- "4d0de05b0168ee0cc41c9c38491a4b4641d446f38170ca170d0d7440b0c8f619";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 fox_1_0_1 ];
-
- meta = {
- longDescription = ''A generic set of macros and conventions to
- build clients to communicate with JSON REST
- APIs'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/foxnewsnetwork/gateway";
- };
- } // packageOverrides)
- ) {};
-
- gateway = gateway_0_0_6;
-
- gb2260_0_5_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "gb2260";
- version = "0.5.0";
- src = fetchHex {
- pkg = "gb2260";
- version = "0.5.0";
- sha256 =
- "a3e4fc9435802613f2abc506c480321ac6eafa2eed72b52d85d2c19f8b84ffe7";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- description = ''The Elixir implementation for looking up the
- Chinese administrative divisions.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/LcpMarvel/gb2260";
- };
- } // packageOverrides)
- ) {};
-
- gb2260 = gb2260_0_5_0;
-
- gealts_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gealts";
- version = "0.0.1";
- src = fetchHex {
- pkg = "gealts";
- version = "0.0.1";
- sha256 =
- "c23b96986b19801c3428ff961e26e5b7327cd38141c2161951fdba233b71ac2b";
- };
-
- meta = {
- description = ''A crude genetic programming library.'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/0010-IO/gealts";
- };
- } // packageOverrides)
- ) {};
-
- gealts = gealts_0_0_1;
-
- gelf_logger_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "gelf_logger";
- version = "0.2.0";
- src = fetchHex {
- pkg = "gelf_logger";
- version = "0.2.0";
- sha256 =
- "3729e42e3c8d492ec4b18cd7a70783cc2d15811b7096613a60da04743d1f7838";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- longDescription = ''A Logger backend that will generate Graylog
- Extended Log Format messages and send them to a
- compatible server.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jschniper/gelf_logger";
- };
- } // packageOverrides)
- ) {};
-
- gelf_logger = gelf_logger_0_2_0;
-
- gelfex_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- connection_1_0_2
- }:
- buildMix ({
- name = "gelfex";
- version = "0.0.1";
- src = fetchHex {
- pkg = "gelfex";
- version = "0.0.1";
- sha256 =
- "35ca2deb8221379fc8eb2d4e33888ce590defe91dbbaaa10ef352d6654723279";
- };
- beamDeps = [ poison_1_5_2 connection_1_0_2 ];
-
- meta = {
- description = ''Elixir client for logging GELF messages to
- Graylog.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/donpinkster/gelfex";
- };
- } // packageOverrides)
- ) {};
-
- gelfex = gelfex_0_0_1;
-
- gen_delegate_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gen_delegate";
- version = "1.0.0";
- src = fetchHex {
- pkg = "gen_delegate";
- version = "1.0.0";
- sha256 =
- "9790952ba41538e835613f064774189bd819c79fde8fa09c2ab2bc5143b9efbf";
- };
-
- meta = {
- description = ''Easy delegation of internal function to a
- GenServer interface'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zackehh/gen_delegate";
- };
- } // packageOverrides)
- ) {};
-
- gen_delegate = gen_delegate_1_0_0;
-
- gen_fsm_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gen_fsm";
- version = "0.0.4";
- src = fetchHex {
- pkg = "gen_fsm";
- version = "0.0.4";
- sha256 =
- "c92bf89ea8dee0f924362b12b61d3cd02306e77a0e8174354044238329b6506a";
- };
-
- meta = {
- description = ''Elixir wrapper around Erlang`s OTP gen_fsm.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/pavlos/gen_fsm";
- };
- } // packageOverrides)
- ) {};
-
- gen_fsm_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gen_fsm";
- version = "0.1.0";
- src = fetchHex {
- pkg = "gen_fsm";
- version = "0.1.0";
- sha256 =
- "273281dbb6cf6171a6fb963538fde67146a11f6025a80113eae4b29822083a62";
- };
-
- meta = {
- description = ''Elixir wrapper around Erlang`s OTP gen_fsm.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/pavlos/gen_fsm";
- };
- } // packageOverrides)
- ) {};
-
- gen_fsm = gen_fsm_0_1_0;
-
- gen_listener_tcp_0_3_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "gen_listener_tcp";
- version = "0.3.2";
- src = fetchHex {
- pkg = "gen_listener_tcp";
- version = "0.3.2";
- sha256 =
- "b3c3fbc525ba2b32d947b06811d38470d5b0abe2ca81b623192a71539ed22336";
- };
-
- meta = {
- description = ''Generic TCP Server'';
-
- homepage = "https://github.com/travelping/gen_listener_tcp";
- };
- } // packageOverrides)
- ) {};
-
- gen_listener_tcp = gen_listener_tcp_0_3_2;
-
- gen_mqtt_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gen_mqtt";
- version = "0.2.1";
- src = fetchHex {
- pkg = "gen_mqtt";
- version = "0.2.1";
- sha256 =
- "3cb7f6099eca4fb46befdc0bee41d21756f50cc263a7234286c8fb9800db197a";
- };
-
- meta = {
- description = ''An Elixir behaviour that makes it possible to
- communicate with a MQTT server'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/gausby/gen_mqtt";
- };
- } // packageOverrides)
- ) {};
-
- gen_mqtt = gen_mqtt_0_2_1;
-
- gen_retry_0_3_0 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, exconstructor_1_0_2
- }:
- buildMix ({
- name = "gen_retry";
- version = "0.3.0";
- src = fetchHex {
- pkg = "gen_retry";
- version = "0.3.0";
- sha256 =
- "dca3dd6948ed3683bb1414f7b8131a12dfdc38677fb3730f522c85c6640d73b7";
- };
- beamDeps = [ exconstructor_1_0_2 ];
-
- meta = {
- longDescription = ''GenRetry provides utilities for retrying
- Elixir functions, with configurable delay and
- backoff characteristics.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/appcues/gen_retry";
- };
- } // packageOverrides)
- ) {};
-
- gen_retry = gen_retry_0_3_0;
-
- gen_smtp_0_10_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "gen_smtp";
- version = "0.10.0";
- src = fetchHex {
- pkg = "gen_smtp";
- version = "0.10.0";
- sha256 =
- "87baa484762849cdb9f9082fd12449eb02cca059ac6a225f24f436fdf6f683ae";
- };
-
- meta = {
- description = ''A generic Erlang SMTP server/client framework'';
- license = stdenv.lib.licenses.bsd2;
- homepage = "https://github.com/Vagabond/gen_smtp";
- };
- } // packageOverrides)
- ) {};
-
- gen_smtp = gen_smtp_0_10_0;
-
- gen_smtp_0_9_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "gen_smtp";
- version = "0.9.0";
- src = fetchHex {
- pkg = "gen_smtp";
- version = "0.9.0";
- sha256 =
- "5a05f23a7cbe0c6242d290b445c6bbc0c287e3d0e09d3fcdc6bcd2c8973b6688";
- };
-
- meta = {
- description = ''A generic Erlang SMTP server/client framework'';
- license = stdenv.lib.licenses.bsd2;
- homepage = "https://github.com/Vagabond/gen_smtp";
- };
- } // packageOverrides)
- ) {};
-
- gendex_0_5_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gendex";
- version = "0.5.1";
- src = fetchHex {
- pkg = "gendex";
- version = "0.5.1";
- sha256 =
- "b3eedba31b1a76ab33e6b57689e4312625fafb2667ac7b485df22c05b4c9439f";
- };
-
- meta = {
- description = ''Gendex tells you the most likely gender of a
- person based on first name.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/dre1080/gendex";
- };
- } // packageOverrides)
- ) {};
-
- gendex = gendex_0_5_1;
-
- geocalc_0_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "geocalc";
- version = "0.4.0";
- src = fetchHex {
- pkg = "geocalc";
- version = "0.4.0";
- sha256 =
- "353bcb1efc5b64fc3f8ca33338e51b47ae5f39b272da79be7f1ff7a6daa8dafb";
- };
-
- meta = {
- description = ''Calculate distance, bearing and more between
- latitude/longitude points.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/yltsrc/geocalc";
- };
- } // packageOverrides)
- ) {};
-
- geocalc = geocalc_0_4_0;
-
- geohash_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "geohash";
- version = "0.1.1";
- src = fetchHex {
- pkg = "geohash";
- version = "0.1.1";
- sha256 =
- "ffca8ce73cce9c52aae2000c5f417009b87f23d6e2df69cd6985bc5cc05aa998";
- };
-
- meta = {
- description = ''Geohash encode/decode implementation for
- Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/polmuz/elixir-geohash";
- };
- } // packageOverrides)
- ) {};
-
- geohash = geohash_0_1_1;
-
- geolite2data_0_0_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "geolite2data";
- version = "0.0.1";
- src = fetchHex {
- pkg = "geolite2data";
- version = "0.0.1";
- sha256 =
- "ba3f48f86302c8f6214afb7822923fcd6b07470ce83cefa1db474e97eb57df97";
- };
-
- meta = {
- description = ''Periodically fetches the free MaxMind GeoLite2
- databases'';
- license = stdenv.lib.licenses.mpl20;
- homepage = "https://github.com/potatosalad/erlang-geolite2data";
- };
- } // packageOverrides)
- ) {};
-
- geolite2data = geolite2data_0_0_1;
-
- geolix_0_10_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
- buildMix ({
- name = "geolix";
- version = "0.10.1";
- src = fetchHex {
- pkg = "geolix";
- version = "0.10.1";
- sha256 =
- "4f269b8b22f01b78b5e0929a3432679f692ae1ac9b31a0f23ca989efd13f9ae0";
- };
- beamDeps = [ poolboy_1_5_1 ];
-
- meta = {
- description = ''MaxMind GeoIP2 database reader/decoder'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/mneudert/geolix";
- };
- } // packageOverrides)
- ) {};
-
- geolix = geolix_0_10_1;
-
- getopt_0_8_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "getopt";
- version = "0.8.2";
- src = fetchHex {
- pkg = "getopt";
- version = "0.8.2";
- sha256 =
- "736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7";
- };
-
- meta = {
- description = ''Command-line options parser for Erlang'';
-
- homepage = "https://github.com/jcomellas/getopt";
- };
- } // packageOverrides)
- ) {};
-
- getopt = getopt_0_8_2;
-
- gettext_0_10_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gettext";
- version = "0.10.0";
- src = fetchHex {
- pkg = "gettext";
- version = "0.10.0";
- sha256 =
- "c37747dced24fe00cb4245cb348a36556fa82851c10748cfe4c6a0253aea374e";
- };
-
- meta = {
- description = ''Internationalization and localization through
- gettext'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/elixir-lang/gettext";
- };
- } // packageOverrides)
- ) {};
-
- gettext_0_11_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gettext";
- version = "0.11.0";
- src = fetchHex {
- pkg = "gettext";
- version = "0.11.0";
- sha256 =
- "9688cb656d6bc13d174051256784066dde15c4ddae1f0335590a62952780b58b";
- };
-
- meta = {
- description = ''Internationalization and localization through
- gettext'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/elixir-lang/gettext";
- };
- } // packageOverrides)
- ) {};
-
- gettext = gettext_0_11_0;
-
- gh_webhook_plug_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "gh_webhook_plug";
- version = "0.0.3";
- src = fetchHex {
- pkg = "gh_webhook_plug";
- version = "0.0.3";
- sha256 =
- "9509e2a82e8b48e7eb3c90cb79602c5fbb12196d36d5e5f8bcd1ce1ac1b442a9";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- longDescription = ''This Plug makes it easy to listen and respond
- to Github webhook requests in your Elixir
- apps.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/emilsoman/gh_webhook_plug";
- };
- } // packageOverrides)
- ) {};
-
- gh_webhook_plug = gh_webhook_plug_0_0_3;
-
- gibran_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gibran";
- version = "0.0.2";
- src = fetchHex {
- pkg = "gibran";
- version = "0.0.2";
- sha256 =
- "bdf0eb8c7469ac17e14e898b26fb47d4a360409f7a750bfde5d7d0765f327ca4";
- };
-
- meta = {
- description = ''An Elixir natural language processor.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/abitdodgy/gibran";
- };
- } // packageOverrides)
- ) {};
-
- gibran = gibran_0_0_2;
-
- git_cli_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "git_cli";
- version = "0.2.0";
- src = fetchHex {
- pkg = "git_cli";
- version = "0.2.0";
- sha256 =
- "8e52506764fd6ba5f153d2bcd5635c160ed83a7a4e8834b4e67eee317a37f962";
- };
-
- meta = {
- description = ''A simple interface to Git CLI'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tuvistavie/elixir-git-cli";
- };
- } // packageOverrides)
- ) {};
-
- git_cli = git_cli_0_2_0;
-
- gitex_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gitex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "gitex";
- version = "0.1.0";
- sha256 =
- "ac3bfa723cf2f734837fc7d89a330fa80156f96eaa2e6326d2ab60880a804de7";
- };
-
- meta = {
- longDescription = ''Elixir implementation of the Git object
- storage, but with the goal to implement the same
- semantic with other storage and topics'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/awetzel/gitex";
- };
- } // packageOverrides)
- ) {};
-
- gitex_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gitex";
- version = "0.2.0";
- src = fetchHex {
- pkg = "gitex";
- version = "0.2.0";
- sha256 =
- "68074becf5e9a01d00096c306a05b023d0107bafca178ff0f043f893b7b95450";
- };
-
- meta = {
- longDescription = ''Elixir implementation of the Git object
- storage, but with the goal to implement the same
- semantic with other storage and topics'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/awetzel/gitex";
- };
- } // packageOverrides)
- ) {};
-
- gitex = gitex_0_2_0;
-
- github_oauth_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "github_oauth";
- version = "0.1.1";
- src = fetchHex {
- pkg = "github_oauth";
- version = "0.1.1";
- sha256 =
- "4e68983af9ed8146a2505ad759cb151c3202471285f07df6132a4acd47aa91f2";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''simple github oauth library'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/lidashuang/github_oauth";
- };
- } // packageOverrides)
- ) {};
-
- github_oauth = github_oauth_0_1_1;
-
- github_trend_ex_0_1_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- floki_0_8_1
- }:
- buildMix ({
- name = "github_trend_ex";
- version = "0.1.2";
- src = fetchHex {
- pkg = "github_trend_ex";
- version = "0.1.2";
- sha256 =
- "019565ad8efe6c25414dcddc6a7fc99e34f0ff457989ec7b5ad03b79b0c8ca8b";
- };
- beamDeps = [ httpoison_0_8_3 floki_0_8_1 ];
-
- meta = {
- description = ''Get trend repositories from Github.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KazuCocoa/github_trend_ex";
- };
- } // packageOverrides)
- ) {};
-
- github_trend_ex = github_trend_ex_0_1_2;
-
- gizoogle_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "gizoogle";
- version = "0.0.2";
- src = fetchHex {
- pkg = "gizoogle";
- version = "0.0.2";
- sha256 =
- "c22d720fc60df8670a194c6ed1fb17fe272a7560b478037aef4a1437331f60e3";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''Uses Gizoogle ta allow you ta drop a rhyme
- like a thug n` retrieve links fo` translated
- sitez'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/notdevinclark/gizoogle";
- };
- } // packageOverrides)
- ) {};
-
- gizoogle = gizoogle_0_0_2;
-
- gl_utils_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gl_utils";
- version = "0.0.1";
- src = fetchHex {
- pkg = "gl_utils";
- version = "0.0.1";
- sha256 =
- "ae529fef193423baa50c673b3f852e0c3ca7b08a85817be7113615dbdacb53f3";
- };
-
- meta = {
- description = ''All of the Erlang gl macros exposed as normal
- functions'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/requnix/gl_utils";
- };
- } // packageOverrides)
- ) {};
-
- gl_utils = gl_utils_0_0_1;
-
- glitchylicious_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "glitchylicious";
- version = "0.0.1";
- src = fetchHex {
- pkg = "glitchylicious";
- version = "0.0.1";
- sha256 =
- "2d7c55bd138722ff810006d4b36873d80ad0473e074ccc377e381c5a88f0a9db";
- };
-
- meta = {
- description = ''Glitching and image corruption library.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/0010-IO/glitchylicious";
- };
- } // packageOverrides)
- ) {};
-
- glitchylicious = glitchylicious_0_0_1;
-
- global_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "global";
- version = "1.0.0";
- src = fetchHex {
- pkg = "global";
- version = "1.0.0";
- sha256 =
- "00b0637bc2d86154af2885807296d4b6616e6b50a2d52c8ce187ddfe317890ee";
- };
-
- meta = {
- description = ''A wrapper for Erlang`s :global module with
- documentation.'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/mgwidmann/global";
- };
- } // packageOverrides)
- ) {};
-
- global = global_1_0_0;
-
- gm_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gm";
- version = "0.0.2";
- src = fetchHex {
- pkg = "gm";
- version = "0.0.2";
- sha256 =
- "3dc6e1d336afe370219b8b465a651012168f6fe7b9e9d2b0609b6384e1bcb8f7";
- };
-
- meta = {
- description = ''Idiomatic GraphicsMagick wrapper for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/utkarshkukreti/gm.ex";
- };
- } // packageOverrides)
- ) {};
-
- gm = gm_0_0_2;
-
- gmail_0_1_11 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_2_1_6,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "gmail";
- version = "0.1.11";
- src = fetchHex {
- pkg = "gmail";
- version = "0.1.11";
- sha256 =
- "14ff16f5eb2e705762dc383e59a22905f1f53d3f3e9e17615159bac3add91f7a";
- };
- beamDeps = [ timex_2_1_6 poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''A simple Gmail REST API client for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/craigp/elixir-gmail";
- };
- } // packageOverrides)
- ) {};
-
- gmail = gmail_0_1_11;
-
- gold_0_12_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3,
- decimal_1_1_2
- }:
- buildMix ({
- name = "gold";
- version = "0.12.0";
- src = fetchHex {
- pkg = "gold";
- version = "0.12.0";
- sha256 =
- "fba43501f6c25116c29358c4b5494de5e078cc516572045ac73a7944b918105b";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 decimal_1_1_2 ];
-
- meta = {
- description = ''An Elixir library to interface with the Bitcoin
- core JSON-RPC API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/solatis/gold";
- };
- } // packageOverrides)
- ) {};
-
- gold = gold_0_12_0;
-
- goldrush_0_1_7 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "goldrush";
- version = "0.1.7";
- src = fetchHex {
- pkg = "goldrush";
- version = "0.1.7";
- sha256 =
- "a94a74cd363ce5f4970ed8242c551ec62b71939db1bbfd2e030142cab25a4ffe";
- };
-
- meta = {
- description = ''Erlang event stream processor'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/DeadZen/goldrush";
- };
- } // packageOverrides)
- ) {};
-
- goldrush_0_1_8 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "goldrush";
- version = "0.1.8";
- src = fetchHex {
- pkg = "goldrush";
- version = "0.1.8";
- sha256 =
- "ba71e005bbb6ebbc3c510a58b2bd6d3b25a8d091a8e87ac3d33ef10522cdcd51";
- };
-
- meta = {
- description = ''Erlang event stream processor'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/DeadZen/goldrush";
- };
- } // packageOverrides)
- ) {};
-
- goldrush = goldrush_0_1_8;
-
- good_enough_geoid_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, csv_1_4_1 }:
- buildMix ({
- name = "good_enough_geoid";
- version = "0.0.2";
- src = fetchHex {
- pkg = "good_enough_geoid";
- version = "0.0.2";
- sha256 =
- "7b2a556206f71e743d77c26a55b60b3282bd799b8254510f62afe2a4ec330746";
- };
- beamDeps = [ csv_1_4_1 ];
-
- meta = {
- description = ''Get EGM Geoid heights that are good enough for
- some purposes (maybe yours).'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/code-lever/good-enough-geoid-elixir";
- };
- } // packageOverrides)
- ) {};
-
- good_enough_geoid = good_enough_geoid_0_0_2;
-
- good_times_1_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "good_times";
- version = "1.1.1";
- src = fetchHex {
- pkg = "good_times";
- version = "1.1.1";
- sha256 =
- "1ecb4524b506a5dde5fa9e2312d6f98249b4b45e49a74cf799a8577b52157b90";
- };
-
- meta = {
- description = ''Expressive and easy to use datetime functions.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/DevL/good_times";
- };
- } // packageOverrides)
- ) {};
-
- good_times = good_times_1_1_1;
-
- google_auth_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- module_mocker_0_2_0,
- cowboy_1_0_4,
- access_token_extractor_0_1_1
- }:
- buildMix ({
- name = "google_auth";
- version = "0.0.2";
- src = fetchHex {
- pkg = "google_auth";
- version = "0.0.2";
- sha256 =
- "029f2399456a7b7474635cab36544d35e200ddd7a470a905191de0fc3612adb5";
- };
- beamDeps = [
- plug_1_1_5
- module_mocker_0_2_0
- cowboy_1_0_4
- access_token_extractor_0_1_1
- ];
-
- meta = {
- longDescription = ''Simple Plug to provide google based
- authentication. Just pass access_token received
- from client side google auth flow and this plug
- will get name, emai and picture of user from
- google and add it to private inside Plug.Conn'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rohanpujaris/google_auth";
- };
- } // packageOverrides)
- ) {};
-
- google_auth = google_auth_0_0_2;
-
- google_books_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "google_books";
- version = "0.0.2";
- src = fetchHex {
- pkg = "google_books";
- version = "0.0.2";
- sha256 =
- "d20b5ca090df63cf4ed32d7257dcdad780bd89ca93bd644721c9d4d696e5734d";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''A simple wrapper for Google Books API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nithinbekal/google_books.ex";
- };
- } // packageOverrides)
- ) {};
-
- google_books = google_books_0_0_2;
-
- google_sheets_2_0_5 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- sweet_xml_0_6_1,
- httpoison_0_8_3,
- hackney_1_6_0
- }:
- buildMix ({
- name = "google_sheets";
- version = "2.0.5";
- src = fetchHex {
- pkg = "google_sheets";
- version = "2.0.5";
- sha256 =
- "aeaaab3e2df75289cf14740a76b014652fb77a5ef95be3921fc36f4165812682";
- };
- beamDeps = [ sweet_xml_0_6_1 httpoison_0_8_3 hackney_1_6_0 ];
-
- meta = {
- description = ''OTP application for fetching and polling Google
- spreadsheet data in CSV format.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/GrandCru/GoogleSheets";
- };
- } // packageOverrides)
- ) {};
-
- google_sheets = google_sheets_2_0_5;
-
- goomoji_translator_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "goomoji_translator";
- version = "0.0.2";
- src = fetchHex {
- pkg = "goomoji_translator";
- version = "0.0.2";
- sha256 =
- "b794dcccc306c4c5712895456c28012e1b9f8e8496392bafcfa9c1fc2c251f82";
- };
-
- meta = {
- description = ''Used to change goomoji codes into normal emoji
- codes'';
- license = stdenv.lib.licenses.asl20;
- homepage =
- "https://github.com/azranel/goomoji-translator_elixir";
- };
- } // packageOverrides)
- ) {};
-
- goomoji_translator = goomoji_translator_0_0_2;
-
- goth_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- json_web_token_0_2_5,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "goth";
- version = "0.0.3";
- src = fetchHex {
- pkg = "goth";
- version = "0.0.3";
- sha256 =
- "0bbf59ae842dc4518cf42123b0fb0d0255bcb72ea37c8ec13bab2efe2339ccc3";
- };
- beamDeps = [ poison_1_5_2 json_web_token_0_2_5 httpoison_0_8_3
- ];
-
- meta = {
- longDescription = ''A simple library to generate and retrieve
- Oauth2 tokens for use with Google Cloud Service
- accounts.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/peburrows/goth";
- };
- } // packageOverrides)
- ) {};
-
- goth_0_1_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- json_web_token_0_2_5,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "goth";
- version = "0.1.3";
- src = fetchHex {
- pkg = "goth";
- version = "0.1.3";
- sha256 =
- "64a26a9b0682757acd59838eaa08f76b394c7fa086b5106c7b3f8682a8416d05";
- };
- beamDeps = [ poison_2_1_0 json_web_token_0_2_5 httpoison_0_8_3
- ];
-
- meta = {
- longDescription = ''A simple library to generate and retrieve
- Oauth2 tokens for use with Google Cloud Service
- accounts.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/peburrows/goth";
- };
- } // packageOverrides)
- ) {};
-
- goth = goth_0_1_3;
-
- gproc_0_3_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "gproc";
- version = "0.3.1";
- src = fetchHex {
- pkg = "gproc";
- version = "0.3.1";
- sha256 =
- "3c449925a5cbf57cc40d13c6c282bc1080b5ed3bad97e1acdbe969fd63a65fce";
- };
-
- meta = {
- longDescription = ''Gproc is a process dictionary for Erlang,
- which provides a number of useful features
- beyond what the built-in dictionary has: * Use
- any term as a process alias * Register a process
- under several aliases * Non-unique properties
- can be registered simultaneously by many
- processes * QLC and match specification
- interface for efficient queries on the
- dictionary * Await registration, let`s you wait
- until a process registers itself * Atomically
- give away registered names and properties to
- another process * Counters, and aggregated
- counters, which automatically maintain the total
- of all counters with a given name * Global
- registry, with all the above functions applied
- to a network of nodes'';
- license = stdenv.lib.licenses.epl10;
- homepage = "https://github.com/uwiger/gproc";
- };
- } // packageOverrides)
- ) {};
-
- gproc_0_5_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "gproc";
- version = "0.5.0";
- src = fetchHex {
- pkg = "gproc";
- version = "0.5.0";
- sha256 =
- "5bc0fa4e999a6665b92ce57a7f12d7e9d1c26bfc39b0f657994be05cd3818b18";
- };
-
- meta = {
- longDescription = ''Gproc is a process dictionary for Erlang,
- which provides a number of useful features
- beyond what the built-in dictionary has: * Use
- any term as a process alias * Register a process
- under several aliases * Non-unique properties
- can be registered simultaneously by many
- processes * QLC and match specification
- interface for efficient queries on the
- dictionary * Await registration, let`s you wait
- until a process registers itself * Atomically
- give away registered names and properties to
- another process * Counters, and aggregated
- counters, which automatically maintain the total
- of all counters with a given name * Global
- registry, with all the above functions applied
- to a network of nodes'';
- license = stdenv.lib.licenses.epl10;
- homepage = "https://github.com/uwiger/gproc";
- };
- } // packageOverrides)
- ) {};
-
- gproc = gproc_0_5_0;
-
- graphex_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "graphex";
- version = "0.2.1";
- src = fetchHex {
- pkg = "graphex";
- version = "0.2.1";
- sha256 =
- "9279db515110de152479903488b1df6ad2de409f5b48d00fac55211bfab2e728";
- };
-
- meta = {
- description = ''A task graph execution library for elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/stocks29/graphex";
- };
- } // packageOverrides)
- ) {};
-
- graphex = graphex_0_2_1;
-
- graphixir_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "graphixir";
- version = "0.0.1";
- src = fetchHex {
- pkg = "graphixir";
- version = "0.0.1";
- sha256 =
- "8d355dc2ac225c2d74f15707908103ca051c74ef1668abf5240f6d3582750518";
- };
-
- meta = {
- description = ''Graphite framework for elixir'';
-
- };
- } // packageOverrides)
- ) {};
-
- graphixir = graphixir_0_0_1;
-
- graphmath_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "graphmath";
- version = "1.0.2";
- src = fetchHex {
- pkg = "graphmath";
- version = "1.0.2";
- sha256 =
- "6be38a7f4c6167f2c766ee74fd2642c8d98412c4b2bd4c1238cad493f30f4524";
- };
-
- meta = {
- description = ''Graphmath is a library for doing 2D and 3D
- mathemtical operations.'';
- license = with stdenv.lib.licenses; [ free wtfpl free ];
- homepage = "https://github.com/crertel/graphmath";
- };
- } // packageOverrides)
- ) {};
-
- graphmath = graphmath_1_0_2;
-
- graphql_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "graphql";
- version = "0.2.0";
- src = fetchHex {
- pkg = "graphql";
- version = "0.2.0";
- sha256 =
- "2469337ef663fb63922e67beafa2a50d56de14176c699758a855210140c269df";
- };
-
- meta = {
- description = ''GraphQL Elixir implementation'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/graphql-elixir/graphql";
- };
- } // packageOverrides)
- ) {};
-
- graphql_0_3_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "graphql";
- version = "0.3.1";
- src = fetchHex {
- pkg = "graphql";
- version = "0.3.1";
- sha256 =
- "ed756b2ee62d3e33c6eef6ffc4bf1a7184c1b5cd022a4550b085768eefa8f4a2";
- };
-
- meta = {
- description = ''GraphQL Elixir implementation'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/graphql-elixir/graphql";
- };
- } // packageOverrides)
- ) {};
-
- graphql = graphql_0_3_1;
-
- graphql_ex_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "graphql_ex";
- version = "0.0.1";
- src = fetchHex {
- pkg = "graphql_ex";
- version = "0.0.1";
- sha256 =
- "51884d5275d354b915db03eb390e858ead88b3f3e4f699b2fa7dc8eb442bc343";
- };
- meta = { };
- } // packageOverrides)
- ) {};
-
- graphql_ex = graphql_ex_0_0_1;
-
- gravatar_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gravatar";
- version = "0.1.0";
- src = fetchHex {
- pkg = "gravatar";
- version = "0.1.0";
- sha256 =
- "4fab4a0313312d4319496662b55f25d3aabaa740ef3d084456425db8c9bdb4fd";
- };
-
- meta = {
- description = ''Gravatar URLs generator'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pilu/gravatar";
- };
- } // packageOverrides)
- ) {};
-
- gravatar = gravatar_0_1_0;
-
- gravatarify_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gravatarify";
- version = "0.1.0";
- src = fetchHex {
- pkg = "gravatarify";
- version = "0.1.0";
- sha256 =
- "d11f416611ed802d72e57f649c74f17c6dbf0e751da87e355cbfd14d4047d17e";
- };
-
- meta = {
- description = ''Gravatar images with an ease'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/shiroyasha/gravatarify";
- };
- } // packageOverrides)
- ) {};
-
- gravatarify = gravatarify_0_1_0;
-
- gray_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "gray";
- version = "0.0.2";
- src = fetchHex {
- pkg = "gray";
- version = "0.0.2";
- sha256 =
- "95b071e0742ed10298c5d0ff027aec3eaadf3a807ed5e88bd4d2861a5220be62";
- };
-
- meta = {
- longDescription = ''Package to help you operate with [gray codes]
- (https://en.wikipedia.org/wiki/Gray_code)'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hashd/gray";
- };
- } // packageOverrides)
- ) {};
-
- gray = gray_0_0_2;
-
- greenhouse_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_2_1_6,
- httpoison_0_8_3,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "greenhouse";
- version = "0.0.1";
- src = fetchHex {
- pkg = "greenhouse";
- version = "0.0.1";
- sha256 =
- "7b32075492339d6ef03572891287689d48d938f36e19601433f47b4ad2f75b5d";
- };
- beamDeps = [ timex_2_1_6 httpoison_0_8_3 exjsx_3_2_0 ];
-
- meta = {
- description = ''Elixir library for access the Greenhouse Harvest
- API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jeffweiss/greenhouse";
- };
- } // packageOverrides)
- ) {};
-
- greenhouse = greenhouse_0_0_1;
-
- growl_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "growl";
- version = "0.0.2";
- src = fetchHex {
- pkg = "growl";
- version = "0.0.2";
- sha256 =
- "0b43fba8d18349b5bd507b457016298cfafea4a50831e8ce944569b45d3bceb8";
- };
-
- meta = {
- longDescription = ''# Growl A simple wrapper to the command line
- interface for the [Growl OSX notification
- system](http://growl.info/). ## Setup ```Elixir
- defp deps do [ {:growl, github:
- \"zhallett/growl\"} ] ``` ## Usage Within the
- script you would like to create a `growl`
- notification, make the module call as follows:
- ```Elixir Growl.notify(\"This is a
- notification\") ``` The API accepts messages in
- a string format, as well as a list. If the first
- argument is a list, the first object is the
- title line, with subsequent lines being the body
- of the notification. ```Elixir
- Growl.notify([\"Example\", \"This is an example
- notification\"]) ``` would give the following
- notification: ![Forced
- Update](https://github.com/zhallett/growl/blob/master/multi_line_notification.png?raw=true
- \"Multi-Line notification Screenshot\")) ##
- Contributing 1. Fork it 2. Create your feature
- branch (`git checkout -b my-new-feature`) 3.
- Commit your changes (`git commit -am `Add some
- feature``) 4. Push to the branch (`git push
- origin my-new-feature`) 5. Create new Pull
- Request '';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/zhallett/growl";
- };
- } // packageOverrides)
- ) {};
-
- growl = growl_0_0_2;
-
- gtfs_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, csv_1_4_1 }:
- buildMix ({
- name = "gtfs";
- version = "0.3.0";
- src = fetchHex {
- pkg = "gtfs";
- version = "0.3.0";
- sha256 =
- "a77116b8886f3fa56fb1c9e722b7d62939ff85a38fa99a24daef5a26a0c939a5";
- };
- beamDeps = [ csv_1_4_1 ];
-
- meta = {
- description = ''A library for parsing a GTFS folder into a
- hierarchy of structured data'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bhelx/gtfs";
- };
- } // packageOverrides)
- ) {};
-
- gtfs = gtfs_0_3_0;
-
- guardsafe_0_5_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "guardsafe";
- version = "0.5.0";
- src = fetchHex {
- pkg = "guardsafe";
- version = "0.5.0";
- sha256 =
- "e6808876c07f21d78c3935c0607791cd2ceec40f3b855fa03774e8087bcfc277";
- };
-
- meta = {
- description = ''Macros expanding into code that can be safely
- used in guard clauses.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/DevL/guardsafe";
- };
- } // packageOverrides)
- ) {};
-
- guardsafe = guardsafe_0_5_0;
-
- gun_1_0_0_pre_1 = callPackage
- (
- {
- buildErlangMk,
- packageOverrides ? {},
- fetchHex,
- ranch_1_1_0,
- cowlib_1_3_0
- }:
- buildErlangMk ({
- name = "gun";
- version = "1.0.0-pre.1";
- src = fetchHex {
- pkg = "gun";
- version = "1.0.0-pre.1";
- sha256 =
- "53aca19e83b15127aa4e299435823b367d5ba6797852984af6c2b9b493be9d56";
- };
- beamDeps = [ ranch_1_1_0 cowlib_1_3_0 ];
-
- meta = {
- description = ''Asynchronous SPDY, HTTP and Websocket client.'';
-
- };
- } // packageOverrides)
- ) {};
-
- gun = gun_1_0_0_pre_1;
-
- guri_0_2_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- websocket_client_1_1_0,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "guri";
- version = "0.2.1";
- src = fetchHex {
- pkg = "guri";
- version = "0.2.1";
- sha256 =
- "7fa0f2ebff111c368895798041d982f00eec34589d93f10bb323bb5a09e1f888";
- };
- beamDeps = [ websocket_client_1_1_0 poison_1_5_2 httpoison_0_8_3
- ];
-
- meta = {
- description = ''Automate tasks and keep everyone in the loop with
- Guri'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/elvio/guri";
- };
- } // packageOverrides)
- ) {};
-
- guri = guri_0_2_1;
-
- gurka_0_1_7 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "gurka";
- version = "0.1.7";
- src = fetchHex {
- pkg = "gurka";
- version = "0.1.7";
- sha256 =
- "b46c96446f46a53411a3b45d126ec19e724178818206ca1d2dd16abff28df6b5";
- };
-
- meta = {
- description = ''Erlang implementation of Cucumber'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- gurka = gurka_0_1_7;
-
- gutenex_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, imagineer_0_2_1 }:
- buildMix ({
- name = "gutenex";
- version = "0.2.0";
- src = fetchHex {
- pkg = "gutenex";
- version = "0.2.0";
- sha256 =
- "5c8ab30570d7ddcd6cdb2eeaf1d3eba4db83f6ef955f4030f05cf476cbce79fa";
- };
- beamDeps = [ imagineer_0_2_1 ];
-
- meta = {
- description = ''PDF Generation in Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/SenecaSystems/gutenex";
- };
- } // packageOverrides)
- ) {};
-
- gutenex = gutenex_0_2_0;
-
- hackney_1_5_7 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- ssl_verify_fun_1_1_0,
- mimerl_1_0_2,
- metrics_1_0_1,
- idna_1_2_0,
- certifi_0_4_0
- }:
- buildMix ({
- name = "hackney";
- version = "1.5.7";
- src = fetchHex {
- pkg = "hackney";
- version = "1.5.7";
- sha256 =
- "627ed3f048b950d2dbbec918519f89f498a2136d74ca8180c15fad412b9bc869";
- };
- beamDeps = [
- ssl_verify_fun_1_1_0
- mimerl_1_0_2
- metrics_1_0_1
- idna_1_2_0
- certifi_0_4_0
- ];
-
- meta = {
- description = ''simple HTTP client'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/benoitc/hackney";
- };
- } // packageOverrides)
- ) {};
-
- hackney_1_6_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- ssl_verify_fun_1_1_0,
- mimerl_1_0_2,
- metrics_1_0_1,
- idna_1_2_0,
- certifi_0_4_0
- }:
- buildMix ({
- name = "hackney";
- version = "1.6.0";
- src = fetchHex {
- pkg = "hackney";
- version = "1.6.0";
- sha256 =
- "8b517f17c794ab611815042d24e149daafbd898d63aac8baf6750b890261c716";
- };
- beamDeps = [
- ssl_verify_fun_1_1_0
- mimerl_1_0_2
- metrics_1_0_1
- idna_1_2_0
- certifi_0_4_0
- ];
-
- meta = {
- description = ''simple HTTP client'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/benoitc/hackney";
- };
- } // packageOverrides)
- ) {};
-
- hackney = hackney_1_6_0;
-
- haikunator_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "haikunator";
- version = "1.0.1";
- src = fetchHex {
- pkg = "haikunator";
- version = "1.0.1";
- sha256 =
- "60692df3a559df14bac6a8c115091977f0a45eea55123a5cb37e3d763cbe92e8";
- };
-
- meta = {
- longDescription = ''Generate Heroku-like memorable random names
- to use in your apps or anywhere else.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/knrz/Haikunator";
- };
- } // packageOverrides)
- ) {};
-
- haikunator = haikunator_1_0_1;
-
- hairnet_1_0_0 = callPackage
- (
- {
- buildRebar3, packageOverrides ? {}, fetchHex, base64url_0_0_1
- }:
- buildRebar3 ({
- name = "hairnet";
- version = "1.0.0";
- src = fetchHex {
- pkg = "hairnet";
- version = "1.0.0";
- sha256 =
- "b3f15cdb7d9e6183a5cde401ded684c88cc2ea09dca75facf82b5281f4596606";
- };
-
- beamDeps = [ base64url_0_0_1 ];
-
- meta = {
- description = ''An Erlang library wrapping AES-GCM (AEAD) crypto
- in a Fernet-like interface'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/ferd/hairnet/";
- };
- } // packageOverrides)
- ) {};
-
- hairnet = hairnet_1_0_0;
-
- happy_1_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "happy";
- version = "1.1.1";
- src = fetchHex {
- pkg = "happy";
- version = "1.1.1";
- sha256 =
- "3b2ee083ea1d68063df4fb0561eb462703e6188d9352d0763b458ee6ce385060";
- };
-
- meta = {
- longDescription = ''Happy path programming in elixir. Alternative
- to ok_jose, elixir`s 1.2 `with` keyword and that
- kind of stuff.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/vic/happy";
- };
- } // packageOverrides)
- ) {};
-
- happy = happy_1_1_1;
-
- harakiri_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "harakiri";
- version = "1.0.1";
- src = fetchHex {
- pkg = "harakiri";
- version = "1.0.1";
- sha256 =
- "2c3bc7300cbded03bb1b01ebe67e74507a5350c79fe08276a2a17359a6c28d79";
- };
-
- meta = {
- description = ''Help applications do things to themselves.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rubencaro/harakiri";
- };
- } // packageOverrides)
- ) {};
-
- harakiri = harakiri_1_0_1;
-
- harvest_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "harvest";
- version = "0.0.3";
- src = fetchHex {
- pkg = "harvest";
- version = "0.0.3";
- sha256 =
- "a9b52f37959a97e876603da5a34a0683e9e4a8e534fb7c672175602768fc812a";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Harvest Time Tracking API wrapper written in
- Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/luishurtado/harvest";
- };
- } // packageOverrides)
- ) {};
-
- harvest = harvest_0_0_3;
-
- hash_n_cache_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "hash_n_cache";
- version = "0.0.2";
- src = fetchHex {
- pkg = "hash_n_cache";
- version = "0.0.2";
- sha256 =
- "3cd95f04cd6017894b1829307e568a72a3d42c6b70379c37b86c80ab0a6f68ec";
- };
-
- meta = {
- longDescription = ''A simple utility to hash an erlang term, and
- cache the term in ETS with the hash as the key
- and the term as the value.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/elbow-jason/hash_n_cache";
- };
- } // packageOverrides)
- ) {};
-
- hash_n_cache = hash_n_cache_0_0_2;
-
- hash_ring_0_4_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "hash_ring";
- version = "0.4.0";
- src = fetchHex {
- pkg = "hash_ring";
- version = "0.4.0";
- sha256 =
- "97f7b4252e660ae3c66fd163277267d3445cfea097342027fe6cc3512fdafd16";
- };
-
- meta = {
- description = ''Consistent Hash Ring'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sile/hash_ring";
- };
- } // packageOverrides)
- ) {};
-
- hash_ring = hash_ring_0_4_0;
-
- hashids_2_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "hashids";
- version = "2.0.2";
- src = fetchHex {
- pkg = "hashids";
- version = "2.0.2";
- sha256 =
- "3dae063908483454ec691e61da580a056997b4c9affcf12b2330937ee48e6bf0";
- };
-
- meta = {
- description = ''Hashids lets you obfuscate numerical identifiers
- via reversible mapping.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/alco/hashids-elixir";
- };
- } // packageOverrides)
- ) {};
-
- hashids = hashids_2_0_2;
-
- heap_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "heap";
- version = "1.0.0";
- src = fetchHex {
- pkg = "heap";
- version = "1.0.0";
- sha256 =
- "39ddb188337ef43dd46e1920abba0bb88821a8cc19cc8688aa36045a58f733d0";
- };
-
- meta = {
- description = ''Heap data structure and tools'';
-
- };
- } // packageOverrides)
- ) {};
-
- heap = heap_1_0_0;
-
- heapq_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "heapq";
- version = "0.0.1";
- src = fetchHex {
- pkg = "heapq";
- version = "0.0.1";
- sha256 =
- "60bc20c109360c6899203f4015fae42c9e5a4f82707f76b064e10d6da135d4fd";
- };
-
- meta = {
- description = ''A Heap-based Priority Queue Implementation in
- Elixir.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/takscape/elixir-heapq";
- };
- } // packageOverrides)
- ) {};
-
- heapq = heapq_0_0_1;
-
- hedwig_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "hedwig";
- version = "0.1.0";
- src = fetchHex {
- pkg = "hedwig";
- version = "0.1.0";
- sha256 =
- "75139dc3ce629dcb703a17d053acf84da0787ab398e20566e10152cdf1ccad9c";
- };
-
- meta = {
- description = ''An adapter-based chat bot framework'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hedwig-im/hedwig";
- };
- } // packageOverrides)
- ) {};
-
- hedwig_1_0_0_rc3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, gproc_0_5_0 }:
- buildMix ({
- name = "hedwig";
- version = "1.0.0-rc3";
- src = fetchHex {
- pkg = "hedwig";
- version = "1.0.0-rc3";
- sha256 =
- "846347c6ae462e98b8c8c8a60f0bef8ee2c4ffa28463a0df030ae8a938cc773f";
- };
- beamDeps = [ gproc_0_5_0 ];
-
- meta = {
- description = ''An adapter-based chat bot framework'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hedwig-im/hedwig";
- };
- } // packageOverrides)
- ) {};
-
- hedwig = hedwig_1_0_0_rc3;
-
- hermes_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, chronos_1_5_1 }:
- buildMix ({
- name = "hermes";
- version = "0.1.0";
- src = fetchHex {
- pkg = "hermes";
- version = "0.1.0";
- sha256 =
- "f28880392a8b1b027c58c387870099f854f842fdeb1f7a0ba94a0b1ca07643bf";
- };
- beamDeps = [ chronos_1_5_1 ];
-
- meta = {
- longDescription = ''Is a mailer component for sending & recieving
- emails. The name comes from the greek messanger
- of the gods.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nurugger07/hemes";
- };
- } // packageOverrides)
- ) {};
-
- hermes = hermes_0_1_0;
-
- hex2bin_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "hex2bin";
- version = "1.0.0";
- src = fetchHex {
- pkg = "hex2bin";
- version = "1.0.0";
- sha256 =
- "e7012d1d9aadd26e680f0983d26fb8923707f05fac9688f19f530fa3795e716f";
- };
-
- meta = {
- description = ''Hex string/binary conversion utilities'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/aesedepece/hex2bin";
- };
- } // packageOverrides)
- ) {};
-
- hex2bin = hex2bin_1_0_0;
-
- hex_math_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "hex_math";
- version = "0.0.2";
- src = fetchHex {
- pkg = "hex_math";
- version = "0.0.2";
- sha256 =
- "1dd9284c402d06bcd63ccb8df6022342defb2de4bd666066ed409e3b3c47761b";
- };
-
- meta = {
- description = ''Library for working with hex grids.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tjcelaya/hex_math";
- };
- } // packageOverrides)
- ) {};
-
- hex_math = hex_math_0_0_2;
-
- hex_searcher_1_0_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- table_rex_0_4_0,
- ibrowse_4_2_2,
- httpotion_2_2_2,
- floki_0_7_2
- }:
- buildMix ({
- name = "hex_searcher";
- version = "1.0.0";
- src = fetchHex {
- pkg = "hex_searcher";
- version = "1.0.0";
- sha256 =
- "26d2097aa0f950c67ea55822e15cfec26976f76a60ec51d758af9d60126b3538";
- };
- beamDeps = [
- table_rex_0_4_0
- ibrowse_4_2_2
- httpotion_2_2_2
- floki_0_7_2
- ];
-
- meta = {
- description = ''Search hex packages from terminal'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nguyenvinhlinh/HexSearcher";
- };
- } // packageOverrides)
- ) {};
-
- hex_searcher = hex_searcher_1_0_0;
-
- hexate_0_5_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "hexate";
- version = "0.5.1";
- src = fetchHex {
- pkg = "hexate";
- version = "0.5.1";
- sha256 =
- "b146d4c48380bef3eee74e16bc243f91783f72502759f1f18460b6a8da441270";
- };
-
- meta = {
- description = ''A simple module for working with hex strings in
- Elixir. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rjsamson/hexate";
- };
- } // packageOverrides)
- ) {};
-
- hexate = hexate_0_5_1;
-
- hexbot_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "hexbot";
- version = "0.0.1";
- src = fetchHex {
- pkg = "hexbot";
- version = "0.0.1";
- sha256 =
- "f9b8c9805468f7b93fa88440f1e75d8ed2fc3b7d11a68c455abf81efcc31590c";
- };
-
- meta = {
- description = ''A hubot-like bot framework for chatops.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tombell/hexbot";
- };
- } // packageOverrides)
- ) {};
-
- hexbot = hexbot_0_0_1;
-
- hexdocset_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, floki_0_0_5 }:
- buildMix ({
- name = "hexdocset";
- version = "1.0.0";
- src = fetchHex {
- pkg = "hexdocset";
- version = "1.0.0";
- sha256 =
- "846ed02411d759710f0f72a401d81a67cbc181421e461d3246540b3d471044be";
- };
- beamDeps = [ floki_0_0_5 ];
-
- meta = {
- description = ''Convert hex doc to Dash.app`s docset format.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/yesmeck/hexdocset";
- };
- } // packageOverrides)
- ) {};
-
- hexdocset = hexdocset_1_0_0;
-
- hipchat_logger_backend_0_1_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "hipchat_logger_backend";
- version = "0.1.2";
- src = fetchHex {
- pkg = "hipchat_logger_backend";
- version = "0.1.2";
- sha256 =
- "211bb8e174858c7858c76f992fa7b19d9373a29d7f501b774517534af17bf590";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''A logger backend for posting errors to
- HipChat.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/fbcouch/hipchat_logger_backend";
- };
- } // packageOverrides)
- ) {};
-
- hipchat_logger_backend = hipchat_logger_backend_0_1_2;
-
- hlc_2_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "hlc";
- version = "2.0.0";
- src = fetchHex {
- pkg = "hlc";
- version = "2.0.0";
- sha256 =
- "460ac04654e920e068d1fd17aec1f78b1879cc42ac7f3def7497f0d1cc5056ad";
- };
-
- meta = {
- description = ''hybrid logical clock'';
-
- homepage = "https://github.com/barrel-db/hlc";
- };
- } // packageOverrides)
- ) {};
-
- hlc = hlc_2_0_0;
-
- hoax_0_11_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "hoax";
- version = "0.11.2";
- src = fetchHex {
- pkg = "hoax";
- version = "0.11.2";
- sha256 =
- "fca0d9056201e671719736b4f86fe2b8da6f8b42d88b28b1bcb2b307586928a8";
- };
-
- meta = {
- description = ''Yet another mocking library for Erlang'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/xenolinguist/hoax";
- };
- } // packageOverrides)
- ) {};
-
- hoax = hoax_0_11_2;
-
- holidays_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "holidays";
- version = "0.1.1";
- src = fetchHex {
- pkg = "holidays";
- version = "0.1.1";
- sha256 =
- "098f192bd02f1fd68fd22ae69dc608a03e89a4c814c3c3901d56c8f697cda622";
- };
-
- meta = {
- description = ''Library for finding which holidays fall on given
- dates.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/CoderDennis/holidays";
- };
- } // packageOverrides)
- ) {};
-
- holidays = holidays_0_1_1;
-
- honeybadger_0_5_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- plug_1_1_5,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "honeybadger";
- version = "0.5.0";
- src = fetchHex {
- pkg = "honeybadger";
- version = "0.5.0";
- sha256 =
- "a19b507955a229276af2af14b4a324d4b352d17b468e9c29215e1637bd493c42";
- };
- beamDeps = [ poison_2_1_0 plug_1_1_5 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''Elixir client, Plug and error_logger for
- integrating with the Honeybadger.io exception
- tracker'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/honeybadger-io/honeybadger-elixir";
- };
- } // packageOverrides)
- ) {};
-
- honeybadger = honeybadger_0_5_0;
-
- hooks_1_1_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "hooks";
- version = "1.1.1";
- src = fetchHex {
- pkg = "hooks";
- version = "1.1.1";
- sha256 =
- "6834ad3a2a624a5ffd49e9cb146ff49ded423b67f31905b122d24128c72c5c85";
- };
-
- meta = {
- description = ''generic plugin & hook system'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/barrel-db/hooks";
- };
- } // packageOverrides)
- ) {};
-
- hooks = hooks_1_1_1;
-
- hound_1_0_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "hound";
- version = "1.0.0";
- src = fetchHex {
- pkg = "hound";
- version = "1.0.0";
- sha256 =
- "433c541048096b864f4a346231967d63f4acfcc32fd280f80505b95a2f9738a4";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Webdriver library for integration testing and
- browser automation'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/HashNuke/hound";
- };
- } // packageOverrides)
- ) {};
-
- hound = hound_1_0_0;
-
- hpack_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "hpack";
- version = "1.0.0";
- src = fetchHex {
- pkg = "hpack";
- version = "1.0.0";
- sha256 =
- "092fe46ef1c59bf2d7d47f627520321eb6965861db1516c95ef19d484958aea5";
- };
-
- meta = {
- longDescription = ''Implementation of the
- [HPack](https://http2.github.io/http2-spec/compression.html)
- protocol, a compression format for efficiently
- representing HTTP header fields, to be used in
- HTTP/2.'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- hpack = hpack_1_0_0;
-
- html_builder_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "html_builder";
- version = "0.1.1";
- src = fetchHex {
- pkg = "html_builder";
- version = "0.1.1";
- sha256 =
- "7cba41180419a26e2fb8ff1c075efcdf31e4079e06144d58623c32c1de3835d9";
- };
-
- meta = {
- description = ''generate html in elixir with simple data
- structures'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/html_builder";
- };
- } // packageOverrides)
- ) {};
-
- html_builder = html_builder_0_1_1;
-
- html_entities_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "html_entities";
- version = "0.3.0";
- src = fetchHex {
- pkg = "html_entities";
- version = "0.3.0";
- sha256 =
- "93811511394efeee964f6e7df3b72b37ad39c1d185030c3561aebf1c15c4d995";
- };
-
- meta = {
- description = ''Decode and encode HTML entities in a string.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/martinsvalin/html_entities";
- };
- } // packageOverrides)
- ) {};
-
- html_entities = html_entities_0_3_0;
-
- html_sanitize_ex_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, mochiweb_2_12_2 }:
- buildMix ({
- name = "html_sanitize_ex";
- version = "0.1.2";
- src = fetchHex {
- pkg = "html_sanitize_ex";
- version = "0.1.2";
- sha256 =
- "e6937b25832bcdccb8b547632428de7fe034199c871f037311d4340c345348a7";
- };
- beamDeps = [ mochiweb_2_12_2 ];
-
- meta = {
- description = ''HTML sanitizer for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rrrene/html_sanitize_ex";
- };
- } // packageOverrides)
- ) {};
-
- html_sanitize_ex_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, mochiweb_2_12_2 }:
- buildMix ({
- name = "html_sanitize_ex";
- version = "1.0.0";
- src = fetchHex {
- pkg = "html_sanitize_ex";
- version = "1.0.0";
- sha256 =
- "5bf36372dafe900da8d9613502ce4efad3d885af5beb0d298386da0b6a1dbbc6";
- };
- beamDeps = [ mochiweb_2_12_2 ];
-
- meta = {
- description = ''HTML sanitizer for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rrrene/html_sanitize_ex";
- };
- } // packageOverrides)
- ) {};
-
- html_sanitize_ex = html_sanitize_ex_1_0_0;
-
- html_to_pdf_0_5_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "html_to_pdf";
- version = "0.5.2";
- src = fetchHex {
- pkg = "html_to_pdf";
- version = "0.5.2";
- sha256 =
- "7adcde56c221e8f2447837d3b5983775f53071035d9ce9f179635a5e94c795e3";
- };
-
- meta = {
- description = ''Super simple library for turning raw HTML or
- webpages into beautiful PDFs.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mattweldon/html_to_pdf";
- };
- } // packageOverrides)
- ) {};
-
- html_to_pdf = html_to_pdf_0_5_2;
-
- http2_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "http2";
- version = "0.0.2";
- src = fetchHex {
- pkg = "http2";
- version = "0.0.2";
- sha256 =
- "fd8354d9c7800223ffcb66c2c359a40a5be3809ea4e3b2046fee253a5d049250";
- };
-
- meta = {
- description = ''HPACK implementation for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kiennt/hpack";
- };
- } // packageOverrides)
- ) {};
-
- http2 = http2_0_0_2;
-
- http_digex_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "http_digex";
- version = "0.0.1";
- src = fetchHex {
- pkg = "http_digex";
- version = "0.0.1";
- sha256 =
- "43bca23be7809bd4e2a5efa23d294117457192c98bd1cdf6b90b61285bc4109a";
- };
-
- meta = {
- description = ''A module to create basic digest http auth
- header'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/techgaun/http_digex";
- };
- } // packageOverrides)
- ) {};
-
- http_digex = http_digex_0_0_1;
-
- http_params_serializer_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "http_params_serializer";
- version = "0.1.1";
- src = fetchHex {
- pkg = "http_params_serializer";
- version = "0.1.1";
- sha256 =
- "7d6c2184814b7232130a3193c9832827c5eeaaae928155d96863ec426da6ce69";
- };
-
- meta = {
- longDescription = ''A small library to serialize deeply nested
- datastructures into HTTP parameters that most
- backends do understand'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/ruby2elixir/http_params_serializer";
- };
- } // packageOverrides)
- ) {};
-
- http_params_serializer = http_params_serializer_0_1_1;
-
- http_proxy_1_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- hackney_1_6_0,
- exjsx_3_2_0,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "http_proxy";
- version = "1.0.2";
- src = fetchHex {
- pkg = "http_proxy";
- version = "1.0.2";
- sha256 =
- "157f7a75f41f9f1532244c0eb1587fa638518c2e9b0f95aaaf3f6d1489ec94e3";
- };
- beamDeps = [ plug_1_1_5 hackney_1_6_0 exjsx_3_2_0 cowboy_1_0_4
- ];
-
- meta = {
- description = ''Multi port HTTP Proxy and support record/play
- request.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KazuCocoa/http_proxy";
- };
- } // packageOverrides)
- ) {};
-
- http_proxy = http_proxy_1_0_2;
-
- http_router_0_0_8 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- xml_builder_0_0_8,
- poison_1_5_2,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "http_router";
- version = "0.0.8";
- src = fetchHex {
- pkg = "http_router";
- version = "0.0.8";
- sha256 =
- "9a2844cc8c880621ca2689e0056f50e2c19e3b0e87a8e2524489459b377a8dc3";
- };
- beamDeps = [
- xml_builder_0_0_8 poison_1_5_2 plug_1_1_5 cowboy_1_0_4
- ];
-
- meta = {
- longDescription = ''HTTP Router with various macros to assist in
- developing your application and organizing your
- code'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/sugar-framework/elixir-http-router";
- };
- } // packageOverrides)
- ) {};
-
- http_router = http_router_0_0_8;
-
- http_signature_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "http_signature";
- version = "1.1.0";
- src = fetchHex {
- pkg = "http_signature";
- version = "1.1.0";
- sha256 =
- "3e6036d9c29289ed0e35dd6f41821dec9061ce20aad3c4d35dcbae8c84eb3baa";
- };
-
- meta = {
- description = ''Erlang and Elixir implementations of Joyent`s
- HTTP Signature Scheme.'';
- license = stdenv.lib.licenses.mpl20;
- homepage =
- "https://github.com/potatosalad/erlang-http_signature";
- };
- } // packageOverrides)
- ) {};
-
- http_signature = http_signature_1_1_0;
-
- httparrot_0_3_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- exjsx_3_2_0,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "httparrot";
- version = "0.3.4";
- src = fetchHex {
- pkg = "httparrot";
- version = "0.3.4";
- sha256 =
- "05dc3a30de92a5fc284c937339131c478d57b125cb3d65e97b99bc0fce3d3452";
- };
- beamDeps = [ exjsx_3_2_0 cowboy_1_0_4 ];
-
- meta = {
- description = '' HTTP Request & Response Server. An incomplete
- clone of http://httpbin.org '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/edgurgel/httparrot";
- };
- } // packageOverrides)
- ) {};
-
- httparrot = httparrot_0_3_4;
-
- httpehaviour_0_9_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, hackney_1_6_0 }:
- buildMix ({
- name = "httpehaviour";
- version = "0.9.0";
- src = fetchHex {
- pkg = "httpehaviour";
- version = "0.9.0";
- sha256 =
- "54e93dcf0e62d392781078cf029478194797fe67c98dffe99a91b5d5ec33e4e5";
- };
- beamDeps = [ hackney_1_6_0 ];
-
- meta = {
- description = ''Yet Yet Another HTTP client for Elixir powered by
- hackney'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/edgurgel/httpehaviour";
- };
- } // packageOverrides)
- ) {};
-
- httpehaviour = httpehaviour_0_9_0;
-
- httplacebo_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "httplacebo";
- version = "0.1.0";
- src = fetchHex {
- pkg = "httplacebo";
- version = "0.1.0";
- sha256 =
- "0f1873e65bb97227d43b5c6fc2138f33ef83f90cd068d9a9aee06ed8ef44a7ec";
- };
-
- meta = {
- description = ''The `do nothing` HTTP client for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/guilleiguaran/httplacebo";
- };
- } // packageOverrides)
- ) {};
-
- httplacebo = httplacebo_0_1_0;
-
- httpoison_0_8_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, hackney_1_5_7 }:
- buildMix ({
- name = "httpoison";
- version = "0.8.2";
- src = fetchHex {
- pkg = "httpoison";
- version = "0.8.2";
- sha256 =
- "00738e34fe2e254199c0324ef60b8150a7b2ced66c2296c4df8425c8e9b8d5c0";
- };
- beamDeps = [ hackney_1_5_7 ];
-
- meta = {
- description = ''Yet Another HTTP client for Elixir powered by
- hackney'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/edgurgel/httpoison";
- };
- } // packageOverrides)
- ) {};
-
- httpoison_0_8_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, hackney_1_6_0 }:
- buildMix ({
- name = "httpoison";
- version = "0.8.3";
- src = fetchHex {
- pkg = "httpoison";
- version = "0.8.3";
- sha256 =
- "74f2103e6eff47dcc2b288e37f42629874df3e4a4dce5fbc9dea508de4785e06";
- };
- beamDeps = [ hackney_1_6_0 ];
-
- meta = {
- description = ''Yet Another HTTP client for Elixir powered by
- hackney'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/edgurgel/httpoison";
- };
- } // packageOverrides)
- ) {};
-
- httpoison = httpoison_0_8_3;
-
- httpotion_2_2_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, ibrowse_4_2_2 }:
- buildMix ({
- name = "httpotion";
- version = "2.2.2";
- src = fetchHex {
- pkg = "httpotion";
- version = "2.2.2";
- sha256 =
- "47c6b6c535592547366fe16bfa175385e7de09eecbb2dc6b0f2cea526ef45fbd";
- };
- beamDeps = [ ibrowse_4_2_2 ];
-
- meta = {
- description = ''Fancy HTTP client for Elixir, based on
- ibrowse.'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/myfreeweb/httpotion";
- };
- } // packageOverrides)
- ) {};
-
- httpotion_3_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, ibrowse_4_2_2 }:
- buildMix ({
- name = "httpotion";
- version = "3.0.0";
- src = fetchHex {
- pkg = "httpotion";
- version = "3.0.0";
- sha256 =
- "ca6364eaa9737ba305307e17d0277c80e57003fc0934b99f6a5048d7a4f932b8";
- };
- beamDeps = [ ibrowse_4_2_2 ];
-
- meta = {
- description = ''Fancy HTTP client for Elixir, based on
- ibrowse.'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/myfreeweb/httpotion";
- };
- } // packageOverrides)
- ) {};
-
- httpotion = httpotion_3_0_0;
-
- huami_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "huami";
- version = "0.0.1";
- src = fetchHex {
- pkg = "huami";
- version = "0.0.1";
- sha256 =
- "c12f38e24e7b085422e5f57c991792cd5045bd083574b1cca0458d8f2dfae40d";
- };
-
- meta = {
- description = ''A CLI version of flower password writing in
- Elixir. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/yesmeck/huami.ex";
- };
- } // packageOverrides)
- ) {};
-
- huami = huami_0_0_1;
-
- huex_0_5_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- json_0_3_3,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "huex";
- version = "0.5.0";
- src = fetchHex {
- pkg = "huex";
- version = "0.5.0";
- sha256 =
- "e5fe37fdc4299567922697516df8ade2f64d2c1573dc9a253e5037f66576858f";
- };
- beamDeps = [ json_0_3_3 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir client for Philips Hue connected light
- bulbs'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/xavier/huex";
- };
- } // packageOverrides)
- ) {};
-
- huex = huex_0_5_0;
-
- hufflehoff_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "hufflehoff";
- version = "0.0.1";
- src = fetchHex {
- pkg = "hufflehoff";
- version = "0.0.1";
- sha256 =
- "f10c6ffceb3b6d161ff5aa4dfeb8fe77affabf073f0bc7059d8296a4256093f2";
- };
-
- meta = {
- description = ''A Huffman encoder/decoder for HTTP/2 headers.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sideshow/hufflehoff";
- };
- } // packageOverrides)
- ) {};
-
- hufflehoff = hufflehoff_0_0_1;
-
- huffman_1_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "huffman";
- version = "1.1.1";
- src = fetchHex {
- pkg = "huffman";
- version = "1.1.1";
- sha256 =
- "6983b0eebb29e6f7b4e971cf46e04ebcf52f073ca97f7ed29b5c0de68d58c496";
- };
-
- meta = {
- description = ''Huffman encoding and decoding.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/SenecaSystems/huffman";
- };
- } // packageOverrides)
- ) {};
-
- huffman = huffman_1_1_1;
-
- hulaaki_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "hulaaki";
- version = "0.0.2";
- src = fetchHex {
- pkg = "hulaaki";
- version = "0.0.2";
- sha256 =
- "d1bea8de565a4ca49f0e362c37597c3e8744b0323a7e9104cf09ac555e713ebe";
- };
-
- meta = {
- description = ''An MQTT 3.1.1 client library written in
- Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/suvash/hulaaki";
- };
- } // packageOverrides)
- ) {};
-
- hulaaki = hulaaki_0_0_2;
-
- hyde_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exredis_0_2_4 }:
- buildMix ({
- name = "hyde";
- version = "0.0.1";
- src = fetchHex {
- pkg = "hyde";
- version = "0.0.1";
- sha256 =
- "d4424adbf13e2aecafa38f73318885f56bd70eb8e5fede22858af8cf76e2475e";
- };
- beamDeps = [ exredis_0_2_4 ];
-
- meta = {
- longDescription = ''Feature Toggles for Elixir - Basic Redis
- backed feature toggles for individual users or
- named groups'';
-
- homepage = "https://github.com/beautifulcode/hyde";
- };
- } // packageOverrides)
- ) {};
-
- hyde = hyde_0_0_1;
-
- hydra_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- porcelain_2_0_1,
- poison_1_5_2,
- plug_1_1_5,
- httpoison_0_8_3,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "hydra";
- version = "0.0.1";
- src = fetchHex {
- pkg = "hydra";
- version = "0.0.1";
- sha256 =
- "ea35ec756dfaa0390ba53a0313bb50b924517f746922a98e3489bddf8e066b7d";
- };
- beamDeps = [
- porcelain_2_0_1
- poison_1_5_2
- plug_1_1_5
- httpoison_0_8_3
- cowboy_1_0_4
- ];
-
- meta = {
- description = ''A multi-headed beast: API gateway, request cache,
- and data transformations'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/doomspork/hydra";
- };
- } // packageOverrides)
- ) {};
-
- hydra = hydra_0_0_1;
-
- hypermedia_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "hypermedia";
- version = "0.0.1";
- src = fetchHex {
- pkg = "hypermedia";
- version = "0.0.1";
- sha256 =
- "595c174772c45206f293f61b338105e61d96dba1436b07ed5b3b12eb07842721";
- };
-
- meta = {
- description = ''A Elixir library for creating HAL/JSON Hypermedia
- APIs'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jurriaan/hypermedia";
- };
- } // packageOverrides)
- ) {};
-
- hypermedia = hypermedia_0_0_1;
-
- hypermock_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, meck_0_8_4 }:
- buildMix ({
- name = "hypermock";
- version = "0.0.2";
- src = fetchHex {
- pkg = "hypermock";
- version = "0.0.2";
- sha256 =
- "dbb7ad24f651a3bb99475f39f9b0d6b7e9b3f959d8a80577ea6c803a5b548516";
- };
- beamDeps = [ meck_0_8_4 ];
-
- meta = { };
- } // packageOverrides)
- ) {};
-
- hypermock = hypermock_0_0_2;
-
- hypex_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "hypex";
- version = "1.1.0";
- src = fetchHex {
- pkg = "hypex";
- version = "1.1.0";
- sha256 =
- "32e153bee0dabea8941940711c9ed9a7e15c50fc3d474c5b75b14359fb408363";
- };
-
- meta = {
- description = ''Fast HyperLogLog implementation for
- Elixir/Erlang'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zackehh/hypex";
- };
- } // packageOverrides)
- ) {};
-
- hypex = hypex_1_1_0;
-
- i18n_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- tipo_0_0_3,
- exprintf_0_1_6
- }:
- buildMix ({
- name = "i18n";
- version = "0.0.2";
- src = fetchHex {
- pkg = "i18n";
- version = "0.0.2";
- sha256 =
- "d3fbaccb502540565a9659fd21cff930b12ee698bfdac6d3df6487e2c101891f";
- };
- beamDeps = [ tipo_0_0_3 exprintf_0_1_6 ];
-
- meta = {
- description = ''i18n locale translations helpers'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nathanfaucett/ex-i18n";
- };
- } // packageOverrides)
- ) {};
-
- i18n = i18n_0_0_2;
-
- iam_role_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, jsone_1_2_3 }:
- buildMix ({
- name = "iam_role";
- version = "1.0.0";
- src = fetchHex {
- pkg = "iam_role";
- version = "1.0.0";
- sha256 =
- "acfc5d5c5130a36dfb2b460f790bd9e32bf39274f17333bd65c28d216983761d";
- };
- beamDeps = [ jsone_1_2_3 ];
-
- meta = {
- description = ''Application for automatically fetching AWS IAM
- role security credentials.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tsharju/iam_role";
- };
- } // packageOverrides)
- ) {};
-
- iam_role = iam_role_1_0_0;
-
- ibrowse_4_2_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "ibrowse";
- version = "4.2.2";
- src = fetchHex {
- pkg = "ibrowse";
- version = "4.2.2";
- sha256 =
- "b800cb7442bcc852c6832821e9d0a7098ff626e1415bddaeff4596640b31c0ae";
- };
-
- meta = {
- description = ''Erlang HTTP client application'';
- license = with stdenv.lib.licenses; [ free bsd3 ];
- homepage = "https://github.com/cmullaparthi/ibrowse";
- };
- } // packageOverrides)
- ) {};
-
- ibrowse = ibrowse_4_2_2;
-
- identicon_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "identicon";
- version = "0.2.0";
- src = fetchHex {
- pkg = "identicon";
- version = "0.2.0";
- sha256 =
- "38b11bb3ed2c76956fcbf8673be8cbf6570ef8a85d92b51ce45304ed0368d88c";
- };
-
- meta = {
- description = ''Elixir library for generating 5x5 symmetrical
- identicons'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/rbishop/identicon";
- };
- } // packageOverrides)
- ) {};
-
- identicon = identicon_0_2_0;
-
- idfk_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_2_1_6 }:
- buildMix ({
- name = "idfk";
- version = "0.1.0";
- src = fetchHex {
- pkg = "idfk";
- version = "0.1.0";
- sha256 =
- "dab162904f49c852db763719364d5b3e6d75bfc319fe3d8f5179c6bb656acf6d";
- };
- beamDeps = [ timex_2_1_6 ];
-
- meta = {
- description = ''The library of Elixir chunks of code that didn`t
- clearly belong anywhere else.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/amorphid/idfk";
- };
- } // packageOverrides)
- ) {};
-
- idfk = idfk_0_1_0;
-
- idna_1_0_2 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "idna";
- version = "1.0.2";
- src = fetchHex {
- pkg = "idna";
- version = "1.0.2";
- sha256 =
- "a5d645e307aa4f67efe31682f720b7eaf431ab148b3d6fb66cbaf6314499610f";
- };
-
- meta = {
- description = ''A pure Erlang IDNA implementation'';
-
- homepage = "https://github.com/benoitc/erlang-idna";
- };
- } // packageOverrides)
- ) {};
-
- idna_1_0_3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "idna";
- version = "1.0.3";
- src = fetchHex {
- pkg = "idna";
- version = "1.0.3";
- sha256 =
- "357d489a51112db4f216034406834f9172b3c0ff5a12f83fb28b25ca271541d1";
- };
-
- meta = {
- description = ''A pure Erlang IDNA implementation'';
-
- homepage = "https://github.com/benoitc/erlang-idna";
- };
- } // packageOverrides)
- ) {};
-
- idna_1_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "idna";
- version = "1.1.0";
- src = fetchHex {
- pkg = "idna";
- version = "1.1.0";
- sha256 =
- "d399393011cd2fa93761d70199b604b2f055bcf6cb45cac922870e122d2eb2fe";
- };
-
- meta = {
- description = ''A pure Erlang IDNA implementation'';
-
- homepage = "https://github.com/benoitc/erlang-idna";
- };
- } // packageOverrides)
- ) {};
-
- idna_1_2_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "idna";
- version = "1.2.0";
- src = fetchHex {
- pkg = "idna";
- version = "1.2.0";
- sha256 =
- "1d724cdafb66397e61774ead242c9b725de7033cde8ea98fa4a91e64ac5ef5b3";
- };
-
- meta = {
- description = ''A pure Erlang IDNA implementation'';
-
- homepage = "https://github.com/benoitc/erlang-idna";
- };
- } // packageOverrides)
- ) {};
-
- idna_2_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "idna";
- version = "2.0.0";
- src = fetchHex {
- pkg = "idna";
- version = "2.0.0";
- sha256 =
- "881226593c79eb4b2bf7106a3f2995c70ee6ffbb371c8d1bc71f2869686089f4";
- };
-
- meta = {
- description = ''A pure Erlang IDNA implementation'';
-
- homepage = "https://github.com/benoitc/erlang-idna";
- };
- } // packageOverrides)
- ) {};
-
- idna = idna_2_0_0;
-
- ieex_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ieex";
- version = "0.0.3";
- src = fetchHex {
- pkg = "ieex";
- version = "0.0.3";
- sha256 =
- "c448a86c7979bc75f98e9eb32473041975fb633bc9715f1965958e4a9dbbd1ff";
- };
-
- meta = {
- description = ''Biblioteca para validacao de Inscricao
- Estadual'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/edmaarcosta/IEEx";
- };
- } // packageOverrides)
- ) {};
-
- ieex = ieex_0_0_3;
-
- imagineer_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, apex_0_3_7 }:
- buildMix ({
- name = "imagineer";
- version = "0.2.1";
- src = fetchHex {
- pkg = "imagineer";
- version = "0.2.1";
- sha256 =
- "31a8430b89770fdd6ec9d96a6e3d9ea92296dfc57e98bb812cd376e60f2e70f8";
- };
- beamDeps = [ apex_0_3_7 ];
-
- meta = {
- description = ''Image processing in Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/SenecaSystems/imagineer";
- };
- } // packageOverrides)
- ) {};
-
- imagineer = imagineer_0_2_1;
-
- imgex_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "imgex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "imgex";
- version = "0.1.0";
- sha256 =
- "783e78b0624b87d1431d8acaa790998ac75d8654312e5799eff7b12956246c49";
- };
-
- meta = {
- description = ''Unofficial client library for generating imgix
- URLs in Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ianwalter/imgex";
- };
- } // packageOverrides)
- ) {};
-
- imgex = imgex_0_1_0;
-
- immortal_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "immortal";
- version = "0.2.0";
- src = fetchHex {
- pkg = "immortal";
- version = "0.2.0";
- sha256 =
- "4387bffa9e2c25b8bfed0bf9d80fd918861c6a4098b853138d2398d5b6f24be2";
- };
-
- meta = {
- description = ''Helpers for fault-tolerant OTP applications'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/danielberkompas/immortal";
- };
- } // packageOverrides)
- ) {};
-
- immortal = immortal_0_2_0;
-
- inaka_aleppo_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "inaka_aleppo";
- version = "1.0.0";
- src = fetchHex {
- pkg = "inaka_aleppo";
- version = "1.0.0";
- sha256 =
- "06754b98702607ec742d8315b2e79188b38fbb60e3f1a1582de5673e230f74d4";
- };
-
- meta = {
- description = ''Aleppo: ALternative Erlang Pre-ProcessOr'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/inaka/aleppo";
- };
- } // packageOverrides)
- ) {};
-
- inaka_aleppo = inaka_aleppo_1_0_0;
-
- inaka_mixer_0_1_5 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "inaka_mixer";
- version = "0.1.5";
- src = fetchHex {
- pkg = "inaka_mixer";
- version = "0.1.5";
- sha256 =
- "37af35b1c17a94a0cb643cba23cba2ca68d6fe51c3ad8337629d4c3c017cc912";
- };
-
- meta = {
- description = ''Mix in public functions from external modules'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/inaka/mixer";
- };
- } // packageOverrides)
- ) {};
-
- inaka_mixer = inaka_mixer_0_1_5;
-
- indefinite_article_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "indefinite_article";
- version = "0.0.1";
- src = fetchHex {
- pkg = "indefinite_article";
- version = "0.0.1";
- sha256 =
- "cb59d3373c5ff05693f74f445e7807d1fe5c38b9cfa6bcedfd9efedb4a0861ae";
- };
-
- meta = {
- description = ''Returns you the indefinite article of a string
- (*a* banana, *an* apple, etc)'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/Buyapowa/indefinite_article";
- };
- } // packageOverrides)
- ) {};
-
- indefinite_article = indefinite_article_0_0_1;
-
- inet_cidr_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "inet_cidr";
- version = "1.0.1";
- src = fetchHex {
- pkg = "inet_cidr";
- version = "1.0.1";
- sha256 =
- "4809be88cf1a436b819acec2b07a33e7ad24beb0cf9b6c8a94217aea7d298d8a";
- };
-
- meta = {
- longDescription = ''Classless Inter-Domain Routing (CIDR) library
- for Elixir Compatible with Erlang`s :inet module
- and support for IPv4 and IPv6'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/cobenian/inet_cidr";
- };
- } // packageOverrides)
- ) {};
-
- inet_cidr = inet_cidr_1_0_1;
-
- inflect_0_0_11 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "inflect";
- version = "0.0.11";
- src = fetchHex {
- pkg = "inflect";
- version = "0.0.11";
- sha256 =
- "36636ccb31b1ca9f34d95af8fff97aa68d34d925c5128dc8f04fc77764fa208a";
- };
-
- meta = {
- description = ''case sensitive regular expression for splitting
- strings'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nathanfaucett/ex-inflect";
- };
- } // packageOverrides)
- ) {};
-
- inflect = inflect_0_0_11;
-
- inflections_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, inflector_0_0_11 }:
- buildMix ({
- name = "inflections";
- version = "0.0.1";
- src = fetchHex {
- pkg = "inflections";
- version = "0.0.1";
- sha256 =
- "f1fe5f35313eb1bd6bfc3a0d5e3bd169a31bfbf09021b9928ecfff3052731efc";
- };
- beamDeps = [ inflector_0_0_11 ];
-
- meta = {
- description = ''inflector helpers for managing different
- locales'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nathanfaucett/ex-inflections";
- };
- } // packageOverrides)
- ) {};
-
- inflections = inflections_0_0_1;
-
- inflections_en_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- inflector_0_0_11,
- inflections_0_0_1
- }:
- buildMix ({
- name = "inflections_en";
- version = "0.0.1";
- src = fetchHex {
- pkg = "inflections_en";
- version = "0.0.1";
- sha256 =
- "28c8e2f52974879499ea039bc8bf369b75e978f4ee60de8641e7efdef575bd77";
- };
- beamDeps = [ inflector_0_0_11 inflections_0_0_1 ];
-
- meta = {
- description = ''inflector english rules'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nathanfaucett/ex-inflections_en";
- };
- } // packageOverrides)
- ) {};
-
- inflections_en = inflections_en_0_0_1;
-
- inflections_es_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- inflector_0_0_11,
- inflections_0_0_1
- }:
- buildMix ({
- name = "inflections_es";
- version = "0.0.1";
- src = fetchHex {
- pkg = "inflections_es";
- version = "0.0.1";
- sha256 =
- "28c6323f851d2287f77d7dd0b888e9888f5f785ff105a356078aff4a46544495";
- };
- beamDeps = [ inflector_0_0_11 inflections_0_0_1 ];
-
- meta = {
- description = ''inflector spanish rules'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nathanfaucett/ex-inflections_es";
- };
- } // packageOverrides)
- ) {};
-
- inflections_es = inflections_es_0_0_1;
-
- inflector_0_0_11 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "inflector";
- version = "0.0.11";
- src = fetchHex {
- pkg = "inflector";
- version = "0.0.11";
- sha256 =
- "4abd1e267d0df9536d3f54c579d74a0951fbbc6100e4b034a0905d99296a9e08";
- };
-
- meta = {
- description = ''simple rule based inflector'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nathanfaucett/ex-inflector";
- };
- } // packageOverrides)
- ) {};
-
- inflector = inflector_0_0_11;
-
- inflex_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "inflex";
- version = "0.3.0";
- src = fetchHex {
- pkg = "inflex";
- version = "0.3.0";
- sha256 =
- "2cb9896a2572eb0989d92d7d98653829e079ccb804aa1b98beafff7678275852";
- };
-
- meta = {
- description = ''An Elixir library for handling word
- inflections.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nurugger07/inflex";
- };
- } // packageOverrides)
- ) {};
-
- inflex_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "inflex";
- version = "1.0.0";
- src = fetchHex {
- pkg = "inflex";
- version = "1.0.0";
- sha256 =
- "549ebe94420051cdf845028372d1f89c8fbdd7b5f5ddd51e0619b827b7be6793";
- };
-
- meta = {
- description = ''An Elixir library for handling word
- inflections.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nurugger07/inflex";
- };
- } // packageOverrides)
- ) {};
-
- inflex_1_4_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "inflex";
- version = "1.4.1";
- src = fetchHex {
- pkg = "inflex";
- version = "1.4.1";
- sha256 =
- "d316fecd9db83db97828bbcbdb689f5c412e3aaf658329cf479cad5baa856c92";
- };
-
- meta = {
- description = ''An Elixir library for handling word
- inflections.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nurugger07/inflex";
- };
- } // packageOverrides)
- ) {};
-
- inflex_1_5_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "inflex";
- version = "1.5.0";
- src = fetchHex {
- pkg = "inflex";
- version = "1.5.0";
- sha256 =
- "d48609edc5bb7901b95dcc00c1e38f259e8006904865a028954ccfe9336a3384";
- };
-
- meta = {
- description = ''An Elixir library for handling word
- inflections.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nurugger07/inflex";
- };
- } // packageOverrides)
- ) {};
-
- inflex = inflex_1_5_0;
-
- ini_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ini";
- version = "0.0.1";
- src = fetchHex {
- pkg = "ini";
- version = "0.0.1";
- sha256 =
- "96b86cf664ca8247cdad166c29251ef4ddc156f16f906bdf2ea1c37831fbf804";
- };
-
- meta = {
- description = ''Module to parse ini files.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nathanjohnson320/ini";
- };
- } // packageOverrides)
- ) {};
-
- ini = ini_0_0_1;
-
- insert_ordered_set_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "insert_ordered_set";
- version = "0.0.1";
- src = fetchHex {
- pkg = "insert_ordered_set";
- version = "0.0.1";
- sha256 =
- "78ebc47d780aa1e8fabce7d4f4d5f3b9c90e1443514ad830b32f7c5184f87634";
- };
-
- meta = {
- longDescription = ''Provides a data structure with the following
- properties: 1. Contains unique values. 2. O(1)
- manipulation operations (e.g. insert, delete) by
- using an underlying Map. 3. Preserves insertion
- order when converting to a list. Allows reverse
- insertion ordering.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/localshred/insert_ordered_set";
- };
- } // packageOverrides)
- ) {};
-
- insert_ordered_set = insert_ordered_set_0_0_1;
-
- insight_0_1_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "insight";
- version = "0.1.4";
- src = fetchHex {
- pkg = "insight";
- version = "0.1.4";
- sha256 =
- "97b4bfd6f0b595b3febca7ea2f0bdf5cb429c18309f7acc8a2a308847aaded07";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir package for consuming any Insight-powered
- Bitcoin explorer.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/stampery/elixir-insight";
- };
- } // packageOverrides)
- ) {};
-
- insight = insight_0_1_4;
-
- insights_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "insights";
- version = "0.0.2";
- src = fetchHex {
- pkg = "insights";
- version = "0.0.2";
- sha256 =
- "92794ab7ba760a7b17ffac1f98ecff1a848148d15a1d9fabe58b0150767cddbd";
- };
-
- meta = {
- longDescription = ''Insights is a wrapper for sending and data
- capture for keen.io or others adapters'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/gullitmiranda/insights";
- };
- } // packageOverrides)
- ) {};
-
- insights = insights_0_0_2;
-
- instrumental_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "instrumental";
- version = "0.1.3";
- src = fetchHex {
- pkg = "instrumental";
- version = "0.1.3";
- sha256 =
- "26d3c6dcd2b04d716266afa9d12ba193fc1f038d21c67178e50f77ef1671acec";
- };
-
- meta = {
- description = ''An Elixir client for Instrumental
- (http://instrumentalapp.com).'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/undeadlabs/instrumental-ex";
- };
- } // packageOverrides)
- ) {};
-
- instrumental = instrumental_0_1_3;
-
- ip2location_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
- buildMix ({
- name = "ip2location";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ip2location";
- version = "0.1.0";
- sha256 =
- "77e059326d6c3f1348c53b3486dfa59d2b0ad90c999f51da86cabbb2d0099685";
- };
- beamDeps = [ poolboy_1_5_1 ];
-
- meta = {
- description = ''An Elixir library for the IP2Location
- database.'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/nazipov/ip2location-elixir";
- };
- } // packageOverrides)
- ) {};
-
- ip2location = ip2location_0_1_0;
-
- ipa_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ipa";
- version = "0.0.3";
- src = fetchHex {
- pkg = "ipa";
- version = "0.0.3";
- sha256 =
- "ff365e6ec32ae9159877fb464c6754387fe97168e15a0ce7de346106ec6d75a6";
- };
-
- meta = {
- longDescription = ''A pale, hoppy library for working with IP
- Addresses. Validate and transform IPv4 addresses
- and subnet masks.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bordeltabernacle/IPA";
- };
- } // packageOverrides)
- ) {};
-
- ipa = ipa_0_0_3;
-
- iplist_1_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- earmark_0_2_1,
- cidr_1_0_0
- }:
- buildMix ({
- name = "iplist";
- version = "1.0.2";
- src = fetchHex {
- pkg = "iplist";
- version = "1.0.2";
- sha256 =
- "fae5b5accc8b7a7618c2d1fbf94607ce6e79ca3b493da6643dbb1bd92be30bd4";
- };
- beamDeps = [ earmark_0_2_1 cidr_1_0_0 ];
-
- meta = {
- description = ''Library and CLI tool to expand IPv4 ranges to
- lists of IP numbers'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/digitalronin/iplist";
- };
- } // packageOverrides)
- ) {};
-
- iplist = iplist_1_0_2;
-
- iptools_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "iptools";
- version = "0.0.2";
- src = fetchHex {
- pkg = "iptools";
- version = "0.0.2";
- sha256 =
- "33bf27bc72094bbc4e67c664c979e5cebfe17c5369c91fc2e2610cc726b252db";
- };
-
- meta = {
- description = ''A set of functions for validating and
- transforming IPv4 addresses'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/blackfist/iptools";
- };
- } // packageOverrides)
- ) {};
-
- iptools = iptools_0_0_2;
-
- is_chinese_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "is_chinese";
- version = "1.0.0";
- src = fetchHex {
- pkg = "is_chinese";
- version = "1.0.0";
- sha256 =
- "907da2e2995c104bb89152d276c41337b6c4075aa866663e3fb7ebe48da8ff62";
- };
-
- meta = {
- description = ''Check whether string is Chinese'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/lidashuang/is_chinese";
- };
- } // packageOverrides)
- ) {};
-
- is_chinese = is_chinese_1_0_0;
-
- is_email_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "is_email";
- version = "0.0.2";
- src = fetchHex {
- pkg = "is_email";
- version = "0.0.2";
- sha256 =
- "fefcf35b6ca506cd7d2e3d1d850b49e9a2545180db46e291845aa9fd54812d82";
- };
-
- meta = {
- description = ''Loosely check whether a given string is an
- email'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/johnotander/is_email";
- };
- } // packageOverrides)
- ) {};
-
- is_email = is_email_0_0_2;
-
- is_up_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpotion_2_2_2 }:
- buildMix ({
- name = "is_up";
- version = "1.0.2";
- src = fetchHex {
- pkg = "is_up";
- version = "1.0.2";
- sha256 =
- "e73713422ef99f9788d130eec1fd880ea15cc5e023137658263fe94bd12a56e1";
- };
- beamDeps = [ httpotion_2_2_2 ];
-
- meta = {
- description = ''Check whether a given url is up.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/johnotander/is_up";
- };
- } // packageOverrides)
- ) {};
-
- is_up = is_up_1_0_2;
-
- is_url_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "is_url";
- version = "0.0.1";
- src = fetchHex {
- pkg = "is_url";
- version = "0.0.1";
- sha256 =
- "4c3f86302e0c675ece51a247838f64ce88335008035463c8c20b21667399d413";
- };
-
- meta = {
- description = ''Validate a url'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/johnotander/is_url";
- };
- } // packageOverrides)
- ) {};
-
- is_url = is_url_0_0_1;
-
- isaac_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "isaac";
- version = "0.0.1";
- src = fetchHex {
- pkg = "isaac";
- version = "0.0.1";
- sha256 =
- "e43c136931b8003def7cf8a9eaa49e9713ab91a76729c667591e0a4c03511fa1";
- };
-
- meta = {
- longDescription = ''Isaac is an elixir module for the [ISAAC
- Stream
- Cipher](http://burtleburtle.net/bob/rand/isaacafa.html)
- It wraps around https://github.com/arianvp/ISAAC
- which is a port of the ISAAC stream cipher to
- platforms which have words bigger than 32 bits.
- '';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/arianvp/elixir-isaac";
- };
- } // packageOverrides)
- ) {};
-
- isaac = isaac_0_0_1;
-
- isbndbex_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "isbndbex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "isbndbex";
- version = "0.1.0";
- sha256 =
- "5c9fe6840a3beadb78a3b5f8d243475258d9d117ef0976cceb0d4c464a4cf4f4";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir wrapper for isbndb rest api.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rcoedo/isbndbex";
- };
- } // packageOverrides)
- ) {};
-
- isbndbex = isbndbex_0_1_0;
-
- iso3166_0_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- floki_0_8_1
- }:
- buildMix ({
- name = "iso3166";
- version = "0.0.4";
- src = fetchHex {
- pkg = "iso3166";
- version = "0.0.4";
- sha256 =
- "fde520eac52e491e0492a42a8f5f00b03435733e81f35e58685998e9142c4215";
- };
- beamDeps = [ poison_2_1_0 floki_0_8_1 ];
-
- meta = {
- longDescription = ''A library that provides a list of ISO3166
- country names, two letter abbreviations, three
- letter abbreviations, and functions for
- converting between them.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/joelpm/iso3166ex";
- };
- } // packageOverrides)
- ) {};
-
- iso3166 = iso3166_0_0_4;
-
- janrain_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "janrain";
- version = "0.0.1";
- src = fetchHex {
- pkg = "janrain";
- version = "0.0.1";
- sha256 =
- "35299ee088dfd5647e7a5cd129d5011f2d6319fe53045b2a8ce3ddf70792cc78";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''A small library to help with Janrain logins.
- Probably most useful when used in conjuction
- with Phoenix and Guardian.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rickr/janrain";
- };
- } // packageOverrides)
- ) {};
-
- janrain = janrain_0_0_1;
-
- japan_municipality_code_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "japan_municipality_code";
- version = "1.0.1";
- src = fetchHex {
- pkg = "japan_municipality_code";
- version = "1.0.1";
- sha256 =
- "b03879f6a716f04579d19c9be818b0e3780b61ab2e79057ed3a7f64e576b5378";
- };
-
- meta = {
- description = ''Elixir Library for Japan municipality key
- converting'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hykw/japan_municipality_key";
- };
- } // packageOverrides)
- ) {};
-
- japan_municipality_code = japan_municipality_code_1_0_1;
-
- jc_1_2_0 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- ranch_1_1_0,
- lager_3_0_1,
- jwalk_1_1_0,
- jsone_1_2_0
- }:
- buildRebar3 ({
- name = "jc";
- version = "1.2.0";
- src = fetchHex {
- pkg = "jc";
- version = "1.2.0";
- sha256 =
- "cbc043e4d0e6b1ccd6279426babcfd73ac186f9ddf780c0bff24f7e586aa3a6c";
- };
-
- beamDeps = [ ranch_1_1_0 lager_3_0_1 jwalk_1_1_0 jsone_1_2_0 ];
-
- meta = {
- description = ''A simple, distributed, in-memory caching
- system'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jr0senblum/jc";
- };
- } // packageOverrides)
- ) {};
-
- jc = jc_1_2_0;
-
- jequalson_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "jequalson";
- version = "0.1.1";
- src = fetchHex {
- pkg = "jequalson";
- version = "0.1.1";
- sha256 =
- "5ed0a54b8aaa457cb441b3baafc508d8be4fc90db29a0cc27980eeeb65db18ac";
- };
-
- meta = {
- description = ''Helpers for testing JSON responses.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/dm1try/jequalson";
- };
- } // packageOverrides)
- ) {};
-
- jequalson = jequalson_0_1_1;
-
- jesse_0_1_3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, jsx_2_8_0 }:
- buildRebar3 ({
- name = "jesse";
- version = "0.1.3";
- src = fetchHex {
- pkg = "jesse";
- version = "0.1.3";
- sha256 =
- "679702baf154d8e078c60b8eb4f2b7f53304e24deea03b32cbff350772afba4d";
- };
-
- beamDeps = [ jsx_2_8_0 ];
-
- meta = {
- description = ''jesse'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/for-GET/jesse";
- };
- } // packageOverrides)
- ) {};
-
- jesse = jesse_0_1_3;
-
- jira_0_0_8 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "jira";
- version = "0.0.8";
- src = fetchHex {
- pkg = "jira";
- version = "0.0.8";
- sha256 =
- "71c19ef23ea7351a2dc7b8f14d0c5794ff00382fa43a88a2235ec9c1741a73cb";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''An Elixir client library for JIRA + JIRA Agile /
- Greenhopper'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jeffweiss/jira";
- };
- } // packageOverrides)
- ) {};
-
- jira = jira_0_0_8;
-
- jobspool_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, uuid_1_1_4 }:
- buildMix ({
- name = "jobspool";
- version = "0.1.0";
- src = fetchHex {
- pkg = "jobspool";
- version = "0.1.0";
- sha256 =
- "f4ba59374f844fe8ac018606748b120b7860c0f568364514d1dc87eb42829aad";
- };
- beamDeps = [ uuid_1_1_4 ];
-
- meta = {
- description = ''Simple Elixir jobs pool'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/flupke/exjobspool";
- };
- } // packageOverrides)
- ) {};
-
- jobspool = jobspool_0_1_0;
-
- joken_0_16_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- plug_1_1_5,
- jose_1_7_5
- }:
- buildMix ({
- name = "joken";
- version = "0.16.1";
- src = fetchHex {
- pkg = "joken";
- version = "0.16.1";
- sha256 =
- "a804bfd350f61688f6ce8d9898bc17fd4b59990c054debeea44234d53048d93d";
- };
- beamDeps = [ poison_1_5_2 plug_1_1_5 jose_1_7_5 ];
-
- meta = {
- description = ''JWT Library for Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/bryanjos/joken";
- };
- } // packageOverrides)
- ) {};
-
- jolt_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "jolt";
- version = "0.1.0";
- src = fetchHex {
- pkg = "jolt";
- version = "0.1.0";
- sha256 =
- "922498b234a1b0a813255d3abf5caa64a9afdc41eb4d8d71f87d71c41fe792e8";
- };
- beamDeps = [ poison_1_5_2 plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- longDescription = ''A full REST JSON API with zero coding,
- powered by Elixir. It is intended to be used as
- a command-line tool (just run mix escript.build
- first).'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/clarkware/jolt";
- };
- } // packageOverrides)
- ) {};
-
- jolt = jolt_0_1_0;
-
- jorel_mix_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "jorel_mix";
- version = "0.0.1";
- src = fetchHex {
- pkg = "jorel_mix";
- version = "0.0.1";
- sha256 =
- "be990099dc7d13dd22e741d96dd3282ba9096f9e132c047ebc0f134b3d470461";
- };
-
- meta = {
- description = ''Just anOther RELease assembler'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/emedia-project/jorel_mix";
- };
- } // packageOverrides)
- ) {};
-
- jorel_mix = jorel_mix_0_0_1;
-
- jose_1_4_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, base64url_0_0_1 }:
- buildMix ({
- name = "jose";
- version = "1.4.2";
- src = fetchHex {
- pkg = "jose";
- version = "1.4.2";
- sha256 =
- "7bc79dfa28b0194c9334eddeaf33d02b51d4101d5b18f08086503a7b82be7cb0";
- };
- beamDeps = [ base64url_0_0_1 ];
-
- meta = {
- description = ''JSON Object Signing and Encryption (JOSE) for
- Erlang and Elixir.'';
- license = stdenv.lib.licenses.mpl20;
- homepage = "https://github.com/potatosalad/erlang-jose";
- };
- } // packageOverrides)
- ) {};
-
- jose_1_7_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, base64url_0_0_1 }:
- buildMix ({
- name = "jose";
- version = "1.7.5";
- src = fetchHex {
- pkg = "jose";
- version = "1.7.5";
- sha256 =
- "c473f64b03fb4541b8b3f56982e563d1090a1168d0dc154e6275135515c4b65d";
- };
- beamDeps = [ base64url_0_0_1 ];
-
- meta = {
- description = ''JSON Object Signing and Encryption (JOSE) for
- Erlang and Elixir.'';
- license = stdenv.lib.licenses.mpl20;
- homepage = "https://github.com/potatosalad/erlang-jose";
- };
- } // packageOverrides)
- ) {};
-
- jose = jose_1_7_5;
-
- jsex_2_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, jsx_2_8_0 }:
- buildMix ({
- name = "jsex";
- version = "2.0.0";
- src = fetchHex {
- pkg = "jsex";
- version = "2.0.0";
- sha256 =
- "98c1501645e31efdbcbb6172983d4deb1335de993966197e6a4343492fa7d872";
- };
- beamDeps = [ jsx_2_8_0 ];
-
- meta = {
- description = ''json for elixir '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/talentdeficit/jsex";
- };
- } // packageOverrides)
- ) {};
-
- jsex = jsex_2_0_0;
-
- json_0_3_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "json";
- version = "0.3.3";
- src = fetchHex {
- pkg = "json";
- version = "0.3.3";
- sha256 =
- "d1986548847189b51f1efb65d196e6ab9f2e88a6878a363aec0e3c77e2550616";
- };
-
- meta = {
- description = ''Native Elixir library for JSON encoding and
- decoding'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/cblage/elixir-json";
- };
- } // packageOverrides)
- ) {};
-
- json = json_0_3_3;
-
- json_api_assert_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "json_api_assert";
- version = "0.0.1";
- src = fetchHex {
- pkg = "json_api_assert";
- version = "0.0.1";
- sha256 =
- "b85f48d26e62977b77ed0a8a62b2079ae9e1ddd6dfba988a13b3366cb6dfd51e";
- };
-
- meta = {
- description = ''assertions for JSON API payload'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/DockYard/json_api_assert";
- };
- } // packageOverrides)
- ) {};
-
- json_api_assert = json_api_assert_0_0_1;
-
- json_diff_ex_0_5_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "json_diff_ex";
- version = "0.5.0";
- src = fetchHex {
- pkg = "json_diff_ex";
- version = "0.5.0";
- sha256 =
- "314fe606c76dea0c5b70ca918f5dd75a89456c6330596d707bbbf70c800352c9";
- };
-
- meta = {
- description = ''Diff and patch for JSON in Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/olafura/json_diff_ex";
- };
- } // packageOverrides)
- ) {};
-
- json_diff_ex = json_diff_ex_0_5_0;
-
- json_logger_0_6_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, json_0_3_3 }:
- buildMix ({
- name = "json_logger";
- version = "0.6.0";
- src = fetchHex {
- pkg = "json_logger";
- version = "0.6.0";
- sha256 =
- "4b3aaa23c2d0fec4fe4ba7c001ec6a72b1ae36f0268ede87557c59663843a0c3";
- };
- beamDeps = [ json_0_3_3 ];
-
- meta = {
- description = ''A simple library for logging with JSON, best
- suited with Logstash.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/LeeroyDing/json_logger";
- };
- } // packageOverrides)
- ) {};
-
- json_logger = json_logger_0_6_0;
-
- json_pointer_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "json_pointer";
- version = "0.0.2";
- src = fetchHex {
- pkg = "json_pointer";
- version = "0.0.2";
- sha256 =
- "150b37bc4ff689758f17aee180fbf8f7226c3eeff7d28a782e6f0a74f859417e";
- };
-
- meta = {
- longDescription = ''Implementation of RFC 6901 which defines a
- string syntax for identifying a specific value
- within a JSON document'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/xavier/json_pointer";
- };
- } // packageOverrides)
- ) {};
-
- json_pointer = json_pointer_0_0_2;
-
- json_stream_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, jsx_2_8_0 }:
- buildMix ({
- name = "json_stream";
- version = "0.0.1";
- src = fetchHex {
- pkg = "json_stream";
- version = "0.0.1";
- sha256 =
- "07e2283f7f211f50d4fa686f1814f7a8b9637cfe3f358f6f15332489b2b7f2ab";
- };
- beamDeps = [ jsx_2_8_0 ];
-
- meta = {
- longDescription = ''Small but useful wrapper above erlang `jsx`
- to stream json elements from an Elixir binary
- stream.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/awetzel/json_stream";
- };
- } // packageOverrides)
- ) {};
-
- json_stream = json_stream_0_0_1;
-
- json_web_token_0_2_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "json_web_token";
- version = "0.2.5";
- src = fetchHex {
- pkg = "json_web_token";
- version = "0.2.5";
- sha256 =
- "2e90fca59a7f9a4862ff8688622da5f12e880134b11ac1eb0eb0b19143d7a309";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- description = ''Elixir implementation of the JSON Web Token
- (JWT), RFC 7519'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/garyf/json_web_token_ex";
- };
- } // packageOverrides)
- ) {};
-
- json_web_token = json_web_token_0_2_5;
-
- jsonapi_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "jsonapi";
- version = "0.3.0";
- src = fetchHex {
- pkg = "jsonapi";
- version = "0.3.0";
- sha256 =
- "f0e3c00a2af7394621695ded4e31cdf369436916ffc47347835f06616d594b33";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- longDescription = ''Fully functional JSONAPI V1 Serializer as
- well as a QueryParser for Plug based projects
- and applications.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jeregrine/jsonapi";
- };
- } // packageOverrides)
- ) {};
-
- jsonapi = jsonapi_0_3_0;
-
- jsone_1_2_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "jsone";
- version = "1.2.0";
- src = fetchHex {
- pkg = "jsone";
- version = "1.2.0";
- sha256 =
- "a60e74284d3a923cde65c00a39dd4542fd7da7c22e8385c0378ad419c54b2e08";
- };
-
- meta = {
- description = ''Erlang JSON Library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sile/jsone";
- };
- } // packageOverrides)
- ) {};
-
- jsone_1_2_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "jsone";
- version = "1.2.2";
- src = fetchHex {
- pkg = "jsone";
- version = "1.2.2";
- sha256 =
- "253c18c7dc6fc27290b1f507f3adc6863f4396b099d0eb396e3c0e58dcfe0ee4";
- };
-
- meta = {
- description = ''Erlang JSON Library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sile/jsone";
- };
- } // packageOverrides)
- ) {};
-
- jsone_1_2_3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "jsone";
- version = "1.2.3";
- src = fetchHex {
- pkg = "jsone";
- version = "1.2.3";
- sha256 =
- "629369e718a50a2fcb23c210b6f2eb2fd08b0a6a2c5edade4fca24cda368ac13";
- };
-
- meta = {
- description = ''Erlang JSON Library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sile/jsone";
- };
- } // packageOverrides)
- ) {};
-
- jsone = jsone_1_2_3;
-
- jsx_1_4_5 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "jsx";
- version = "1.4.5";
- src = fetchHex {
- pkg = "jsx";
- version = "1.4.5";
- sha256 =
- "ff5115611c5dd789cebe3addc07d18b86340f701c52ad063caba6fe8da3a489b";
- };
-
- meta = {
- longDescription = ''an erlang application for consuming,
- producing and manipulating json. inspired by
- yajl'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/talentdeficit/jsx";
- };
- } // packageOverrides)
- ) {};
-
- jsx_2_5_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, mixunit_0_9_2 }:
- buildMix ({
- name = "jsx";
- version = "2.5.3";
- src = fetchHex {
- pkg = "jsx";
- version = "2.5.3";
- sha256 =
- "528ab2fdadbcfe95a44ddb831724ee28d48bd3dbd11f2e8109874c855c43dd12";
- };
- beamDeps = [ mixunit_0_9_2 ];
-
- meta = {
- longDescription = ''an erlang application for consuming,
- producing and manipulating json. inspired by
- yajl'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/talentdeficit/jsx";
- };
- } // packageOverrides)
- ) {};
-
- jsx_2_6_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "jsx";
- version = "2.6.2";
- src = fetchHex {
- pkg = "jsx";
- version = "2.6.2";
- sha256 =
- "6bfccb6461cc3c7d5cc63f3e69ffeb2f1f8de50eca5980065311c056a69a907f";
- };
-
- meta = {
- longDescription = ''an erlang application for consuming,
- producing and manipulating json. inspired by
- yajl'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/talentdeficit/jsx";
- };
- } // packageOverrides)
- ) {};
-
- jsx_2_7_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "jsx";
- version = "2.7.1";
- src = fetchHex {
- pkg = "jsx";
- version = "2.7.1";
- sha256 =
- "52d0e8bda0c8624bc59c3119236eb49bb66289702ea3d59ad76fd2a56cdf9089";
- };
-
- meta = {
- longDescription = ''an erlang application for consuming,
- producing and manipulating json. inspired by
- yajl'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/talentdeficit/jsx";
- };
- } // packageOverrides)
- ) {};
-
- jsx_2_8_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "jsx";
- version = "2.8.0";
- src = fetchHex {
- pkg = "jsx";
- version = "2.8.0";
- sha256 =
- "a8ba15d5bac2c48b2be1224a0542ad794538d79e2cc16841a4e24ca75f0f8378";
- };
-
- meta = {
- longDescription = ''an erlang application for consuming,
- producing and manipulating json. inspired by
- yajl'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/talentdeficit/jsx";
- };
- } // packageOverrides)
- ) {};
-
- jsx = jsx_2_8_0;
-
- jsxd_0_1_10 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "jsxd";
- version = "0.1.10";
- src = fetchHex {
- pkg = "jsxd";
- version = "0.1.10";
- sha256 =
- "f71a8238f08a1dee130e8959ff5343524891fa6531392667a5b911cead5f5082";
- };
-
- meta = {
- description = ''jsx data structire traversing and modification
- library.'';
- license = stdenv.lib.licenses.cddl;
- homepage = "https://github.com/Licenser/jsxd";
- };
- } // packageOverrides)
- ) {};
-
- jsxd = jsxd_0_1_10;
-
- junit_formatter_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "junit_formatter";
- version = "1.1.0";
- src = fetchHex {
- pkg = "junit_formatter";
- version = "1.1.0";
- sha256 =
- "d173ee429c98c9829eb9b24a8615ac584b49c58c29cefc9532eff5e19404ea8b";
- };
-
- meta = {
- longDescription = ''An ExUnit.Formatter that produces an XML
- report of the tests run in the project _build
- dir. It is a good fit with Jenkins test
- reporting plugin, for example.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/victorolinasc/junit-formatter";
- };
- } // packageOverrides)
- ) {};
-
- junit_formatter = junit_formatter_1_1_0;
-
- jwalk_1_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "jwalk";
- version = "1.1.0";
- src = fetchHex {
- pkg = "jwalk";
- version = "1.1.0";
- sha256 =
- "10c150910ba3539583887cb2b5c3f70d602138471e6f6b5c22498aa18ed654e1";
- };
-
- meta = {
- longDescription = ''Helper module for working with Erlang
- representations of JSON, handling eep-18, map,
- mochijson-style and proplists representations'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jr0senblum/jwalk";
- };
- } // packageOverrides)
- ) {};
-
- jwalk_1_1_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "jwalk";
- version = "1.1.2";
- src = fetchHex {
- pkg = "jwalk";
- version = "1.1.2";
- sha256 =
- "322d6bc04c1b16efdd711711c101415f9df18a87af31315e6d04e48e678d1bf0";
- };
-
- meta = {
- longDescription = ''Helper module for working with Erlang
- representations of JSON, handling eep-18, map,
- mochijson-style and proplists representations'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jr0senblum/jwalk";
- };
- } // packageOverrides)
- ) {};
-
- jwalk = jwalk_1_1_2;
-
- jwt_0_1_2 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- jsx_2_8_0,
- base64url_0_0_1
- }:
- buildRebar3 ({
- name = "jwt";
- version = "0.1.2";
- src = fetchHex {
- pkg = "jwt";
- version = "0.1.2";
- sha256 =
- "be9a6502857f40e3c285909a80a21d00dffcb9330951abe86e6c9cffb17770f1";
- };
-
- beamDeps = [ jsx_2_8_0 base64url_0_0_1 ];
-
- meta = {
- description = ''Erlang JWT library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/artemeff/jwt";
- };
- } // packageOverrides)
- ) {};
-
- jwt = jwt_0_1_2;
-
- jwt_claims_0_0_3 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, json_web_token_0_2_5
- }:
- buildMix ({
- name = "jwt_claims";
- version = "0.0.3";
- src = fetchHex {
- pkg = "jwt_claims";
- version = "0.0.3";
- sha256 =
- "baf94583907a4d774079a8a98c13c0cf5d306ee6211e805f156523a20658e230";
- };
- beamDeps = [ json_web_token_0_2_5 ];
-
- meta = {
- description = ''Elixir implementation of JWT registered claims,
- RFC 7519'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/garyf/jwt_claims_ex";
- };
- } // packageOverrides)
- ) {};
-
- jwt_claims = jwt_claims_0_0_3;
-
- jwtex_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_3_1 }:
- buildMix ({
- name = "jwtex";
- version = "0.0.1";
- src = fetchHex {
- pkg = "jwtex";
- version = "0.0.1";
- sha256 =
- "5b8b826e8543e323f62a0e8cb2fb5714d8e7110ecce97419cd0a4a656fa411cf";
- };
- beamDeps = [ poison_1_3_1 ];
-
- meta = {
- description = ''JWT decoding library for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mschae/jwtex";
- };
- } // packageOverrides)
- ) {};
-
- jwtex = jwtex_0_0_1;
-
- k6_bytea_1_1_5 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "k6_bytea";
- version = "1.1.5";
- src = fetchHex {
- pkg = "k6_bytea";
- version = "1.1.5";
- sha256 =
- "1ce4ca84bbe45890bc3c07809f8e01fb80c4613226fbd318aaac73d4cd233132";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''A mutable byte array for Erlang.'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- k6_bytea = k6_bytea_1_1_5;
-
- kafka_ex_0_5_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "kafka_ex";
- version = "0.5.0";
- src = fetchHex {
- pkg = "kafka_ex";
- version = "0.5.0";
- sha256 =
- "5e5d5be9bad3d9b9e77f75047c479aadc140d7e13be85a912cef8e7d647f0ae7";
- };
-
- meta = {
- description = ''Kafka client for Elixir/Erlang.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kafkaex/kafka_ex";
- };
- } // packageOverrides)
- ) {};
-
- kafka_ex = kafka_ex_0_5_0;
-
- kaguya_0_4_7 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "kaguya";
- version = "0.4.7";
- src = fetchHex {
- pkg = "kaguya";
- version = "0.4.7";
- sha256 =
- "d687b8832c42e4d3d03e09e68b9df3a9bb4b208d287d8c2835170c343e2e4554";
- };
-
- meta = {
- longDescription = ''A small, powerful, and modular IRC bot
- framework. Using a flexible macro based routing
- system, modules can be easily created and
- used.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/Luminarys/Kaguya";
- };
- } // packageOverrides)
- ) {};
-
- kaguya = kaguya_0_4_7;
-
- kennitala_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "kennitala";
- version = "1.0.0";
- src = fetchHex {
- pkg = "kennitala";
- version = "1.0.0";
- sha256 =
- "8f22c152fb5de86455d4570ec23f96b3ee110c8f7243e9fd7ffd85fbccf63838";
- };
-
- meta = {
- longDescription = ''Elixir library for validating and handling
- the Icelandic Kennitala identity number.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/JonGretar/Kennitala.ex";
- };
- } // packageOverrides)
- ) {};
-
- kennitala = kennitala_1_0_0;
-
- key2value_1_4_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "key2value";
- version = "1.4.0";
- src = fetchHex {
- pkg = "key2value";
- version = "1.4.0";
- sha256 =
- "ad63453fcf54ab853581b78c6d2df56be41ea691ba4bc05920264c19f35a0ded";
- };
-
- meta = {
- description = ''Erlang 2-way Map'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/okeuday/key2value";
- };
- } // packageOverrides)
- ) {};
-
- key2value_1_5_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "key2value";
- version = "1.5.1";
- src = fetchHex {
- pkg = "key2value";
- version = "1.5.1";
- sha256 =
- "2a40464b9f8ef62e8828d869ac8d2bf9135b4956d29ba4eb044e8522b2d35ffa";
- };
-
- meta = {
- description = ''Erlang 2-way Map'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/okeuday/key2value";
- };
- } // packageOverrides)
- ) {};
-
- key2value = key2value_1_5_1;
-
- keymaster_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- plug_1_1_5
- }:
- buildMix ({
- name = "keymaster";
- version = "0.0.3";
- src = fetchHex {
- pkg = "keymaster";
- version = "0.0.3";
- sha256 =
- "93ba90778f0dbe162fde8584c1510a61fcbf0f08d20ed24ea8548a3f84790fa8";
- };
- beamDeps = [ poison_2_1_0 plug_1_1_5 ];
-
- meta = {
- description = ''An opinionated OAuth 2.0 server for Elixir
- projects.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/austinsmorris/keymaster";
- };
- } // packageOverrides)
- ) {};
-
- keymaster = keymaster_0_0_3;
-
- keys1value_1_5_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "keys1value";
- version = "1.5.1";
- src = fetchHex {
- pkg = "keys1value";
- version = "1.5.1";
- sha256 =
- "2385132be0903c170fe21e54a0c3e746a604777b66ee458bb6e5f25650d3354f";
- };
-
- meta = {
- description = ''Erlang Set Associative Map For Key Lists'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/okeuday/keys1value";
- };
- } // packageOverrides)
- ) {};
-
- keys1value = keys1value_1_5_1;
-
- kinja_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "kinja";
- version = "0.0.1";
- src = fetchHex {
- pkg = "kinja";
- version = "0.0.1";
- sha256 =
- "97b68a603fb5e665f07aac0396ee53d28690bdc42845c38b23741675c053b761";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''A wrapper for the Kinja API.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/adampash/kinjaex";
- };
- } // packageOverrides)
- ) {};
-
- kinja = kinja_0_0_1;
-
- kitsune_0_5_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
- buildMix ({
- name = "kitsune";
- version = "0.5.2";
- src = fetchHex {
- pkg = "kitsune";
- version = "0.5.2";
- sha256 =
- "f8d48f1f3abe89aa9df7b37bc59c9bfa5932142d076d5322f97e92ec732bf993";
- };
- beamDeps = [ poison_1_5_2 ];
-
- meta = {
- longDescription = ''Kitsune is an Elixir library for transforming
- the representation of data inspired by
- Representable.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/edubkendo/kitsune";
- };
- } // packageOverrides)
- ) {};
-
- kitsune = kitsune_0_5_2;
-
- kitto_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "kitto";
- version = "0.0.1";
- src = fetchHex {
- pkg = "kitto";
- version = "0.0.1";
- sha256 =
- "36a2c19a364fd9998ee3d0635fb6386104733d9887143f2ade8fe39f7096e635";
- };
- beamDeps = [ poison_2_1_0 plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''Framework for creating interactive dashboards'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kittoframework/kitto";
- };
- } // packageOverrides)
- ) {};
-
- kitto = kitto_0_0_1;
-
- kubex_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "kubex";
- version = "0.1.1";
- src = fetchHex {
- pkg = "kubex";
- version = "0.1.1";
- sha256 =
- "b0bd22246731b1c4d4d7f832cd0015fd6586022c779fb6672f45a648da7dcf79";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Kubernetes integration for and in pure Elixir.'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/ingerslevio/kubex";
- };
- } // packageOverrides)
- ) {};
-
- kubex = kubex_0_1_1;
-
- kwfuns_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "kwfuns";
- version = "0.0.4";
- src = fetchHex {
- pkg = "kwfuns";
- version = "0.0.4";
- sha256 =
- "ce1ac52be8d3c3cb7c77fc339eaa877a190899e889bf97cdb92e01922fd52b54";
- };
-
- meta = {
- longDescription = ''Macros to create functions with syntax based
- keyword parameters with default values defkw
- make_list_elem( parent, text, spaced: false,
- type: :ul ) do ... end translates to def
- make_list_elem( parent, text, keywords \\ [] )
- do some_code_with( spaces, typed) end'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/RobertDober/lab42_defkw";
- };
- } // packageOverrides)
- ) {};
-
- kwfuns = kwfuns_0_0_4;
-
- lager_3_0_1 = callPackage
- (
- {
- buildRebar3, packageOverrides ? {}, fetchHex, goldrush_0_1_7
- }:
- buildRebar3 ({
- name = "lager";
- version = "3.0.1";
- src = fetchHex {
- pkg = "lager";
- version = "3.0.1";
- sha256 =
- "d32c9233105b72dc5c1f6a8fe9a33cc205ecccc359c4449950060cee5a329e35";
- };
-
- beamDeps = [ goldrush_0_1_7 ];
-
- meta = {
- description = ''Erlang logging framework'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/basho/lager";
- };
- } // packageOverrides)
- ) {};
-
- lager_3_0_2 = callPackage
- (
- {
- buildRebar3, packageOverrides ? {}, fetchHex, goldrush_0_1_7
- }:
- buildRebar3 ({
- name = "lager";
- version = "3.0.2";
- src = fetchHex {
- pkg = "lager";
- version = "3.0.2";
- sha256 =
- "527f3b233e01b6cb68780c14ef675ed08ec02247dc029cacecbb56c78dfca100";
- };
-
- beamDeps = [ goldrush_0_1_7 ];
-
- meta = {
- description = ''Erlang logging framework'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/basho/lager";
- };
- } // packageOverrides)
- ) {};
-
- lager_3_2_1 = callPackage
- (
- {
- buildRebar3, packageOverrides ? {}, fetchHex, goldrush_0_1_8
- }:
- buildRebar3 ({
- name = "lager";
- version = "3.2.1";
- src = fetchHex {
- pkg = "lager";
- version = "3.2.1";
- sha256 =
- "09a751789852094bf1ffad239a602bc47829da13ca5937b9d12df27470692095";
- };
-
- beamDeps = [ goldrush_0_1_8 ];
-
- meta = {
- description = ''Erlang logging framework'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/basho/lager";
- };
- } // packageOverrides)
- ) {};
-
- lager = lager_3_2_1;
-
- lager_hipchat_0_2_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, lager_3_0_2 }:
- buildRebar3 ({
- name = "lager_hipchat";
- version = "0.2.0";
- src = fetchHex {
- pkg = "lager_hipchat";
- version = "0.2.0";
- sha256 =
- "83dc3246822b33b2889c431975ff0f8ffc6954c9e5f744bfd99acd9fa8605a1c";
- };
-
- beamDeps = [ lager_3_0_2 ];
-
- meta = {
- description = ''HipChat backend for Lager'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/synlay/lager_hipchat";
- };
- } // packageOverrides)
- ) {};
-
- lager_hipchat = lager_hipchat_0_2_0;
-
- lager_logger_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, lager_3_2_1 }:
- buildMix ({
- name = "lager_logger";
- version = "1.0.2";
- src = fetchHex {
- pkg = "lager_logger";
- version = "1.0.2";
- sha256 =
- "28e13b1a5d43acefdf7f49d219ecb268dd934da448d2e1d4c3f74378fdea9e89";
- };
- beamDeps = [ lager_3_2_1 ];
-
- meta = {
- longDescription = ''LagerLogger is a lager backend that forwards
- all log messages to Elixir`s Logger.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/PSPDFKit-labs/lager_logger";
- };
- } // packageOverrides)
- ) {};
-
- lager_logger = lager_logger_1_0_2;
-
- lasse_1_1_0 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "lasse";
- version = "1.1.0";
- src = fetchHex {
- pkg = "lasse";
- version = "1.1.0";
- sha256 =
- "53e70ea9031f7583331a9f9bdbb29da933e591e5c4cce521b4bf85c68e7f3385";
- };
-
- meta = {
- description = ''Lasse: Server-Sent Event handler for Cowboy.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/inaka/lasse";
- };
- } // packageOverrides)
- ) {};
-
- lasse = lasse_1_1_0;
-
- ldap_ex_0_2_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ldap_ex";
- version = "0.2.4";
- src = fetchHex {
- pkg = "ldap_ex";
- version = "0.2.4";
- sha256 =
- "5ecdbce6e0243f92ce012b4fdf7daff4bbf6e748d37e028a4674e1ec87d81dbe";
- };
-
- meta = {
- longDescription = ''This is a binary instead of char_list version
- of the stock Erlang :eldap library.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/OvermindDL1/ldap_ex";
- };
- } // packageOverrides)
- ) {};
-
- ldap_ex = ldap_ex_0_2_4;
-
- left_pad_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "left_pad";
- version = "0.0.3";
- src = fetchHex {
- pkg = "left_pad";
- version = "0.0.3";
- sha256 =
- "9b14a4b7f84f320175bd2ed2f24754a62206fdd67d90117602876c415cf22374";
- };
-
- meta = {
- description = ''Pad a string to the left with any number of
- characters.'';
- license = stdenv.lib.licenses.mpl20;
- homepage = "https://github.com/folz/left_pad.ex";
- };
- } // packageOverrides)
- ) {};
-
- left_pad = left_pad_0_0_3;
-
- leftpad_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "leftpad";
- version = "1.0.1";
- src = fetchHex {
- pkg = "leftpad";
- version = "1.0.1";
- sha256 =
- "88e4cd8039461f2558f6e8378d834772b9315554080c5b729d65472209824a89";
- };
-
- meta = {
- description = ''left pad for elixir, because why not?
- ¯\\_(ツ)_/¯'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/colinrymer/leftpad.ex";
- };
- } // packageOverrides)
- ) {};
-
- leftpad = leftpad_1_0_1;
-
- lessonly_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "lessonly";
- version = "0.0.1";
- src = fetchHex {
- pkg = "lessonly";
- version = "0.0.1";
- sha256 =
- "a7c53da4a3153043a36636e9c9b188e7bad54caac4c994705afe4d47fd2ef111";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''An Elixir wrapper for the Lesson.ly API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/stevegrossi/lessonly-elixir";
- };
- } // packageOverrides)
- ) {};
-
- lessonly = lessonly_0_0_1;
-
- level_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "level";
- version = "1.0.0";
- src = fetchHex {
- pkg = "level";
- version = "1.0.0";
- sha256 =
- "42d54a840e79af5833e5ae335b374699c46d996053f2f3480e181a57cad2ae62";
- };
-
- meta = {
- longDescription = ''Level implements various helper functions and
- data types for working with Googles Level data
- store. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gausby/level";
- };
- } // packageOverrides)
- ) {};
-
- level = level_1_0_0;
-
- lex_luthor_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "lex_luthor";
- version = "0.1.0";
- src = fetchHex {
- pkg = "lex_luthor";
- version = "0.1.0";
- sha256 =
- "1a8ebf646f9cd29f3696659e67f4bbb65a5a558e4b3e1f43013c5e85022189a2";
- };
-
- meta = {
- longDescription = ''LexLuthor is a Lexer in Elixir (say that 10
- times fast) which uses macros to generate a
- reusable lexers. Good times.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jamesotron/lex_luthor";
- };
- } // packageOverrides)
- ) {};
-
- lex_luthor = lex_luthor_0_1_0;
-
- lfsr_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "lfsr";
- version = "0.0.2";
- src = fetchHex {
- pkg = "lfsr";
- version = "0.0.2";
- sha256 =
- "8a14455bd0ce5c6b7dc56bf1027007c67e48979b49b70e09372cc36769d16b90";
- };
-
- meta = {
- description = ''Elixir implementation of a binary Galois Linear
- Feedback Shift Register. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pma/lfsr";
- };
- } // packageOverrides)
- ) {};
-
- lfsr = lfsr_0_0_2;
-
- lhttpc_1_3_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "lhttpc";
- version = "1.3.0";
- src = fetchHex {
- pkg = "lhttpc";
- version = "1.3.0";
- sha256 =
- "ddd2bd4b85159bc987c954b14877168e6a3c3e516105702189776e97c50296a4";
- };
-
- meta = {
- description = ''Lightweight HTTP Client'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/talko/lhttpc";
- };
- } // packageOverrides)
- ) {};
-
- lhttpc_1_4_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "lhttpc";
- version = "1.4.0";
- src = fetchHex {
- pkg = "lhttpc";
- version = "1.4.0";
- sha256 =
- "26d5a12b63fedb3e862a816a472258007dc1e85b75a9bcdb0223425e39827777";
- };
-
- meta = {
- description = ''Lightweight HTTP Client'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/talko/lhttpc";
- };
- } // packageOverrides)
- ) {};
-
- lhttpc = lhttpc_1_4_0;
-
- libsnarlmatch_0_1_7 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "libsnarlmatch";
- version = "0.1.7";
- src = fetchHex {
- pkg = "libsnarlmatch";
- version = "0.1.7";
- sha256 =
- "72e9bcf7968e75774393778146ac6596116f1c60136dd607ad249183684ee380";
- };
-
- meta = {
- description = ''permission matcher library'';
- license = stdenv.lib.licenses.cddl;
- homepage = "https://github.com/project-fifo/libsnarlmatch";
- };
- } // packageOverrides)
- ) {};
-
- libsnarlmatch = libsnarlmatch_0_1_7;
-
- lineo_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "lineo";
- version = "0.0.1";
- src = fetchHex {
- pkg = "lineo";
- version = "0.0.1";
- sha256 =
- "cbf80d2a2315803949dc186decce770c6850fb45fb919982ed24da758893093a";
- };
-
- meta = {
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/lineo";
- };
- } // packageOverrides)
- ) {};
-
- lineo_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "lineo";
- version = "0.1.0";
- src = fetchHex {
- pkg = "lineo";
- version = "0.1.0";
- sha256 =
- "842733d2aae3b8cfadf3acfe456241eb3434e68984d1fdbb7be15e335591e21c";
- };
-
- meta = {
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/lineo";
- };
- } // packageOverrides)
- ) {};
-
- lineo = lineo_0_1_0;
-
- linguist_0_1_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "linguist";
- version = "0.1.5";
- src = fetchHex {
- pkg = "linguist";
- version = "0.1.5";
- sha256 =
- "d8b0665512a800854152082f6d56142e56e5da5f5b0d879298117b7dfd55ba97";
- };
-
- meta = {
- description = ''Elixir Internationalization library '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/chrismccord/linguist";
- };
- } // packageOverrides)
- ) {};
-
- linguist = linguist_0_1_5;
-
- liquid_0_2_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "liquid";
- version = "0.2.2";
- src = fetchHex {
- pkg = "liquid";
- version = "0.2.2";
- sha256 =
- "b68ae1dbc002e05028f7a74bb717d9a7863397eddde802d6ed5d96394120d1b1";
- };
-
- meta = {
- description = ''Liquid implementation in elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nulian/liquid-elixir";
- };
- } // packageOverrides)
- ) {};
-
- liquid = liquid_0_2_2;
-
- lob_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- chacha20_0_3_2
- }:
- buildMix ({
- name = "lob";
- version = "0.1.0";
- src = fetchHex {
- pkg = "lob";
- version = "0.1.0";
- sha256 =
- "adf071a07fde2fbd2393c06a18959e6d48622c7a3769e868cf577095c7eac67e";
- };
- beamDeps = [ poison_2_1_0 chacha20_0_3_2 ];
-
- meta = {
- description = ''Length-Object-Binary (LOB) Packet Encoding'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/lob_ex";
- };
- } // packageOverrides)
- ) {};
-
- lob = lob_0_1_0;
-
- logfmt_3_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "logfmt";
- version = "3.0.2";
- src = fetchHex {
- pkg = "logfmt";
- version = "3.0.2";
- sha256 =
- "d079aab159c3682d90054dbf8228cc0f86c8d5df6e6145c60d69a81110c3ee1c";
- };
-
- meta = {
- description = ''Logfmt is a module for encoding and decoding
- logfmt-style log lines.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jclem/logfmt-elixir";
- };
- } // packageOverrides)
- ) {};
-
- logfmt = logfmt_3_0_2;
-
- logger_file_backend_0_0_8 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "logger_file_backend";
- version = "0.0.8";
- src = fetchHex {
- pkg = "logger_file_backend";
- version = "0.0.8";
- sha256 =
- "1d89664561365545517114eeba9f96b193fd1f52c90b5f055b79f1e40547ffea";
- };
-
- meta = {
- description = ''Simple logger backend that writes to a file'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/onkel-dirtus/logger_file_backend";
- };
- } // packageOverrides)
- ) {};
-
- logger_file_backend = logger_file_backend_0_0_8;
-
- logger_lager_backend_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "logger_lager_backend";
- version = "0.0.2";
- src = fetchHex {
- pkg = "logger_lager_backend";
- version = "0.0.2";
- sha256 =
- "cd9f4c0df86d9209d905b451f4177aa0cbe341488ae36969c49af772830432a0";
- };
-
- meta = {
- description = ''A Logger backend that forwards messages to
- lager'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/jonathanperret/logger_lager_backend";
- };
- } // packageOverrides)
- ) {};
-
- logger_lager_backend = logger_lager_backend_0_0_2;
-
- logger_loggly_backend_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "logger_loggly_backend";
- version = "0.2.0";
- src = fetchHex {
- pkg = "logger_loggly_backend";
- version = "0.2.0";
- sha256 =
- "111d0e256ace86e2af366b1afc7152b4aadd3cd6c093d5d2b119c08a84395fd6";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- description = ''Loggly logger backend'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/joeyfeldberg/loggly_backend";
- };
- } // packageOverrides)
- ) {};
-
- logger_loggly_backend = logger_loggly_backend_0_2_0;
-
- logger_logstash_backend_2_0_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_2_1_6,
- exjsx_3_1_0
- }:
- buildMix ({
- name = "logger_logstash_backend";
- version = "2.0.0";
- src = fetchHex {
- pkg = "logger_logstash_backend";
- version = "2.0.0";
- sha256 =
- "e0c709aa8fbddd825ef5cc5287e0d04f4470498173555e07156675aeba2b2b7a";
- };
- beamDeps = [ timex_2_1_6 exjsx_3_1_0 ];
-
- meta = {
- description = ''Logstash UDP producer backend for Logger.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/marcelog/logger_logstash_backend";
- };
- } // packageOverrides)
- ) {};
-
- logger_logstash_backend = logger_logstash_backend_2_0_0;
-
- logger_papertrail_backend_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "logger_papertrail_backend";
- version = "0.1.0";
- src = fetchHex {
- pkg = "logger_papertrail_backend";
- version = "0.1.0";
- sha256 =
- "ae2bff0588a702cb3bd87080c5f4558d34efd0fbf19f976397fe9b0538b1c20b";
- };
-
- meta = {
- description = ''A Papertrail backend for Elixir Logger'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/larskrantz/logger_papertrail_backend";
- };
- } // packageOverrides)
- ) {};
-
- logger_papertrail_backend = logger_papertrail_backend_0_1_0;
-
- logglix_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "logglix";
- version = "0.0.1";
- src = fetchHex {
- pkg = "logglix";
- version = "0.0.1";
- sha256 =
- "c193945b52e7fe3f6973e7defec46683b794baacd784eaa0c1f7c65978fea654";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir loggly application event subscriber'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/pragmaticivan/logglix";
- };
- } // packageOverrides)
- ) {};
-
- logglix = logglix_0_0_1;
-
- logi_0_5_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "logi";
- version = "0.5.0";
- src = fetchHex {
- pkg = "logi";
- version = "0.5.0";
- sha256 =
- "45619004d3735f27e6f397ba0696c5fc6ea1ee89e037fd50847d975e0330de8f";
- };
-
- meta = {
- description = ''A Logger Interface Library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sile/logi";
- };
- } // packageOverrides)
- ) {};
-
- logi = logi_0_5_0;
-
- logi_stdlib_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, logi_0_5_0 }:
- buildRebar3 ({
- name = "logi_stdlib";
- version = "0.1.0";
- src = fetchHex {
- pkg = "logi_stdlib";
- version = "0.1.0";
- sha256 =
- "a2e12cf14fe6660e81b6351f51711c4891147eb4140d1b2b8c23007bb750312b";
- };
-
- beamDeps = [ logi_0_5_0 ];
-
- meta = {
- description = ''Standard Library for logi'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sile/logi_stdlib";
- };
- } // packageOverrides)
- ) {};
-
- logi_stdlib = logi_stdlib_0_1_0;
-
- lolcat_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- quickrand_1_5_1,
- colorful_0_6_0
- }:
- buildMix ({
- name = "lolcat";
- version = "0.0.1";
- src = fetchHex {
- pkg = "lolcat";
- version = "0.0.1";
- sha256 =
- "884799d2e7f294a6a5455e19c9816592d7b1314cefaba18952876fef0c4a10af";
- };
- beamDeps = [ quickrand_1_5_1 colorful_0_6_0 ];
-
- meta = {
- description = ''The clone of lolcat. written in elixir '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/restartr/ex-lolcat";
- };
- } // packageOverrides)
- ) {};
-
- lolcat = lolcat_0_0_1;
-
- loom_0_0_10 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "loom";
- version = "0.0.10";
- src = fetchHex {
- pkg = "loom";
- version = "0.0.10";
- sha256 =
- "f32cf0fe1c14efb9b4fda15285a5d331b64e952da7a0561c66f7e2b671d36cb8";
- };
-
- meta = {
- description = ''A modern CRDT library that uses protocols to
- create composable CRDTs.'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/asonge/loom";
- };
- } // packageOverrides)
- ) {};
-
- loom = loom_0_0_10;
-
- lru_1_3_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "lru";
- version = "1.3.1";
- src = fetchHex {
- pkg = "lru";
- version = "1.3.1";
- sha256 =
- "cd6ac15c383d58cd2933df9cb918617b24b12b6e5fb24d94c4c8f200fd93f619";
- };
-
- meta = {
- description = ''implements a fixed-size LRU cache'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/barrel-db/erlang-lru";
- };
- } // packageOverrides)
- ) {};
-
- lru = lru_1_3_1;
-
- lru_cache_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "lru_cache";
- version = "0.1.0";
- src = fetchHex {
- pkg = "lru_cache";
- version = "0.1.0";
- sha256 =
- "9543e4b00ad3763fa2a92cf9ed7429dff645d912f5d9134b32d573bb327f56b5";
- };
-
- meta = {
- description = ''ETS-based LRU Cache'';
-
- homepage = "https://github.com/arago/lru_cache";
- };
- } // packageOverrides)
- ) {};
-
- lru_cache = lru_cache_0_1_0;
-
- ltsv_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ltsv";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ltsv";
- version = "0.1.0";
- sha256 =
- "62e56251331da6cf5b95de9ecf6e0984749b0ba935356397151fa19f2491a449";
- };
-
- meta = {
- description = ''A Labeled Tab-separated Values Parser'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ma2gedev/ltsvex";
- };
- } // packageOverrides)
- ) {};
-
- ltsv = ltsv_0_1_0;
-
- luhn_0_3_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "luhn";
- version = "0.3.1";
- src = fetchHex {
- pkg = "luhn";
- version = "0.3.1";
- sha256 =
- "86aba88228660238ad981b92cb7a0e92be04772fc54fe5effb338c94b3b7d9fa";
- };
-
- meta = {
- description = ''Luhn algorithm in Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ma2gedev/luhn_ex";
- };
- } // packageOverrides)
- ) {};
-
- luhn = luhn_0_3_1;
-
- luhnatex_0_5_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "luhnatex";
- version = "0.5.1";
- src = fetchHex {
- pkg = "luhnatex";
- version = "0.5.1";
- sha256 =
- "f08bb73777cd8a12780ea12697064c942a08184074512d4e593443da74526eed";
- };
-
- meta = {
- description = ''Luhn algorithm in Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/my-flow/luhnatex";
- };
- } // packageOverrides)
- ) {};
-
- luhnatex = luhnatex_0_5_1;
-
- lz4_0_2_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "lz4";
- version = "0.2.2";
- src = fetchHex {
- pkg = "lz4";
- version = "0.2.2";
- sha256 =
- "a59522221e7cdfe3792bf8b3bb21cfe7ac657790e5826201fa2c5d0bc7484a2d";
- };
- compilePorts = true;
-
- meta = {
- description = ''LZ4 bindings for Erlang'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/szktty/erlang-lz4.git";
- };
- } // packageOverrides)
- ) {};
-
- lz4 = lz4_0_2_2;
-
- lz_string_0_0_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "lz_string";
- version = "0.0.5";
- src = fetchHex {
- pkg = "lz_string";
- version = "0.0.5";
- sha256 =
- "318ce091382febc3ca63e0ff9bff6bda78a797dd90f2a2f95fec6d0e2757d6fa";
- };
-
- meta = {
- description = ''Elixir implementation of pieroxy`s lz-string
- compression algorithm.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/koudelka/elixir-lz-string";
- };
- } // packageOverrides)
- ) {};
-
- lz_string = lz_string_0_0_5;
-
- m2x_2_0_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- json_0_3_3,
- hackney_1_6_0
- }:
- buildMix ({
- name = "m2x";
- version = "2.0.0";
- src = fetchHex {
- pkg = "m2x";
- version = "2.0.0";
- sha256 =
- "e125cf588d48d9b04fb4a003bb62ab1a8e8df359866dba0cde6444e9fd7ce939";
- };
- beamDeps = [ json_0_3_3 hackney_1_6_0 ];
-
- meta = {
- longDescription = ''Elixir client library for the AT&T M2X
- (http://m2x.att.com) API. AT&T M2X is a
- cloud-based fully managed time-series data
- storage service for network connected
- machine-to-machine (M2M) devices and the
- Internet of Things (IoT).'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/attm2x/m2x-elixir";
- };
- } // packageOverrides)
- ) {};
-
- m2x = m2x_2_0_0;
-
- m2x_erlang_1_3_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- jsx_2_8_0,
- hackney_1_6_0
- }:
- buildMix ({
- name = "m2x_erlang";
- version = "1.3.1";
- src = fetchHex {
- pkg = "m2x_erlang";
- version = "1.3.1";
- sha256 =
- "873db746f4428490670b54aabcc93fda8d94c3c4e25c94a9aef7275858a8b809";
- };
- beamDeps = [ jsx_2_8_0 hackney_1_6_0 ];
-
- meta = {
- longDescription = ''Erlang client library for the AT&T M2X
- (http://m2x.att.com) API. AT&T M2X is a
- cloud-based fully managed time-series data
- storage service for network connected
- machine-to-machine (M2M) devices and the
- Internet of Things (IoT).'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/attm2x/m2x-erlang";
- };
- } // packageOverrides)
- ) {};
-
- m2x_erlang = m2x_erlang_1_3_1;
-
- maas_1_0_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- poison_2_1_0
- }:
- buildMix ({
- name = "maas";
- version = "1.0.0";
- src = fetchHex {
- pkg = "maas";
- version = "1.0.0";
- sha256 =
- "f6c2a3dd4e291b7000d45938abd975a21e055ef2eba57701ed7e0399e7a64617";
- };
- beamDeps = [ httpoison_0_8_3 poison_2_1_0 ];
-
- meta = {
- description = ''A wrapper for the Mars Atmospheric Weather System
- API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lucidstack/ex-maas";
- };
- } // packageOverrides)
- ) {};
-
- maas = maas_1_0_0;
-
- maester_1_0_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "maester";
- version = "1.0.0";
- src = fetchHex {
- pkg = "maester";
- version = "1.0.0";
- sha256 =
- "4fa324e1545ba5805d2eef2341c9554b52a51dfd79146dc13ec4b589e55efddd";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''An API of Ice and Fire client for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sotojuan/maester";
- };
- } // packageOverrides)
- ) {};
-
- maester = maester_1_0_0;
-
- magic_number_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "magic_number";
- version = "0.0.4";
- src = fetchHex {
- pkg = "magic_number";
- version = "0.0.4";
- sha256 =
- "5b6fa41f5d24c3fd2f3cf9a96fefcf762c98bdd301158a95ab5355fe4f9eb61a";
- };
-
- meta = {
- description = ''MagicNumber is the module to determine a file`s
- type from its magic number.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ishikawa/elixir-magic-number";
- };
- } // packageOverrides)
- ) {};
-
- magic_number = magic_number_0_0_4;
-
- magnet_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "magnet";
- version = "0.0.1";
- src = fetchHex {
- pkg = "magnet";
- version = "0.0.1";
- sha256 =
- "064af72e9422262813977752e2f7439501894bce48e5679576ceb93f6b649581";
- };
-
- meta = {
- description = ''A magnet-uri encoder and decoder'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/gausby/magnet";
- };
- } // packageOverrides)
- ) {};
-
- magnet = magnet_0_0_1;
-
- mail_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mail";
- version = "0.0.4";
- src = fetchHex {
- pkg = "mail";
- version = "0.0.4";
- sha256 =
- "015bb93bc3233fbf0bb28daf71963ddc290d574d9b3d63e1b45641d1a2d4571e";
- };
-
- meta = {
- description = ''Easily build a composable mail message'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/DockYard/elixir-mail";
- };
- } // packageOverrides)
- ) {};
-
- mail = mail_0_0_4;
-
- mailer_1_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_2_1_6,
- gen_smtp_0_10_0
- }:
- buildMix ({
- name = "mailer";
- version = "1.0.1";
- src = fetchHex {
- pkg = "mailer";
- version = "1.0.1";
- sha256 =
- "08b834102ad6eb2f2a363b70939935d3d23d1e3a68d96a2a7f8730fb7834c63d";
- };
- beamDeps = [ timex_2_1_6 gen_smtp_0_10_0 ];
-
- meta = {
- description = ''Mailer - A simple email client'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/antp/mailer";
- };
- } // packageOverrides)
- ) {};
-
- mailer = mailer_1_0_1;
-
- mailgun_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
- buildMix ({
- name = "mailgun";
- version = "0.1.2";
- src = fetchHex {
- pkg = "mailgun";
- version = "0.1.2";
- sha256 =
- "9cc828e06238045c92414db8f2e9a64a6004aca9b9a4856e5222db99bd8528e8";
- };
- beamDeps = [ poison_1_5_2 ];
-
- meta = {
- description = ''Elixir Mailgun Client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/chrismccord/mailgun";
- };
- } // packageOverrides)
- ) {};
-
- mailgun = mailgun_0_1_2;
-
- majremind_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "majremind";
- version = "0.0.1";
- src = fetchHex {
- pkg = "majremind";
- version = "0.0.1";
- sha256 =
- "604ba3b2142497b2384c73b2320f9738711a9cc07b4348f8e870ee6e470c4749";
- };
-
- meta = {
- longDescription = ''A self-maintained database of your updated
- server which tells you which one needs to be
- updated. It uses Disk Erlang Term Storage for
- its internal database, located at
- $HOME/.config/majremind/ '';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- majremind = majremind_0_0_1;
-
- mandrake_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mandrake";
- version = "0.0.4";
- src = fetchHex {
- pkg = "mandrake";
- version = "0.0.4";
- sha256 =
- "ed672e094f68ff07c1f8e78a3c8a95af3e23a71ca90515ad441738446ee18887";
- };
-
- meta = {
- longDescription = ''Mandrake is a functional programming library
- that bring something else magic in elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mbasso/mandrake";
- };
- } // packageOverrides)
- ) {};
-
- mandrake = mandrake_0_0_4;
-
- mandrill_0_5_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "mandrill";
- version = "0.5.0";
- src = fetchHex {
- pkg = "mandrill";
- version = "0.5.0";
- sha256 =
- "9fb3a65d01de47cfc979a492079960506f21f8975e37e994478a70ee04c8d9a6";
- };
- beamDeps = [ httpoison_0_8_3 exjsx_3_2_0 ];
-
- meta = {
- longDescription = ''A Mandrill wrapper for Elixir Requires an
- active account with Mandrill
- (http://mandrill.com).'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/slogsdon/mandrill-elixir";
- };
- } // packageOverrides)
- ) {};
-
- mandrill = mandrill_0_5_0;
-
- maptu_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "maptu";
- version = "0.1.0";
- src = fetchHex {
- pkg = "maptu";
- version = "0.1.0";
- sha256 =
- "8dc5fd69e78a948a6cd3b95a1b1cb1a7056948a4445e4abed773cae8c88c16da";
- };
-
- meta = {
- description = ''Tiny library to convert from \"encoded\" maps to
- Elixir structs.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/whatyouhide/maptu";
- };
- } // packageOverrides)
- ) {};
-
- maptu = maptu_0_1_0;
-
- marco_polo_0_2_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- decimal_1_1_2,
- connection_1_0_2
- }:
- buildMix ({
- name = "marco_polo";
- version = "0.2.2";
- src = fetchHex {
- pkg = "marco_polo";
- version = "0.2.2";
- sha256 =
- "a3107bb545590f4533dee040432659566b9c5ddbbbdbf7d1ee92381f450c0956";
- };
- beamDeps = [ decimal_1_1_2 connection_1_0_2 ];
-
- meta = {
- description = ''Binary driver for the OrientDB database.'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/MyMedsAndMe/marco_polo";
- };
- } // packageOverrides)
- ) {};
-
- marco_polo = marco_polo_0_2_2;
-
- mariaex_0_4_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_2 }:
- buildMix ({
- name = "mariaex";
- version = "0.4.4";
- src = fetchHex {
- pkg = "mariaex";
- version = "0.4.4";
- sha256 =
- "fadba91ff3719ac0fae7d454abfd812819630ea9f9aec768c5321331baa38b79";
- };
- beamDeps = [ decimal_1_1_2 ];
-
- meta = {
- description = ''Pure elixir database driver for MariaDB /
- MySQL.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/xerions/mariaex";
- };
- } // packageOverrides)
- ) {};
-
- marked_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "marked";
- version = "0.0.1";
- src = fetchHex {
- pkg = "marked";
- version = "0.0.1";
- sha256 =
- "6e16369d41355bef05b18f98230afe08dcb3ccfaaab168382513d86c19721035";
- };
-
- meta = {
- description = ''CommonMark compatible Markdown parser'';
-
- };
- } // packageOverrides)
- ) {};
-
- marked = marked_0_0_1;
-
- markit_0_1_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "markit";
- version = "0.1.2";
- src = fetchHex {
- pkg = "markit";
- version = "0.1.2";
- sha256 =
- "6304ceb1e7a5787555bc7d048bf3c9c0b432fe5378c6d630fb02d0bb871e57b5";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Access stock market data from markit.com'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/col/markit";
- };
- } // packageOverrides)
- ) {};
-
- markit = markit_0_1_2;
-
- markit_skill_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- markit_0_1_2,
- inflex_1_5_0,
- alexa_0_1_14
- }:
- buildMix ({
- name = "markit_skill";
- version = "0.0.2";
- src = fetchHex {
- pkg = "markit_skill";
- version = "0.0.2";
- sha256 =
- "166d8ef88c08c21821dda379a053af761db4de5dff50226bfcb0e3a18fc855db";
- };
- beamDeps = [ markit_0_1_2 inflex_1_5_0 alexa_0_1_14 ];
-
- meta = {
- description = ''Amazon Alexa skill that uses data from
- Markit.com'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/col/markit_skill";
- };
- } // packageOverrides)
- ) {};
-
- markit_skill = markit_skill_0_0_2;
-
- maru_entity_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "maru_entity";
- version = "0.1.2";
- src = fetchHex {
- pkg = "maru_entity";
- version = "0.1.2";
- sha256 =
- "93b1f9f3941032cdf98b999cf4db85cace7e6259a78427322c5af8a5621e45b6";
- };
-
- meta = {
- description = ''Elixir copy of grape-entity'';
-
- };
- } // packageOverrides)
- ) {};
-
- maru_entity = maru_entity_0_1_2;
-
- math_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "math";
- version = "0.2.0";
- src = fetchHex {
- pkg = "math";
- version = "0.2.0";
- sha256 =
- "75557fb9743e866f743d894102da851531ffc69b4c0f8fdd12cd749acb1a6215";
- };
-
- meta = {
- longDescription = ''The Math module adds many useful functions
- that extend Elixir`s standard library. - General
- Functions • a <~> b Comparison of floats, to
- check if they are _nearly_ equal. •
- Math.pow(x, n) Arithmetic exponentiation. Works
- both with integer powers and floats. •
- Math.sqrt(x) The square root of x. •
- Math.nth_root(x, n) The n-th root of x. •
- Math.isqrt(x) The integer square root of x. •
- Math.gcd(a, b) The greatest common divisor of a
- and b. • Math.lcm(a, b) The least common
- multiple of a and b. • Math.factorial(n) The
- n-th factorial number. •
- Math.k_permutations(n, k) The number of distinct
- ways to create groups of size k from n distinct
- elements. • Math.k_combinations(n, k) The
- number of distinct ways to create groups of size
- k from n distinct elements where order does not
- matter. - Logarithms • Math.exp(x) Calculates
- ℯ to the xth power. • Math.log(x) Calculates
- the natural logarithm (base ℯ) of x. •
- Math.log(x, b) Calculates the base-b logarithm
- of x • Math.log2(x) Calculates the binary
- logarithm (base 2) of x. • Math.log10(x)
- Calculates the common logarithm (base 10) of x.
- • Math.e Returns a floating-point
- approximation of the number ℯ. - Trigonometry
- • Math.pi Returns a floating-point
- approximation of the number π. •
- Math.deg2rad(x) converts from degrees to
- radians. • Math.rad2deg(x) converts from
- radians to degrees. • Math.sin(x) The sine of
- x. • Math.cos(x) The cosine of x. •
- Math.tan(x) The tangent of x. • Math.asin(x)
- The inverse sine of x. • Math.acos(x) The
- inverse cosine of x. • Math.atan(x) The
- inverse tangent of x. • Math.atan2(x, y) The
- inverse tangent of x and y. This variant returns
- the inverse tangent in the correct quadrant, as
- the signs of both x and y are known. •
- Math.sinh(x) The hyperbolic sine of x. •
- Math.cosh(x) The hyperbolic cosine of x. •
- Math.tanh(x) The hyperbolic tangent of x. •
- Math.asinh(x) The inverse hyperbolic sine of x.
- • Math.acosh(x) The inverse hyperbolic cosine
- of x. • Math.atanh(x) The inverse hyperbolic
- tangent of x. - Working with Collections •
- Math.Enum.product(collection) The result of
- multiplying all elements in the passed
- collection. • Math.Enum.mean(collection) the
- mean of the numbers in the collection. •
- Math.Enum.median(collection) the median of the
- numbers in the collection.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/folz/math";
- };
- } // packageOverrides)
- ) {};
-
- math = math_0_2_0;
-
- matrix_0_3_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- exprintf_0_1_6,
- earmark_0_2_1
- }:
- buildMix ({
- name = "matrix";
- version = "0.3.1";
- src = fetchHex {
- pkg = "matrix";
- version = "0.3.1";
- sha256 =
- "3184d70b36666d52e011caf8be4590e2ecf3cc772203ec22b44d90c302592523";
- };
- beamDeps = [ exprintf_0_1_6 earmark_0_2_1 ];
-
- meta = {
- longDescription = ''Matrix is a linear algebra library for
- manipulating dense matrices. Its primary design
- goal is ease of use.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/twist-vector/elixir-matrix.git";
- };
- } // packageOverrides)
- ) {};
-
- matrix = matrix_0_3_1;
-
- maxwell_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, mimerl_1_0_2 }:
- buildMix ({
- name = "maxwell";
- version = "1.0.0";
- src = fetchHex {
- pkg = "maxwell";
- version = "1.0.0";
- sha256 =
- "4a71f54a7645210f5274c00171a217a03a04635620d5eef52d0463a88f64d106";
- };
- beamDeps = [ mimerl_1_0_2 ];
-
- meta = {
- longDescription = ''Maxwell is an HTTP client that provides a
- common interface over many adapters (such as
- hackney, ibrowse) and embraces the concept of
- Rack middleware when processing the
- request/response cycle.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zhongwencool/maxwell";
- };
- } // packageOverrides)
- ) {};
-
- maxwell = maxwell_1_0_0;
-
- maybe_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "maybe";
- version = "0.0.1";
- src = fetchHex {
- pkg = "maybe";
- version = "0.0.1";
- sha256 =
- "b1915afa2dd6a2db64ad7b20b41eeb2d3cb576cdbd20679594eb6ef76f612638";
- };
-
- meta = {
- description = ''Utils to deal with errors'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zweifisch/maybe";
- };
- } // packageOverrides)
- ) {};
-
- maybe = maybe_0_0_1;
-
- mazurka_1_0_0 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, mimetype_parser_0_1_2
- }:
- buildMix ({
- name = "mazurka";
- version = "1.0.0";
- src = fetchHex {
- pkg = "mazurka";
- version = "1.0.0";
- sha256 =
- "7f035374ceb139b7531ca24bd111ee25cbf3be11b45af1bbf663ed3b832e7b13";
- };
- beamDeps = [ mimetype_parser_0_1_2 ];
-
- meta = {
- description = ''hypermedia api toolkit'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mazurka/mazurka";
- };
- } // packageOverrides)
- ) {};
-
- mazurka = mazurka_1_0_0;
-
- mazurka_dsl_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mazurka_dsl";
- version = "0.1.1";
- src = fetchHex {
- pkg = "mazurka_dsl";
- version = "0.1.1";
- sha256 =
- "2877b27736daa1f5757ff1c2b34ec35d43c8e501b5292be5f9db7de95b88ea69";
- };
-
- meta = {
- description = ''DSL for defining mazurka resources'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mazurka/mazurka_dsl";
- };
- } // packageOverrides)
- ) {};
-
- mazurka_dsl = mazurka_dsl_0_1_1;
-
- mazurka_mediatype_0_2_0 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, etude_1_0_0_beta_2
- }:
- buildMix ({
- name = "mazurka_mediatype";
- version = "0.2.0";
- src = fetchHex {
- pkg = "mazurka_mediatype";
- version = "0.2.0";
- sha256 =
- "4ccd8b27d6405e93cb34861f211d69b79ab46c2dbc5c7874d4ee3c580a5754bb";
- };
- beamDeps = [ etude_1_0_0_beta_2 ];
-
- meta = {
- description = ''mazurka mediatype interface'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mazurka/mazurka_mediatype";
- };
- } // packageOverrides)
- ) {};
-
- mazurka_mediatype = mazurka_mediatype_0_2_0;
-
- mazurka_mediatype_hyperjson_0_2_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_3_1,
- mazurka_mediatype_0_2_0,
- etude_1_0_0_beta_2
- }:
- buildMix ({
- name = "mazurka_mediatype_hyperjson";
- version = "0.2.3";
- src = fetchHex {
- pkg = "mazurka_mediatype_hyperjson";
- version = "0.2.3";
- sha256 =
- "f09489f242598ece8496f50c9dfc3d1a051b6115a654ebbb9ce5336e04b2cb8d";
- };
- beamDeps = [
- poison_1_3_1
- mazurka_mediatype_0_2_0
- etude_1_0_0_beta_2
- ];
-
- meta = {
- description = ''hyper+json mediatype compiler for mazurka'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/mazurka/mazurka_mediatype_hyperjson";
- };
- } // packageOverrides)
- ) {};
-
- mazurka_mediatype_hyperjson = mazurka_mediatype_hyperjson_0_2_3;
-
- mc_data_0_0_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "mc_data";
- version = "0.0.5";
- src = fetchHex {
- pkg = "mc_data";
- version = "0.0.5";
- sha256 =
- "0ad4b4489554951f93fc9da39b8f14e5b87dada3005d6d012528cbc387d0aa27";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- description = ''Provides access to data from the game
- Minecraft.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/McEx/McData";
- };
- } // packageOverrides)
- ) {};
-
- mc_data = mc_data_0_0_5;
-
- mcup_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mcup";
- version = "0.0.2";
- src = fetchHex {
- pkg = "mcup";
- version = "0.0.2";
- sha256 =
- "c59537882707237c961d3d69b149619ec35c808cd5e98646cbcb7985e300b975";
- };
-
- meta = {
- description = ''DSL for markup. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Joe-noh/mcup";
- };
- } // packageOverrides)
- ) {};
-
- mcup = mcup_0_0_2;
-
- mdns_server_0_2_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "mdns_server";
- version = "0.2.0";
- src = fetchHex {
- pkg = "mdns_server";
- version = "0.2.0";
- sha256 =
- "bc9465880e15e57033960ab6820258b87134bef69032210c67e53e3718e289d0";
- };
-
- meta = {
- description = ''mDNS service discovery server'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Licenser/erlang-mdns-server";
- };
- } // packageOverrides)
- ) {};
-
- mdns_server = mdns_server_0_2_0;
-
- mdns_server_lib_0_2_3 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- ranch_1_1_0,
- mdns_server_0_2_0,
- lager_3_0_2
- }:
- buildRebar3 ({
- name = "mdns_server_lib";
- version = "0.2.3";
- src = fetchHex {
- pkg = "mdns_server_lib";
- version = "0.2.3";
- sha256 =
- "078775ccea5d768095716ca6bd82f657601203352495d9726f4cc080c8c07695";
- };
-
- beamDeps = [ ranch_1_1_0 mdns_server_0_2_0 lager_3_0_2 ];
-
- meta = {
- description = ''server side for mdns client server
- implementation'';
- license = stdenv.lib.licenses.cddl;
- homepage = "https://github.com/Licenser/mdns_server_lib";
- };
- } // packageOverrides)
- ) {};
-
- mdns_server_lib = mdns_server_lib_0_2_3;
-
- meck_0_8_3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "meck";
- version = "0.8.3";
- src = fetchHex {
- pkg = "meck";
- version = "0.8.3";
- sha256 =
- "53bd3873d0193d6b2b4a165cfc4b9ffc3934355c3ba19e88239ef6a027cc02b6";
- };
-
- meta = {
- description = ''A mocking framework for Erlang'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/eproxus/meck";
- };
- } // packageOverrides)
- ) {};
-
- meck_0_8_4 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "meck";
- version = "0.8.4";
- src = fetchHex {
- pkg = "meck";
- version = "0.8.4";
- sha256 =
- "2cdfbd0edd8f62b3d2061efc03c0e490282dd2ea6de44e15d2006e83f4f8eead";
- };
-
- meta = {
- description = ''A mocking framework for Erlang'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/eproxus/meck";
- };
- } // packageOverrides)
- ) {};
-
- meck = meck_0_8_4;
-
- meld_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "meld";
- version = "0.1.2";
- src = fetchHex {
- pkg = "meld";
- version = "0.1.2";
- sha256 =
- "3f86b810df38e0767a472829a26f92c07c986c1bcc41421eba021a5a6c174e83";
- };
-
- meta = {
- description = ''create real CLIs in elixir, using mix tasks'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/conflate/meld";
- };
- } // packageOverrides)
- ) {};
-
- meld = meld_0_1_2;
-
- mellon_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- plug_1_1_5
- }:
- buildMix ({
- name = "mellon";
- version = "0.1.1";
- src = fetchHex {
- pkg = "mellon";
- version = "0.1.1";
- sha256 =
- "2b05fca901c0b9609cdd65cfb015a7646a9ec239cf1694ee8f1384a53a5ac0b4";
- };
- beamDeps = [ poison_2_1_0 plug_1_1_5 ];
-
- meta = {
- longDescription = ''Mellon is a Plug used in authentication of
- APIs. It`s flexible, you can define your own
- validator etc.'';
-
- homepage = "https://github.com/sajmoon/mellon";
- };
- } // packageOverrides)
- ) {};
-
- mellon = mellon_0_1_1;
-
- mem_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mem";
- version = "0.2.0";
- src = fetchHex {
- pkg = "mem";
- version = "0.2.0";
- sha256 =
- "6a97047af66ab2c4283460ae43611c9a843abb95584dca4e648ed320c7fdfa34";
- };
-
- meta = {
- description = ''KV cache with TTL, LRU and Persistence support'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/falood/mem";
- };
- } // packageOverrides)
- ) {};
-
- mem = mem_0_2_0;
-
- memcache_client_1_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- poison_2_1_0,
- connection_1_0_2
- }:
- buildMix ({
- name = "memcache_client";
- version = "1.1.0";
- src = fetchHex {
- pkg = "memcache_client";
- version = "1.1.0";
- sha256 =
- "e12d6add6d9ef817f7cf47d85c37c75c9ec81512a7ad88f23b50963048bce439";
- };
- beamDeps = [ poolboy_1_5_1 poison_2_1_0 connection_1_0_2 ];
-
- meta = {
- description = ''Memcache client library utilizing the memcache
- binary protocol.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tsharju/memcache_client";
- };
- } // packageOverrides)
- ) {};
-
- memcache_client = memcache_client_1_1_0;
-
- merkle_tree_1_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "merkle_tree";
- version = "1.1.1";
- src = fetchHex {
- pkg = "merkle_tree";
- version = "1.1.1";
- sha256 =
- "6020578ceee91ae26c63aab9bf8112fbb83cc029d25e6ad4f35b2ed4bfdcaf7a";
- };
-
- meta = {
- longDescription = ''A hash tree or Merkle tree is a tree in which
- every non-leaf node is labelled with the hash of
- the labels or values (in case of leaves) of its
- child nodes. Hash trees are useful because they
- allow efficient and secure verification of the
- contents of large data structures.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/yosriady/merkle_tree";
- };
- } // packageOverrides)
- ) {};
-
- merkle_tree = merkle_tree_1_1_1;
-
- messagepack_0_4_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "messagepack";
- version = "0.4.1";
- src = fetchHex {
- pkg = "messagepack";
- version = "0.4.1";
- sha256 =
- "cdf2d4a2af846a8c3cd43a9f80082883ff7c2c5e221ec078375102db0fb5ca2f";
- };
-
- meta = {
- description = ''MessagePack for Erlang / Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/tomaon/messagepack";
- };
- } // packageOverrides)
- ) {};
-
- messagepack = messagepack_0_4_1;
-
- messenger_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "messenger";
- version = "0.0.2";
- src = fetchHex {
- pkg = "messenger";
- version = "0.0.2";
- sha256 =
- "dda5b1bde69852ac8f2ae7f2d10d55209fd7b6babfc4e664779e3204a9e258b8";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Facebook messenger API client for Elixir'';
-
- };
- } // packageOverrides)
- ) {};
-
- messenger = messenger_0_0_2;
-
- meta_inspector_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "meta_inspector";
- version = "0.0.2";
- src = fetchHex {
- pkg = "meta_inspector";
- version = "0.0.2";
- sha256 =
- "60edc00c2af5ab30e2abebe5f40614421fde2861e147147b33ae54bf4beb180a";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''HTTP Metadata inspector'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- meta_inspector = meta_inspector_0_0_2;
-
- metainvestigator_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, floki_0_8_1 }:
- buildMix ({
- name = "metainvestigator";
- version = "0.0.3";
- src = fetchHex {
- pkg = "metainvestigator";
- version = "0.0.3";
- sha256 =
- "774b3973090491a9a342a68c5cf099c98581ae0f1b1d313a08a7d2030d541781";
- };
- beamDeps = [ floki_0_8_1 ];
-
- meta = {
- description = ''A library for web scraping, inspired by
- MetaInspector'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nekova/metainvestigator";
- };
- } // packageOverrides)
- ) {};
-
- metainvestigator = metainvestigator_0_0_3;
-
- meter_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "meter";
- version = "0.1.0";
- src = fetchHex {
- pkg = "meter";
- version = "0.1.0";
- sha256 =
- "029f4f4a05b10c05b45c70671a353d780964759c3f4b90cf1531c02ef5466724";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- description = ''Track your elixir application on google
- analytycs'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/carlo-colombo/meter";
- };
- } // packageOverrides)
- ) {};
-
- meter = meter_0_1_0;
-
- metrics_1_0_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "metrics";
- version = "1.0.1";
- src = fetchHex {
- pkg = "metrics";
- version = "1.0.1";
- sha256 =
- "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16";
- };
-
- meta = {
- description = ''A generic interface to different metrics systems
- in Erlang.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/benoitc/erlang-metrics";
- };
- } // packageOverrides)
- ) {};
-
- metrics_1_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "metrics";
- version = "1.1.0";
- src = fetchHex {
- pkg = "metrics";
- version = "1.1.0";
- sha256 =
- "48bd4774cef5bd88680cf71c9db46acbe5a80f23072cb2a0a42e8f7d5bd33549";
- };
-
- meta = {
- description = ''A generic interface to different metrics systems
- in Erlang.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/benoitc/erlang-metrics";
- };
- } // packageOverrides)
- ) {};
-
- metrics_1_2_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "metrics";
- version = "1.2.0";
- src = fetchHex {
- pkg = "metrics";
- version = "1.2.0";
- sha256 =
- "c27c7786b8ad0c5f941956fc413f7f31a2e26ba72ebf2fb1396cf363b0b9e70b";
- };
-
- meta = {
- description = ''A generic interface to different metrics systems
- in Erlang.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/benoitc/erlang-metrics";
- };
- } // packageOverrides)
- ) {};
-
- metrics = metrics_1_2_0;
-
- metrix_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, logfmt_3_0_2 }:
- buildMix ({
- name = "metrix";
- version = "0.2.0";
- src = fetchHex {
- pkg = "metrix";
- version = "0.2.0";
- sha256 =
- "544fbe90988d7ac1e828287b44d88166c8aa2738ec983b1578af7d51d7b63dd7";
- };
- beamDeps = [ logfmt_3_0_2 ];
-
- meta = {
- longDescription = ''Metrix is a library to log custom application
- metrics, in a well-structured, human *and*
- machine readable format, for use by downstream
- log processing systems (like Librato, Reimann,
- etc...)'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rwdaigle/metrix";
- };
- } // packageOverrides)
- ) {};
-
- metrix = metrix_0_2_0;
-
- mex_0_0_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mex";
- version = "0.0.5";
- src = fetchHex {
- pkg = "mex";
- version = "0.0.5";
- sha256 =
- "52765dc6f5d0b03dba9f08424b85cfbc96f873dfc769cdb6a26ac391ad3344e3";
- };
-
- meta = {
- description = ''Macro-expansion display helper for IEx.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mrluc/mex";
- };
- } // packageOverrides)
- ) {};
-
- mex = mex_0_0_5;
-
- microformats2_0_0_5 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpotion_2_2_2,
- floki_0_7_2
- }:
- buildMix ({
- name = "microformats2";
- version = "0.0.5";
- src = fetchHex {
- pkg = "microformats2";
- version = "0.0.5";
- sha256 =
- "890ca1812738869aa65865339a730c5542949cac4b017b25fc276e81b37157b2";
- };
- beamDeps = [ httpotion_2_2_2 floki_0_7_2 ];
-
- meta = {
- description = ''A microformats2 parser
- (http://microformats.org/wiki/microformats-2) for
- Elixir'';
- license = stdenv.lib.licenses.agpl3;
- homepage = "https://github.com/ckruse/microformats2-elixir";
- };
- } // packageOverrides)
- ) {};
-
- microformats2 = microformats2_0_0_5;
-
- milkpotion_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- poison_2_1_0
- }:
- buildMix ({
- name = "milkpotion";
- version = "0.0.2";
- src = fetchHex {
- pkg = "milkpotion";
- version = "0.0.2";
- sha256 =
- "1106589d5bdb3d65fd18ff997760b8c3ad9bca7744ae1a0b48b2995227f0c0fd";
- };
- beamDeps = [ httpoison_0_8_3 poison_2_1_0 ];
-
- meta = {
- description = ''milkpotion is an api wrapper for Remember the
- Milk'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/croesnick/milkpotion.git";
- };
- } // packageOverrides)
- ) {};
-
- milkpotion = milkpotion_0_0_2;
-
- milliseconds_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "milliseconds";
- version = "0.0.1";
- src = fetchHex {
- pkg = "milliseconds";
- version = "0.0.1";
- sha256 =
- "6f82b9f47590e96ed90761d6eb331a9c11a40b68216d5e4867420899420035f0";
- };
-
- meta = {
- longDescription = '' Simple library to work with milliseconds.
- Convert text to milliseconds: convert(\"2d\")
- Convert milliseconds to text: convert(8640000)
- Calculate future time: future_time(\"6hrs\") '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/davebryson/elixir_milliseconds";
- };
- } // packageOverrides)
- ) {};
-
- milliseconds = milliseconds_0_0_1;
-
- mime_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mime";
- version = "1.0.0";
- src = fetchHex {
- pkg = "mime";
- version = "1.0.0";
- sha256 =
- "069f07e17e67069195b747ed8b935c547a79adf32c4f8b4cae6dec7d3f1c805c";
- };
-
- meta = {
- description = ''A MIME type module for Elixir'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/elixir-lang/mime";
- };
- } // packageOverrides)
- ) {};
-
- mime = mime_1_0_0;
-
- mime_types_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mime_types";
- version = "0.1.1";
- src = fetchHex {
- pkg = "mime_types";
- version = "0.1.1";
- sha256 =
- "46b4f4a52deda3ac9fa48ae6e3582efb851d6c72de4a11e4dfcc7e386dab710b";
- };
-
- meta = {
- description = ''A toolbelt for working with MIME types in
- Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/christhekeele/mime_types";
- };
- } // packageOverrides)
- ) {};
-
- mime_types = mime_types_0_1_1;
-
- mimerl_1_0_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "mimerl";
- version = "1.0.2";
- src = fetchHex {
- pkg = "mimerl";
- version = "1.0.2";
- sha256 =
- "7a4c8e1115a2732a67d7624e28cf6c9f30c66711a9e92928e745c255887ba465";
- };
-
- meta = {
- description = ''Library to handle mimetypes'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/benoitc/mimerl";
- };
- } // packageOverrides)
- ) {};
-
- mimerl_1_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "mimerl";
- version = "1.1.0";
- src = fetchHex {
- pkg = "mimerl";
- version = "1.1.0";
- sha256 =
- "def0f1922a5dcdeeee6e4f41139b364e7f0f40239774b528a0986b12bcb42ddc";
- };
-
- meta = {
- description = ''Library to handle mimetypes'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/benoitc/mimerl";
- };
- } // packageOverrides)
- ) {};
-
- mimerl = mimerl_1_1_0;
-
- mimetype_parser_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mimetype_parser";
- version = "0.1.2";
- src = fetchHex {
- pkg = "mimetype_parser";
- version = "0.1.2";
- sha256 =
- "c495521cad6cf49fb79098e68e921c58955312df46c9c5aa5abab44224c2647d";
- };
-
- meta = {
- description = ''parse mimetypes'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/mimetype_parser";
- };
- } // packageOverrides)
- ) {};
-
- mimetype_parser = mimetype_parser_0_1_2;
-
- mimex_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mimex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "mimex";
- version = "0.1.0";
- sha256 =
- "68858d5fb6a59780c3b94a445fd994856c3f1d0f3ed8dff6a95b6aa80027e4de";
- };
-
- meta = {
- description = ''MIME type utilities for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hex-sh/mimex";
- };
- } // packageOverrides)
- ) {};
-
- mimex = mimex_0_1_0;
-
- minmaxlist_0_0_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "minmaxlist";
- version = "0.0.6";
- src = fetchHex {
- pkg = "minmaxlist";
- version = "0.0.6";
- sha256 =
- "cc9bc50dc971c8c3743bcecdaca35330593d6466d911c656ba7d718836e68a57";
- };
-
- meta = {
- longDescription = ''Elixir library extending `Enum.min_by/2`,
- `Enum.max_by/2` and `Enum.min_max_by/2` to
- return a list of results instead of just one.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/seantanly/elixir-minmaxlist";
- };
- } // packageOverrides)
- ) {};
-
- minmaxlist = minmaxlist_0_0_6;
-
- misc_random_0_2_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "misc_random";
- version = "0.2.6";
- src = fetchHex {
- pkg = "misc_random";
- version = "0.2.6";
- sha256 =
- "4fe3db3bddcf55d93404fa9f5bf006800d54bfeb78bcf583376750d28ac0d7bc";
- };
-
- meta = {
- longDescription = ''This is a very thin wrapper around erlang`s
- random:uniform method. It allows you to create
- random strings or numbers.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gutschilla/elixir-helper-random";
- };
- } // packageOverrides)
- ) {};
-
- misc_random = misc_random_0_2_6;
-
- mix_apidoc_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
- buildMix ({
- name = "mix_apidoc";
- version = "0.2.0";
- src = fetchHex {
- pkg = "mix_apidoc";
- version = "0.2.0";
- sha256 =
- "0f6119dc530050b8344e62e82b450dcd8cdad9a370d39af17420d8e7299eb059";
- };
- beamDeps = [ poison_1_5_2 ];
-
- meta = {
- longDescription = ''A mix task that triggers apidoc to create
- documentation for RESTful web APIs from inline
- code annotations.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sldab/mix_apidoc";
- };
- } // packageOverrides)
- ) {};
-
- mix_apidoc = mix_apidoc_0_2_0;
-
- mix_deps_tree_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mix_deps_tree";
- version = "0.1.0";
- src = fetchHex {
- pkg = "mix_deps_tree";
- version = "0.1.0";
- sha256 =
- "de19ea3eebf578080263f25fdf6a248fdc460aa86e41d582cc0d0379329fa6b6";
- };
-
- meta = {
- description = ''Mix task to print dependency tree of an
- application to a terminal'';
-
- homepage = "https://github.com/liveforeverx/mix_deps_tree";
- };
- } // packageOverrides)
- ) {};
-
- mix_deps_tree = mix_deps_tree_0_1_0;
-
- mix_erlang_tasks_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mix_erlang_tasks";
- version = "0.1.0";
- src = fetchHex {
- pkg = "mix_erlang_tasks";
- version = "0.1.0";
- sha256 =
- "95d2839c422c482a70c08a8702da8242f86b773f8ab6e8602a4eb72da8da04ed";
- };
-
- meta = {
- longDescription = ''This project provides a few Mix tasks that
- make it more convenient to use Mix as a build
- tool and package manager when developing
- applications in Erlang.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/alco/mix-erlang-tasks";
- };
- } // packageOverrides)
- ) {};
-
- mix_erlang_tasks = mix_erlang_tasks_0_1_0;
-
- mix_eunit_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mix_eunit";
- version = "0.1.2";
- src = fetchHex {
- pkg = "mix_eunit";
- version = "0.1.2";
- sha256 =
- "910cd611635e845be3c57b2c6c0dac7af24c87055b3d289fe93d7df1dafaeb6c";
- };
-
- meta = {
- description = ''A mix task to run eunit tests, works for umbrella
- projects'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/dantswain/mix_eunit";
- };
- } // packageOverrides)
- ) {};
-
- mix_eunit = mix_eunit_0_1_2;
-
- mix_info_0_7_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mix_info";
- version = "0.7.2";
- src = fetchHex {
- pkg = "mix_info";
- version = "0.7.2";
- sha256 =
- "7b4430ea649bb0c978f3b761403c068b08d9781c3f325c3f0dc57c1b44f395a2";
- };
-
- meta = {
- longDescription = ''A mix task that counts directories, files,
- lines of code, modules, functions etc and
- displays the results.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pskordilakis/mix_info";
- };
- } // packageOverrides)
- ) {};
-
- mix_info = mix_info_0_7_2;
-
- mix_test_watch_0_2_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, fs_0_9_2 }:
- buildMix ({
- name = "mix_test_watch";
- version = "0.2.6";
- src = fetchHex {
- pkg = "mix_test_watch";
- version = "0.2.6";
- sha256 =
- "b7019e9a0eba42bc98f15be9c1402f23c2b0dab7b67e71bba8bc5b337b0ab273";
- };
- beamDeps = [ fs_0_9_2 ];
-
- meta = {
- description = ''Automatically run tests when files change'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lpil/mix-test.watch";
- };
- } // packageOverrides)
- ) {};
-
- mix_test_watch = mix_test_watch_0_2_6;
-
- mixgraph_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- json_0_3_3,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "mixgraph";
- version = "0.0.1";
- src = fetchHex {
- pkg = "mixgraph";
- version = "0.0.1";
- sha256 =
- "0c911c4e300d7e5196ff9d427b9d66d935d540309cb8a54a397641f7059f1700";
- };
- beamDeps = [ json_0_3_3 httpotion_2_2_2 ];
-
- meta = {
- description = ''Create an interactive dependency graph for any
- hex package published in hex.pm'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sivsushruth/mixgraph";
- };
- } // packageOverrides)
- ) {};
-
- mixgraph = mixgraph_0_0_1;
-
- mixpanel_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exjsx_3_1_0 }:
- buildMix ({
- name = "mixpanel";
- version = "0.0.3";
- src = fetchHex {
- pkg = "mixpanel";
- version = "0.0.3";
- sha256 =
- "7b81d80d3705e5d4451951984bac49d476e3c79131138e9ffb66538f9c51a56e";
- };
- beamDeps = [ exjsx_3_1_0 ];
-
- meta = {
- description = ''A client for the Mixpanel HTTP API. See
- mixpanel.com.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/michihuber/mixpanel_ex";
- };
- } // packageOverrides)
- ) {};
-
- mixpanel = mixpanel_0_0_3;
-
- mixpanel_api_ex_0_8_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "mixpanel_api_ex";
- version = "0.8.3";
- src = fetchHex {
- pkg = "mixpanel_api_ex";
- version = "0.8.3";
- sha256 =
- "1ff5eb4aa333495a86868873deb8fcd04c5f2e6f2560d77ac6ccbe07e2e3d7b4";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir client for the Mixpanel API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/agevio/mixpanel_api_ex";
- };
- } // packageOverrides)
- ) {};
-
- mixpanel_api_ex = mixpanel_api_ex_0_8_3;
-
- mixpanel_data_client_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_3_1,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "mixpanel_data_client";
- version = "0.0.2";
- src = fetchHex {
- pkg = "mixpanel_data_client";
- version = "0.0.2";
- sha256 =
- "7f3bbd608ae18153655f27bd50ea01ad85630d6c1cc6ab9ed336e95419f06c86";
- };
- beamDeps = [ poison_1_3_1 httpoison_0_8_3 ];
-
- meta = {
- description = ''Client library for interacting with the Mixpanel
- Data API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jeregrine/mixpanel_data_client";
- };
- } // packageOverrides)
- ) {};
-
- mixpanel_data_client = mixpanel_data_client_0_0_2;
-
- mixunit_0_9_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mixunit";
- version = "0.9.2";
- src = fetchHex {
- pkg = "mixunit";
- version = "0.9.2";
- sha256 =
- "2c0e66d10d479ec95c636d2de1db04cba03574282182af0df49c297230b22d43";
- };
-
- meta = {
- description = ''an eunit task for mix'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/talentdeficit/mixunit";
- };
- } // packageOverrides)
- ) {};
-
- mixunit = mixunit_0_9_2;
-
- mmExchangeRate_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- jsx_2_8_0,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "mmExchangeRate";
- version = "0.0.1";
- src = fetchHex {
- pkg = "mmExchangeRate";
- version = "0.0.1";
- sha256 =
- "6daf6e74bf3ce8f9d7cc19b18b023d700201a847dde94a0eef1f263ce65efbac";
- };
- beamDeps = [ jsx_2_8_0 httpotion_2_2_2 ];
-
- meta = {
- longDescription = ''A simple exchange rate checker and calculator
- based on Central Bank of Myanmar Api. '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/Arkar-Aung/mmExchangeRate";
- };
- } // packageOverrides)
- ) {};
-
- mmExchangeRate = mmExchangeRate_0_0_1;
-
- mmath_0_2_0_alpha4 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "mmath";
- version = "0.2.0-alpha4";
- src = fetchHex {
- pkg = "mmath";
- version = "0.2.0-alpha4";
- sha256 =
- "a855fe72b1939659a2856b32c74e148ed6c1d58cfb6eea5a24787995d66c05d7";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''math library for metric sequences and binary
- arrays.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/dalmatinerdb/mmath";
- };
- } // packageOverrides)
- ) {};
-
- mmath_0_2_0_alpha7 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "mmath";
- version = "0.2.0-alpha7";
- src = fetchHex {
- pkg = "mmath";
- version = "0.2.0-alpha7";
- sha256 =
- "b4d68cce7e243b4e16f7a93cbdb16605f00c469cd9ebf7aa58c8b3214f8f8868";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''math library for metric sequences and binary
- arrays.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/dalmatinerdb/mmath";
- };
- } // packageOverrides)
- ) {};
-
- mmath = mmath_0_2_0_alpha7;
-
- mnemonex_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, the_fuzz_0_3_0 }:
- buildMix ({
- name = "mnemonex";
- version = "1.1.0";
- src = fetchHex {
- pkg = "mnemonex";
- version = "1.1.0";
- sha256 =
- "e3b0bf58cdee4d18cdc324d3bb6f6241724e6d38b4fcb24fc04e2dae243339b9";
- };
- beamDeps = [ the_fuzz_0_3_0 ];
-
- meta = {
- description = ''mnemonicode encoder/decoder'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/mnemonex";
- };
- } // packageOverrides)
- ) {};
-
- mnemonex = mnemonex_1_1_0;
-
- mnemonic_slugs_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mnemonic_slugs";
- version = "0.0.1";
- src = fetchHex {
- pkg = "mnemonic_slugs";
- version = "0.0.1";
- sha256 =
- "d5200aaf06da3f9f307b58464f5eca2ed1a0dc379a12fe4f42444bb1e30a4bd8";
- };
-
- meta = {
- description = ''MnemonicSlugs is an Elixir library for generating
- memorable slugs.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/devshane/mnemonic_slugs";
- };
- } // packageOverrides)
- ) {};
-
- mnemonic_slugs = mnemonic_slugs_0_0_1;
-
- mochiweb_2_12_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "mochiweb";
- version = "2.12.2";
- src = fetchHex {
- pkg = "mochiweb";
- version = "2.12.2";
- sha256 =
- "d3e681d4054b74a96cf2efcd09e94157ab83a5f55ddc4ce69f90b8144673bd7a";
- };
-
- meta = {
- description = ''MochiWeb is an Erlang library for building
- lightweight HTTP servers. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mochi/mochiweb";
- };
- } // packageOverrides)
- ) {};
-
- mochiweb = mochiweb_2_12_2;
-
- mochiweb_html_2_15_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "mochiweb_html";
- version = "2.15.0";
- src = fetchHex {
- pkg = "mochiweb_html";
- version = "2.15.0";
- sha256 =
- "7651a4ef29bd6d69819b37b6aa12c7616c5cf75e67ccd849cfb499e2bbbf0ce6";
- };
-
- meta = {
- description = ''Mochiweb HTML parser'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/philss/mochiweb_html";
- };
- } // packageOverrides)
- ) {};
-
- mochiweb_html = mochiweb_html_2_15_0;
-
- mock_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, meck_0_8_4 }:
- buildMix ({
- name = "mock";
- version = "0.1.3";
- src = fetchHex {
- pkg = "mock";
- version = "0.1.3";
- sha256 =
- "bf7cf50d528394d870cdecac4920ab719cec0af98eff95759b57cab0e5ee143e";
- };
- beamDeps = [ meck_0_8_4 ];
-
- meta = {
- longDescription = ''A mocking libary for the Elixir language. We
- use the Erlang meck library to provide module
- mocking functionality for Elixir. It uses macros
- in Elixir to expose the functionality in a
- convenient manner for integrating in Elixir
- tests.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jjh42/mock";
- };
- } // packageOverrides)
- ) {};
-
- mock = mock_0_1_3;
-
- module_mocker_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "module_mocker";
- version = "0.2.0";
- src = fetchHex {
- pkg = "module_mocker";
- version = "0.2.0";
- sha256 =
- "ce8aa59f0c58ce7d333a1853f6a3a106fe0cbbe79f6f9aeb72370d66ed454f5b";
- };
-
- meta = {
- longDescription = ''ModuleMocker allows to use different module
- in development and test environment. It allows
- convention to mock module for test'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rohanpujaris/module_mocker";
- };
- } // packageOverrides)
- ) {};
-
- module_mocker = module_mocker_0_2_0;
-
- mogrify_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mogrify";
- version = "0.3.0";
- src = fetchHex {
- pkg = "mogrify";
- version = "0.3.0";
- sha256 =
- "490631d662a0303d468b48868929df99cc62081b5711c3a6b3eb7b0b2dac21e5";
- };
-
- meta = {
- description = ''ImageMagick command line wrapper.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/route/mogrify";
- };
- } // packageOverrides)
- ) {};
-
- mogrify = mogrify_0_3_0;
-
- mojoauth_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
- buildMix ({
- name = "mojoauth";
- version = "1.0.2";
- src = fetchHex {
- pkg = "mojoauth";
- version = "1.0.2";
- sha256 =
- "72d8b3fdff6d6571d7dcc9ad46b249823c84e0321920a0e9d6f39ee5f9fc2f23";
- };
- beamDeps = [ timex_1_0_2 ];
-
- meta = {
- longDescription = ''MojoAuth is a set of standard approaches to
- cross-app authentication based on HMAC.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/adhearsion/mojo-auth.ex";
- };
- } // packageOverrides)
- ) {};
-
- mojoauth = mojoauth_1_0_2;
-
- moment_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "moment";
- version = "0.1.0";
- src = fetchHex {
- pkg = "moment";
- version = "0.1.0";
- sha256 =
- "0cc098c8ba88f768ffd41e4bc4bb45b559d49361a2f8f7a39c686020da3f1842";
- };
-
- meta = {
- description = ''Parse, validate, manipulate, and display dates in
- Elixir.'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/atabary/moment";
- };
- } // packageOverrides)
- ) {};
-
- moment = moment_0_1_0;
-
- mon_handler_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, dialyze_0_2_1 }:
- buildMix ({
- name = "mon_handler";
- version = "1.0.2";
- src = fetchHex {
- pkg = "mon_handler";
- version = "1.0.2";
- sha256 =
- "d18942f95750b94e3da1d9fca7a2ea4b1b1d27c017feff76cb109b29bb308f58";
- };
- beamDeps = [ dialyze_0_2_1 ];
-
- meta = {
- longDescription = ''A minimal GenServer that monitors a given
- GenEvent handler. This server will handle exits
- of the Handler and attempt to re-add it to the
- manager when unexpected exits occur. Exits for
- :normal, :shutdown or :swapped reasons will not
- attempt a re-add to the manager.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tattdcodemonkey/mon_handler";
- };
- } // packageOverrides)
- ) {};
-
- mon_handler = mon_handler_1_0_2;
-
- monad_1_0_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "monad";
- version = "1.0.5";
- src = fetchHex {
- pkg = "monad";
- version = "1.0.5";
- sha256 =
- "d8ebe20971160e96bd6cdf11b5e8b5c24b70fddde3d198e5f7c3b5ebfbc78d6e";
- };
-
- meta = {
- description = ''Monads and do-syntax for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rmies/monad";
- };
- } // packageOverrides)
- ) {};
-
- monad = monad_1_0_5;
-
- monadex_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "monadex";
- version = "1.0.2";
- src = fetchHex {
- pkg = "monadex";
- version = "1.0.2";
- sha256 =
- "968784f2789fcb30b118399e51736f2265ca6b2823cc8fcabd73d6e4ac23e082";
- };
-
- meta = {
- description = ''Improve pipelines with monads.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rob-brown/MonadEx";
- };
- } // packageOverrides)
- ) {};
-
- monadex = monadex_1_0_2;
-
- mondo_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- plug_1_1_5,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "mondo";
- version = "0.1.0";
- src = fetchHex {
- pkg = "mondo";
- version = "0.1.0";
- sha256 =
- "f557216314e098137f5140f1194e2eba7a2a030d78affc23ea5943f586ab1095";
- };
- beamDeps = [ poison_2_1_0 plug_1_1_5 httpoison_0_8_3 ];
-
- meta = {
- description = ''An Elixir client for the Mondo API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/stevedomin/mondo_elixir";
- };
- } // packageOverrides)
- ) {};
-
- mondo = mondo_0_1_0;
-
- mongodb_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- connection_1_0_2
- }:
- buildMix ({
- name = "mongodb";
- version = "0.1.1";
- src = fetchHex {
- pkg = "mongodb";
- version = "0.1.1";
- sha256 =
- "714f0543288c42bc42bf3ee6ac5f52db3fbc0b152610aa2536b51c244652abe0";
- };
- beamDeps = [ poolboy_1_5_1 connection_1_0_2 ];
-
- meta = {
- description = ''MongoDB driver for Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/ericmj/mongodb";
- };
- } // packageOverrides)
- ) {};
-
- mongodb = mongodb_0_1_1;
-
- monk_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "monk";
- version = "0.1.3";
- src = fetchHex {
- pkg = "monk";
- version = "0.1.3";
- sha256 =
- "35e6a2eea7090612fa25a003fb95ac120f27087f203445bbc33ac18682ddd724";
- };
-
- meta = {
- description = ''Monk helps to distinguish good from evil with an
- simple ok/error monad'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/niahoo/monk";
- };
- } // packageOverrides)
- ) {};
-
- monk = monk_0_1_3;
-
- morph_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "morph";
- version = "0.1.0";
- src = fetchHex {
- pkg = "morph";
- version = "0.1.0";
- sha256 =
- "a20a6bfda56cb8f2d9904e2ea4b2b0a4159ab2692181919f6eb4fe9f52abf3f2";
- };
-
- meta = {
- description = ''Lightweight string transformations for Elixir.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/cmoncrief/elixir-morph";
- };
- } // packageOverrides)
- ) {};
-
- morph = morph_0_1_0;
-
- mortgage_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mortgage";
- version = "0.0.2";
- src = fetchHex {
- pkg = "mortgage";
- version = "0.0.2";
- sha256 =
- "fbd6e7dcf2d8213b4b1ab3b00904482a6aadf32625245bdc02eb76b7cd265173";
- };
-
- meta = {
- description = ''A set of functions for working with mortgages and
- mortgage notes.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/geolessel/mortgage";
- };
- } // packageOverrides)
- ) {};
-
- mortgage = mortgage_0_0_2;
-
- moxie_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "moxie";
- version = "0.0.1";
- src = fetchHex {
- pkg = "moxie";
- version = "0.0.1";
- sha256 =
- "193e18ce0888f01fe2b43d0dcf79af5f48e50eba3a73609703cb4c04bea2ae46";
- };
-
- meta = {
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/molossus/moxie";
- };
- } // packageOverrides)
- ) {};
-
- moxie = moxie_0_0_1;
-
- mpinyin_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mpinyin";
- version = "0.0.2";
- src = fetchHex {
- pkg = "mpinyin";
- version = "0.0.2";
- sha256 =
- "1de0911391e6a76a91166f5210d4254165692ea28c00d4f153763d0a5757cb92";
- };
-
- meta = {
- description = ''Pinyin module for Elixir. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Hor/mpinyin";
- };
- } // packageOverrides)
- ) {};
-
- mpinyin = mpinyin_0_0_2;
-
- mpower_1_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "mpower";
- version = "1.0.1";
- src = fetchHex {
- pkg = "mpower";
- version = "1.0.1";
- sha256 =
- "d08a6ec51f1da683507ed08d0787a726eb3e56dd16084fffc279a5391fa02014";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir wrapper for MPowerPayments API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/abakhi/mpower";
- };
- } // packageOverrides)
- ) {};
-
- mpower = mpower_1_0_1;
-
- mr_roboto_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "mr_roboto";
- version = "1.0.0";
- src = fetchHex {
- pkg = "mr_roboto";
- version = "1.0.0";
- sha256 =
- "80c5af8f07bd85f28b60e350a5cfc92d1a5c2bcde9a0c3d93fcaa378a033a371";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- description = ''A simple robots.txt service'';
-
- };
- } // packageOverrides)
- ) {};
-
- mr_roboto = mr_roboto_1_0_0;
-
- msgpack_0_5_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "msgpack";
- version = "0.5.0";
- src = fetchHex {
- pkg = "msgpack";
- version = "0.5.0";
- sha256 =
- "520ae767b3c3c0796d2913c92f463bc8b4dee091880734f5b99a90921e18b704";
- };
-
- meta = {
- description = ''MessagePack serializer/deserializer'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "http://msgpack.org";
- };
- } // packageOverrides)
- ) {};
-
- msgpack = msgpack_0_5_0;
-
- msgpax_0_8_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "msgpax";
- version = "0.8.2";
- src = fetchHex {
- pkg = "msgpax";
- version = "0.8.2";
- sha256 =
- "aa0baa382383160d90275a1b5d8f72c457a2feed89cbb1bd080a5c3821389507";
- };
-
- meta = {
- longDescription = ''This library provides an API for serializing
- and de-serializing Elixir terms using the
- MessagePack format'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/lexmag/msgpax";
- };
- } // packageOverrides)
- ) {};
-
- msgpax = msgpax_0_8_2;
-
- mtx_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "mtx";
- version = "1.0.0";
- src = fetchHex {
- pkg = "mtx";
- version = "1.0.0";
- sha256 =
- "3bdcb209fe3cdfc5a6b5b95f619ecd123b7ee1d9203ace2178c8ff73be5bb90f";
- };
-
- meta = {
- description = ''Metrics Client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/synrc/mtx";
- };
- } // packageOverrides)
- ) {};
-
- mtx = mtx_1_0_0;
-
- multidef_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "multidef";
- version = "0.2.1";
- src = fetchHex {
- pkg = "multidef";
- version = "0.2.1";
- sha256 =
- "719dfdb9206ea34fc7b49c282b30adab752f9d1efb22678907d54fa0b54c50c6";
- };
-
- meta = {
- longDescription = ''Lets you define multiple heads for the same
- function: defmodule Test do import MultiDef mdef
- fred do { :init, val } -> fred {:double, val} {
- :double, val } -> IO.puts(val*2) a, b -> a+b end
- end IO.inspect Test.fred 1, 2 #=> 3 IO.inspect
- Test.fred { :init, 4 } #=> 8 '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/pragdave/mdef";
- };
- } // packageOverrides)
- ) {};
-
- multidef = multidef_0_2_1;
-
- multiset_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "multiset";
- version = "0.0.4";
- src = fetchHex {
- pkg = "multiset";
- version = "0.0.4";
- sha256 =
- "f713b5102d17963fc516e0017725d716dade0b1fec979f0e3a53b8d203748c45";
- };
-
- meta = {
- description = ''Multisets for Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/hilverd/multiset-elixir";
- };
- } // packageOverrides)
- ) {};
-
- multiset = multiset_0_0_4;
-
- murdoch_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3,
- goth_0_0_3
- }:
- buildMix ({
- name = "murdoch";
- version = "0.0.1";
- src = fetchHex {
- pkg = "murdoch";
- version = "0.0.1";
- sha256 =
- "77ec44ca76d6b4a14df7222104a36cb29ed25f7d52fb3ffe30807ddc82a2d9ad";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 goth_0_0_3 ];
-
- meta = {
- longDescription = ''A library for interacting with Google Cloud
- Pub/Sub (PubSub). Supports both publication and
- pull subscription'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/peburrows/murdoch";
- };
- } // packageOverrides)
- ) {};
-
- murdoch = murdoch_0_0_1;
-
- murmur_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "murmur";
- version = "0.2.1";
- src = fetchHex {
- pkg = "murmur";
- version = "0.2.1";
- sha256 =
- "7e38b2f136d4e8039abb88f6cbdf50c939408d3819be4b18b639a968ee9c2bce";
- };
-
- meta = {
- longDescription = ''Murmur is a pure Elixir implementation of the
- non-cryptographic hash Murmur3. It aims to
- implement the x86_32bit, x86_128bit and
- x64_128bit variants.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gmcabrita/murmur";
- };
- } // packageOverrides)
- ) {};
-
- murmur_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "murmur";
- version = "1.0.0";
- src = fetchHex {
- pkg = "murmur";
- version = "1.0.0";
- sha256 =
- "5e81af1fe3c7a166830e5a695e2f2253a5255888c2f510d206d103914b4e28da";
- };
-
- meta = {
- longDescription = ''Murmur is a pure Elixir implementation of the
- non-cryptographic hash Murmur3. It aims to
- implement the x86_32bit, x86_128bit and
- x64_128bit variants.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gmcabrita/murmur";
- };
- } // packageOverrides)
- ) {};
-
- murmur = murmur_1_0_0;
-
- mustache_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mustache";
- version = "0.0.2";
- src = fetchHex {
- pkg = "mustache";
- version = "0.0.2";
- sha256 =
- "0d91f0a6221f482e736987c59032e84f6bade6ae9179e595592e2cc0b728b441";
- };
-
- meta = {
- description = ''Mustache templates for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/schultyy/Mustache.ex";
- };
- } // packageOverrides)
- ) {};
-
- mustache = mustache_0_0_2;
-
- mutant_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mutant";
- version = "0.0.2";
- src = fetchHex {
- pkg = "mutant";
- version = "0.0.2";
- sha256 =
- "c875062e082242b79c85356993ad3cfd7d550392d34fc6da23a132495b0dcb6f";
- };
-
- meta = {
- description = ''Now you can create mutable structs, use this with
- care and only as a last resort'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/hackersguildco/Mutant";
- };
- } // packageOverrides)
- ) {};
-
- mutant = mutant_0_0_2;
-
- mysql_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "mysql";
- version = "1.0.0";
- src = fetchHex {
- pkg = "mysql";
- version = "1.0.0";
- sha256 =
- "34b8e9252e150d329798a0d7f7054f40c08703ccdd7e37dfc5116fe388513251";
- };
-
- meta = {
- description = ''MySQL/OTP – MySQL driver for Erlang/OTP'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/mysql-otp/mysql-otp";
- };
- } // packageOverrides)
- ) {};
-
- mysql = mysql_1_0_0;
-
- mysqlex_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, mysql_1_0_0 }:
- buildMix ({
- name = "mysqlex";
- version = "0.0.1";
- src = fetchHex {
- pkg = "mysqlex";
- version = "0.0.1";
- sha256 =
- "5df9c80e9ff9a61fe9ddb4c8883963686f66e21168b64acfa55b14c50e9305ee";
- };
- beamDeps = [ mysql_1_0_0 ];
-
- meta = {
- longDescription = ''An Ecto-compatible wrapper around the
- mysql-otp library.
- https://github.com/mysql-otp/mysql-otp'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/tjheeta/mysqlex";
- };
- } // packageOverrides)
- ) {};
-
- mysqlex = mysqlex_0_0_1;
-
- n2o_2_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "n2o";
- version = "2.3.0";
- src = fetchHex {
- pkg = "n2o";
- version = "2.3.0";
- sha256 =
- "fca4f0a259fda332784d6d7948f8aadec5fb6a7695d5ac79b849b0ae547fb7b8";
- };
-
- meta = {
- description = ''N2O Application Server'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/synrc/n2o";
- };
- } // packageOverrides)
- ) {};
-
- n2o = n2o_2_3_0;
-
- nadia_0_4_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "nadia";
- version = "0.4.0";
- src = fetchHex {
- pkg = "nadia";
- version = "0.4.0";
- sha256 =
- "e76217333ad6d02ec971bfa781e70268285fc417aebb486318e0584affccb08d";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Telegram Bot API Wrapper written in Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zhyu/nadia";
- };
- } // packageOverrides)
- ) {};
-
- nadia = nadia_0_4_0;
-
- naive_bayes_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "naive_bayes";
- version = "0.1.3";
- src = fetchHex {
- pkg = "naive_bayes";
- version = "0.1.3";
- sha256 =
- "4b65f199852dcb95ba483b7eeae0afed36931418854aadf6b8235197a985d29e";
- };
-
- meta = {
- description = ''An Elixir implementation of Naive Bayes'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ashleyw/naive_bayes";
- };
- } // packageOverrides)
- ) {};
-
- naive_bayes = naive_bayes_0_1_3;
-
- named_args_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "named_args";
- version = "0.1.0";
- src = fetchHex {
- pkg = "named_args";
- version = "0.1.0";
- sha256 =
- "d90285d6fab53c66762e6b3cec655d79df24251e8ed277faa4b308d6f2789c1e";
- };
-
- meta = {
- description = ''Ensures default maps and keyword lists have the
- defaults specified.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mgwidmann/named_args";
- };
- } // packageOverrides)
- ) {};
-
- named_args = named_args_0_1_0;
-
- narp_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "narp";
- version = "0.0.1";
- src = fetchHex {
- pkg = "narp";
- version = "0.0.1";
- sha256 =
- "90800be330ed49563b24d891a578678865ce108cd77fa2427e09dbb6b1bac737";
- };
-
- meta = {
- description = ''Narp is an easy and flexible way to authorize
- function calls in elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/faber-lotto/narp";
- };
- } // packageOverrides)
- ) {};
-
- narp = narp_0_0_1;
-
- nat_set_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "nat_set";
- version = "0.0.1";
- src = fetchHex {
- pkg = "nat_set";
- version = "0.0.1";
- sha256 =
- "cc6ed65c754153d7c98c9825370780831cfbe638d162cb4ae2178eadcdd00611";
- };
-
- meta = {
- description = ''Represent sets of natural numbers compactly in
- Elixir using bitwise operations'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/hilverd/nat-set-elixir";
- };
- } // packageOverrides)
- ) {};
-
- nat_set = nat_set_0_0_1;
-
- nativegen_0_4_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "nativegen";
- version = "0.4.1";
- src = fetchHex {
- pkg = "nativegen";
- version = "0.4.1";
- sha256 =
- "54c36ca3c0333f04b84f8b15fa028fcecfe77614954c78e87b22ed56e977f46f";
- };
-
- meta = {
- description = ''Accessible REST API code generator for native
- app.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/yoavlt/nativegen";
- };
- } // packageOverrides)
- ) {};
-
- nativegen = nativegen_0_4_1;
-
- nats_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- json_0_3_3
- }:
- buildMix ({
- name = "nats";
- version = "0.0.1";
- src = fetchHex {
- pkg = "nats";
- version = "0.0.1";
- sha256 =
- "5568e91f56f65388ad6cb92ddbd70cec5227dadea9d12ec558e93bfe71c9bf78";
- };
- beamDeps = [ poolboy_1_5_1 json_0_3_3 ];
-
- meta = {
- description = ''A NATS client written in elixir supporting
- pub/sub for microservices'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/aforward/elixir_nats";
- };
- } // packageOverrides)
- ) {};
-
- nats = nats_0_0_1;
-
- nats_msg_0_4_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "nats_msg";
- version = "0.4.1";
- src = fetchHex {
- pkg = "nats_msg";
- version = "0.4.1";
- sha256 =
- "8e21a78bf2ae76d7702bcc03eb87bdddac1b99edebfc99db98e8e94a7a5361c4";
- };
-
- meta = {
- description = ''Pure Erlang NATS Protocol Message
- Encoder/Decoder'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/yuce/nats_msg";
- };
- } // packageOverrides)
- ) {};
-
- nats_msg = nats_msg_0_4_1;
-
- natsio_0_1_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "natsio";
- version = "0.1.4";
- src = fetchHex {
- pkg = "natsio";
- version = "0.1.4";
- sha256 =
- "3ed391e3e5f494828da2cb4949e661df782004cfe8273b9f1685ba4bc858187e";
- };
-
- meta = {
- description = ''NATS framework for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nats-io/elixir-nats";
- };
- } // packageOverrides)
- ) {};
-
- natsio = natsio_0_1_4;
-
- natural_sort_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "natural_sort";
- version = "0.3.0";
- src = fetchHex {
- pkg = "natural_sort";
- version = "0.3.0";
- sha256 =
- "6c3476edf395c487a8b55d104458e0f029ca2adb7a0373d12a7a08643f7e7172";
- };
-
- meta = {
- description = ''Sort a list of strings containing numbers in a
- natural manner. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/DanCouper/natural_sort";
- };
- } // packageOverrides)
- ) {};
-
- natural_sort = natural_sort_0_3_0;
-
- navigation_history_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "navigation_history";
- version = "0.2.0";
- src = fetchHex {
- pkg = "navigation_history";
- version = "0.2.0";
- sha256 =
- "9fbddedd831930c3f2e784c53442558d90d68040f9921dfa9441da63d6b8dacc";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''Navigation history tracking plug'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/tuvistavie/plug-navigation-history";
- };
- } // packageOverrides)
- ) {};
-
- navigation_history = navigation_history_0_2_0;
-
- navigation_tree_0_4_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "navigation_tree";
- version = "0.4.4";
- src = fetchHex {
- pkg = "navigation_tree";
- version = "0.4.4";
- sha256 =
- "a4e6aad3224ad9c463a1ac0412463a18ac71b7a78ea16303ad72f43f1fb217c6";
- };
-
- meta = {
- longDescription = ''A navigation tree representation with helpers
- to generate HTML out of it - depending of
- userroles. Also creates nice HTML navbars for
- Bootstrap. Implemented as Agent to hold config
- state.'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/gutschilla/elixir-navigation-tree";
- };
- } // packageOverrides)
- ) {};
-
- navigation_tree = navigation_tree_0_4_4;
-
- ndc_ex_sdk_0_2_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_2_1_6,
- httpotion_2_2_2,
- ibrowse_4_2_2,
- pipe_0_0_2,
- xml_builder_0_0_8
- }:
- buildMix ({
- name = "ndc_ex_sdk";
- version = "0.2.1";
- src = fetchHex {
- pkg = "ndc_ex_sdk";
- version = "0.2.1";
- sha256 =
- "2d17a23afbbe4f348abb6c1e9fb787ff609ba678828f2cd41dedb6a79b9c8232";
- };
- beamDeps = [
- timex_2_1_6
- httpotion_2_2_2
- ibrowse_4_2_2
- pipe_0_0_2
- xml_builder_0_0_8
- ];
-
- meta = {
- longDescription = ''This is an Elixir package that wrapps any
- NDC-compliant API. It`s host-agnostic and quite
- flexible-through-configuration so that it can
- reach NDC hosts with a certain flexibility'';
- license = stdenv.lib.licenses.free;
- };
- } // packageOverrides)
- ) {};
-
- ndc_ex_sdk = ndc_ex_sdk_0_2_1;
-
- neat_ex_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, json_0_3_3 }:
- buildMix ({
- name = "neat_ex";
- version = "1.1.0";
- src = fetchHex {
- pkg = "neat_ex";
- version = "1.1.0";
- sha256 =
- "42d08b8c1bb5245d19864f683df77354ee466b285bac48abed3dd3471a738b21";
- };
- beamDeps = [ json_0_3_3 ];
-
- meta = {
- longDescription = ''This project provides the means to define,
- simulate, and serialize
- Artificial-Neural-Networks (ANNs), as well as
- the means to develop them through use of the
- Neuro-Evolution of Augmenting Toplogies (NEAT)
- algorithm created by Dr. Kenneth Stanley.
- Neuro-Evolution, unlike back-propogation, easily
- allows the usage of recurrent neural networks
- instead of just feed-forward networks, and
- fitness functions instead of just training data.
- Additionally, since NEAT augments topologies,
- all the engine needs to start is the
- input/output layout, and a fitness function.'';
- license = stdenv.lib.licenses.asl20;
- };
- } // packageOverrides)
- ) {};
-
- neat_ex = neat_ex_1_1_0;
-
- nectar_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "nectar";
- version = "0.0.1";
- src = fetchHex {
- pkg = "nectar";
- version = "0.0.1";
- sha256 =
- "dffc5f1c68c83d9eb83ca1c8868d923beaccfdf36ae2e5122dc7bc8edd5665f5";
- };
-
- meta = {
- description = ''Placeholder package for nectar ecommerce'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- nectar = nectar_0_0_1;
-
- nerves_io_neopixel_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "nerves_io_neopixel";
- version = "0.2.0";
- src = fetchHex {
- pkg = "nerves_io_neopixel";
- version = "0.2.0";
- sha256 =
- "662ca0af01330399eba9aff9806c086027ec5b3a2e235af4cd909282a6d09afa";
- };
-
- meta = {
- description = ''Drive WS2812B \"NeoPixel\" RGB LED strips from a
- Raspberry Pi using Elixir.'';
- license = with stdenv.lib.licenses; [ mit bsd2 ];
- homepage = "https://github.com/GregMefford/nerves_io_neopixel";
- };
- } // packageOverrides)
- ) {};
-
- nerves_io_neopixel = nerves_io_neopixel_0_2_0;
-
- nerves_system_0_1_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- porcelain_2_0_1,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "nerves_system";
- version = "0.1.4";
- src = fetchHex {
- pkg = "nerves_system";
- version = "0.1.4";
- sha256 =
- "2ad32ff5a6d9a827fb89f93a9c0626add1c72ffaf9068f3cea94fa5fd0eff591";
- };
- beamDeps = [ porcelain_2_0_1 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''Elixir compilers and scripts for building
- Nerves Systems. For useable system
- configurations see nerves_system_*'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nerves-project/nerves_system";
- };
- } // packageOverrides)
- ) {};
-
- nerves_system = nerves_system_0_1_4;
-
- nerves_system_br_0_5_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "nerves_system_br";
- version = "0.5.2";
- src = fetchHex {
- pkg = "nerves_system_br";
- version = "0.5.2";
- sha256 =
- "43747294af52161eb7d58269a18d1927d7fe66185047fbfae204938d9ebe56c3";
- };
-
- meta = {
- description = ''Nerves System BR - Buildroot based build platform
- for Nerves Systems'';
- license = with stdenv.lib.licenses; [ asl20 free ];
- homepage = "https://github.com/nerves-project/nerves_system_br";
- };
- } // packageOverrides)
- ) {};
-
- nerves_system_br = nerves_system_br_0_5_2;
-
- nerves_toolchain_0_6_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "nerves_toolchain";
- version = "0.6.2";
- src = fetchHex {
- pkg = "nerves_toolchain";
- version = "0.6.2";
- sha256 =
- "0e2c841389de2b3a9d527dee288e5a8d01883cea424edf951e70e7d9855f45f1";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''Elixir compilers and scripts for building
- Nerves Toolchains. For useable toolchain
- configurations see nerves_toolchain_*'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nerves-project/nerves_toolchain";
- };
- } // packageOverrides)
- ) {};
-
- nerves_toolchain = nerves_toolchain_0_6_2;
-
- nerves_uart_0_0_6 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, elixir_make_0_1_0
- }:
- buildMix ({
- name = "nerves_uart";
- version = "0.0.6";
- src = fetchHex {
- pkg = "nerves_uart";
- version = "0.0.6";
- sha256 =
- "1de94781598204b33f21ac27346390421f377c18b9503c86de60265b37573768";
- };
- beamDeps = [ elixir_make_0_1_0 ];
-
- meta = {
- description = ''Discover and use UARTs and serial ports in
- Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nerves-project/nerves_uart";
- };
- } // packageOverrides)
- ) {};
-
- nerves_uart = nerves_uart_0_0_6;
-
- nest_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "nest";
- version = "0.0.1";
- src = fetchHex {
- pkg = "nest";
- version = "0.0.1";
- sha256 =
- "4092651c14022a285eb4ffb8b6e9c3d6c5937729644fcc88b43f74324bc3bac3";
- };
-
- meta = {
- longDescription = ''A library for using the Nest API, allowing
- integration with Nest Thermostats and other Nest
- devices.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/adamzaninovich/nest";
- };
- } // packageOverrides)
- ) {};
-
- nest = nest_0_0_1;
-
- netrc_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "netrc";
- version = "0.0.2";
- src = fetchHex {
- pkg = "netrc";
- version = "0.0.2";
- sha256 =
- "a82b1702d8702a51b17e1756261b316ae3a72ac07bbf04e3a1258cc1210f6000";
- };
-
- meta = {
- description = ''Read netrc files'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ma2gedev/netrcex";
- };
- } // packageOverrides)
- ) {};
-
- netrc = netrc_0_0_2;
-
- netstrings_2_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "netstrings";
- version = "2.0.1";
- src = fetchHex {
- pkg = "netstrings";
- version = "2.0.1";
- sha256 =
- "f6a3727dba6ae5aa3371ffddf7adf6aaf46bf387e84873f65152083ecf821845";
- };
-
- meta = {
- description = ''Netstrings implementaton'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/netstrings_ex";
- };
- } // packageOverrides)
- ) {};
-
- netstrings = netstrings_2_0_1;
-
- neural_net_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "neural_net";
- version = "1.0.0";
- src = fetchHex {
- pkg = "neural_net";
- version = "1.0.0";
- sha256 =
- "164cead198d6f8e2ba396346c4c4f8ec8c5b6e6ae00d6915eec902c436779239";
- };
-
- meta = {
- longDescription = ''NeuralNet is an A.I. library that allows for
- the construction and training of complex
- recurrent neural networks. Architectures such as
- LSTM or GRU can be specified in under 20 lines
- of code. Any neural network that can be built
- with the NeuralNet DSL can be trainined with
- automatically implemented BPTT (back-propagation
- through time).'';
- license = stdenv.lib.licenses.asl20;
- };
- } // packageOverrides)
- ) {};
-
- neural_net = neural_net_1_0_0;
-
- neural_network_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "neural_network";
- version = "0.1.0";
- src = fetchHex {
- pkg = "neural_network";
- version = "0.1.0";
- sha256 =
- "80e84eaf4e0ff5455651c6c7cef484b9eefd60d6bd8e59606eb72a42cf18587c";
- };
-
- meta = {
- longDescription = ''A neural network made up of layers of neurons
- connected to each other to form a relationship
- allowing it to learn.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kblake/neural-net-elixir";
- };
- } // packageOverrides)
- ) {};
-
- neural_network = neural_network_0_1_0;
-
- news_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "news";
- version = "0.3.0";
- src = fetchHex {
- pkg = "news";
- version = "0.3.0";
- sha256 =
- "b8759a3cb0bb40e86d5a5ea65b911a066da4ec197b097be88fb67f6358838124";
- };
-
- meta = {
- description = ''Publish elixir and erlang new weekly'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zhongwencool/news";
- };
- } // packageOverrides)
- ) {};
-
- news = news_0_3_0;
-
- ngram_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ngram";
- version = "0.0.1";
- src = fetchHex {
- pkg = "ngram";
- version = "0.0.1";
- sha256 =
- "13185be68166d8314ae63f70eceb58a4e00b441d3294633450d4f8a7c565e218";
- };
-
- meta = {
- description = ''n-gram tokenization and distance calculations'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ardcore/ngram";
- };
- } // packageOverrides)
- ) {};
-
- ngram = ngram_0_0_1;
-
- nile_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "nile";
- version = "0.1.3";
- src = fetchHex {
- pkg = "nile";
- version = "0.1.3";
- sha256 =
- "73a2c8be8507bb39de74eb3fa5ae40e3c40cabef30cd884f67ab6d3400a7bea4";
- };
-
- meta = {
- description = ''Elixir stream extensions'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/nile";
- };
- } // packageOverrides)
- ) {};
-
- nile = nile_0_1_3;
-
- ninjaproxies_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "ninjaproxies";
- version = "0.2.0";
- src = fetchHex {
- pkg = "ninjaproxies";
- version = "0.2.0";
- sha256 =
- "5524329d00944690b362d30fef9c4032c03c401cc44d0ad9e98e147f5792fade";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Ninjaproxies client library for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zensavona/ninjaproxies";
- };
- } // packageOverrides)
- ) {};
-
- ninjaproxies = ninjaproxies_0_2_0;
-
- njord_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "njord";
- version = "0.1.1";
- src = fetchHex {
- pkg = "njord";
- version = "0.1.1";
- sha256 =
- "b438430dbf6ceaf2bede01a285c5032be3041cbedd7c1552653d75179fab4dfb";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''A wrapper over HTTPoison to build client APIs.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gmtprime/njord";
- };
- } // packageOverrides)
- ) {};
-
- njord = njord_0_1_1;
-
- noise_0_0_4 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "noise";
- version = "0.0.4";
- src = fetchHex {
- pkg = "noise";
- version = "0.0.4";
- sha256 =
- "2a448e5aff72edd08a587de16c9887ca80ffcde00004eaa2f94dae56536958be";
- };
-
- meta = {
- description = ''A pseudo-random noise generation library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/joshforisha/noise";
- };
- } // packageOverrides)
- ) {};
-
- noise = noise_0_0_4;
-
- normalize_email_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, is_email_0_0_2 }:
- buildMix ({
- name = "normalize_email";
- version = "0.0.1";
- src = fetchHex {
- pkg = "normalize_email";
- version = "0.0.1";
- sha256 =
- "ac5864ecf0d002ecbc56f9296bff7c01fc1d7e2e84e2529f7726f1a068f5d584";
- };
- beamDeps = [ is_email_0_0_2 ];
-
- meta = {
- description = ''Normalize an email address'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/johnotander/normalize_email";
- };
- } // packageOverrides)
- ) {};
-
- normalize_email = normalize_email_0_0_1;
-
- normalize_url_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "normalize_url";
- version = "0.1.1";
- src = fetchHex {
- pkg = "normalize_url";
- version = "0.1.1";
- sha256 =
- "7d1c75f4bf5156636e8d0b5c6addb0cae802b970f8412f4b0429b3547220d88e";
- };
-
- meta = {
- description = ''Normalize a url'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/johnotander/normalize_url";
- };
- } // packageOverrides)
- ) {};
-
- normalize_url = normalize_url_0_1_1;
-
- not_qwerty123_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, gettext_0_11_0 }:
- buildMix ({
- name = "not_qwerty123";
- version = "1.1.0";
- src = fetchHex {
- pkg = "not_qwerty123";
- version = "1.1.0";
- sha256 =
- "4997296d742f72fe95f8933cba92ab6cee3147888dc9bbd7b703c7f970e8ab58";
- };
- beamDeps = [ gettext_0_11_0 ];
-
- meta = {
- description = ''Library to check password strength and generate
- random passwords.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/riverrun/notqwerty123";
- };
- } // packageOverrides)
- ) {};
-
- not_qwerty123 = not_qwerty123_1_1_0;
-
- number_0_4_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "number";
- version = "0.4.1";
- src = fetchHex {
- pkg = "number";
- version = "0.4.1";
- sha256 =
- "773d28c837acf17b0056deb54b7d966a3d6a9d853e88c08829b5732cb7029fb9";
- };
-
- meta = {
- description = ''Convert numbers to various string formats, such
- as currency'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/danielberkompas/number";
- };
- } // packageOverrides)
- ) {};
-
- number = number_0_4_1;
-
- numerix_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "numerix";
- version = "0.0.4";
- src = fetchHex {
- pkg = "numerix";
- version = "0.0.4";
- sha256 =
- "b837acc1c095fe580cc69314b72c9171a0d7d6f8734f81ee2ec1f917614c997f";
- };
-
- meta = {
- description = ''A collection of (potentially) useful mathematical
- functions'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/safwank/Numerix";
- };
- } // packageOverrides)
- ) {};
-
- numerix = numerix_0_0_4;
-
- oauth2_0_3_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- plug_1_1_5,
- httpoison_0_8_3,
- hackney_1_6_0
- }:
- buildMix ({
- name = "oauth2";
- version = "0.3.0";
- src = fetchHex {
- pkg = "oauth2";
- version = "0.3.0";
- sha256 =
- "ee23e6fb6ac84abce23713ba93f1df2fd368c9ad7b9288f0ef6fcec0e0249043";
- };
- beamDeps = [
- poison_1_5_2 plug_1_1_5 httpoison_0_8_3 hackney_1_6_0
- ];
-
- meta = {
- description = ''An Elixir OAuth 2.0 Client Library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/scrogson/oauth2";
- };
- } // packageOverrides)
- ) {};
-
- oauth2_erlang_0_6_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "oauth2_erlang";
- version = "0.6.1";
- src = fetchHex {
- pkg = "oauth2_erlang";
- version = "0.6.1";
- sha256 =
- "dc60e92de379fd27c3b9296e2368e97797233a092297d41f47f3a72846b2a974";
- };
-
- meta = {
- description = ''Erlang OAuth 2.0 implementation'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kivra/oauth2";
- };
- } // packageOverrides)
- ) {};
-
- oauth2_erlang = oauth2_erlang_0_6_1;
-
- oauther_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "oauther";
- version = "1.0.2";
- src = fetchHex {
- pkg = "oauther";
- version = "1.0.2";
- sha256 =
- "2b65e6408600d5daed7bb1b108533624b6c34491f0278b44013400aa7b551e4d";
- };
-
- meta = {
- description = ''Library to authenticate with OAuth 1.0
- protocol.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/lexmag/oauther";
- };
- } // packageOverrides)
- ) {};
-
- oauther = oauther_1_0_2;
-
- octet_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "octet";
- version = "0.0.2";
- src = fetchHex {
- pkg = "octet";
- version = "0.0.2";
- sha256 =
- "12c7d7cff035f48139e7304913e7c227ce5bf95508ad8096ed510328d916ede3";
- };
-
- meta = {
- description = ''Octet string converter'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kiennt/octet";
- };
- } // packageOverrides)
- ) {};
-
- octet = octet_0_0_2;
-
- octokit_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_1_0_2,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "octokit";
- version = "0.1.0";
- src = fetchHex {
- pkg = "octokit";
- version = "0.1.0";
- sha256 =
- "1c761130e94dbbe16a7751ee1289e1334c9208222da03a8ae9fd77c50f5e969b";
- };
- beamDeps = [ timex_1_0_2 poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''An Elixir library for accessing the GitHub
- API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lee-dohm/octokit.ex";
- };
- } // packageOverrides)
- ) {};
-
- octokit = octokit_0_1_0;
-
- odgn_json_pointer_1_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "odgn_json_pointer";
- version = "1.2.0";
- src = fetchHex {
- pkg = "odgn_json_pointer";
- version = "1.2.0";
- sha256 =
- "fd99e3d11e4d2a52fd3b4ee5d3d1fb1f1d316ebaf1b7e699e563c813cc7f8e77";
- };
-
- meta = {
- description = ''This is an implementation of JSON Pointer (RFC
- 6901) for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/odogono/elixir-jsonpointer";
- };
- } // packageOverrides)
- ) {};
-
- odgn_json_pointer = odgn_json_pointer_1_2_0;
-
- odin_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "odin";
- version = "0.0.1";
- src = fetchHex {
- pkg = "odin";
- version = "0.0.1";
- sha256 =
- "17951e0c8c73f10b38e4110e6ecefe507b4ea6203bcea7d55e34320be60b5a4a";
- };
-
- meta = {
- description = ''elixir toolkit for building command-line
- interfaces.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/plus-eg/odin";
- };
- } // packageOverrides)
- ) {};
-
- odin = odin_0_0_1;
-
- odt_potion_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "odt_potion";
- version = "0.0.1";
- src = fetchHex {
- pkg = "odt_potion";
- version = "0.0.1";
- sha256 =
- "f2c429129dc1e636dbd3563750c667315aff650ddfe7aefe06991299f76f35bd";
- };
-
- meta = {
- description = ''Substitute placeholders in ODT`s with custom
- information'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/andrewcottage/odt_potion";
- };
- } // packageOverrides)
- ) {};
-
- odt_potion = odt_potion_0_0_1;
-
- og_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "og";
- version = "0.1.0";
- src = fetchHex {
- pkg = "og";
- version = "0.1.0";
- sha256 =
- "0b858c07cb6d6d40eca28e3462c03213aeb1f3f1a22bd98e53c2bda445ee98b7";
- };
-
- meta = {
- description = ''Og is a small collection of logger helper
- functions in elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/stephenmoloney/og";
- };
- } // packageOverrides)
- ) {};
-
- og = og_0_1_0;
-
- ok_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ok";
- version = "0.1.3";
- src = fetchHex {
- pkg = "ok";
- version = "0.1.3";
- sha256 =
- "e5ac8a719f097467925d492da2cd2ad9543dfd8729739fa4a32a671337eb08bb";
- };
-
- meta = {
- description = ''Effecient error handling in elixir pipelines.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/CrowdHailer/OK";
- };
- } // packageOverrides)
- ) {};
-
- ok = ok_0_1_3;
-
- ok_jose_2_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ok_jose";
- version = "2.0.0";
- src = fetchHex {
- pkg = "ok_jose";
- version = "2.0.0";
- sha256 =
- "55377aa3f9b6e563aeb14b3960e4d2a697a059799e8d8ee390059faeaab219eb";
- };
-
- meta = {
- description = ''Pipe functions that produce ok/error tuples.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/vic/ok_jose";
- };
- } // packageOverrides)
- ) {};
-
- ok_jose = ok_jose_2_0_0;
-
- one_signal_0_0_6 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "one_signal";
- version = "0.0.6";
- src = fetchHex {
- pkg = "one_signal";
- version = "0.0.6";
- sha256 =
- "d90ec5f9e43d164e2942422d3c1e9a6b26a956ea135eb1a316380e12ef6b27d1";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir wrapper of OneSignal'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/yoavlt/one_signal";
- };
- } // packageOverrides)
- ) {};
-
- one_signal = one_signal_0_0_6;
-
- onetime_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
- buildMix ({
- name = "onetime";
- version = "1.0.0";
- src = fetchHex {
- pkg = "onetime";
- version = "1.0.0";
- sha256 =
- "28481e7e239caa0002a42178af46cb80c3501faca7c1b953558e9d8dbba76c4c";
- };
- beamDeps = [ timex_1_0_2 ];
-
- meta = {
- description = ''An onetime key-value store'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ryo33/onetime-elixir";
- };
- } // packageOverrides)
- ) {};
-
- onetime = onetime_1_0_0;
-
- oop_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "oop";
- version = "0.1.0";
- src = fetchHex {
- pkg = "oop";
- version = "0.1.0";
- sha256 =
- "eee8595a9f8bee5967850b143070d1a6c9b819c69ea19c82ae7c353e5991785e";
- };
-
- meta = {
- description = ''OOP in Elixir!'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/wojtekmach/oop";
- };
- } // packageOverrides)
- ) {};
-
- oop = oop_0_1_0;
-
- opbeat_0_3_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "opbeat";
- version = "0.3.0";
- src = fetchHex {
- pkg = "opbeat";
- version = "0.3.0";
- sha256 =
- "20977e8ae08a1789326a3e5c0c8fa3265dd0e6ddc1fb6abe25c3a33d3fc9e692";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir client for opbeat'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/teodor-pripoae/opbeat";
- };
- } // packageOverrides)
- ) {};
-
- opbeat = opbeat_0_3_0;
-
- open_graphx_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- floki_0_8_1
- }:
- buildMix ({
- name = "open_graphx";
- version = "0.0.2";
- src = fetchHex {
- pkg = "open_graphx";
- version = "0.0.2";
- sha256 =
- "2eef951c4fbb8a01f11ed3ab6ca62dc695a84baf9ae0fbe7698058eac8020b70";
- };
- beamDeps = [ httpoison_0_8_3 floki_0_8_1 ];
-
- meta = {
- description = ''Load Open Graph Protocol'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/yoavlt/open_graphx";
- };
- } // packageOverrides)
- ) {};
-
- open_graphx = open_graphx_0_0_2;
-
- openmaize_jwt_0_9_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "openmaize_jwt";
- version = "0.9.0";
- src = fetchHex {
- pkg = "openmaize_jwt";
- version = "0.9.0";
- sha256 =
- "1c07dc9646a6270d9a21669ca27b55453e3af568724715a26feef395d5b105ab";
- };
- beamDeps = [ poison_2_1_0 plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''JSON Web Token library for use with the Openmaize
- authentication library.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/riverrun/openmaizejwt";
- };
- } // packageOverrides)
- ) {};
-
- openmaize_jwt = openmaize_jwt_0_9_0;
-
- openstack_0_0_5 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- maybe_0_0_1,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "openstack";
- version = "0.0.5";
- src = fetchHex {
- pkg = "openstack";
- version = "0.0.5";
- sha256 =
- "f3387f15fea0ae51eacc7c7b3667ac5cc611c479ae48a7ce8ea61d5ae1c6ba57";
- };
- beamDeps = [ poison_1_5_2 maybe_0_0_1 httpoison_0_8_3 ];
-
- meta = {
- description = ''Openstack Client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zweifisch/openstack.ex";
- };
- } // packageOverrides)
- ) {};
-
- openstack = openstack_0_0_5;
-
- openstax_keystone_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_2_1_6,
- poison_1_5_2,
- httpoison_0_8_3,
- connection_1_0_2
- }:
- buildMix ({
- name = "openstax_keystone";
- version = "0.1.1";
- src = fetchHex {
- pkg = "openstax_keystone";
- version = "0.1.1";
- sha256 =
- "0ca484da2caef05a6aa4ce71c009f249142cc83f504160c179e783e9639c7de9";
- };
- beamDeps = [
- timex_2_1_6
- poison_1_5_2
- httpoison_0_8_3
- connection_1_0_2
- ];
-
- meta = {
- description = ''OpenStack Keystone client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mspanc/openstax_keystone";
- };
- } // packageOverrides)
- ) {};
-
- openstax_keystone = openstax_keystone_0_1_1;
-
- openstax_swift_0_1_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "openstax_swift";
- version = "0.1.4";
- src = fetchHex {
- pkg = "openstax_swift";
- version = "0.1.4";
- sha256 =
- "244bf77997b366950ec9852b2a65ab58bb1370e86028ae5efe8f84668384e903";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''OpenStack Swift client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mspanc/openstax_swift";
- };
- } // packageOverrides)
- ) {};
-
- openstax_swift = openstax_swift_0_1_4;
-
- ordered_list_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ordered_list";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ordered_list";
- version = "0.1.0";
- sha256 =
- "6b6410f35d1bda7335fc0c5f16e2b6f5a6a8c162363073931347dc184521159d";
- };
-
- meta = {
- description = ''Sorting and reordering positions in a list.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/aarondufall/ordered_list";
- };
- } // packageOverrides)
- ) {};
-
- ordered_list = ordered_list_0_1_0;
-
- os_utils_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "os_utils";
- version = "0.3.0";
- src = fetchHex {
- pkg = "os_utils";
- version = "0.3.0";
- sha256 =
- "b49e32630b3f198b5fe4f6858aa03d1236d659564f98d522c9e646c045e13b64";
- };
-
- meta = {
- description = ''OS utilities for Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/orderthruchaos/os_utils";
- };
- } // packageOverrides)
- ) {};
-
- os_utils = os_utils_0_3_0;
-
- osc_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "osc";
- version = "0.1.1";
- src = fetchHex {
- pkg = "osc";
- version = "0.1.1";
- sha256 =
- "41830bf1494e6f2419ab8e35d11c0f650aab1d37b45d1b3fdfcc3682e191324c";
- };
-
- meta = {
- description = ''OSC encoder/decoder for elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/osc_ex";
- };
- } // packageOverrides)
- ) {};
-
- osc = osc_0_1_1;
-
- pact_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pact";
- version = "0.2.0";
- src = fetchHex {
- pkg = "pact";
- version = "0.2.0";
- sha256 =
- "a19000dcfd6c6b220e508ed44e9040d83e4814db2f6f74b11de1a4597a8de05e";
- };
-
- meta = {
- description = ''Elixir dependency registry for better testing and
- cleaner code'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/BlakeWilliams/pact";
- };
- } // packageOverrides)
- ) {};
-
- pact = pact_0_2_0;
-
- pagarmex_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "pagarmex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "pagarmex";
- version = "0.1.0";
- sha256 =
- "9678030fc6b9ffe0d312967f85a3dacd4ef70e4b14f6eea7d8c6c3fc3796816e";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''A PagarMe Library for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gullitmiranda/pagarmex";
- };
- } // packageOverrides)
- ) {};
-
- pagarmex = pagarmex_0_1_0;
-
- pagexduty_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- exjsx_3_1_0
- }:
- buildMix ({
- name = "pagexduty";
- version = "0.1.0";
- src = fetchHex {
- pkg = "pagexduty";
- version = "0.1.0";
- sha256 =
- "7292a63eeb27637ff19f91f50910d2bbbc860e1eb0413aa5a5035ef32b41b232";
- };
- beamDeps = [ httpoison_0_8_3 exjsx_3_1_0 ];
-
- meta = {
- description = ''A Pagerduty client for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ride/pagexduty";
- };
- } // packageOverrides)
- ) {};
-
- pagexduty = pagexduty_0_1_0;
-
- paginex_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "paginex";
- version = "0.0.1";
- src = fetchHex {
- pkg = "paginex";
- version = "0.0.1";
- sha256 =
- "4fdc1a0bb02fbd910d24c59caae6d5793fd24a2a29d6498c04a332095e616770";
- };
-
- meta = {
- description = ''Exposes a pagination struct that can be helpful
- to render the pagination html.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bhserna/paginex";
- };
- } // packageOverrides)
- ) {};
-
- paginex = paginex_0_0_1;
-
- painstaking_0_5_8 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exoddic_1_3_1 }:
- buildMix ({
- name = "painstaking";
- version = "0.5.8";
- src = fetchHex {
- pkg = "painstaking";
- version = "0.5.8";
- sha256 =
- "f9de5ab6139fdda653df0a90e57fe229728a25f3611bf520c9433edd2ab81318";
- };
- beamDeps = [ exoddic_1_3_1 ];
-
- meta = {
- description = ''Bet stake sizing recommendations'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/painstaking";
- };
- } // packageOverrides)
- ) {};
-
- painstaking = painstaking_0_5_8;
-
- palette_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "palette";
- version = "0.0.2";
- src = fetchHex {
- pkg = "palette";
- version = "0.0.2";
- sha256 =
- "0ad5bbd207b4462078888882b494de937690659bb72ca34ff247b1c9c4784033";
- };
-
- meta = {
- description = ''A handy library for colouring strings.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lpil/palette";
- };
- } // packageOverrides)
- ) {};
-
- palette = palette_0_0_2;
-
- pandex_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pandex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "pandex";
- version = "0.1.0";
- sha256 =
- "a9c6b401be16af5f385c4ff8fc7e3eb9686e2829b0855854de428ff2bd23e34f";
- };
-
- meta = {
- longDescription = ''Pandex is a lightweight Elixir wrapper for
- [Pandoc](http://pandoc.org). Pandex enables you
- to convert Markdown, CommonMark, HTML, Latex,
- json, html to HTML, HTML5, opendocument, rtf,
- texttile, asciidoc, markdown, json and others.
- Pandex has no dependencies other than Pandoc
- itself.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/filterkaapi/pandex";
- };
- } // packageOverrides)
- ) {};
-
- pandex = pandex_0_1_0;
-
- pangu_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pangu";
- version = "0.1.0";
- src = fetchHex {
- pkg = "pangu";
- version = "0.1.0";
- sha256 =
- "2634cc2463421757aca0a76665de83940d4fda12f8ed316ae929bb29f64d06c5";
- };
-
- meta = {
- description = ''Paranoid text spacing in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/cataska/pangu.ex";
- };
- } // packageOverrides)
- ) {};
-
- pangu = pangu_0_1_0;
-
- parabaikElixirConverter_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "parabaikElixirConverter";
- version = "0.0.1";
- src = fetchHex {
- pkg = "parabaikElixirConverter";
- version = "0.0.1";
- sha256 =
- "ac72f871ac393ca2e42d11f9103019f6270209b1b0fe58d6f110f5dd66c387e4";
- };
-
- meta = {
- longDescription = ''ParabaikElixirConverter is just a Elixir
- version of Parabaik converter. It can convert
- from Unicode to Zawgyi-One and Zawgyi-One to
- Unicode vice versa. '';
- license = stdenv.lib.licenses.asl20;
- homepage =
- "https://github.com/Arkar-Aung/ParabaikElixirConverter";
- };
- } // packageOverrides)
- ) {};
-
- parabaikElixirConverter = parabaikElixirConverter_0_0_1;
-
- parallel_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "parallel";
- version = "0.0.3";
- src = fetchHex {
- pkg = "parallel";
- version = "0.0.3";
- sha256 =
- "d9b5e98c1892f5376b4dfa28c48a3a17029f86a28d1f9ec2f7c1a2747f256a4d";
- };
-
- meta = {
- description = ''Straightforward parallel processing for Elixir'';
-
- homepage = "https://github.com/Anonyfox/parallel";
- };
- } // packageOverrides)
- ) {};
-
- parallel = parallel_0_0_3;
-
- parallel_stream_1_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "parallel_stream";
- version = "1.0.3";
- src = fetchHex {
- pkg = "parallel_stream";
- version = "1.0.3";
- sha256 =
- "8b0090b13a42343ad709ed088111fd40a9e4c2d1819ef6c1e601347134ed34d0";
- };
-
- meta = {
- description = ''Parallel stream operations for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/beatrichartz/parallel_stream";
- };
- } // packageOverrides)
- ) {};
-
- parallel_stream = parallel_stream_1_0_3;
-
- paratize_2_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "paratize";
- version = "2.1.3";
- src = fetchHex {
- pkg = "paratize";
- version = "2.1.3";
- sha256 =
- "7dc6135524c65473f680ec3ade55c2f65b77ad40451ffd2bbd4128066b037d84";
- };
-
- meta = {
- description = ''Elixir library providing some handy parallel
- processing facilities.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/seantanly/elixir-paratize";
- };
- } // packageOverrides)
- ) {};
-
- paratize = paratize_2_1_3;
-
- parse_torrent_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- earmark_0_2_1,
- bencode_0_3_0
- }:
- buildMix ({
- name = "parse_torrent";
- version = "0.2.0";
- src = fetchHex {
- pkg = "parse_torrent";
- version = "0.2.0";
- sha256 =
- "444d49f20ede110e33e0817134ef3f0b843a7af01c88e9c168acc4892ae2d320";
- };
- beamDeps = [ earmark_0_2_1 bencode_0_3_0 ];
-
- meta = {
- description = ''Parses a .torrent file and returns a map'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/preciz/parse_torrent";
- };
- } // packageOverrides)
- ) {};
-
- parse_torrent = parse_torrent_0_2_0;
-
- parselix_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "parselix";
- version = "0.1.0";
- src = fetchHex {
- pkg = "parselix";
- version = "0.1.0";
- sha256 =
- "c728426e1361e94918a7b24d45b86f00e0e7225e9086b02074ac7b33a4307406";
- };
-
- meta = {
- description = ''A Parser Combinator Library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ryo33/Parselix";
- };
- } // packageOverrides)
- ) {};
-
- parselix = parselix_0_1_0;
-
- parsey_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "parsey";
- version = "0.0.1";
- src = fetchHex {
- pkg = "parsey";
- version = "0.0.1";
- sha256 =
- "5d2db82a9f9109e3ae95058d7405ff379c88635ef2393dda27d76b13cd28d155";
- };
-
- meta = {
- description = ''A library to parse non-complex nested inputs with
- a given ruleset.'';
- license = stdenv.lib.licenses.bsd2;
- homepage = "https://github.com/ScrimpyCat/Parsey";
- };
- } // packageOverrides)
- ) {};
-
- parsey = parsey_0_0_1;
-
- pass_0_3_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- json_web_token_0_2_5
- }:
- buildMix ({
- name = "pass";
- version = "0.3.0";
- src = fetchHex {
- pkg = "pass";
- version = "0.3.0";
- sha256 =
- "e2d44e9a94ce802b0723cd6e8c149c85c696e8ff3bf939f4c81ebd08938d0496";
- };
- beamDeps = [ plug_1_1_5 json_web_token_0_2_5 ];
-
- meta = {
- description = ''A simple authentication manager for Plug
- applications.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/elixir-extracts/pass";
- };
- } // packageOverrides)
- ) {};
-
- pass = pass_0_3_0;
-
- pathway_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_5_2 }:
- buildMix ({
- name = "pathway";
- version = "0.1.0";
- src = fetchHex {
- pkg = "pathway";
- version = "0.1.0";
- sha256 =
- "ae734bc8db0d91c0876e15b7e22e8d7616701eff94b1bd2930d2783a1b11c01d";
- };
- beamDeps = [ poison_1_5_2 ];
-
- meta = {
- description = ''A HTTP client library for the Trak.io REST API.
- '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/novabyte/pathway";
- };
- } // packageOverrides)
- ) {};
-
- pathway = pathway_0_1_0;
-
- pattern_tap_0_2_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pattern_tap";
- version = "0.2.2";
- src = fetchHex {
- pkg = "pattern_tap";
- version = "0.2.2";
- sha256 =
- "2d17fe4c076b12efe39a362ade88d11d8bed204009027755802213db9feb3675";
- };
-
- meta = {
- description = ''Macro for tapping into a pattern match while
- using the pipe operator '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mgwidmann/elixir-pattern_tap";
- };
- } // packageOverrides)
- ) {};
-
- pattern_tap = pattern_tap_0_2_2;
-
- pavlov_0_2_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, meck_0_8_4 }:
- buildMix ({
- name = "pavlov";
- version = "0.2.3";
- src = fetchHex {
- pkg = "pavlov";
- version = "0.2.3";
- sha256 =
- "4d38e96b7581261a49f00d2046603ad3c9af6d52abd26d16bbf6a0a5a82c9643";
- };
- beamDeps = [ meck_0_8_4 ];
-
- meta = {
- longDescription = ''Pavlov is a BDD library for your Elixir
- projects, allowing you to write expressive unit
- tests that tell the story of how your
- application behaves. The syntax tries to follow
- RSpec`s wherever possible.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sproutapp/pavlov";
- };
- } // packageOverrides)
- ) {};
-
- pavlov = pavlov_0_2_3;
-
- pbkdf2_2_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "pbkdf2";
- version = "2.0.0";
- src = fetchHex {
- pkg = "pbkdf2";
- version = "2.0.0";
- sha256 =
- "1e793ce6fdb0576613115714deae9dfc1d1537eaba74f07efb36de139774488d";
- };
-
- meta = {
- description = ''Erlang PBKDF2 Key Derivation Function'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/basho/erlang-pbkdf2";
- };
- } // packageOverrides)
- ) {};
-
- pbkdf2 = pbkdf2_2_0_0;
-
- pbkdf2_nif_0_3_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "pbkdf2_nif";
- version = "0.3.0";
- src = fetchHex {
- pkg = "pbkdf2_nif";
- version = "0.3.0";
- sha256 =
- "7ad61389164cceac87e2bed9d8f184cd713cca85d51e096604c40bf86d96a8b7";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''PBKDF2 NIF implementation'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/barrel-db/erlang-pbkdf2-nif";
- };
- } // packageOverrides)
- ) {};
-
- pbkdf2_nif = pbkdf2_nif_0_3_0;
-
- pc_1_2_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "pc";
- version = "1.2.0";
- src = fetchHex {
- pkg = "pc";
- version = "1.2.0";
- sha256 =
- "ef0f59d26a25af0a5247ef1a06d28d8300f8624647b02dc521ac79a7eceb8883";
- };
-
- meta = {
- description = ''a rebar3 port compiler for native code'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/blt/port_compiler";
- };
- } // packageOverrides)
- ) {};
-
- pc = pc_1_2_0;
-
- pdf2htmlex_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pdf2htmlex";
- version = "0.2.0";
- src = fetchHex {
- pkg = "pdf2htmlex";
- version = "0.2.0";
- sha256 =
- "50885e995d25362b1f25c74796c0627657147d4d10ccb4be736be3b06b8a44a3";
- };
-
- meta = {
- description = ''Convert PDF docs to beautiful HTML files without
- losing text or format.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ricn/pdf2htmlex";
- };
- } // packageOverrides)
- ) {};
-
- pdf2htmlex = pdf2htmlex_0_2_0;
-
- pdf_generator_0_3_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- porcelain_2_0_1,
- misc_random_0_2_6
- }:
- buildMix ({
- name = "pdf_generator";
- version = "0.3.3";
- src = fetchHex {
- pkg = "pdf_generator";
- version = "0.3.3";
- sha256 =
- "1aeb29a3b4821de0f86985e65661c7dedae28d2c924ef42677e1f02093607856";
- };
- beamDeps = [ porcelain_2_0_1 misc_random_0_2_6 ];
-
- meta = {
- longDescription = ''A wrapper for wkhtmltopdf (HTML to PDF) and
- PDFTK (adds in encryption) for use in Elixir
- projects.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gutschilla/elixir-pdf-generator";
- };
- } // packageOverrides)
- ) {};
-
- pdf_generator = pdf_generator_0_3_3;
-
- peon_2_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "peon";
- version = "2.0.0";
- src = fetchHex {
- pkg = "peon";
- version = "2.0.0";
- sha256 =
- "3d87e626f5d014563d1cf319c0fe8576c8eb3f4399ecc9a0d7fb2385a180aaab";
- };
-
- meta = {
- description = ''Use Elixir maps as a document storage format.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/supernintendo/peon";
- };
- } // packageOverrides)
- ) {};
-
- peon = peon_2_0_0;
-
- permission_ex_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "permission_ex";
- version = "0.2.0";
- src = fetchHex {
- pkg = "permission_ex";
- version = "0.2.0";
- sha256 =
- "efaf05029f498689b93e254f120bb01dd7bafd205a23e4246b70e97565af097e";
- };
-
- meta = {
- description = ''Permission management and checking library for
- Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/OvermindDL1/permission_ex";
- };
- } // packageOverrides)
- ) {};
-
- permission_ex = permission_ex_0_2_0;
-
- petick_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "petick";
- version = "0.0.1";
- src = fetchHex {
- pkg = "petick";
- version = "0.0.1";
- sha256 =
- "77ca306a379109aeb98528fdc5642dccc0b66379e67058814470d0cf30053586";
- };
-
- meta = {
- description = ''Periodic timer'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/niku/petick";
- };
- } // packageOverrides)
- ) {};
-
- petick = petick_0_0_1;
-
- pg2pubsub_0_2_13 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pg2pubsub";
- version = "0.2.13";
- src = fetchHex {
- pkg = "pg2pubsub";
- version = "0.2.13";
- sha256 =
- "a2c3ef4dcf031c71c75781ec49236220f405e836f4ee384bdcfbbf8abd6fc4db";
- };
-
- meta = {
- description = ''A PubSub implementation for Elixir, using PG2
- (Erlang process groups).'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kbremner/pg2pubsub";
- };
- } // packageOverrides)
- ) {};
-
- pg2pubsub = pg2pubsub_0_2_13;
-
- pgapp_0_0_1 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- epgsql_3_1_1
- }:
- buildRebar3 ({
- name = "pgapp";
- version = "0.0.1";
- src = fetchHex {
- pkg = "pgapp";
- version = "0.0.1";
- sha256 =
- "5155404f5caa82d6b4f052703cdadddfbc2089e9512bfeef72092933ec1e521d";
- };
-
- beamDeps = [ poolboy_1_5_1 epgsql_3_1_1 ];
-
- meta = {
- description = ''epgsql application'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- pgapp = pgapp_0_0_1;
-
- phasedb_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- inflex_1_5_0,
- heap_1_0_0,
- calendar_0_12_4
- }:
- buildMix ({
- name = "phasedb";
- version = "0.0.2";
- src = fetchHex {
- pkg = "phasedb";
- version = "0.0.2";
- sha256 =
- "d9d7d5f7317ad0ce20da3b95e26b286d45d91a61a63a684fba42681a5ced68ee";
- };
- beamDeps = [
- poison_2_1_0 inflex_1_5_0 heap_1_0_0 calendar_0_12_4
- ];
-
- meta = {
- description = ''A real-time time series database.'';
-
- };
- } // packageOverrides)
- ) {};
-
- phasedb = phasedb_0_0_2;
-
- phasedb_client_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- websocket_client_1_1_0,
- table_rex_0_8_0,
- poison_2_1_0,
- phasedb_0_0_2,
- calendar_0_12_4
- }:
- buildMix ({
- name = "phasedb_client";
- version = "0.0.1";
- src = fetchHex {
- pkg = "phasedb_client";
- version = "0.0.1";
- sha256 =
- "11019f0c5c2ecbfe578150434f064c84a54752093d004a9cc15296fa054b94fa";
- };
- beamDeps = [
- websocket_client_1_1_0
- table_rex_0_8_0
- poison_2_1_0
- phasedb_0_0_2
- calendar_0_12_4
- ];
-
- meta = {
- description = ''A real-time time series database - command line
- client.'';
-
- };
- } // packageOverrides)
- ) {};
-
- phasedb_client = phasedb_client_0_0_1;
-
- phasedb_server_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- phasedb_0_0_2,
- cowboy_1_0_4,
- calendar_0_12_4
- }:
- buildMix ({
- name = "phasedb_server";
- version = "0.0.1";
- src = fetchHex {
- pkg = "phasedb_server";
- version = "0.0.1";
- sha256 =
- "dfde579bb29ed0d805276effb4f7a27d6a302a9615881051fb25eba8cf16da05";
- };
- beamDeps = [ phasedb_0_0_2 cowboy_1_0_4 calendar_0_12_4 ];
-
- meta = {
- description = ''A real-time time series database.'';
-
- };
- } // packageOverrides)
- ) {};
-
- phasedb_server = phasedb_server_0_0_1;
-
- phoenix_1_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "phoenix";
- version = "1.0.4";
- src = fetchHex {
- pkg = "phoenix";
- version = "1.0.4";
- sha256 =
- "591d5f7f3a6f5407e8491a92dc6a2d0b7b94ef4f3526ad8ef4eb82660e6f69f6";
- };
- beamDeps = [ poison_1_5_2 plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- longDescription = ''Productive. Reliable. Fast. A productive web
- framework that does not compromise speed and
- maintainability.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/phoenixframework/phoenix";
- };
- } // packageOverrides)
- ) {};
-
- phoenix_generator_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, inflex_0_3_0 }:
- buildMix ({
- name = "phoenix_generator";
- version = "0.2.1";
- src = fetchHex {
- pkg = "phoenix_generator";
- version = "0.2.1";
- sha256 =
- "2be3753fba7b4a9afa461d270ab5111d76d1e5997b8e1587344051d85b6a1a36";
- };
- beamDeps = [ inflex_0_3_0 ];
-
- meta = {
- description = ''A collection of boilerplate generators for the
- Phoenix web framework.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/etufe/phoenix_generator";
- };
- } // packageOverrides)
- ) {};
-
- phoenix_generator = phoenix_generator_0_2_1;
-
- phoenix_jsroutes_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "phoenix_jsroutes";
- version = "0.0.1";
- src = fetchHex {
- pkg = "phoenix_jsroutes";
- version = "0.0.1";
- sha256 =
- "f1f94ced7edb338d802290265e25784e32ad9e5f51eea65286f22663d831e44e";
- };
-
- meta = {
- description = ''Brings phoenix router helpers to your javascript
- code.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tiagoengel/phoenix-jsroutes";
- };
- } // packageOverrides)
- ) {};
-
- phoenix_jsroutes = phoenix_jsroutes_0_0_1;
-
- phoenix_pubsub_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "phoenix_pubsub";
- version = "0.0.1";
- src = fetchHex {
- pkg = "phoenix_pubsub";
- version = "0.0.1";
- sha256 =
- "ea9f1853699e838965155af063f536f440afacadca316fb657858b3ac40da2eb";
- };
-
- meta = {
- description = ''Distributed PubSub and Presence platform'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/phoenixframework/phoenix_pubsub";
- };
- } // packageOverrides)
- ) {};
-
- phoenix_pubsub_1_0_0_rc_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "phoenix_pubsub";
- version = "1.0.0-rc.0";
- src = fetchHex {
- pkg = "phoenix_pubsub";
- version = "1.0.0-rc.0";
- sha256 =
- "94765c0866ffe55f76894daa5e5adcc30822d3710718b0c03980db8f093b575f";
- };
-
- meta = {
- description = ''Distributed PubSub and Presence platform'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/phoenixframework/phoenix_pubsub";
- };
- } // packageOverrides)
- ) {};
-
- phoenix_pubsub = phoenix_pubsub_1_0_0_rc_0;
-
- phoenix_pubsub_vernemq_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "phoenix_pubsub_vernemq";
- version = "0.0.3";
- src = fetchHex {
- pkg = "phoenix_pubsub_vernemq";
- version = "0.0.3";
- sha256 =
- "92c228aee119d21c68b0b43250414686dee16986cb4d0039608612abd0d22824";
- };
-
- meta = {
- description = ''The VerneMQ MQTT pubsub adapter for the Phoenix
- framework'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/larshesel/phoenix_pubsub_vernemq";
- };
- } // packageOverrides)
- ) {};
-
- phoenix_pubsub_vernemq = phoenix_pubsub_vernemq_0_0_3;
-
- phoenix_webpack_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "phoenix_webpack";
- version = "0.1.0";
- src = fetchHex {
- pkg = "phoenix_webpack";
- version = "0.1.0";
- sha256 =
- "9a5b53836b60bfc3baf36e9aa85b48cfc227f004419b81c195e5e08936562ba7";
- };
-
- meta = {
- description = ''Easily generate webpack configs for phoenix'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/keathley/phoenix_webpack";
- };
- } // packageOverrides)
- ) {};
-
- phoenix_webpack = phoenix_webpack_0_1_0;
-
- phone_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "phone";
- version = "0.2.0";
- src = fetchHex {
- pkg = "phone";
- version = "0.2.0";
- sha256 =
- "af836882ba2e1b8feec420d181a15ac3c9a9230f9f7a87753e33e2da8a591d22";
- };
-
- meta = {
- description = ''Get useful info from telephone numbers.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/fcevado/phone";
- };
- } // packageOverrides)
- ) {};
-
- phone = phone_0_2_0;
-
- phst_transform_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "phst_transform";
- version = "1.0.0";
- src = fetchHex {
- pkg = "phst_transform";
- version = "1.0.0";
- sha256 =
- "f18683a70d858a9d9459881458f985d13233a3c04e6b0005458a51e560fdfd84";
- };
-
- meta = {
- longDescription = ''An Elixir Protocol and implementation for
- creating a tranform of any elixir data.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/philosophers-stone/transform";
- };
- } // packageOverrides)
- ) {};
-
- phst_transform = phst_transform_1_0_0;
-
- pigeon_0_7_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "pigeon";
- version = "0.7.0";
- src = fetchHex {
- pkg = "pigeon";
- version = "0.7.0";
- sha256 =
- "16d2745d952553088248185d5371b42a17c9885293f54e7c7871d8a256e182be";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''HTTP2-compliant wrapper for sending iOS
- (APNS) and Android (GCM) push notifications.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/codedge-llc/pigeon";
- };
- } // packageOverrides)
- ) {};
-
- pigeon = pigeon_0_7_0;
-
- piliponi_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "piliponi";
- version = "0.0.1";
- src = fetchHex {
- pkg = "piliponi";
- version = "0.0.1";
- sha256 =
- "1729646601f1f12aff154e0401063298ec54bfd745f9137a64f63384f106a645";
- };
-
- meta = {
- description = ''Simple mobile phone formatter for the
- Philippines'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/wetoolaguer/piliponi";
- };
- } // packageOverrides)
- ) {};
-
- piliponi = piliponi_0_0_1;
-
- pinboardixir_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "pinboardixir";
- version = "0.2.0";
- src = fetchHex {
- pkg = "pinboardixir";
- version = "0.2.0";
- sha256 =
- "360050f089cd50515bf51a5634420beab54bb7ec3b2063d49d91179182e423d7";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''A Pinboard client in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ElaWorkshop/pinboardixir";
- };
- } // packageOverrides)
- ) {};
-
- pinboardixir = pinboardixir_0_2_0;
-
- pinglix_1_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_0_19_5,
- poison_1_4_0,
- plug_1_1_5
- }:
- buildMix ({
- name = "pinglix";
- version = "1.1.1";
- src = fetchHex {
- pkg = "pinglix";
- version = "1.1.1";
- sha256 =
- "bff8166655cc143518c0089aca104755ab188816707fb73a5739dd094f45e895";
- };
- beamDeps = [ timex_0_19_5 poison_1_4_0 plug_1_1_5 ];
-
- meta = {
- longDescription = ''Plug compatible health check system in Elixir
- based on
- https://github.com/jbarnette/pinglish.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pvdvreede/pinglix";
- };
- } // packageOverrides)
- ) {};
-
- pinglix = pinglix_1_1_1;
-
- pinyin_0_1_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pinyin";
- version = "0.1.4";
- src = fetchHex {
- pkg = "pinyin";
- version = "0.1.4";
- sha256 =
- "e0fc3dc148bc938ad12f5aefabf017620eb314ca4cf045b91ad195c557d5fa96";
- };
-
- meta = {
- description = ''chinese pinyin library'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/lidashuang/pinyin";
- };
- } // packageOverrides)
- ) {};
-
- pinyin = pinyin_0_1_4;
-
- pipe_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pipe";
- version = "0.0.2";
- src = fetchHex {
- pkg = "pipe";
- version = "0.0.2";
- sha256 =
- "ad6d90981606bb04d040c0af49cf493417994214ce6e74ac572dc2ee67e2c064";
- };
-
- meta = {
- description = ''An Elixir extension that extends the pipe (|>)
- operator through macros. '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/batate/elixir-pipes";
- };
- } // packageOverrides)
- ) {};
-
- pipe = pipe_0_0_2;
-
- pipe_here_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pipe_here";
- version = "1.0.0";
- src = fetchHex {
- pkg = "pipe_here";
- version = "1.0.0";
- sha256 =
- "95558a60ec7736685029e1b28b1c7cd7c7eae714fab779406aa2512c0f29c51e";
- };
-
- meta = {
- description = ''An Elixir macro for easily piping arguments at
- any position.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/vic/pipe_here";
- };
- } // packageOverrides)
- ) {};
-
- pipe_here = pipe_here_1_0_0;
-
- pipe_while_ok_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pipe_while_ok";
- version = "0.0.2";
- src = fetchHex {
- pkg = "pipe_while_ok";
- version = "0.0.2";
- sha256 =
- "b62708d0a0b82f421f937b99c5ff21a966e21d9a1f42ba75b8788100ac2c6567";
- };
-
- meta = {
- description = ''PipeWhileOk =========== Moved to
- https://githib.com/pragdave/exlibris '';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/pragdave/pipe_while_ok";
- };
- } // packageOverrides)
- ) {};
-
- pipe_while_ok = pipe_while_ok_0_0_2;
-
- pipette_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, mock_0_1_3 }:
- buildMix ({
- name = "pipette";
- version = "0.0.4";
- src = fetchHex {
- pkg = "pipette";
- version = "0.0.4";
- sha256 =
- "8742ea9b115071c3aa7cec4ddacfa161ff63fd647e0491ac442cb118d7198e26";
- };
- beamDeps = [ mock_0_1_3 ];
-
- meta = {
- description = ''new_data = pipette(data, template)'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/liquidz/pipette";
- };
- } // packageOverrides)
- ) {};
-
- pipette = pipette_0_0_4;
-
- pipper_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pipper";
- version = "1.0.0";
- src = fetchHex {
- pkg = "pipper";
- version = "1.0.0";
- sha256 =
- "a6b5100f6bab060674e5a828dcfb1b7c12e65739186e54809a23320a5550e149";
- };
-
- meta = {
- description = ''Provides a \"pipe-equals\" operator'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/drewblas/pipper";
- };
- } // packageOverrides)
- ) {};
-
- pipper = pipper_1_0_0;
-
- pkcs7_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pkcs7";
- version = "1.0.2";
- src = fetchHex {
- pkg = "pkcs7";
- version = "1.0.2";
- sha256 =
- "0e4faa65411e204b7952712d58f657335109ecbb24cf79163dc96458ba8d6518";
- };
-
- meta = {
- description = ''PKCS7 binary padding for erlang'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/pkcs7.erl";
- };
- } // packageOverrides)
- ) {};
-
- pkcs7 = pkcs7_1_0_2;
-
- plaid_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "plaid";
- version = "0.0.1";
- src = fetchHex {
- pkg = "plaid";
- version = "0.0.1";
- sha256 =
- "1168a916f1a2fa5528b7891fe32784a1c415dbd5fc8b05bb9a7571f887f3ee9e";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Client for Plaid, the finance API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/travisjeffery/plaid";
- };
- } // packageOverrides)
- ) {};
-
- plaid = plaid_0_0_1;
-
- plantuml_mix_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "plantuml_mix";
- version = "0.0.1";
- src = fetchHex {
- pkg = "plantuml_mix";
- version = "0.0.1";
- sha256 =
- "6d064ebc3be722642875ea5e2ce63a5678b95d96353c3605f6e83684651947f0";
- };
-
- meta = {
- longDescription = ''Add plantuml task to mix. Execute mix
- plantuml --help for options. Requires that the
- env var PLANTUML_JAR points to a valid PlantUML
- jar file. Requires Java > 1.6 installed on the
- system.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/binarytemple/plantuml_mix";
- };
- } // packageOverrides)
- ) {};
-
- plantuml_mix = plantuml_mix_0_0_1;
-
- plist_0_0_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "plist";
- version = "0.0.4";
- src = fetchHex {
- pkg = "plist";
- version = "0.0.4";
- sha256 =
- "533836ee86188fa2a0aed92410534851aac3cb46ee0919c98553b1f38a63aa1a";
- };
-
- meta = {
- description = ''An Elixir library to parse files in Apple`s
- property list formats'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ciaran/plist";
- };
- } // packageOverrides)
- ) {};
-
- plist = plist_0_0_4;
-
- plivo_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "plivo";
- version = "0.0.1";
- src = fetchHex {
- pkg = "plivo";
- version = "0.0.1";
- sha256 =
- "e710b4132ece4f648b772dc540dd1ba7d0fb241fe2f271639cf0764bdb024848";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''An elixir client for Plivo API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/aarvay/plivo-elixir";
- };
- } // packageOverrides)
- ) {};
-
- plivo = plivo_0_0_1;
-
- plug_0_11_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
- buildMix ({
- name = "plug";
- version = "0.11.3";
- src = fetchHex {
- pkg = "plug";
- version = "0.11.3";
- sha256 =
- "82834fa130af2520b9dad4a271f4fe5c25a456cf2334aae35ef84989efec65e3";
- };
- beamDeps = [ cowboy_1_0_4 ];
-
- meta = {
- description = ''A specification and conveniences for composable
- modules between web applications'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/elixir-lang/plug";
- };
- } // packageOverrides)
- ) {};
-
- plug_0_12_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
- buildMix ({
- name = "plug";
- version = "0.12.2";
- src = fetchHex {
- pkg = "plug";
- version = "0.12.2";
- sha256 =
- "b26e8c636fc5b83e0b69767fb3cb2c693703b7f8c1eed11091e57f6e7caebc2d";
- };
- beamDeps = [ cowboy_1_0_4 ];
-
- meta = {
- description = ''A specification and conveniences for composable
- modules between web applications'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/elixir-lang/plug";
- };
- } // packageOverrides)
- ) {};
-
- plug_0_13_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
- buildMix ({
- name = "plug";
- version = "0.13.1";
- src = fetchHex {
- pkg = "plug";
- version = "0.13.1";
- sha256 =
- "50b7ef7c753e703b04ed79bc254ed0fbe07db3ed90894598d377c41e15f4490b";
- };
- beamDeps = [ cowboy_1_0_4 ];
-
- meta = {
- description = ''A specification and conveniences for composable
- modules between web applications'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/elixir-lang/plug";
- };
- } // packageOverrides)
- ) {};
-
- plug_0_14_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
- buildMix ({
- name = "plug";
- version = "0.14.0";
- src = fetchHex {
- pkg = "plug";
- version = "0.14.0";
- sha256 =
- "bacee77168bce635d959d8c41e0723936fba41170edf11665deaf30ee668303d";
- };
- beamDeps = [ cowboy_1_0_4 ];
-
- meta = {
- description = ''A specification and conveniences for composable
- modules between web applications'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/elixir-lang/plug";
- };
- } // packageOverrides)
- ) {};
-
- plug_0_8_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
- buildMix ({
- name = "plug";
- version = "0.8.4";
- src = fetchHex {
- pkg = "plug";
- version = "0.8.4";
- sha256 =
- "22c18f351cb30df9ca0b33bedd545bdbbc7eee60f1321cfcfe703228355ff2ec";
- };
- beamDeps = [ cowboy_1_0_4 ];
-
- meta = {
- description = ''A specification and conveniences for composable
- modules between web applications'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/elixir-lang/plug";
- };
- } // packageOverrides)
- ) {};
-
- plug_0_9_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
- buildMix ({
- name = "plug";
- version = "0.9.0";
- src = fetchHex {
- pkg = "plug";
- version = "0.9.0";
- sha256 =
- "2715df7f9e2650d1725576f5a683317d8dcaf656f524c14b384d7a54d74a09d1";
- };
- beamDeps = [ cowboy_1_0_4 ];
-
- meta = {
- description = ''A specification and conveniences for composable
- modules between web applications'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/elixir-lang/plug";
- };
- } // packageOverrides)
- ) {};
-
- plug_1_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
- buildMix ({
- name = "plug";
- version = "1.0.3";
- src = fetchHex {
- pkg = "plug";
- version = "1.0.3";
- sha256 =
- "31d1cc267cf48e3db8ce00b7a7bb6ced41c04d8f3593a61318f9a7f721997f6e";
- };
- beamDeps = [ cowboy_1_0_4 ];
-
- meta = {
- description = ''A specification and conveniences for composable
- modules between web applications'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/elixir-lang/plug";
- };
- } // packageOverrides)
- ) {};
-
- plug_1_1_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, cowboy_1_0_4 }:
- buildMix ({
- name = "plug";
- version = "1.1.5";
- src = fetchHex {
- pkg = "plug";
- version = "1.1.5";
- sha256 =
- "706871cb3d66c8c44cad4bceaa1f500eba34d5400450b9d63163d9dd4de88d3d";
- };
- beamDeps = [ cowboy_1_0_4 ];
-
- meta = {
- description = ''A specification and conveniences for composable
- modules between web applications'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/elixir-lang/plug";
- };
- } // packageOverrides)
- ) {};
-
- plug = plug_1_1_5;
-
- plug_accept_language_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "plug_accept_language";
- version = "0.1.0";
- src = fetchHex {
- pkg = "plug_accept_language";
- version = "0.1.0";
- sha256 =
- "5535c842805ba980f3bf5fa5cde202fd3375c049e3681e206de1976c5765765a";
- };
-
- meta = {
- description = ''parse the accept-language header'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/plug_accept_language";
- };
- } // packageOverrides)
- ) {};
-
- plug_accept_language = plug_accept_language_0_1_0;
-
- plug_accesslog_0_11_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- tzdata_0_5_8,
- timex_2_1_6,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "plug_accesslog";
- version = "0.11.0";
- src = fetchHex {
- pkg = "plug_accesslog";
- version = "0.11.0";
- sha256 =
- "86ee180fd234a3c6d413153764f2a9e2d57171d3e89df2643a276b8760bcc867";
- };
- beamDeps = [ tzdata_0_5_8 timex_2_1_6 plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''Plug for writing access logs'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/mneudert/plug_accesslog";
- };
- } // packageOverrides)
- ) {};
-
- plug_accesslog = plug_accesslog_0_11_0;
-
- plug_assign_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_0_3 }:
- buildMix ({
- name = "plug_assign";
- version = "1.0.0";
- src = fetchHex {
- pkg = "plug_assign";
- version = "1.0.0";
- sha256 =
- "293a2885e8d23fce64b9f81019882e14512d57cf82b863f9be860157e5f79708";
- };
- beamDeps = [ plug_1_0_3 ];
-
- meta = {
- description = ''A simple plug to allow setting variables in a
- connection.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nshafer/plug_assign";
- };
- } // packageOverrides)
- ) {};
-
- plug_assign = plug_assign_1_0_0;
-
- plug_cloudflare_1_3_0 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5, cidr_1_0_0
- }:
- buildMix ({
- name = "plug_cloudflare";
- version = "1.3.0";
- src = fetchHex {
- pkg = "plug_cloudflare";
- version = "1.3.0";
- sha256 =
- "641df2e40267446172c43b2f52dd9a1cbcd1f24dccd101bda29732a13335ab21";
- };
- beamDeps = [ plug_1_1_5 cidr_1_0_0 ];
-
- meta = {
- description = ''Convert CloudFlare`s CF-Connecting-IP header to
- Plug.Conn`s remote_ip field.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/c-rack/plug_cloudflare";
- };
- } // packageOverrides)
- ) {};
-
- plug_cloudflare = plug_cloudflare_1_3_0;
-
- plug_forwarded_peer_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "plug_forwarded_peer";
- version = "0.0.2";
- src = fetchHex {
- pkg = "plug_forwarded_peer";
- version = "0.0.2";
- sha256 =
- "c2466e0f0ef75a0d925a957fa50dfcded2c4788fe67857a675411e7184ae5ec3";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- longDescription = ''Very simple plug which reads
- `X-Forwarded-For` or `Forwarded` header
- according to rfc7239 and fill `conn.remote_ip`
- with the root client ip.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/awetzel/plug_forwarded_peer";
- };
- } // packageOverrides)
- ) {};
-
- plug_forwarded_peer = plug_forwarded_peer_0_0_2;
-
- plug_fprof_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "plug_fprof";
- version = "0.0.1";
- src = fetchHex {
- pkg = "plug_fprof";
- version = "0.0.1";
- sha256 =
- "4c5e6171ab7ebb29b6d473f8c5fd758a11ade5847d31add676c944a302ab006c";
- };
-
- meta = {
- description = ''A Plug that adds fprof tracing to requests, to
- allow for easy profiling.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/obmarg/plug_fprof";
- };
- } // packageOverrides)
- ) {};
-
- plug_fprof = plug_fprof_0_0_1;
-
- plug_geoip2_0_4_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- geolix_0_10_1
- }:
- buildMix ({
- name = "plug_geoip2";
- version = "0.4.2";
- src = fetchHex {
- pkg = "plug_geoip2";
- version = "0.4.2";
- sha256 =
- "2a6443040e07e677b0ff7749d2cdf7797a97254466f6740aee11544a18f4993a";
- };
- beamDeps = [ plug_1_1_5 geolix_0_10_1 ];
-
- meta = {
- longDescription = ''Adds geo location to a Plug connection based
- upon the client IP address by using MaxMind`s
- GeoIP2 database.'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- plug_geoip2 = plug_geoip2_0_4_2;
-
- plug_heartbeat_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "plug_heartbeat";
- version = "0.2.0";
- src = fetchHex {
- pkg = "plug_heartbeat";
- version = "0.2.0";
- sha256 =
- "23cb357dad510695b6bb339fdbf5d3fc8581546124f7389d63c9cf723e4ad40f";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''A tiny plug for responding to heartbeat requests
- '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/whatyouhide/plug_heartbeat";
- };
- } // packageOverrides)
- ) {};
-
- plug_heartbeat = plug_heartbeat_0_2_0;
-
- plug_media_type_router_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "plug_media_type_router";
- version = "0.0.2";
- src = fetchHex {
- pkg = "plug_media_type_router";
- version = "0.0.2";
- sha256 =
- "e5f72ee4fd1a43321532e3165b3609a1184ba2d576279a1a63e17afba084f12b";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- longDescription = ''An Elixir Plug for routing requests to other
- Plugs based on the request`s Media Type'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/cazrin/plug_media_type_router";
- };
- } // packageOverrides)
- ) {};
-
- plug_media_type_router = plug_media_type_router_0_0_2;
-
- plug_pagecache_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "plug_pagecache";
- version = "0.2.0";
- src = fetchHex {
- pkg = "plug_pagecache";
- version = "0.2.0";
- sha256 =
- "8f33202de45d772dd1f416a10d43f8e2daabf937d459e010fa9c850834e1877f";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''Plug for full page response caching'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/mneudert/plug_pagecache";
- };
- } // packageOverrides)
- ) {};
-
- plug_pagecache = plug_pagecache_0_2_0;
-
- plug_rails_cookie_session_store_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "plug_rails_cookie_session_store";
- version = "0.1.0";
- src = fetchHex {
- pkg = "plug_rails_cookie_session_store";
- version = "0.1.0";
- sha256 =
- "e08041d2ad4884826d8296a5560609df04a936ceca492d094f06458699ac69da";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''Rails compatible Plug session store'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/cconstantin/plug_rails_cookie_session_store";
- };
- } // packageOverrides)
- ) {};
-
- plug_rails_cookie_session_store =
- plug_rails_cookie_session_store_0_1_0;
-
- plug_range_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "plug_range";
- version = "0.0.2";
- src = fetchHex {
- pkg = "plug_range";
- version = "0.0.2";
- sha256 =
- "0dbe3c166e01180913f07a5e4c46cd9427f3e797dd7be515871631b0ed60b9eb";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''An elixir plug that serves HTTP range requests'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/TheSquad/plug_range";
- };
- } // packageOverrides)
- ) {};
-
- plug_range = plug_range_0_0_2;
-
- plug_redirect_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "plug_redirect";
- version = "0.1.2";
- src = fetchHex {
- pkg = "plug_redirect";
- version = "0.1.2";
- sha256 =
- "f5fb2653ed39cf843bcc3cb13ba2bf547b1f66ef7c24f963551acd0b8e1c4705";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''A plug builder for redirecting requests.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lpil/plug-redirect";
- };
- } // packageOverrides)
- ) {};
-
- plug_redirect = plug_redirect_0_1_2;
-
- plug_redirect_https_0_0_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "plug_redirect_https";
- version = "0.0.6";
- src = fetchHex {
- pkg = "plug_redirect_https";
- version = "0.0.6";
- sha256 =
- "73f1b3172183005f0fb59a43c50a94a708c06ffcc35a7387967d87e001369068";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''Plug to redirect http requests to https requests
- behind a reverse proxy'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/stocks29/plug_redirect_https.git";
- };
- } // packageOverrides)
- ) {};
-
- plug_redirect_https = plug_redirect_https_0_0_6;
-
- plug_require_header_0_8_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- plug_1_1_5
- }:
- buildMix ({
- name = "plug_require_header";
- version = "0.8.0";
- src = fetchHex {
- pkg = "plug_require_header";
- version = "0.8.0";
- sha256 =
- "b721158316f6d2efd4b24bd05a8a1c06caa699ee25249185c8c4f03f9204b283";
- };
- beamDeps = [ poison_1_5_2 plug_1_1_5 ];
-
- meta = {
- description = ''An Elixir Plug for requiring and extracting a
- given header.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/DevL/plug_require_header";
- };
- } // packageOverrides)
- ) {};
-
- plug_require_header = plug_require_header_0_8_0;
-
- plug_response_header_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "plug_response_header";
- version = "0.2.1";
- src = fetchHex {
- pkg = "plug_response_header";
- version = "0.2.1";
- sha256 =
- "82fd11fc70d925ed5a608ac13a9f604a80e24827f6603999d6a0f3f123862048";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''This plug allows manipulation of HTTP response
- headers'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/c-rack/plug_response_header";
- };
- } // packageOverrides)
- ) {};
-
- plug_response_header = plug_response_header_0_2_1;
-
- plug_ribbon_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "plug_ribbon";
- version = "0.2.1";
- src = fetchHex {
- pkg = "plug_ribbon";
- version = "0.2.1";
- sha256 =
- "34fcbffb6fc3adde6bb167506934ab19787d2fff82b6bf93918e0000159bfe9d";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''Injects a ribbon to your web application
- depending on the environment'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://git.io/plug_ribbon";
- };
- } // packageOverrides)
- ) {};
-
- plug_ribbon = plug_ribbon_0_2_1;
-
- plug_runtime_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "plug_runtime";
- version = "1.0.0";
- src = fetchHex {
- pkg = "plug_runtime";
- version = "1.0.0";
- sha256 =
- "58e213a40fe339771ab93520da56c2108488cfd9e99c7e92def367567ce225a7";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- longDescription = ''A simple Plug to measure the runtime of a
- request. Results will be in the X-Runtime
- header.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/mje113/plug_runtime";
- };
- } // packageOverrides)
- ) {};
-
- plug_runtime = plug_runtime_1_0_0;
-
- plug_statsd_0_4_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- ex_statsd_0_5_3
- }:
- buildMix ({
- name = "plug_statsd";
- version = "0.4.1";
- src = fetchHex {
- pkg = "plug_statsd";
- version = "0.4.1";
- sha256 =
- "af3158b9d43101e39e22472fcea98180911298c92a735d5ff14dce309e5e30f2";
- };
- beamDeps = [ plug_1_1_5 ex_statsd_0_5_3 ];
-
- meta = {
- description = ''A (Phoenix) plug for sending request counts and
- response times to statsd'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jeffweiss/plug_statsd";
- };
- } // packageOverrides)
- ) {};
-
- plug_statsd = plug_statsd_0_4_1;
-
- plug_test_helpers_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_0_8_4,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "plug_test_helpers";
- version = "0.1.0";
- src = fetchHex {
- pkg = "plug_test_helpers";
- version = "0.1.0";
- sha256 =
- "f542d679a33d42147612164ade572fa973344b4550ffcbbb0ef540492c9e97fe";
- };
- beamDeps = [ plug_0_8_4 cowboy_1_0_4 ];
-
- meta = {
- description = ''Helpers to test your Plugs with ExUnit'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/xavier/plug_test_helpers";
- };
- } // packageOverrides)
- ) {};
-
- plug_test_helpers = plug_test_helpers_0_1_0;
-
- plug_utm_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "plug_utm";
- version = "0.0.2";
- src = fetchHex {
- pkg = "plug_utm";
- version = "0.0.2";
- sha256 =
- "d473d6b360f5a9189cee2a0f95c06ffb1cb9495a9bb8c729a631c2fa33ed5fc9";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''UTM tracking parameters to cookies'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/honeypotio/plug_utm";
- };
- } // packageOverrides)
- ) {};
-
- plug_utm = plug_utm_0_0_2;
-
- plug_wait1_0_1_5 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_3_1,
- plug_0_13_1,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "plug_wait1";
- version = "0.1.5";
- src = fetchHex {
- pkg = "plug_wait1";
- version = "0.1.5";
- sha256 =
- "33d45e8c5dba4b9639c115b079581954877184c2c7ab394b80514cfd4199bb15";
- };
- beamDeps = [ poison_1_3_1 plug_0_13_1 cowboy_1_0_4 ];
-
- meta = {
- description = ''Plug adapter for the wait1 protocol'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/wait1/plug_wait1";
- };
- } // packageOverrides)
- ) {};
-
- plug_wait1 = plug_wait1_0_1_5;
-
- plug_x_forwarded_for_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "plug_x_forwarded_for";
- version = "0.1.0";
- src = fetchHex {
- pkg = "plug_x_forwarded_for";
- version = "0.1.0";
- sha256 =
- "7a12dff0f850855ae85d70ed0e71aff5ec55dad6c52fc46d6ba21119e6183b33";
- };
-
- meta = {
- description = ''x-forwarded-for plug middleware'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/plug_x_forwarded_for";
- };
- } // packageOverrides)
- ) {};
-
- plug_x_forwarded_for = plug_x_forwarded_for_0_1_0;
-
- plugin_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "plugin";
- version = "0.1.0";
- src = fetchHex {
- pkg = "plugin";
- version = "0.1.0";
- sha256 =
- "f596a2e9e14081884a841d1805e024d435c6a27e5e38b9c64214017659560fad";
- };
-
- meta = {
- longDescription = ''Like Plug, only without web-specific logic
- and without a typed Conn-datastructure'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ruby2elixir/plugin";
- };
- } // packageOverrides)
- ) {};
-
- plugin = plugin_0_1_0;
-
- plugs_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "plugs";
- version = "0.1.1";
- src = fetchHex {
- pkg = "plugs";
- version = "0.1.1";
- sha256 =
- "d11f4122bcd3fd83ac1b442ebf908ebb1f1ad535fa305446c90cf2ce51222c07";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''A collection of Plug middleware for web
- applications'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sugar-framework/plugs";
- };
- } // packageOverrides)
- ) {};
-
- plugs = plugs_0_1_1;
-
- plugsnag_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, bugsnag_1_2_0 }:
- buildMix ({
- name = "plugsnag";
- version = "1.1.0";
- src = fetchHex {
- pkg = "plugsnag";
- version = "1.1.0";
- sha256 =
- "aa3a9e587042f5519d8309fc4cf764a0262eda0da752ddf87c5fcfea176208ad";
- };
- beamDeps = [ bugsnag_1_2_0 ];
-
- meta = {
- description = ''Bugsnag reporter for Elixir`s Plug'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jarednorman/plugsnag";
- };
- } // packageOverrides)
- ) {};
-
- plugsnag = plugsnag_1_1_0;
-
- plumber_girl_0_9_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "plumber_girl";
- version = "0.9.6";
- src = fetchHex {
- pkg = "plumber_girl";
- version = "0.9.6";
- sha256 =
- "2a9faf9980cae59e11a6f9cf151a634cd809de220293bbbaba849f216c247a45";
- };
-
- meta = {
- description = ''PlumberGirl takes care of your Elixir piping
- issues!'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ruby2elixir/plumber_girl";
- };
- } // packageOverrides)
- ) {};
-
- plumber_girl = plumber_girl_0_9_6;
-
- pmbag_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "pmbag";
- version = "1.0.0";
- src = fetchHex {
- pkg = "pmbag";
- version = "1.0.0";
- sha256 =
- "9f12262ac93faf29c00e3da5f5836086542fbcfa0539bf733ab3e5cca0d34872";
- };
-
- meta = {
- description = ''Erlang Private Mail Bag.'';
- license = stdenv.lib.licenses.mpl20;
- homepage = "https://github.com/potatosalad/pmbag";
- };
- } // packageOverrides)
- ) {};
-
- pmbag = pmbag_1_0_0;
-
- pobox_1_0_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "pobox";
- version = "1.0.2";
- src = fetchHex {
- pkg = "pobox";
- version = "1.0.2";
- sha256 =
- "372090633c2565cd645acf2d1e2354c0791d5a5dc2f74885795b8807d402fe88";
- };
-
- meta = {
- description = ''External buffer processes to protect against
- mailbox overflow'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ferd/pobox/";
- };
- } // packageOverrides)
- ) {};
-
- pobox = pobox_1_0_2;
-
- pocketeer_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "pocketeer";
- version = "0.1.1";
- src = fetchHex {
- pkg = "pocketeer";
- version = "0.1.1";
- sha256 =
- "886367d81a41a7668805e06877aedfa1b9b4f1506ef1b42e95a4b3bf722d8e76";
- };
- beamDeps = [ poison_2_1_0 httpotion_2_2_2 ];
-
- meta = {
- description = ''An Elixir client for the Pocket API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://www.github.com/justahero/pocketeer";
- };
- } // packageOverrides)
- ) {};
-
- pocketeer = pocketeer_0_1_1;
-
- pocketex_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_3_1,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "pocketex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "pocketex";
- version = "0.1.0";
- sha256 =
- "b832df8e3f3102b69892cc5cfab4418de876a6ecc5780805458b9946aa407cbf";
- };
- beamDeps = [ poison_1_3_1 httpoison_0_8_3 ];
-
- meta = {
- description = ''Pocketex is an Elixir client for the Pocket read
- later service (getpocket.com) '';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/essenciary/pocketex";
- };
- } // packageOverrides)
- ) {};
-
- pocketex = pocketex_0_1_0;
-
- poison_1_3_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "poison";
- version = "1.3.1";
- src = fetchHex {
- pkg = "poison";
- version = "1.3.1";
- sha256 =
- "fbd78dd3e5abbadc17ddd89905002f6d20a03046f7555a6098d28a9f14feaf58";
- };
-
- meta = {
- description = ''An incredibly fast, pure Elixir JSON library'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/devinus/poison";
- };
- } // packageOverrides)
- ) {};
-
- poison_1_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "poison";
- version = "1.4.0";
- src = fetchHex {
- pkg = "poison";
- version = "1.4.0";
- sha256 =
- "b2715aaeb9f549f4e30739d43993e3c1b1053a4ed69d50c660621bdd1eb96606";
- };
-
- meta = {
- description = ''An incredibly fast, pure Elixir JSON library'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/devinus/poison";
- };
- } // packageOverrides)
- ) {};
-
- poison_1_5_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "poison";
- version = "1.5.0";
- src = fetchHex {
- pkg = "poison";
- version = "1.5.0";
- sha256 =
- "a31ffdaf77494ff12d6c2c9cb03235d4373596d2faf62ee5b99c1ae479618400";
- };
-
- meta = {
- description = ''An incredibly fast, pure Elixir JSON library'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/devinus/poison";
- };
- } // packageOverrides)
- ) {};
-
- poison_1_5_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "poison";
- version = "1.5.2";
- src = fetchHex {
- pkg = "poison";
- version = "1.5.2";
- sha256 =
- "4afc59dcadf71be7edc8b934b39f554ec7b31e2b1b1a4767383a663f86958ce3";
- };
-
- meta = {
- description = ''An incredibly fast, pure Elixir JSON library'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/devinus/poison";
- };
- } // packageOverrides)
- ) {};
-
- poison_2_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "poison";
- version = "2.0.1";
- src = fetchHex {
- pkg = "poison";
- version = "2.0.1";
- sha256 =
- "7f34906a0839f3b49b9b7647461c5144787611f599e8d743214280761699df2b";
- };
-
- meta = {
- description = ''An incredibly fast, pure Elixir JSON library'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/devinus/poison";
- };
- } // packageOverrides)
- ) {};
-
- poison_2_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "poison";
- version = "2.1.0";
- src = fetchHex {
- pkg = "poison";
- version = "2.1.0";
- sha256 =
- "002caaf939b97c84533ef0f621d3ed414ed703fcd03c91ec0dd62043df102c63";
- };
-
- meta = {
- description = ''An incredibly fast, pure Elixir JSON library'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/devinus/poison";
- };
- } // packageOverrides)
- ) {};
-
- poison = poison_2_1_0;
-
- poker_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "poker";
- version = "0.0.2";
- src = fetchHex {
- pkg = "poker";
- version = "0.0.2";
- sha256 =
- "9599ef62b0a2e1b15ff2697cb1603dd7be00911d8a613e1d01cfdf8c8b5d63b3";
- };
-
- meta = {
- description = ''An Elixir library to work with Poker hands.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/wojtekmach/poker_elixir";
- };
- } // packageOverrides)
- ) {};
-
- poker = poker_0_0_2;
-
- poloniex_0_0_8 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- vex_0_5_5,
- poison_2_1_0,
- httpoison_0_8_3,
- exconstructor_1_0_2
- }:
- buildMix ({
- name = "poloniex";
- version = "0.0.8";
- src = fetchHex {
- pkg = "poloniex";
- version = "0.0.8";
- sha256 =
- "7890a5f26178ec224379fa4160092d55f9098131eaab8711a75ef1fe6808cc83";
- };
- beamDeps = [
- vex_0_5_5
- poison_2_1_0
- httpoison_0_8_3
- exconstructor_1_0_2
- ];
-
- meta = {
- longDescription = ''WIP Poloniex API wrapper for Elixir. Provides
- access to market data including trading pairs
- between ETH, BTC, DOGE, LTC and others.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/cyberpunk-ventures/poloniex_ex";
- };
- } // packageOverrides)
- ) {};
-
- poloniex = poloniex_0_0_8;
-
- poly1305_0_4_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- equivalex_0_1_0,
- chacha20_0_3_2
- }:
- buildMix ({
- name = "poly1305";
- version = "0.4.1";
- src = fetchHex {
- pkg = "poly1305";
- version = "0.4.1";
- sha256 =
- "b0f804a21e3c1f57cd37b6e439107a1eaf8d7a2404717fb95d21eb3f134973bb";
- };
- beamDeps = [ equivalex_0_1_0 chacha20_0_3_2 ];
-
- meta = {
- description = ''Poly1305 message authentication'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/poly1305_ex";
- };
- } // packageOverrides)
- ) {};
-
- poly1305 = poly1305_0_4_1;
-
- polyglot_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "polyglot";
- version = "0.0.1";
- src = fetchHex {
- pkg = "polyglot";
- version = "0.0.1";
- sha256 =
- "83aaf990f322ea5c314b469932e87db7175374b0e0b28d078defba60dca0fb78";
- };
-
- meta = {
- longDescription = ''Polyglot is a localization library for Elixir
- that provides reusable formatting rules and
- translations for a large number of languages.'';
- license = with stdenv.lib.licenses; [ mit free ];
- homepage = "https://github.com/padde/polyglot";
- };
- } // packageOverrides)
- ) {};
-
- polyglot = polyglot_0_0_1;
-
- polyline_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, vector_0_3_0 }:
- buildMix ({
- name = "polyline";
- version = "0.1.0";
- src = fetchHex {
- pkg = "polyline";
- version = "0.1.0";
- sha256 =
- "6df2ebd1a5f55d6f680924200175bc5473beadd013acec72d201fcec18d31afd";
- };
- beamDeps = [ vector_0_3_0 ];
-
- meta = {
- description = ''Encoding and decoding of Polylines'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pkinney/polyline_ex";
- };
- } // packageOverrides)
- ) {};
-
- polyline = polyline_0_1_0;
-
- polyvox_id3_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "polyvox_id3";
- version = "0.2.1";
- src = fetchHex {
- pkg = "polyvox_id3";
- version = "0.2.1";
- sha256 =
- "2bb3e3b9edde6630160857563c992f7e9ea56d11d263172c95161b4275f6b48c";
- };
-
- meta = {
- description = ''A podcast-centric ID3 library for parsing and
- writing ID3 tags.'';
- license = stdenv.lib.licenses.gpl3;
- homepage = "https://github.com/polyvox/polyvox_id3";
- };
- } // packageOverrides)
- ) {};
-
- polyvox_id3 = polyvox_id3_0_2_1;
-
- pool_ring_0_1_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pool_ring";
- version = "0.1.5";
- src = fetchHex {
- pkg = "pool_ring";
- version = "0.1.5";
- sha256 =
- "a5d965379d8cb05e772e606951ba1b33c45b58a0809ba9f44eff453ea43068ce";
- };
-
- meta = {
- description = ''create a pool based on a hash ring'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/pool_ring";
- };
- } // packageOverrides)
- ) {};
-
- pool_ring = pool_ring_0_1_5;
-
- pool_sup_0_2_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, croma_0_4_4 }:
- buildMix ({
- name = "pool_sup";
- version = "0.2.2";
- src = fetchHex {
- pkg = "pool_sup";
- version = "0.2.2";
- sha256 =
- "73cebc2ad393a7ef92c6787b8b581051ddc299372d25bc1175d94dee0ec28e90";
- };
- beamDeps = [ croma_0_4_4 ];
-
- meta = {
- description = ''A supervisor specialized to manage pool of
- workers'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- pool_sup = pool_sup_0_2_2;
-
- poolboy_1_4_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "poolboy";
- version = "1.4.1";
- src = fetchHex {
- pkg = "poolboy";
- version = "1.4.1";
- sha256 =
- "b112f2bfa13010f751ecc013f74af0601eb41315bb0ccfa5eed641d73fbbe899";
- };
-
- meta = {
- description = ''A hunky Erlang worker pool factory'';
- license = with stdenv.lib.licenses; [ unlicense asl20 ];
- homepage = "https://github.com/devinus/poolboy";
- };
- } // packageOverrides)
- ) {};
-
- poolboy_1_4_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "poolboy";
- version = "1.4.2";
- src = fetchHex {
- pkg = "poolboy";
- version = "1.4.2";
- sha256 =
- "6133b67251080f32ffed4f71913cd2998fd6f02fa076677aadf7278b62853938";
- };
-
- meta = {
- description = ''A hunky Erlang worker pool factory'';
- license = with stdenv.lib.licenses; [ unlicense asl20 ];
- homepage = "https://github.com/devinus/poolboy";
- };
- } // packageOverrides)
- ) {};
-
- poolboy_1_5_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "poolboy";
- version = "1.5.1";
- src = fetchHex {
- pkg = "poolboy";
- version = "1.5.1";
- sha256 =
- "8f7168911120e13419e086e78d20e4d1a6776f1eee2411ac9f790af10813389f";
- };
-
- meta = {
- description = ''A hunky Erlang worker pool factory'';
- license = with stdenv.lib.licenses; [ unlicense asl20 ];
- homepage = "https://github.com/devinus/poolboy";
- };
- } // packageOverrides)
- ) {};
-
- poolboy = poolboy_1_5_1;
-
- pooler_1_5_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "pooler";
- version = "1.5.0";
- src = fetchHex {
- pkg = "pooler";
- version = "1.5.0";
- sha256 =
- "f493b4b947967fa4250dd1f96e86a5440ecab51da114d2c256cced58ad991908";
- };
-
- meta = {
- description = ''An OTP Process Pool Application'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/seth/pooler";
- };
- } // packageOverrides)
- ) {};
-
- pooler = pooler_1_5_0;
-
- pop3mail_0_1_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pop3mail";
- version = "0.1.6";
- src = fetchHex {
- pkg = "pop3mail";
- version = "0.1.6";
- sha256 =
- "ca8496c92a3c0caa479836f254980c2af69a66a29e08cea45a164874801c54da";
- };
-
- meta = {
- longDescription = ''Pop3 client to download email (including
- attachments) from the inbox. Decodes multipart
- content, quoted-printables, base64 and
- encoded-words. Uses an Erlang pop3 client with
- SSL support derived from the epop package. Add
- this dependency in mix.exs: {:erlpop, github:
- \"trifork/erlpop\"}'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nico-amsterdam/pop3mail";
- };
- } // packageOverrides)
- ) {};
-
- pop3mail = pop3mail_0_1_6;
-
- populator_0_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "populator";
- version = "0.4.0";
- src = fetchHex {
- pkg = "populator";
- version = "0.4.0";
- sha256 =
- "4f2b2720676db740139ebd69ca0c26b111721d7d049f185f0e5a50cfca18085d";
- };
-
- meta = {
- description = ''Supervisor population control library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rubencaro/populator";
- };
- } // packageOverrides)
- ) {};
-
- populator = populator_0_4_0;
-
- porcelain_2_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "porcelain";
- version = "2.0.1";
- src = fetchHex {
- pkg = "porcelain";
- version = "2.0.1";
- sha256 =
- "dbe57a57c3917654694ea6be7e756e26345a59d2974fe6ec861a71f469767ad9";
- };
-
- meta = {
- longDescription = ''Porcelain implements a saner approach to
- launching and communicating with external OS
- processes from Elixir. Built on top of Erlang`s
- ports, it provides richer functionality and
- simpler API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/alco/porcelain";
- };
- } // packageOverrides)
- ) {};
-
- porcelain = porcelain_2_0_1;
-
- porter_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "porter";
- version = "0.0.1";
- src = fetchHex {
- pkg = "porter";
- version = "0.0.1";
- sha256 =
- "81ef97a1d6eb495b6a919cdaae4268a49a3591903424d4ed00f67104d09e89dd";
- };
-
- meta = {
- longDescription = ''Porter provides an OTP application that runs
- the specified system command using the Erlang
- Port library and then streams the results back
- to you.'';
-
- };
- } // packageOverrides)
- ) {};
-
- porter = porter_0_0_1;
-
- posexional_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "posexional";
- version = "0.2.1";
- src = fetchHex {
- pkg = "posexional";
- version = "0.2.1";
- sha256 =
- "c3cedc2c99ed10c400be538e558fcb09cdb675d972d3f5deb33d4029b916da82";
- };
-
- meta = {
- description = ''A library to manage positional files'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/primait/posexional";
- };
- } // packageOverrides)
- ) {};
-
- posexional = posexional_0_2_1;
-
- positive_13_3_7 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "positive";
- version = "13.3.7";
- src = fetchHex {
- pkg = "positive";
- version = "13.3.7";
- sha256 =
- "516964039cbae4e64226d9e50787f32134f3411bc0ae8cedf26488ba004616be";
- };
-
- meta = {
- description = ''Library: check if an integer is positive'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jlouis/positive";
- };
- } // packageOverrides)
- ) {};
-
- positive = positive_13_3_7;
-
- postgrex_0_9_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_2 }:
- buildMix ({
- name = "postgrex";
- version = "0.9.1";
- src = fetchHex {
- pkg = "postgrex";
- version = "0.9.1";
- sha256 =
- "9c9a4ffca145479b343d7a51730557305425aab69e8d31cc32f348f85996fb5a";
- };
- beamDeps = [ decimal_1_1_2 ];
-
- meta = {
- description = ''PostgreSQL driver for Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/ericmj/postgrex";
- };
- } // packageOverrides)
- ) {};
-
- pot_0_9_4 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "pot";
- version = "0.9.4";
- src = fetchHex {
- pkg = "pot";
- version = "0.9.4";
- sha256 =
- "ba6814a8e2be50d64ee65612cf627aba4784555054c22ac5066e6543f349887c";
- };
-
- meta = {
- longDescription = ''POT is an Erlang library for generating
- Google Authenticator compatible one time
- passwords.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/yuce/pot";
- };
- } // packageOverrides)
- ) {};
-
- pot = pot_0_9_4;
-
- power_assert_0_0_8 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "power_assert";
- version = "0.0.8";
- src = fetchHex {
- pkg = "power_assert";
- version = "0.0.8";
- sha256 =
- "b4e1d27ab8e05f01d458ba84c4caced1f9b0209b3178dfcf4334e857a8aa6cd0";
- };
-
- meta = {
- description = ''Power Assert in Elixir. Shows evaluation results
- each expression.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/ma2gedev/power_assert_ex";
- };
- } // packageOverrides)
- ) {};
-
- power_assert = power_assert_0_0_8;
-
- ppg_0_1_3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, evel_0_1_1 }:
- buildRebar3 ({
- name = "ppg";
- version = "0.1.3";
- src = fetchHex {
- pkg = "ppg";
- version = "0.1.3";
- sha256 =
- "8bbd51b5c1f2e08636839ad6f6151b3ad2a5c46e3fe8bdb1f33f79a2b57d1e13";
- };
-
- beamDeps = [ evel_0_1_1 ];
-
- meta = {
- description = ''Plumtree based Process Group'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sile/ppg";
- };
- } // packageOverrides)
- ) {};
-
- ppg = ppg_0_1_3;
-
- pqueue_1_5_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "pqueue";
- version = "1.5.1";
- src = fetchHex {
- pkg = "pqueue";
- version = "1.5.1";
- sha256 =
- "7ba01afe6b50ea4b239fa770f9e2c2db4871b3927ac44aea180d1fd52601b317";
- };
-
- meta = {
- description = ''Erlang Priority Queue Implementation'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/okeuday/pqueue";
- };
- } // packageOverrides)
- ) {};
-
- pqueue = pqueue_1_5_1;
-
- pragmatic_0_1_7 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pragmatic";
- version = "0.1.7";
- src = fetchHex {
- pkg = "pragmatic";
- version = "0.1.7";
- sha256 =
- "a86e89bf594108715bf7db70ccb93eb2a020367a9bb6c441ca74d3eb92c35fa3";
- };
-
- meta = {
- longDescription = ''A small, simple library to deal with the
- practical issues arising from using Elixir on
- Windows'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/OnorioCatenacci/pragmatic";
- };
- } // packageOverrides)
- ) {};
-
- pragmatic = pragmatic_0_1_7;
-
- prefecture_jp_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "prefecture_jp";
- version = "0.0.2";
- src = fetchHex {
- pkg = "prefecture_jp";
- version = "0.0.2";
- sha256 =
- "ffc29fc76ee098b5f6c7c93db3736916cc23b0ace424dd8c0f946570aeb75c22";
- };
-
- meta = {
- description = ''PrefectureJp is a library for Japanese
- prefecture.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ymmtmsys/prefecture_jp";
- };
- } // packageOverrides)
- ) {};
-
- prefecture_jp = prefecture_jp_0_0_2;
-
- prelude_0_0_1 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, etude_1_0_0_beta_0
- }:
- buildMix ({
- name = "prelude";
- version = "0.0.1";
- src = fetchHex {
- pkg = "prelude";
- version = "0.0.1";
- sha256 =
- "805c5a43a043864b4793f4aeff574b88e9eaac18e49d93cb71cbd6270283bde9";
- };
- beamDeps = [ etude_1_0_0_beta_0 ];
-
- meta = {
- description = ''a preprocessor/compiler toolset for erlang and
- elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/prelude";
- };
- } // packageOverrides)
- ) {};
-
- prelude = prelude_0_0_1;
-
- presentex_0_0_10 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "presentex";
- version = "0.0.10";
- src = fetchHex {
- pkg = "presentex";
- version = "0.0.10";
- sha256 =
- "86479a0b79146dadc3f224d2023d06d7f4f87fd455a3267bbd11759ebde1404c";
- };
-
- meta = {
- description = ''An Elixir -> HTML/JavaScript presentation
- generation tool. '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/Cobenian/Presentex";
- };
- } // packageOverrides)
- ) {};
-
- presentex = presentex_0_0_10;
-
- pretty_hex_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pretty_hex";
- version = "0.0.1";
- src = fetchHex {
- pkg = "pretty_hex";
- version = "0.0.1";
- sha256 =
- "ab91a38480049af4811ffdaf15dbee9370acb9b20cdc870281d2006a8fe928b4";
- };
-
- meta = {
- description = ''A binary hex dumping library in Elixir. '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/polsab/pretty_hex";
- };
- } // packageOverrides)
- ) {};
-
- pretty_hex = pretty_hex_0_0_1;
-
- pricing_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_1_0_2,
- porcelain_2_0_1
- }:
- buildMix ({
- name = "pricing";
- version = "0.0.1";
- src = fetchHex {
- pkg = "pricing";
- version = "0.0.1";
- sha256 =
- "82e0438611507f600bd799c986872588f88627fdcf7a15d4031d779c9d1cd4d7";
- };
- beamDeps = [ timex_1_0_2 porcelain_2_0_1 ];
-
- meta = {
- description = ''Pricing financial instruments in Elixir'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/arthurcolle/pricing";
- };
- } // packageOverrides)
- ) {};
-
- pricing = pricing_0_0_1;
-
- priority_queue_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "priority_queue";
- version = "1.0.0";
- src = fetchHex {
- pkg = "priority_queue";
- version = "1.0.0";
- sha256 =
- "ba3dc420a5898d863803455c05ad870c6b6f3adb12b50ebea6cd6aeed1b358b7";
- };
-
- meta = {
- description = ''Priority Queue for Elixir. Heap implementation'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/ewildgoose/elixir_priority_queue";
- };
- } // packageOverrides)
- ) {};
-
- priority_queue = priority_queue_1_0_0;
-
- progress_bar_1_5_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "progress_bar";
- version = "1.5.0";
- src = fetchHex {
- pkg = "progress_bar";
- version = "1.5.0";
- sha256 =
- "36fa99f89b876078a19f9d929dd74a043a5e34bbf8d62cda5d9cd26e2ce94426";
- };
-
- meta = {
- description = ''Command-line progress bars and spinners.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/henrik/progress_bar";
- };
- } // packageOverrides)
- ) {};
-
- progress_bar = progress_bar_1_5_0;
-
- project_info_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "project_info";
- version = "1.0.0";
- src = fetchHex {
- pkg = "project_info";
- version = "1.0.0";
- sha256 =
- "749553b710d363e5b900a6d3d37da7c461b8f7a977c9da814124f5862cf209a0";
- };
-
- meta = {
- longDescription = ''A mix task to get info about the current mix
- project such as name or version number. Useful
- to automate tasks using a CI server or a build
- script.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/nubleer/project_info";
- };
- } // packageOverrides)
- ) {};
-
- project_info = project_info_1_0_0;
-
- prometheus_0_2_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "prometheus";
- version = "0.2.0";
- src = fetchHex {
- pkg = "prometheus";
- version = "0.2.0";
- sha256 =
- "9fbf8aeee723667f86f1d24bbe2562a4db4322ef850d5d6cc353d15c54f64937";
- };
-
- meta = {
- description = ''Prometheus monitoring system and time series
- database client in Erlang.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/deadtrickster/prometheus.erl";
- };
- } // packageOverrides)
- ) {};
-
- prometheus = prometheus_0_2_0;
-
- prometheus_plugs_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- prometheus_0_2_0,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "prometheus_plugs";
- version = "0.0.3";
- src = fetchHex {
- pkg = "prometheus_plugs";
- version = "0.0.3";
- sha256 =
- "b15e425ba78e1c76368b66b22f5e22d283fa3cff26f3a4d45a2498cb5db6c0ff";
- };
- beamDeps = [ prometheus_0_2_0 plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- description = ''Prometheus monitoring system client Plugs. Http
- metrics collector and exporter'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/deadtrickster/prometheus-plugs";
- };
- } // packageOverrides)
- ) {};
-
- prometheus_plugs = prometheus_plugs_0_0_3;
-
- prop_types_0_0_11 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, tipo_0_0_3 }:
- buildMix ({
- name = "prop_types";
- version = "0.0.11";
- src = fetchHex {
- pkg = "prop_types";
- version = "0.0.11";
- sha256 =
- "d786fbef06701e21871f39c9c1bb3354966f24cd606d1b1fd7bff1cc97d2873f";
- };
- beamDeps = [ tipo_0_0_3 ];
-
- meta = {
- description = ''Property Type validations and checkers for elixir
- apps'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bakasho/prop_types";
- };
- } // packageOverrides)
- ) {};
-
- prop_types = prop_types_0_0_11;
-
- proper_case_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "proper_case";
- version = "0.1.1";
- src = fetchHex {
- pkg = "proper_case";
- version = "0.1.1";
- sha256 =
- "63c279ad8721fb91175f74a03584fda2baaea6f5d79d5e899dddfd934e924d8a";
- };
-
- meta = {
- longDescription = ''An Elixir library that converts keys in maps
- between `snake_case` and `camel_case`. Useful as
- a plug in Phoenix for converting incoming params
- from JavaScript`s `camelCase` to Elixir`s
- `snake_case`'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/johnnyji/proper_case";
- };
- } // packageOverrides)
- ) {};
-
- proper_case = proper_case_0_1_1;
-
- proplist_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "proplist";
- version = "1.1.0";
- src = fetchHex {
- pkg = "proplist";
- version = "1.1.0";
- sha256 =
- "6fc73362d15b4810f4979ddf72ec53c1efc020657a57b7cdd1f682bd38c08298";
- };
-
- meta = {
- description = ''Proplist provides the complete Keyword API, but
- for Proplists.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/knrz/proplist";
- };
- } // packageOverrides)
- ) {};
-
- proplist = proplist_1_1_0;
-
- proto_def_0_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- estree_2_3_0
- }:
- buildMix ({
- name = "proto_def";
- version = "0.0.4";
- src = fetchHex {
- pkg = "proto_def";
- version = "0.0.4";
- sha256 =
- "155b17cd62296cc1d5ee0333a87df4b25616a6dff7863a8e7ad219437db5a37e";
- };
- beamDeps = [ poison_2_1_0 estree_2_3_0 ];
-
- meta = {
- longDescription = ''ProtoDef compiler for Elixir. (mostly)
- Compatible with
- https://github.com/ProtoDef-io/ProtoDef.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ProtoDef-io/elixir-protodef";
- };
- } // packageOverrides)
- ) {};
-
- proto_def = proto_def_0_0_4;
-
- providers_1_4_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, getopt_0_8_2 }:
- buildRebar3 ({
- name = "providers";
- version = "1.4.1";
- src = fetchHex {
- pkg = "providers";
- version = "1.4.1";
- sha256 =
- "dfd88305670a3d942c08a2d852eeb4c20ec40ee2ba589339a48083ac74f14e36";
- };
-
- beamDeps = [ getopt_0_8_2 ];
-
- meta = {
- description = ''Providers provider.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tsloughter/providers";
- };
- } // packageOverrides)
- ) {};
-
- providers_1_6_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, getopt_0_8_2 }:
- buildRebar3 ({
- name = "providers";
- version = "1.6.0";
- src = fetchHex {
- pkg = "providers";
- version = "1.6.0";
- sha256 =
- "0f6876529a613d34224de8c61d3660388eb981142360f2699486d8536050ce2f";
- };
-
- beamDeps = [ getopt_0_8_2 ];
-
- meta = {
- description = ''Providers provider.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tsloughter/providers";
- };
- } // packageOverrides)
- ) {};
-
- providers = providers_1_6_0;
-
- proxy_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- httpoison_0_8_3,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "proxy";
- version = "0.0.1";
- src = fetchHex {
- pkg = "proxy";
- version = "0.0.1";
- sha256 =
- "74691b18a0918d6e14df1f254ee9f342a547bc280151a4d88a540839ae75bbae";
- };
- beamDeps = [ plug_1_1_5 httpoison_0_8_3 cowboy_1_0_4 ];
-
- meta = {
- description = ''Proxy plug for upstream servers'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/chadwpry/elixir-proxy";
- };
- } // packageOverrides)
- ) {};
-
- proxy = proxy_0_0_1;
-
- public_suffix_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, idna_2_0_0 }:
- buildMix ({
- name = "public_suffix";
- version = "0.3.0";
- src = fetchHex {
- pkg = "public_suffix";
- version = "0.3.0";
- sha256 =
- "ffced61dca1d881ed91b4c6ee675e707bd1dbff14adb48adebf0bebbaeccae48";
- };
- beamDeps = [ idna_2_0_0 ];
-
- meta = {
- longDescription = ''Operate on domain names using the public
- suffix rules provided by
- https://publicsuffix.org/.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/seomoz/publicsuffix-elixir";
- };
- } // packageOverrides)
- ) {};
-
- public_suffix = public_suffix_0_3_0;
-
- publicsuffix_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "publicsuffix";
- version = "0.0.1";
- src = fetchHex {
- pkg = "publicsuffix";
- version = "0.0.1";
- sha256 =
- "c20351c883ab00a424c6eace4adb23726fbf242240bc63f583f4c07cbe0a824b";
- };
-
- meta = {
- description = ''Domain name parser for Elixir based on the Public
- Suffix List.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/weppos/publicsuffix-elixir";
- };
- } // packageOverrides)
- ) {};
-
- publicsuffix = publicsuffix_0_0_1;
-
- pubnub_ex_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "pubnub_ex";
- version = "0.0.2";
- src = fetchHex {
- pkg = "pubnub_ex";
- version = "0.0.2";
- sha256 =
- "83d270cfe2be6728fb96d9145371a87ddc876a97f91cdca2584cc82c2a0b91cb";
- };
- beamDeps = [ httpoison_0_8_3 exjsx_3_2_0 ];
-
- meta = {
- description = ''A pubsub tool for pubnub.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ryuone/pubnub_ex";
- };
- } // packageOverrides)
- ) {};
-
- pubnub_ex = pubnub_ex_0_0_2;
-
- pubsub_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "pubsub";
- version = "0.0.2";
- src = fetchHex {
- pkg = "pubsub";
- version = "0.0.2";
- sha256 =
- "2072bf67d5d4b6d41c81f0e89697d72ca323c5640e883b0d0cec7d43cf6c8ae8";
- };
-
- meta = {
- description = ''Publish-Subscribe utility'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/simonewebdesign/elixir_pubsub";
- };
- } // packageOverrides)
- ) {};
-
- pubsub = pubsub_0_0_2;
-
- qdate_0_4_3 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- erlware_commons_0_20_0,
- erlang_localtime_1_0_0
- }:
- buildRebar3 ({
- name = "qdate";
- version = "0.4.3";
- src = fetchHex {
- pkg = "qdate";
- version = "0.4.3";
- sha256 =
- "0bbad4929a7cf2432c832fe45310080776c64973037c5b1aa21bbe05dbc61401";
- };
-
- beamDeps = [ erlware_commons_0_20_0 erlang_localtime_1_0_0 ];
-
- meta = {
- description = ''Simple Date and Timezone handling for Erlang'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/choptastic/qdate";
- };
- } // packageOverrides)
- ) {};
-
- qdate = qdate_0_4_3;
-
- qiita_ex_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "qiita_ex";
- version = "0.0.2";
- src = fetchHex {
- pkg = "qiita_ex";
- version = "0.0.2";
- sha256 =
- "0bb9a5535c0915c426ff13350b907cbd2b455bb99d8bcb8324ffadb6c9bcf1eb";
- };
- beamDeps = [ httpoison_0_8_3 exjsx_3_2_0 ];
-
- meta = {
- description = ''Qiita API v2 Interface for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ma2gedev/qiita_ex";
- };
- } // packageOverrides)
- ) {};
-
- qiita_ex = qiita_ex_0_0_2;
-
- qiniu_0_3_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "qiniu";
- version = "0.3.0";
- src = fetchHex {
- pkg = "qiniu";
- version = "0.3.0";
- sha256 =
- "f47360528cd289be5f5bb444d289e90f5f330a3230c9386f5a7aecd019a73081";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Qiniu Resource (Cloud) Storage SDK for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tony612/qiniu";
- };
- } // packageOverrides)
- ) {};
-
- qiniu = qiniu_0_3_0;
-
- qlc_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "qlc";
- version = "1.0.0";
- src = fetchHex {
- pkg = "qlc";
- version = "1.0.0";
- sha256 =
- "80df25fc032ced6f8c0c21df4099434db09d6de87ee32237719c776974ad15cc";
- };
-
- meta = {
- description = ''QLC interface for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/k1complete/qlc";
- };
- } // packageOverrides)
- ) {};
-
- qlc = qlc_1_0_0;
-
- quantum_1_7_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_2_1_6 }:
- buildMix ({
- name = "quantum";
- version = "1.7.1";
- src = fetchHex {
- pkg = "quantum";
- version = "1.7.1";
- sha256 =
- "55a74be6a021816fe78d9a4a9450281e027302806313c9fa6e51694d44106c0a";
- };
- beamDeps = [ timex_2_1_6 ];
-
- meta = {
- description = ''Cron-like job scheduler for Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/c-rack/quantum-elixir";
- };
- } // packageOverrides)
- ) {};
-
- quantum = quantum_1_7_1;
-
- quark_1_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "quark";
- version = "1.0.2";
- src = fetchHex {
- pkg = "quark";
- version = "1.0.2";
- sha256 =
- "c24950acc4d6f44aff612302871b2cff5f56d6b702285bc04e7b71179e5b13c7";
- };
-
- meta = {
- description = ''Common combinators for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/robot-overlord/quark";
- };
- } // packageOverrides)
- ) {};
-
- quark = quark_1_0_2;
-
- queue_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "queue";
- version = "0.0.1";
- src = fetchHex {
- pkg = "queue";
- version = "0.0.1";
- sha256 =
- "a383d4b4a64e7639e66f314ae9e38e387453bcce6c96173e3d90b497c82bed9b";
- };
-
- meta = {
- description = ''Elixir wrapper for erlang double sided FIFO
- queue'';
-
- };
- } // packageOverrides)
- ) {};
-
- queue = queue_0_0_1;
-
- queuex_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "queuex";
- version = "0.2.0";
- src = fetchHex {
- pkg = "queuex";
- version = "0.2.0";
- sha256 =
- "e40b25befc34ecff962c92536e6a520967dd2d6031cb70a58be62269a6aec623";
- };
-
- meta = {
- description = ''Priority Queue'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/falood/queuex";
- };
- } // packageOverrides)
- ) {};
-
- queuex = queuex_0_2_0;
-
- quickrand_1_5_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "quickrand";
- version = "1.5.1";
- src = fetchHex {
- pkg = "quickrand";
- version = "1.5.1";
- sha256 =
- "0b3dcc6ddb23319c1f6a5ed143778864b8ad2f0ebd693a2d121cf5ae0c4db507";
- };
-
- meta = {
- longDescription = ''Quick Random Number Generation: Provides a
- simple interface to call efficient random number
- generation functions based on the context.
- Proper random number seeding is enforced.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/okeuday/quickrand";
- };
- } // packageOverrides)
- ) {};
-
- quickrand = quickrand_1_5_1;
-
- quintana_0_2_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex, folsom_0_8_3 }:
- buildRebar3 ({
- name = "quintana";
- version = "0.2.1";
- src = fetchHex {
- pkg = "quintana";
- version = "0.2.1";
- sha256 =
- "d4683eb33c71f6cab3b17b896b4fa9180f17a0a8b086440bfe0c5675182f0194";
- };
-
- beamDeps = [ folsom_0_8_3 ];
-
- meta = {
- description = ''Wrapper around some Folsom functions'';
-
- };
- } // packageOverrides)
- ) {};
-
- quintana = quintana_0_2_1;
-
- ra_0_3_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ra";
- version = "0.3.2";
- src = fetchHex {
- pkg = "ra";
- version = "0.3.2";
- sha256 =
- "696cc4fd2dc1a36c705af7e7a1551bd054ad245841fccbc5d9d210f375c2dcf4";
- };
-
- meta = {
- description = ''Ra is a framework for building command line
- applications.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/NobbZ/ra";
- };
- } // packageOverrides)
- ) {};
-
- ra = ra_0_3_2;
-
- rabbitElixir_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exjsx_3_1_0 }:
- buildMix ({
- name = "rabbitElixir";
- version = "1.0.1";
- src = fetchHex {
- pkg = "rabbitElixir";
- version = "1.0.1";
- sha256 =
- "bc0ddae7fa0b869a6688db2e5d909d375ff0692a959aa768eed586bcfd2d0a2f";
- };
- beamDeps = [ exjsx_3_1_0 ];
-
- meta = {
- description = ''Another Zawgyi <=> Unicode Converter '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Rabbit-Converter/Rabbit-Elixir";
- };
- } // packageOverrides)
- ) {};
-
- rabbitElixir = rabbitElixir_1_0_1;
-
- rabbit_common_3_5_6 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "rabbit_common";
- version = "3.5.6";
- src = fetchHex {
- pkg = "rabbit_common";
- version = "3.5.6";
- sha256 =
- "9335ab3ebc4e8e140d7bc9b1b0e7ee99c0aa87d0a746b704184121ba35c04f1c";
- };
-
- meta = {
- longDescription = ''Includes modules which are a runtime
- dependency of the RabbitMQ/AMQP Erlang client
- and are common to the RabbitMQ server.'';
- license = stdenv.lib.licenses.mpl11;
- homepage = "https://github.com/jbrisbin/rabbit_common";
- };
- } // packageOverrides)
- ) {};
-
- rabbit_common = rabbit_common_3_5_6;
-
- rails_4_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "rails";
- version = "4.2.0";
- src = fetchHex {
- pkg = "rails";
- version = "4.2.0";
- sha256 =
- "731692769aa106a20c87b12dca15336fd1d16a7f02e2615ad76f6ce83a2b0b46";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- longDescription = ''A plug to get your plug/phoenix applications
- performance more in line with Rails.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/BlakeWilliams/rails";
- };
- } // packageOverrides)
- ) {};
-
- rails = rails_4_2_0;
-
- ralitobu_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ralitobu";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ralitobu";
- version = "0.1.0";
- sha256 =
- "c131ef38e9f9e438e7479ba34430c7c874d1646670d6636a8cc98db2f113d075";
- };
-
- meta = {
- description = ''The Rate Limiter with Token Bucket algorithm'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/asaaki/ralitobu";
- };
- } // packageOverrides)
- ) {};
-
- ralitobu = ralitobu_0_1_0;
-
- ralitobu_plug_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- ralitobu_0_1_0,
- plug_1_1_5
- }:
- buildMix ({
- name = "ralitobu_plug";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ralitobu_plug";
- version = "0.1.0";
- sha256 =
- "f6c425f0dea74222243ffb3d4aaefd24b5ee0547ec71ac78896f1cfe02821e74";
- };
- beamDeps = [ ralitobu_0_1_0 plug_1_1_5 ];
-
- meta = {
- description = ''Elixir Plug for Ralitobu, the Rate Limiter with
- Token Bucket algorithm'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/asaaki/ralitobu_plug";
- };
- } // packageOverrides)
- ) {};
-
- ralitobu_plug = ralitobu_plug_0_1_0;
-
- ranch_1_1_0 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "ranch";
- version = "1.1.0";
- src = fetchHex {
- pkg = "ranch";
- version = "1.1.0";
- sha256 =
- "98ade939e63e6567da5dec5bc5bd93cbdc53d53f8b1aa998adec60dc4057f048";
- };
-
- meta = {
- description = ''Socket acceptor pool for TCP protocols.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/ninenines/ranch";
- };
- } // packageOverrides)
- ) {};
-
- ranch_1_2_1 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "ranch";
- version = "1.2.1";
- src = fetchHex {
- pkg = "ranch";
- version = "1.2.1";
- sha256 =
- "f602d057615ce737945c239e9c8155d3f5300fc5b1255abf81f2a9d0d08e5b04";
- };
-
- meta = {
- description = ''Socket acceptor pool for TCP protocols.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/ninenines/ranch";
- };
- } // packageOverrides)
- ) {};
-
- ranch = ranch_1_2_1;
-
- random_string_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "random_string";
- version = "0.0.1";
- src = fetchHex {
- pkg = "random_string";
- version = "0.0.1";
- sha256 =
- "4a90483956764f6ad3d928e27d2e6a1e830bc53b28ded5464c715eb2ec6b8ed8";
- };
-
- meta = {
- description = ''Generates random string (or a stream of
- characters) of desired character sets.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sylph01/random_string";
- };
- } // packageOverrides)
- ) {};
-
- random_string = random_string_0_0_1;
-
- range_extras_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "range_extras";
- version = "0.1.0";
- src = fetchHex {
- pkg = "range_extras";
- version = "0.1.0";
- sha256 =
- "edc50d31341e1370d009df8b51d7d0e355a966068520ff38e88b8b542953e15c";
- };
-
- meta = {
- description = ''Elixir range utilities: constant-time random
- sampling and set operations.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/lnikkila/elixir-range-extras";
- };
- } // packageOverrides)
- ) {};
-
- range_extras = range_extras_0_1_0;
-
- rankmatcher_0_1_5 = callPackage
- (
- {
- buildRebar3, packageOverrides ? {}, fetchHex, libsnarlmatch_0_1_7
- }:
- buildRebar3 ({
- name = "rankmatcher";
- version = "0.1.5";
- src = fetchHex {
- pkg = "rankmatcher";
- version = "0.1.5";
- sha256 =
- "304704fcc294c636d80f030001495ada0e6b66a36c7a2f785964c8f491e3f197";
- };
-
- beamDeps = [ libsnarlmatch_0_1_7 ];
-
- meta = {
- description = ''Library to rank and match lists'';
- license = stdenv.lib.licenses.cddl;
- homepage = "https://github.com/dalmatinerdb/mstore";
- };
- } // packageOverrides)
- ) {};
-
- rankmatcher = rankmatcher_0_1_5;
-
- rapidax_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "rapidax";
- version = "0.0.3";
- src = fetchHex {
- pkg = "rapidax";
- version = "0.0.3";
- sha256 =
- "9912b79b3d2729465bf66315bd955e031aeb038f05a63faa2dc0414026edb18c";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 cowboy_1_0_4 ];
-
- meta = {
- description = ''Rapidly develop your API client - based on
- rapidash gem'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/victorlcampos/rapidax";
- };
- } // packageOverrides)
- ) {};
-
- rapidax = rapidax_0_0_3;
-
- ratio_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ratio";
- version = "1.0.0";
- src = fetchHex {
- pkg = "ratio";
- version = "1.0.0";
- sha256 =
- "bd20f7aff8c5052a59037a66b603df55a7f23db1b23e7f8287bd331c0d9b8e9c";
- };
-
- meta = {
- longDescription = ''This library allows you to use Rational
- numbers in Elixir, to enable exact calculations
- with all numbers big and small. It defines the
- new <|> operator, (optionally) overrides the
- arithmetic +, -, * and / operators to work with
- ints, floats and Rational numbers all alike.
- Floats are also automatically coerced into
- Rationals whenever possible. And don`t worry: If
- you don`t like operator-overloading: There are
- longhand function aliases available too.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/qqwy/elixir-rational";
- };
- } // packageOverrides)
- ) {};
-
- ratio = ratio_1_0_0;
-
- rational_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, earmark_0_2_1 }:
- buildMix ({
- name = "rational";
- version = "0.2.0";
- src = fetchHex {
- pkg = "rational";
- version = "0.2.0";
- sha256 =
- "640093486afd882e5283d4269d9ab624369239016fed67e3b8038845322107b7";
- };
- beamDeps = [ earmark_0_2_1 ];
-
- meta = {
- longDescription = ''Rational is a module for exact representation
- and manipulation of rational fractions, that is,
- those fractions that can be exactly represented
- by a ratio of integers (e.g., 1/3 or
- 4176/22687).'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/twist-vector/elixir-rational.git";
- };
- } // packageOverrides)
- ) {};
-
- rational = rational_0_2_0;
-
- ratx_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ratx";
- version = "0.1.0";
- src = fetchHex {
- pkg = "ratx";
- version = "0.1.0";
- sha256 =
- "fbf933ff32fdc127200880f5b567820bf03504ade1bd697ffbc0535dbafc23d6";
- };
-
- meta = {
- description = ''Rate limiter and overload protection for erlang
- and elixir applications. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/liveforeverx/ratx";
- };
- } // packageOverrides)
- ) {};
-
- ratx = ratx_0_1_0;
-
- ravel_0_0_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ravel";
- version = "0.0.6";
- src = fetchHex {
- pkg = "ravel";
- version = "0.0.6";
- sha256 =
- "a8fc97393216e2c4429982deefb77b48031ca7feca1f81835451af8977d4932e";
- };
-
- meta = {
- description = ''Extendable validation for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/revati/ravel";
- };
- } // packageOverrides)
- ) {};
-
- ravel = ravel_0_0_6;
-
- ravenex_0_0_5 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- uuid_1_1_4,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "ravenex";
- version = "0.0.5";
- src = fetchHex {
- pkg = "ravenex";
- version = "0.0.5";
- sha256 =
- "909039771fc414dd95d72d3e57c474f5ba7e593c9a9b448e3849ea68aa9d58cc";
- };
- beamDeps = [ uuid_1_1_4 poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''Ravenex is an Elixir client for Sentry.
- Automatically send error notifications to
- Sentry. Easily connects with Phoenix through
- adding a logger or Plug.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hayesgm/ravenex";
- };
- } // packageOverrides)
- ) {};
-
- ravenex = ravenex_0_0_5;
-
- raxx_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "raxx";
- version = "0.0.1";
- src = fetchHex {
- pkg = "raxx";
- version = "0.0.1";
- sha256 =
- "b4a2fbb7d4e85932626656d38adb4de95d47bce04255a9c5b7c2562a27f92111";
- };
- beamDeps = [ httpoison_0_8_3 cowboy_1_0_4 ];
-
- meta = {
- longDescription = ''A Elixir webserver interface, for stateless
- HTTP. Raxx exists to simplify handling the HTTP
- request-response cycle. It deliberately does not
- handle other communication styles that are part
- of the modern web.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/crowdhailer/raxx";
- };
- } // packageOverrides)
- ) {};
-
- raxx = raxx_0_0_1;
-
- react_on_elixir_0_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- poison_1_5_2
- }:
- buildMix ({
- name = "react_on_elixir";
- version = "0.0.4";
- src = fetchHex {
- pkg = "react_on_elixir";
- version = "0.0.4";
- sha256 =
- "5747938079acd15a39768a77ab013b199d429d725397fcd1e8313abf6eeb7c3b";
- };
- beamDeps = [ poolboy_1_5_1 poison_1_5_2 ];
-
- meta = {
- description = ''Server render react components from Elixir'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/gauravtiwari/react_on_elixir";
- };
- } // packageOverrides)
- ) {};
-
- react_on_elixir = react_on_elixir_0_0_4;
-
- read_repos_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "read_repos";
- version = "0.0.1";
- src = fetchHex {
- pkg = "read_repos";
- version = "0.0.1";
- sha256 =
- "f981ea689d21956e1470d947ba24c5480e808fdf1a9da4cd148e5a4e1247e8b4";
- };
-
- meta = {
- description = ''Simple master-slave library for Ecto.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kenta-aktsk/read_repos";
- };
- } // packageOverrides)
- ) {};
-
- read_repos = read_repos_0_0_1;
-
- readability_0_5_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- floki_0_8_1
- }:
- buildMix ({
- name = "readability";
- version = "0.5.0";
- src = fetchHex {
- pkg = "readability";
- version = "0.5.0";
- sha256 =
- "82b03705957be376e748029a9ac94a699f5dac072fdef662c46258c83d7e1a3e";
- };
- beamDeps = [ httpoison_0_8_3 floki_0_8_1 ];
-
- meta = {
- description = ''Readability library for extracting and curating
- articles.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/keepcosmos/readability";
- };
- } // packageOverrides)
- ) {};
-
- readability = readability_0_5_0;
-
- readit_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "readit";
- version = "0.0.3";
- src = fetchHex {
- pkg = "readit";
- version = "0.0.3";
- sha256 =
- "a3f99c65e9ef62c625c81150735b7456db71e350cf892ee1119d3839cfab361e";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''A Simple Read-Only Reddit API Client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/adamzaninovich/readit";
- };
- } // packageOverrides)
- ) {};
-
- readit = readit_0_0_3;
-
- reap_0_1_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, jsex_2_0_0 }:
- buildMix ({
- name = "reap";
- version = "0.1.3";
- src = fetchHex {
- pkg = "reap";
- version = "0.1.3";
- sha256 =
- "e260540500a29ac9945db512a550cd9b56ba4295b4aa3c1b408ad62720e7807b";
- };
- beamDeps = [ jsex_2_0_0 ];
-
- meta = {
- description = ''A library for working with the refheap API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Raynes/reap";
- };
- } // packageOverrides)
- ) {};
-
- reap = reap_0_1_3;
-
- reaxive_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "reaxive";
- version = "0.1.0";
- src = fetchHex {
- pkg = "reaxive";
- version = "0.1.0";
- sha256 =
- "d185c80da34499999000f6aaab3ab891cdff34cb3a2079835e8e6f5b4e813fa2";
- };
-
- meta = {
- longDescription = ''Reaxive is a library inspired by Reactive
- Extensions and ELM to provide functional
- reactive programming to Elixir. It allows for
- active sequences of events and a set of
- stream-reducer like transformations such as map
- or filter. '';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/alfert/reaxive";
- };
- } // packageOverrides)
- ) {};
-
- reaxive = reaxive_0_1_0;
-
- rebar3_appup_plugin_1_1_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "rebar3_appup_plugin";
- version = "1.1.1";
- src = fetchHex {
- pkg = "rebar3_appup_plugin";
- version = "1.1.1";
- sha256 =
- "ea6d33c962770187021c528d0472a4f0b123c4adaf3242afb33465b796a34497";
- };
-
- meta = {
- description = ''A rebar3 plugin for handling .appup files'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lrascao/rebar3_appup_plugin";
- };
- } // packageOverrides)
- ) {};
-
- rebar3_appup_plugin = rebar3_appup_plugin_1_1_1;
-
- rebar3_asn1_compiler_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "rebar3_asn1_compiler";
- version = "1.0.0";
- src = fetchHex {
- pkg = "rebar3_asn1_compiler";
- version = "1.0.0";
- sha256 =
- "25ec1d5c97393195650ac8c7a06a267a886a1479950ee047c43b5228c07b30b9";
- };
-
- meta = {
- description = ''Compile ASN.1 modules with Rebar3'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pyykkis/rebar3_asn1_compiler";
- };
- } // packageOverrides)
- ) {};
-
- rebar3_asn1_compiler = rebar3_asn1_compiler_1_0_0;
-
- spell_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_4_0,
- msgpax_0_8_2
- }:
- buildMix ({
- name = "spell";
- version = "0.1.0";
- src = fetchHex {
- pkg = "spell";
- version = "0.1.0";
- sha256 =
- "c768ada54d3cbda57d63344b0b9c91520362700dde4b939a825358f01f1dbfa9";
- };
- beamDeps = [ poison_1_4_0 msgpax_0_8_2 ];
-
- meta = {
- longDescription = ''Spell is an extensible Elixir WAMP client.
- Spell supports the client subscriber, publisher,
- callee, and caller roles.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/MyMedsAndMe/spell";
- };
- } // packageOverrides)
- ) {};
-
- spell = spell_0_1_0;
-
- spex_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "spex";
- version = "0.1.2";
- src = fetchHex {
- pkg = "spex";
- version = "0.1.2";
- sha256 =
- "102a1a74e19cd68c843ba45ac8580f44b5b8e4cc572e206e143cab56f369fb93";
- };
-
- meta = {
- description = ''Validate your Elixir values against value-based
- specs'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/codegram/spex";
- };
- } // packageOverrides)
- ) {};
-
- spex = spex_0_1_2;
-
- spf_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "spf";
- version = "0.0.1";
- src = fetchHex {
- pkg = "spf";
- version = "0.0.1";
- sha256 =
- "64126066eaac871e08a1ece2721e0fccb36220b28a4c6b03f08f0d4d459909a3";
- };
-
- meta = {
- description = ''SPF implementation in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hex-sh/spf";
- };
- } // packageOverrides)
- ) {};
-
- spf = spf_0_0_1;
-
- spherical_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "spherical";
- version = "0.0.1";
- src = fetchHex {
- pkg = "spherical";
- version = "0.0.1";
- sha256 =
- "eaa7f1a4d265a0a6d0b8e23b530882dda0e68e35780a5af50ac6a2d9d2ba2fac";
- };
-
- meta = {
- description = ''An spherical geometry library for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/arpunk/spherical";
- };
- } // packageOverrides)
- ) {};
-
- spherical = spherical_0_0_1;
-
- spotify_ex_0_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- plug_1_1_5,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "spotify_ex";
- version = "0.0.4";
- src = fetchHex {
- pkg = "spotify_ex";
- version = "0.0.4";
- sha256 =
- "f2e8647410096d34d9baecf8d9622896214320641ed72c11c711f9a463e4a961";
- };
- beamDeps = [ poison_1_5_2 plug_1_1_5 httpoison_0_8_3 ];
-
- meta = {
- description = ''An Elixir wrapper for Spotify API O-Auth.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://www.github.com/jsncmgs1/spotify_ex";
- };
- } // packageOverrides)
- ) {};
-
- spotify_ex = spotify_ex_0_0_4;
-
- spout_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "spout";
- version = "0.0.1";
- src = fetchHex {
- pkg = "spout";
- version = "0.0.1";
- sha256 =
- "5389628219cfa6df18ba366cb668055e44e97eccfea38d385d0581c489f3926a";
- };
-
- meta = {
- longDescription = ''A TAP producer that integrates with existing
- ExUnit tests via an ExUnit formatter'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Stratus3D/Spout";
- };
- } // packageOverrides)
- ) {};
-
- spout = spout_0_0_1;
-
- spreedly_0_1_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "spreedly";
- version = "0.1.2";
- src = fetchHex {
- pkg = "spreedly";
- version = "0.1.2";
- sha256 =
- "b5c770da8627fb1a3a570ffeec1a15e9ee1d643383f26018855ac028471e1329";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''A wrapper for the Spreedly API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/duff/spreedly-elixir";
- };
- } // packageOverrides)
- ) {};
-
- spreedly = spreedly_0_1_2;
-
- sqlcx_1_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- esqlcipher_1_0_0,
- decimal_1_1_2
- }:
- buildMix ({
- name = "sqlcx";
- version = "1.1.0";
- src = fetchHex {
- pkg = "sqlcx";
- version = "1.1.0";
- sha256 =
- "203c9b39da2e359322c9d83bb64d2559dd26e0f22a03d493bfc817120c394e8d";
- };
- beamDeps = [ esqlcipher_1_0_0 decimal_1_1_2 ];
-
- meta = {
- description = ''A thin Elixir wrapper around esqlcipher'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/FelixKiunke/sqlcx";
- };
- } // packageOverrides)
- ) {};
-
- sqlcx = sqlcx_1_1_0;
-
- sqlitex_0_8_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- pipe_0_0_2,
- esqlite_0_2_2,
- decimal_1_1_2
- }:
- buildMix ({
- name = "sqlitex";
- version = "0.8.3";
- src = fetchHex {
- pkg = "sqlitex";
- version = "0.8.3";
- sha256 =
- "44daaeb135178165d0a6cd6754e4af05e56e5d2943c0b1108df7df718745ec0f";
- };
- beamDeps = [ pipe_0_0_2 esqlite_0_2_2 decimal_1_1_2 ];
-
- meta = {
- description = ''A thin Elixir wrapper around esqlite'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mmmries/sqlitex";
- };
- } // packageOverrides)
- ) {};
-
- sqlitex_1_0_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- esqlite_0_2_2,
- decimal_1_1_2
- }:
- buildMix ({
- name = "sqlitex";
- version = "1.0.0";
- src = fetchHex {
- pkg = "sqlitex";
- version = "1.0.0";
- sha256 =
- "cbd7310e900841aa2dc6071b497330e730de1cd9618003006e0af48afb24d5f8";
- };
- beamDeps = [ esqlite_0_2_2 decimal_1_1_2 ];
-
- meta = {
- description = ''A thin Elixir wrapper around esqlite'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mmmries/sqlitex";
- };
- } // packageOverrides)
- ) {};
-
- sqlitex = sqlitex_1_0_0;
-
- sshex_2_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "sshex";
- version = "2.1.0";
- src = fetchHex {
- pkg = "sshex";
- version = "2.1.0";
- sha256 =
- "303bd8fd007bf2d10ddfae83b74acafc747f24908c2590b098ba2e85c570c58b";
- };
-
- meta = {
- description = ''Simple SSH helpers for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/rubencaro/sshex";
- };
- } // packageOverrides)
- ) {};
-
- sshex = sshex_2_1_0;
-
- ssl_verify_fun_1_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "ssl_verify_fun";
- version = "1.1.0";
- src = fetchHex {
- pkg = "ssl_verify_fun";
- version = "1.1.0";
- sha256 =
- "6c0e0d857fdb031ba67b0a791202bee116bea2313db7b649839000847591ba1e";
- };
-
- meta = {
- description = ''SSL verification functions for Erlang'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/deadtrickster/ssl_verify_fun.erl";
- };
- } // packageOverrides)
- ) {};
-
- ssl_verify_fun = ssl_verify_fun_1_1_0;
-
- stache_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "stache";
- version = "0.2.1";
- src = fetchHex {
- pkg = "stache";
- version = "0.2.1";
- sha256 =
- "475e80a2b6e713a75d0a085b067489e2fc1606751aab47413e12a33cf2ae4712";
- };
-
- meta = {
- description = ''Mustache templates in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/cwbriones/stache";
- };
- } // packageOverrides)
- ) {};
-
- stache = stache_0_2_1;
-
- stackd_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "stackd";
- version = "0.0.1";
- src = fetchHex {
- pkg = "stackd";
- version = "0.0.1";
- sha256 =
- "41749dc834f92af4954988b5e9155d45fcbf63224ecfcabce6f1fc80f3aff8f9";
- };
-
- meta = {
- description = ''Stackd'';
-
- };
- } // packageOverrides)
- ) {};
-
- stackd = stackd_0_0_1;
-
- stash_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "stash";
- version = "1.0.0";
- src = fetchHex {
- pkg = "stash";
- version = "1.0.0";
- sha256 =
- "ac68a470ed2a292b59c1dbf286a97e8b25ec72adaeeb3734c183dc54b659f7d6";
- };
-
- meta = {
- description = ''Simple ETS backed key/value store for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zackehh/stash";
- };
- } // packageOverrides)
- ) {};
-
- stash = stash_1_0_0;
-
- stathat_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "stathat";
- version = "0.0.3";
- src = fetchHex {
- pkg = "stathat";
- version = "0.0.3";
- sha256 =
- "2d3663d1bbbf13fbae688a89656dd53f747e69d23ec73bcfd8835c2ca9d09c35";
- };
-
- meta = {
- description = ''StatHat client library.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/travisjeffery/stathat";
- };
- } // packageOverrides)
- ) {};
-
- stathat = stathat_0_0_3;
-
- statistics_0_4_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "statistics";
- version = "0.4.1";
- src = fetchHex {
- pkg = "statistics";
- version = "0.4.1";
- sha256 =
- "726d8791e9bafb08b3ceeb5b08df6664f29a73a0e6ac0db835500b686a153bd5";
- };
-
- meta = {
- description = ''Functions for descriptive statistics and common
- distributions'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/msharp/elixir-statistics";
- };
- } // packageOverrides)
- ) {};
-
- statistics = statistics_0_4_1;
-
- statix_0_7_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "statix";
- version = "0.7.0";
- src = fetchHex {
- pkg = "statix";
- version = "0.7.0";
- sha256 =
- "0439c5698eaef7c2de213d9bff5681eeccc1dec789931e9ae73b9d2b2968234b";
- };
-
- meta = {
- description = ''An Elixir client for StatsD compatible
- servers.'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/lexmag/statix";
- };
- } // packageOverrides)
- ) {};
-
- statix = statix_0_7_0;
-
- std_json_io_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- porcelain_2_0_1,
- poolboy_1_5_1,
- poison_1_5_2,
- fs_0_9_2
- }:
- buildMix ({
- name = "std_json_io";
- version = "0.1.0";
- src = fetchHex {
- pkg = "std_json_io";
- version = "0.1.0";
- sha256 =
- "14f1c18c31a0b0b3ffb1e654247925335059eec9c800d81dd6379166e7403d1e";
- };
- beamDeps = [ porcelain_2_0_1 poolboy_1_5_1 poison_1_5_2 fs_0_9_2
- ];
-
- meta = {
- description = ''Application for managing and communicating with
- IO servers via JSON'';
-
- };
- } // packageOverrides)
- ) {};
-
- std_json_io = std_json_io_0_1_0;
-
- steamex_0_0_5 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- sweet_xml_0_6_1,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "steamex";
- version = "0.0.5";
- src = fetchHex {
- pkg = "steamex";
- version = "0.0.5";
- sha256 =
- "4a290c432c0480cf372fece76cc4f09e231261fda64ef5027e8855e16aa5a2f6";
- };
- beamDeps = [ sweet_xml_0_6_1 httpoison_0_8_3 ];
-
- meta = {
- description = ''Steam API and Auth (with Phoenix/Plug
- integration) for Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/antipax/steamex";
- };
- } // packageOverrides)
- ) {};
-
- steamex = steamex_0_0_5;
-
- stemex_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "stemex";
- version = "0.1.1";
- src = fetchHex {
- pkg = "stemex";
- version = "0.1.1";
- sha256 =
- "219b8e81fedba5a9bb978b8f7eaf230e77f2702d58e409adcca998fde1788521";
- };
-
- meta = {
- longDescription = ''Stemex is a NIF wrapper above snowball
- containing stemmers for : danish, dutch,
- english, finnish, french, german, hungarian,
- italian, kraaij_pohlmann, lovins, norwegian,
- portuguese, romanian, russian, spanish, swedish,
- turkish.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/awetzel/stemex";
- };
- } // packageOverrides)
- ) {};
-
- stemex = stemex_0_1_1;
-
- stillir_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "stillir";
- version = "1.0.0";
- src = fetchHex {
- pkg = "stillir";
- version = "1.0.0";
- sha256 =
- "04afdee2e5123b6da11fcc28c38d581f74db0cbe1faa1c36ed4f364797b588c0";
- };
-
- meta = {
- description = ''Read Unix env vars into application config'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/heroku/stillir";
- };
- } // packageOverrides)
- ) {};
-
- stillir = stillir_1_0_0;
-
- stockastic_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "stockastic";
- version = "0.0.2";
- src = fetchHex {
- pkg = "stockastic";
- version = "0.0.2";
- sha256 =
- "f180915a21d4aa4a64f660696b77c5788334d4bae2639a58814565af0d75ca56";
- };
- beamDeps = [ httpoison_0_8_3 exjsx_3_2_0 ];
-
- meta = {
- description = ''Simple Elixir wrapper for the Stockfighter API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/shanewilton/stockastic";
- };
- } // packageOverrides)
- ) {};
-
- stockastic = stockastic_0_0_2;
-
- stockfighter_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "stockfighter";
- version = "0.0.1";
- src = fetchHex {
- pkg = "stockfighter";
- version = "0.0.1";
- sha256 =
- "d72726cf055068e2b62ef9091ec17ab9292b60bc7f4a7306c17cad6d022a3bd7";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''a simple wrapper of stockfighter http api'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lerencao/stockfighter";
- };
- } // packageOverrides)
- ) {};
-
- stockfighter = stockfighter_0_0_1;
-
- stopwatch_0_0_7 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
- buildMix ({
- name = "stopwatch";
- version = "0.0.7";
- src = fetchHex {
- pkg = "stopwatch";
- version = "0.0.7";
- sha256 =
- "de20ad70ca3b0f70d0a2000858e80c0afd4163101e18d0428ee62a58e7c8360a";
- };
- beamDeps = [ timex_1_0_2 ];
-
- meta = {
- description = ''The stopwatch provides an easy api to measure
- elapsed time and profile code.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/matteosister/stopwatch";
- };
- } // packageOverrides)
- ) {};
-
- stopwatch = stopwatch_0_0_7;
-
- stream_runner_1_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "stream_runner";
- version = "1.1.0";
- src = fetchHex {
- pkg = "stream_runner";
- version = "1.1.0";
- sha256 =
- "3c2da3658440ba57224cd484de4b0d8b128e5463413ac05285cdfa4b37e30798";
- };
-
- meta = {
- description = ''Run a Stream as a process'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/fishcakez/stream_runner";
- };
- } // packageOverrides)
- ) {};
-
- stream_runner = stream_runner_1_1_0;
-
- stream_weaver_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "stream_weaver";
- version = "0.0.2";
- src = fetchHex {
- pkg = "stream_weaver";
- version = "0.0.2";
- sha256 =
- "6664a585d4afaac63e69f367e79bcc6af886dbebd1f8b66a099f6164973dc168";
- };
-
- meta = {
- description = ''Library for working with streams'';
-
- };
- } // packageOverrides)
- ) {};
-
- stream_weaver = stream_weaver_0_0_2;
-
- stream_x_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "stream_x";
- version = "0.0.1";
- src = fetchHex {
- pkg = "stream_x";
- version = "0.0.1";
- sha256 =
- "68832e9ac5542ca7763e5ea8493f2f775b84d79995fd63eda608ef6f786d1395";
- };
-
- meta = {
- description = ''Extra Elixir Stream utilities'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/koyeung/stream_x";
- };
- } // packageOverrides)
- ) {};
-
- stream_x = stream_x_0_0_1;
-
- strftimerl_0_1_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "strftimerl";
- version = "0.1.1";
- src = fetchHex {
- pkg = "strftimerl";
- version = "0.1.1";
- sha256 =
- "c09c7cd6a421bcbc1020c1440a2e73e312b852adbb3034d11f3dffa27d7953b1";
- };
-
- meta = {
- description = ''strftime formatting in erlang'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/gmr/strftimerl";
- };
- } // packageOverrides)
- ) {};
-
- strftimerl = strftimerl_0_1_1;
-
- strict_comparison_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "strict_comparison";
- version = "0.0.1";
- src = fetchHex {
- pkg = "strict_comparison";
- version = "0.0.1";
- sha256 =
- "c033d7c5befc4971171a20c8fce96ae04fc0ebf0bae790b7ee0e7498f9d7997e";
- };
-
- meta = {
- description = ''Provides strict number comparison in both regular
- code and guards.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/antipax/strict_comparison";
- };
- } // packageOverrides)
- ) {};
-
- strict_comparison = strict_comparison_0_0_1;
-
- strinx_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "strinx";
- version = "0.2.1";
- src = fetchHex {
- pkg = "strinx";
- version = "0.2.1";
- sha256 =
- "b3a083b3c0f28d35d283cb5e50b03798840e401eb723d44d8e9137735a3798e7";
- };
-
- meta = {
- longDescription = ''Some string transformation functions for
- Elixir. Heavily inspired by ActiveSupport`s
- String extensions (Ruby).'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/asaaki/strinx.ex";
- };
- } // packageOverrides)
- ) {};
-
- strinx = strinx_0_2_1;
-
- stripex_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, gateway_0_0_6 }:
- buildMix ({
- name = "stripex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "stripex";
- version = "0.1.0";
- sha256 =
- "49959c78e677d3e30edd808cce7a013a7120f337705d0e2fd646c000d9b30853";
- };
- beamDeps = [ gateway_0_0_6 ];
-
- meta = {
- longDescription = ''A much more ruby-stripe-like wrapper around
- Stripe`s API (built with Poison). Full
- documentation can be found at
- https://stripe.com/docs/api'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/foxnewsnetwork/stripex";
- };
- } // packageOverrides)
- ) {};
-
- stripex = stripex_0_1_0;
-
- struct_fields_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "struct_fields";
- version = "0.3.0";
- src = fetchHex {
- pkg = "struct_fields";
- version = "0.3.0";
- sha256 =
- "d0ec469ccb59d2207a94cb8e3d3ce9b8bf09f239695e33a0e2447e2a1ff2178b";
- };
-
- meta = {
- description = ''Tiny module to easily get a list of fields for
- structs.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nTraum/struct_fields";
- };
- } // packageOverrides)
- ) {};
-
- struct_fields = struct_fields_0_3_0;
-
- styledown_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, execjs_1_1_3 }:
- buildMix ({
- name = "styledown";
- version = "0.0.3";
- src = fetchHex {
- pkg = "styledown";
- version = "0.0.3";
- sha256 =
- "8dc31569257a9d5fe3eb67ca87d0cd29f6d14c4a62191262b41a28fc9bca18fc";
- };
- beamDeps = [ execjs_1_1_3 ];
-
- meta = {
- description = ''Elixir integration of Styledown'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/styledown/styledown_ex";
- };
- } // packageOverrides)
- ) {};
-
- styledown = styledown_0_0_3;
-
- supervisor3_1_1_1 = callPackage
- (
- { buildErlangMk, packageOverrides ? {}, fetchHex }:
- buildErlangMk ({
- name = "supervisor3";
- version = "1.1.1";
- src = fetchHex {
- pkg = "supervisor3";
- version = "1.1.1";
- sha256 =
- "0d17df36f524f7420d7e1afb0d65054ffdfcd5438de63597d6ab626deb38f94c";
- };
-
- meta = {
- description = ''A copy of supervisor.erl from the R16B Erlang/OTP
- with modifications'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/klarna/supervisor3";
- };
- } // packageOverrides)
- ) {};
-
- supervisor3 = supervisor3_1_1_1;
-
- supool_1_5_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "supool";
- version = "1.5.1";
- src = fetchHex {
- pkg = "supool";
- version = "1.5.1";
- sha256 =
- "c191d63ff19ae177bf4cfba02303ae4552d8b48ec4133e24053e037513dfae09";
- };
-
- meta = {
- description = ''Erlang Process Pool as a Supervisor'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/okeuday/supool";
- };
- } // packageOverrides)
- ) {};
-
- supool = supool_1_5_1;
-
- swapi_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "swapi";
- version = "1.0.0";
- src = fetchHex {
- pkg = "swapi";
- version = "1.0.0";
- sha256 =
- "55b40ddd97d632b027463aefccb8d6fa9ffa77f224a25af5565bbaecff5c7a3c";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- description = ''An Elixir wrapper for the Star Wars API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/twhitacre/swapi.ex";
- };
- } // packageOverrides)
- ) {};
-
- swapi = swapi_1_0_0;
-
- sweet_xml_0_5_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "sweet_xml";
- version = "0.5.1";
- src = fetchHex {
- pkg = "sweet_xml";
- version = "0.5.1";
- sha256 =
- "3266dedc5e2e6c6b1c5b8a088504a58980632727803de22a5a276da847ea6947";
- };
-
- meta = {
- description = ''An sweet wrapper of :xmerl to help query xml
- docs'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/awetzel/sweet_xml";
- };
- } // packageOverrides)
- ) {};
-
- sweet_xml_0_6_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "sweet_xml";
- version = "0.6.1";
- src = fetchHex {
- pkg = "sweet_xml";
- version = "0.6.1";
- sha256 =
- "30059e5367a4728ca4b246682adc72618a0a8c997eca6f52a107b2fe3ab4f313";
- };
-
- meta = {
- description = ''An sweet wrapper of :xmerl to help query xml
- docs'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/awetzel/sweet_xml";
- };
- } // packageOverrides)
- ) {};
-
- sweet_xml = sweet_xml_0_6_1;
-
- syn_1_4_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "syn";
- version = "1.4.0";
- src = fetchHex {
- pkg = "syn";
- version = "1.4.0";
- sha256 =
- "cec944ba1768a5142ba496bc84b62ebeab68e8ddd2c8e3263c95f89660275d9c";
- };
-
- meta = {
- description = ''A global Process Registry and Process Group
- manager.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ostinelli/syn";
- };
- } // packageOverrides)
- ) {};
-
- syn = syn_1_4_0;
-
- syn_osc_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, osc_0_1_1 }:
- buildMix ({
- name = "syn_osc";
- version = "0.1.0";
- src = fetchHex {
- pkg = "syn_osc";
- version = "0.1.0";
- sha256 =
- "7cdb75d8e9a64f3e2baf77bce83d06e0da4361d34a82c3ddda68a6efb3d21df9";
- };
- beamDeps = [ osc_0_1_1 ];
-
- meta = {
- description = ''SynOSC encoder/decoder for elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/syn_osc_ex";
- };
- } // packageOverrides)
- ) {};
-
- syn_osc = syn_osc_0_1_0;
-
- syntactic_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "syntactic";
- version = "0.0.2";
- src = fetchHex {
- pkg = "syntactic";
- version = "0.0.2";
- sha256 =
- "20adf1f265ebb17ab79d53355b7854c751cee68c73f8a66baca7035da06f65db";
- };
-
- meta = {
- description = ''A collection of Elixir syntactic sugars.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hzamani/elixir-syntactic";
- };
- } // packageOverrides)
- ) {};
-
- syntactic = syntactic_0_0_2;
-
- synthex_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "synthex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "synthex";
- version = "0.1.0";
- sha256 =
- "111932916800698a032b9cf7e883146613acc788d165066210e1e09b00e476bc";
- };
-
- meta = {
- description = ''A signal synthesis library'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/bitgamma/synthex";
- };
- } // packageOverrides)
- ) {};
-
- synthex = synthex_0_1_0;
-
- system_env_loader_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "system_env_loader";
- version = "0.1.0";
- src = fetchHex {
- pkg = "system_env_loader";
- version = "0.1.0";
- sha256 =
- "b271e8dcc857d7e36159554c343ed0af950e9dc8adf0f4cee399228142f68ec6";
- };
-
- meta = {
- longDescription = ''A little package to load (bashlike) files
- with exported ENV variables into Elixir
- runtime'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ruby2elixir/system_env_loader";
- };
- } // packageOverrides)
- ) {};
-
- system_env_loader = system_env_loader_0_1_0;
-
- table_0_0_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "table";
- version = "0.0.5";
- src = fetchHex {
- pkg = "table";
- version = "0.0.5";
- sha256 =
- "8d1f3ac55512f92eeba1345842278ee6f89d2a4f19be0e272a5f32a958f066d5";
- };
-
- meta = {
- description = ''ascii tables for cli'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zweifisch/table";
- };
- } // packageOverrides)
- ) {};
-
- table = table_0_0_5;
-
- table_rex_0_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "table_rex";
- version = "0.4.0";
- src = fetchHex {
- pkg = "table_rex";
- version = "0.4.0";
- sha256 =
- "71776a56629b850c647d298577f153faa41d3a98cff41446dd799c6bf30fcf19";
- };
-
- meta = {
- description = ''Generate configurable text-based tables for
- display (ASCII & more)'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/djm/table_rex";
- };
- } // packageOverrides)
- ) {};
-
- table_rex_0_8_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "table_rex";
- version = "0.8.0";
- src = fetchHex {
- pkg = "table_rex";
- version = "0.8.0";
- sha256 =
- "8d026afe99ac07f1261eae09334edbf8ec7ce55b812c3a60440ed88db83aad82";
- };
-
- meta = {
- description = ''Generate configurable text-based tables for
- display (ASCII & more)'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/djm/table_rex";
- };
- } // packageOverrides)
- ) {};
-
- table_rex = table_rex_0_8_0;
-
- tabula_2_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tabula";
- version = "2.0.1";
- src = fetchHex {
- pkg = "tabula";
- version = "2.0.1";
- sha256 =
- "ed66a6d83890eaece976daf1083aa4e0ed9d877e185a1a9ccf1f2c87ee61b49e";
- };
-
- meta = {
- description = ''Pretty printer for maps/structs collections'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/aerosol/Tabula";
- };
- } // packageOverrides)
- ) {};
-
- tabula = tabula_2_0_1;
-
- tachometer_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tachometer";
- version = "0.1.1";
- src = fetchHex {
- pkg = "tachometer";
- version = "0.1.1";
- sha256 =
- "ead8f6a964b79df0b2948a59c72ec0e2b319bb7684079e7170fa191c78481a42";
- };
-
- meta = {
- description = ''Scheduler instrumentation for BEAM in Elixir'';
- license = stdenv.lib.licenses.gpl3;
- homepage = "https://github.com/pavlos/tachometer";
- };
- } // packageOverrides)
- ) {};
-
- tachometer_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, watcher_1_0_0 }:
- buildMix ({
- name = "tachometer";
- version = "0.2.0";
- src = fetchHex {
- pkg = "tachometer";
- version = "0.2.0";
- sha256 =
- "de5e0bda346e31130f33ca118cdd4afccd0ba6728c571ccae35f65d3020074aa";
- };
- beamDeps = [ watcher_1_0_0 ];
-
- meta = {
- description = ''Scheduler instrumentation for BEAM in Elixir'';
- license = stdenv.lib.licenses.gpl3;
- homepage = "https://github.com/pavlos/tachometer";
- };
- } // packageOverrides)
- ) {};
-
- tachometer = tachometer_0_2_0;
-
- tail_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tail";
- version = "1.0.1";
- src = fetchHex {
- pkg = "tail";
- version = "1.0.1";
- sha256 =
- "8cec5c708be02aab6094f9c6fdf5b6b0e68c0c3d4f2f9ae341e743d119e9c07f";
- };
-
- meta = {
- longDescription = ''A simple file tail functionality. Calls a
- callback function whenever new lines are
- detected on a file.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/TheFirstAvenger/elixir-tail.git";
- };
- } // packageOverrides)
- ) {};
-
- tail = tail_1_0_1;
-
- tally_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tally";
- version = "0.0.1";
- src = fetchHex {
- pkg = "tally";
- version = "0.0.1";
- sha256 =
- "cd9e07c47f5ce6f01a33a98552aa028e4f9a4c0ec35a2cb16178a9bf37117a36";
- };
-
- meta = {
- description = ''A reporting library for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/boudra/tally";
- };
- } // packageOverrides)
- ) {};
-
- tally = tally_0_0_1;
-
- tane_0_3_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tane";
- version = "0.3.1";
- src = fetchHex {
- pkg = "tane";
- version = "0.3.1";
- sha256 =
- "8154bcc365b7f21d7ab6ff6d122f6dc110dda05bbfcd7f331a7f514512913e0a";
- };
-
- meta = {
- description = ''Library for Seeding Databases'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Joe-noh/tane";
- };
- } // packageOverrides)
- ) {};
-
- tane = tane_0_3_1;
-
- tanuki_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "tanuki";
- version = "0.2.0";
- src = fetchHex {
- pkg = "tanuki";
- version = "0.2.0";
- sha256 =
- "f499d6bcb80fc29f2d0b68d16d8309cb25589583b1f4d0eb23cbc4fe5afbab8c";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''GitLab API wrapper in Elixir, named after GitLabs
- mascot'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ZJvandeWeg/Tanuki";
- };
- } // packageOverrides)
- ) {};
-
- tanuki = tanuki_0_2_0;
-
- tap_0_1_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tap";
- version = "0.1.4";
- src = fetchHex {
- pkg = "tap";
- version = "0.1.4";
- sha256 =
- "573cba12e7152f6e577fd485e9f0d834bdf1ea60229123bbfbaefcfd91879218";
- };
-
- meta = {
- description = ''Elixir tracing'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/eproxus/tap";
- };
- } // packageOverrides)
- ) {};
-
- tap = tap_0_1_4;
-
- tau_0_0_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tau";
- version = "0.0.6";
- src = fetchHex {
- pkg = "tau";
- version = "0.0.6";
- sha256 =
- "6469f53ae39221f045b6dbd8199eaa95ed5f6c1252b063bc6edd1f21ae2ad0e7";
- };
-
- meta = {
- description = ''The mathematical constant tau'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/FranklinChen/tau";
- };
- } // packageOverrides)
- ) {};
-
- tau = tau_0_0_6;
-
- taxon_search_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpotion_2_2_2
- }:
- buildMix ({
- name = "taxon_search";
- version = "0.0.1";
- src = fetchHex {
- pkg = "taxon_search";
- version = "0.0.1";
- sha256 =
- "eb185015a4f238e8a540f60d187edb28b19e643526e595f4cb0e4b553bdf1a6f";
- };
- beamDeps = [ poison_2_1_0 httpotion_2_2_2 ];
-
- meta = {
- description = ''TaxonSearch is a tool for looking up species
- names in Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/annejohnson/taxon_search";
- };
- } // packageOverrides)
- ) {};
-
- taxon_search = taxon_search_0_0_1;
-
- tds_0_5_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, decimal_1_1_2 }:
- buildMix ({
- name = "tds";
- version = "0.5.4";
- src = fetchHex {
- pkg = "tds";
- version = "0.5.4";
- sha256 =
- "110eb8d8a58d0d5fe629bfe75dacb56fa14bde441d2baffbfa2bb0c65ee66cba";
- };
- beamDeps = [ decimal_1_1_2 ];
-
- meta = {
- description = ''MSSQL / TDS Driver for Ecto.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/livehelpnow/tds";
- };
- } // packageOverrides)
- ) {};
-
- tds = tds_0_5_4;
-
- tea_crypto_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "tea_crypto";
- version = "1.0.0";
- src = fetchHex {
- pkg = "tea_crypto";
- version = "1.0.0";
- sha256 =
- "0e7e60d0afe79f0624faa8a358a3a00c912cfa548f3632383927abca4db29cc6";
- };
-
- meta = {
- description = ''A TEA implementation in Erlang. '';
-
- homepage = "https://github.com/keichan34/tea_crypto";
- };
- } // packageOverrides)
- ) {};
-
- tea_crypto = tea_crypto_1_0_0;
-
- teacup_0_3_4 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "teacup";
- version = "0.3.4";
- src = fetchHex {
- pkg = "teacup";
- version = "0.3.4";
- sha256 =
- "59495d566e810f481ec22b263e8bf0ed90efea9c9272e4980e36d921cd6ab5f9";
- };
-
- meta = {
- description = ''Simple TCP client library for Erlang'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- teacup = teacup_0_3_4;
-
- teacup_nats_0_4_0 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- teacup_0_3_4,
- nats_msg_0_4_1,
- jsx_2_8_0
- }:
- buildRebar3 ({
- name = "teacup_nats";
- version = "0.4.0";
- src = fetchHex {
- pkg = "teacup_nats";
- version = "0.4.0";
- sha256 =
- "f0f891f8f9b384517380d643ecf2121a9e383fd05416997778597c5647a9dd6f";
- };
-
- beamDeps = [ teacup_0_3_4 nats_msg_0_4_1 jsx_2_8_0 ];
-
- meta = {
- description = ''Teacup based NATS Client for Erlang'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/yuce/teacup_nats.git";
- };
- } // packageOverrides)
- ) {};
-
- teacup_nats = teacup_nats_0_4_0;
-
- teamcity_exunit_formatter_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "teamcity_exunit_formatter";
- version = "0.3.0";
- src = fetchHex {
- pkg = "teamcity_exunit_formatter";
- version = "0.3.0";
- sha256 =
- "0d209ca85fcd3d8112be29288988ce6329b2b2e7c10cd7deab636508716de82f";
- };
-
- meta = {
- longDescription = ''A formatter for Elixirs ExUnit that formats
- as TeamCity Service Messages. Will let you track
- test results in TeamCitys UI'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lixhq/teamcity-exunit-formatter";
- };
- } // packageOverrides)
- ) {};
-
- teamcity_exunit_formatter = teamcity_exunit_formatter_0_3_0;
-
- telegram_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "telegram";
- version = "0.0.3";
- src = fetchHex {
- pkg = "telegram";
- version = "0.0.3";
- sha256 =
- "ad7b74cec90ade9090a9056aa69c055398fd3f60352b50c732849f06c503287d";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- description = ''Simple module for parsing Telegram bot updates'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/col/telegram";
- };
- } // packageOverrides)
- ) {};
-
- telegram = telegram_0_0_3;
-
- telehashname_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "telehashname";
- version = "0.0.2";
- src = fetchHex {
- pkg = "telehashname";
- version = "0.0.2";
- sha256 =
- "301a92653dafa69f118fdb8b8ca42259ac2e82441175231e1d67afcd26409f71";
- };
-
- meta = {
- description = ''Telehash hashname implementation'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mwmiller/telehashname_ex";
- };
- } // packageOverrides)
- ) {};
-
- telehashname = telehashname_0_0_2;
-
- telephonist_0_1_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- immortal_0_2_0,
- ex_twiml_2_1_0
- }:
- buildMix ({
- name = "telephonist";
- version = "0.1.2";
- src = fetchHex {
- pkg = "telephonist";
- version = "0.1.2";
- sha256 =
- "c89922cfc4137dace4fd6458a6ff32f624dd9775b2e90efffbd864cdaa537a3e";
- };
- beamDeps = [ immortal_0_2_0 ex_twiml_2_1_0 ];
-
- meta = {
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/danielberkompas/telephonist";
- };
- } // packageOverrides)
- ) {};
-
- telephonist = telephonist_0_1_2;
-
- temp_0_4_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "temp";
- version = "0.4.0";
- src = fetchHex {
- pkg = "temp";
- version = "0.4.0";
- sha256 =
- "1a852035e1c8bb9b33d00d322161689553d412fea783617afbd22112d481ffff";
- };
-
- meta = {
- description = ''An Elixir module to easily create and use
- temporary files and directories.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/tuvistavie/elixir-temp";
- };
- } // packageOverrides)
- ) {};
-
- temp = temp_0_4_0;
-
- tempdir_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tempdir";
- version = "0.0.1";
- src = fetchHex {
- pkg = "tempdir";
- version = "0.0.1";
- sha256 =
- "fa658ebbdbddfa729b8276652949d20ac2fbb4eff0261a61fb5f9c96fc943ffd";
- };
-
- meta = {
- description = ''Simple Elixir Library for creating self-cleaning
- tmp directories'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/andrewvy/tempdir";
- };
- } // packageOverrides)
- ) {};
-
- tempdir = tempdir_0_0_1;
-
- tempfile_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tempfile";
- version = "0.1.0";
- src = fetchHex {
- pkg = "tempfile";
- version = "0.1.0";
- sha256 =
- "e6e505207616d1bb77e85ac4b4d9a11437ed1eb58eb06e99c582498602a9a45b";
- };
-
- meta = {
- description = ''Auto cleaning and randomly named temporary
- files'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sorentwo/tempfile";
- };
- } // packageOverrides)
- ) {};
-
- tempfile = tempfile_0_1_0;
-
- temporary_env_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "temporary_env";
- version = "1.0.1";
- src = fetchHex {
- pkg = "temporary_env";
- version = "1.0.1";
- sha256 =
- "64bd9bade983bbdbb0c59c35343faa4c86d5533a8fe596891be84d52a41bdfe0";
- };
-
- meta = {
- description = ''A tool for managing application env state within
- tests.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lpil/temporary-env";
- };
- } // packageOverrides)
- ) {};
-
- temporary_env = temporary_env_1_0_1;
-
- tentabucket_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "tentabucket";
- version = "0.0.1";
- src = fetchHex {
- pkg = "tentabucket";
- version = "0.0.1";
- sha256 =
- "5784dad17f973efcc3c4ea7672927095864d58af1f830614e4c8f06c63d4822d";
- };
- beamDeps = [ httpoison_0_8_3 exjsx_3_2_0 ];
-
- meta = {
- description = ''Simple Bitbucket API client library for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/duksis/tentabucket";
- };
- } // packageOverrides)
- ) {};
-
- tentabucket = tentabucket_0_0_1;
-
- tentacat_0_5_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "tentacat";
- version = "0.5.1";
- src = fetchHex {
- pkg = "tentacat";
- version = "0.5.1";
- sha256 =
- "eabbffa3f2529848bb44ecdd1c140fdd06fb382a9c76a5f3ed018b87c2691946";
- };
- beamDeps = [ httpoison_0_8_3 exjsx_3_2_0 ];
-
- meta = {
- description = ''Simple Elixir wrapper for the GitHub API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/edgurgel/tentacat";
- };
- } // packageOverrides)
- ) {};
-
- tentacat = tentacat_0_5_1;
-
- term_table_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "term_table";
- version = "0.0.2";
- src = fetchHex {
- pkg = "term_table";
- version = "0.0.2";
- sha256 =
- "e0a39ef8fa4343ded18bf53b381c12ae557ca2982e24351788db457b38bd7924";
- };
-
- meta = {
- description = ''Pretty terminal table for Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/ske77/term_table";
- };
- } // packageOverrides)
- ) {};
-
- term_table = term_table_0_0_2;
-
- termcap_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "termcap";
- version = "0.1.0";
- src = fetchHex {
- pkg = "termcap";
- version = "0.1.0";
- sha256 =
- "8c5167d68759bd1cd020eeaf5fd94153430fd19fa5a5fdeeb0b3129f0aba2a21";
- };
-
- meta = {
- description = ''Pure erlang termcap library'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- termcap = termcap_0_1_0;
-
- tesla_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exjsx_3_1_0 }:
- buildMix ({
- name = "tesla";
- version = "0.2.1";
- src = fetchHex {
- pkg = "tesla";
- version = "0.2.1";
- sha256 =
- "02193ace70596445a5924e33a7e89ee15378dde07197b59bb5fba9217d8afc10";
- };
- beamDeps = [ exjsx_3_1_0 ];
-
- meta = {
- description = ''HTTP client library, with support for middleware
- and multiple adapters.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/monterail/tesla";
- };
- } // packageOverrides)
- ) {};
-
- tesla = tesla_0_2_1;
-
- test_times_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "test_times";
- version = "1.0.0";
- src = fetchHex {
- pkg = "test_times";
- version = "1.0.0";
- sha256 =
- "be468ea6002d247f743bd005c4ed71b5f86ae0e9b112ab52fea8c4f5db71cced";
- };
-
- meta = {
- description = ''Report individual test times in ascending
- order'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/pinfieldharm/test_times";
- };
- } // packageOverrides)
- ) {};
-
- test_times = test_times_1_0_0;
-
- tfidf_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tfidf";
- version = "0.1.2";
- src = fetchHex {
- pkg = "tfidf";
- version = "0.1.2";
- sha256 =
- "9dc3b778a31998671a3a3e91d5abcf1c7e9794e39d97d4eba4ce4150d80e2b36";
- };
-
- meta = {
- description = ''Elixir implementation of tf-idf (Term
- frequency-inverse document frequency)'';
- license = stdenv.lib.licenses.unlicense;
- homepage = "https://github.com/OCannings/tf-idf";
- };
- } // packageOverrides)
- ) {};
-
- tfidf = tfidf_0_1_2;
-
- the_fuzz_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "the_fuzz";
- version = "0.3.0";
- src = fetchHex {
- pkg = "the_fuzz";
- version = "0.3.0";
- sha256 =
- "f959818716b25f2c535648e9dc6dc8558c6b9fce5f337e1fcf11f913178087b8";
- };
-
- meta = {
- longDescription = ''String metrics and phonetic algorithms for
- Elixir (e.g. Dice/Sorensen, Hamming, Jaccard,
- Jaro, Jaro-Winkler, Levenshtein, Metaphone,
- N-Gram, NYSIIS, Overlap, Ratcliff/Obershelp,
- Refined NYSIIS, Refined Soundex, Soundex,
- Tversky, Tanimoto, Weighted Levenshtein). Based
- Heavily on StringMetrics for Scala written by
- Rocky Madden.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/smashedtoatoms/the_fuzz";
- };
- } // packageOverrides)
- ) {};
-
- the_fuzz = the_fuzz_0_3_0;
-
- thermex_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "thermex";
- version = "0.1.0";
- src = fetchHex {
- pkg = "thermex";
- version = "0.1.0";
- sha256 =
- "0fd2767f5fd6a73ab57d65f5797a84675341d923b5a4c10652223c4969846656";
- };
-
- meta = {
- description = ''An OTP application for watching temperature
- sensors'';
-
- };
- } // packageOverrides)
- ) {};
-
- thermex = thermex_0_1_0;
-
- thoth_0_0_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "thoth";
- version = "0.0.5";
- src = fetchHex {
- pkg = "thoth";
- version = "0.0.5";
- sha256 =
- "2712b42e23e730ec8e9a226e1d9f86fb003d60e7b44b0674c9d44132a0fc3a83";
- };
-
- meta = {
- description = ''An Elixir digraph inspired local Graph DB'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/oakfang/thoth";
- };
- } // packageOverrides)
- ) {};
-
- thoth = thoth_0_0_5;
-
- thrash_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "thrash";
- version = "0.1.0";
- src = fetchHex {
- pkg = "thrash";
- version = "0.1.0";
- sha256 =
- "cebcabe309682f04d030f24f71498579fd16f688965cc5e29262a660082953e7";
- };
-
- meta = {
- description = ''Fast serializer/deserializer for Apache Thrift`s
- binary protocol.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/dantswain/thrash";
- };
- } // packageOverrides)
- ) {};
-
- thrash = thrash_0_1_0;
-
- thrift_1_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "thrift";
- version = "1.2.1";
- src = fetchHex {
- pkg = "thrift";
- version = "1.2.1";
- sha256 =
- "52dbe7126498efa96039b0b7689a96295af244cb6203f891f1b4b10c1f7f539d";
- };
-
- meta = {
- longDescription = ''A collection of utilities for working with
- Thrift in Elixir. Provides a copy of the Apache
- Thrift Erlang runtime.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/pinterest/elixir-thrift";
- };
- } // packageOverrides)
- ) {};
-
- thrift = thrift_1_2_1;
-
- tiled_map_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "tiled_map";
- version = "0.0.1";
- src = fetchHex {
- pkg = "tiled_map";
- version = "0.0.1";
- sha256 =
- "c285c5293bb97d0e526c1cab14cdcf4b17dd12a76e2a0d707f1b71a4fcf9501e";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- description = ''Basic parsing of JSON Map Format from Tiled map
- editor'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kentdahl/tiled_map";
- };
- } // packageOverrides)
- ) {};
-
- tiled_map = tiled_map_0_0_1;
-
- time_ago_words_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_2_1_6 }:
- buildMix ({
- name = "time_ago_words";
- version = "0.0.2";
- src = fetchHex {
- pkg = "time_ago_words";
- version = "0.0.2";
- sha256 =
- "8cf37434618123ce09ebbba90f9b86eca0fdfdce6cd2887b2a03e5d171515f50";
- };
- beamDeps = [ timex_2_1_6 ];
-
- meta = {
- longDescription = ''A simple function to return the approximate
- difference between two times using words.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/midwire/time_ago_words";
- };
- } // packageOverrides)
- ) {};
-
- time_ago_words = time_ago_words_0_0_2;
-
- time_distance_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, timex_1_0_2 }:
- buildMix ({
- name = "time_distance";
- version = "0.0.1";
- src = fetchHex {
- pkg = "time_distance";
- version = "0.0.1";
- sha256 =
- "41ebe658882f2defd2cd472960e5a31b18d7ea2a4520c06907f7f2093d030e58";
- };
- beamDeps = [ timex_1_0_2 ];
-
- meta = {
- longDescription = ''Show the difference between two specified
- times, or between a specified time and now in
- words (eg. 1 week ago)'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/aussiegeek/time_distance";
- };
- } // packageOverrides)
- ) {};
-
- time_distance = time_distance_0_0_1;
-
- time_seer_0_0_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "time_seer";
- version = "0.0.6";
- src = fetchHex {
- pkg = "time_seer";
- version = "0.0.6";
- sha256 =
- "b5cfe4b5126deef913a91463c735c214efdde1cfb57e9303444d1a687fde53f5";
- };
-
- meta = {
- longDescription = ''TimeSeer is an Elixir library for parsing
- dates and times and returning Erlang style date
- and time tuples. Eg. \"15:12:07\" \"2:42pm\"
- \"24/12/2014\" will become {15,12,7}, {14,42,0},
- and {2014,12,24} respectively.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lau/time_seer";
- };
- } // packageOverrides)
- ) {};
-
- time_seer = time_seer_0_0_6;
-
- timex_0_19_5 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- tzdata_0_5_8,
- combine_0_8_0
- }:
- buildMix ({
- name = "timex";
- version = "0.19.5";
- src = fetchHex {
- pkg = "timex";
- version = "0.19.5";
- sha256 =
- "be1985ab99a6aebc3672b1d82b27e409c9a7af4658f3cc5900fa8754e159b02c";
- };
- beamDeps = [ tzdata_0_5_8 combine_0_8_0 ];
-
- meta = {
- longDescription = ''Timex is a rich, comprehensive Date/Time
- library for Elixir projects, with full timezone
- support via the :tzdata package. If you need to
- manipulate dates, times, datetimes, timestamps,
- etc., then Timex is for you!'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bitwalker/timex";
- };
- } // packageOverrides)
- ) {};
-
- timex_1_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- tzdata_0_0_1,
- combine_0_8_0
- }:
- buildMix ({
- name = "timex";
- version = "1.0.2";
- src = fetchHex {
- pkg = "timex";
- version = "1.0.2";
- sha256 =
- "cbc359d21b5e2e694ab437e614bb4198af5be1031da4969dfd7ddf1b56064c88";
- };
- beamDeps = [ tzdata_0_0_1 combine_0_8_0 ];
-
- meta = {
- longDescription = ''Timex is a rich, comprehensive Date/Time
- library for Elixir projects, with full timezone
- support via the :tzdata package. If you need to
- manipulate dates, times, datetimes, timestamps,
- etc., then Timex is for you!'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bitwalker/timex";
- };
- } // packageOverrides)
- ) {};
-
- timex_2_1_6 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- gettext_0_11_0,
- combine_0_8_0,
- tzdata_0_0_1
- }:
- buildMix ({
- name = "timex";
- version = "2.1.6";
- src = fetchHex {
- pkg = "timex";
- version = "2.1.6";
- sha256 =
- "c0e3b74beb0734f0602eed0de5bbcce984fc435f258c974bde4169a407330d12";
- };
- beamDeps = [ gettext_0_11_0 combine_0_8_0 tzdata_0_0_1 ];
-
- meta = {
- longDescription = ''Timex is a rich, comprehensive Date/Time
- library for Elixir projects, with full timezone
- support via the :tzdata package. If you need to
- manipulate dates, times, datetimes, timestamps,
- etc., then Timex is for you!'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bitwalker/timex";
- };
- } // packageOverrides)
- ) {};
-
- timex = timex_2_1_6;
-
- tinymt_0_3_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tinymt";
- version = "0.3.1";
- src = fetchHex {
- pkg = "tinymt";
- version = "0.3.1";
- sha256 =
- "9de8fcedf254661bc4aa550aac317e28be35d4a5d91adf3fa3689dfad6cc1e5a";
- };
-
- meta = {
- description = ''Tiny Mersenne Twister (TinyMT) for Erlang'';
- license = stdenv.lib.licenses.bsd2;
- homepage = "https://github.com/jj1bdx/tinymt-erlang/";
- };
- } // packageOverrides)
- ) {};
-
- tinymt = tinymt_0_3_1;
-
- tipo_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tipo";
- version = "0.0.3";
- src = fetchHex {
- pkg = "tipo";
- version = "0.0.3";
- sha256 =
- "3feeb200a1806b41afe6404b09493fb98a140ab0c642c2c0328c96cbf9cf66c8";
- };
-
- meta = {
- description = ''Type checking for primitive elixir data types'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jwaterfaucett/tipo";
- };
- } // packageOverrides)
- ) {};
-
- tipo = tipo_0_0_3;
-
- tirexs_0_8_0_beta6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exjsx_3_2_0 }:
- buildMix ({
- name = "tirexs";
- version = "0.8.0-beta6";
- src = fetchHex {
- pkg = "tirexs";
- version = "0.8.0-beta6";
- sha256 =
- "eee9deb8bb020f482ac9e6e77505819931b2db1050e7b999643bf9ca73beab15";
- };
- beamDeps = [ exjsx_3_2_0 ];
-
- meta = {
- description = ''An Elixir flavored DSL for building JSON based
- queries to Elasticsearch engine'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/Zatvobor/tirexs";
- };
- } // packageOverrides)
- ) {};
-
- tirexs_0_8_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exjsx_3_2_0 }:
- buildMix ({
- name = "tirexs";
- version = "0.8.2";
- src = fetchHex {
- pkg = "tirexs";
- version = "0.8.2";
- sha256 =
- "0412e42030723f179579987bb9f6281cb0dc0db95134296058e2e95554a5b198";
- };
- beamDeps = [ exjsx_3_2_0 ];
-
- meta = {
- description = ''An Elixir flavored DSL for building JSON based
- queries to Elasticsearch engine'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/Zatvobor/tirexs";
- };
- } // packageOverrides)
- ) {};
-
- tirexs = tirexs_0_8_2;
-
- tlv_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tlv";
- version = "0.1.0";
- src = fetchHex {
- pkg = "tlv";
- version = "0.1.0";
- sha256 =
- "bc040b662594ad6c83f1d931ee2e74f8d00697afa215087297f64546a0c500e9";
- };
-
- meta = {
- description = ''Encodes/Decodes BER-TLVs structures'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bitgamma/elixir_tlv";
- };
- } // packageOverrides)
- ) {};
-
- tlv = tlv_0_1_0;
-
- tmdb_0_0_6 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_4_0,
- httpoison_0_8_3,
- exjsx_3_1_0
- }:
- buildMix ({
- name = "tmdb";
- version = "0.0.6";
- src = fetchHex {
- pkg = "tmdb";
- version = "0.0.6";
- sha256 =
- "4cbad6ffa556a0eeecb22c3960d47451e918313e5651808439f039403dd38d3a";
- };
- beamDeps = [ poison_1_4_0 httpoison_0_8_3 exjsx_3_1_0 ];
-
- meta = { };
- } // packageOverrides)
- ) {};
-
- tmdb = tmdb_0_0_6;
-
- todo_1_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "todo";
- version = "1.2.0";
- src = fetchHex {
- pkg = "todo";
- version = "1.2.0";
- sha256 =
- "92b0da31ee335a4caff5bb91950688fc3195c2eb78cc70be80e3b616f2be88bc";
- };
-
- meta = {
- description = ''A small TODO comments utility.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/niahoo/elixir-todo";
- };
- } // packageOverrides)
- ) {};
-
- todo = todo_1_2_0;
-
- togglex_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "togglex";
- version = "0.2.0";
- src = fetchHex {
- pkg = "togglex";
- version = "0.2.0";
- sha256 =
- "725b4299c5aad1c87900e667d6a01c88ba18f8e545283f31d2f726745c174e30";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Simple Elixir wrapper for the Toggl API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/diacode/togglex";
- };
- } // packageOverrides)
- ) {};
-
- togglex = togglex_0_2_0;
-
- toglx_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- togglex_0_2_0,
- configparser_ex_0_2_1,
- argument_parser_0_1_3
- }:
- buildMix ({
- name = "toglx";
- version = "0.0.1";
- src = fetchHex {
- pkg = "toglx";
- version = "0.0.1";
- sha256 =
- "e6952e6955f5d61d479254a9b4a99831c4d73237e6fc8b39eeea6e4277979ba5";
- };
- beamDeps = [
- togglex_0_2_0
- configparser_ex_0_2_1
- argument_parser_0_1_3
- ];
-
- meta = {
- description = ''Toggl(ex) time tracking client'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/kennyballou/toglx";
- };
- } // packageOverrides)
- ) {};
-
- toglx = toglx_0_0_1;
-
- tonic_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tonic";
- version = "0.0.1";
- src = fetchHex {
- pkg = "tonic";
- version = "0.0.1";
- sha256 =
- "a94df1788fe102a001ec565846cf8b15d0eacc2e1644bf21c8c510b8294d24a6";
- };
-
- meta = {
- description = ''A DSL for conveniently loading binary
- data/files.'';
- license = stdenv.lib.licenses.bsd2;
- homepage = "https://github.com/ScrimpyCat/Tonic";
- };
- } // packageOverrides)
- ) {};
-
- tonic = tonic_0_0_1;
-
- toniq_1_0_5 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- uuid_1_1_4,
- exredis_0_2_4
- }:
- buildMix ({
- name = "toniq";
- version = "1.0.5";
- src = fetchHex {
- pkg = "toniq";
- version = "1.0.5";
- sha256 =
- "aa67c43131393872d82d53b9a8bf4a3d5b97c52a6588d53aaa61c29828e0664a";
- };
- beamDeps = [ uuid_1_1_4 exredis_0_2_4 ];
-
- meta = {
- longDescription = ''Simple and reliable background job processing
- library for Elixir. Has persistence, retries,
- concurrency limiting, error handling and is
- heroku friendly.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/joakimk/toniq";
- };
- } // packageOverrides)
- ) {};
-
- toniq = toniq_1_0_5;
-
- towel_0_2_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "towel";
- version = "0.2.1";
- src = fetchHex {
- pkg = "towel";
- version = "0.2.1";
- sha256 =
- "e7b7c5e7e6d8df9e781e130d1defccc9a27f888f7b95c132d8ccd1d6957d3b7a";
- };
-
- meta = {
- description = ''A delightfully simple monad library that`s
- written for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/knrz/towel";
- };
- } // packageOverrides)
- ) {};
-
- towel = towel_0_2_1;
-
- tqdm_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tqdm";
- version = "0.0.2";
- src = fetchHex {
- pkg = "tqdm";
- version = "0.0.2";
- sha256 =
- "2791905b98c0d3371ebf98fd7185d0af58ca8d2911182d908b970afab0b8801d";
- };
-
- meta = {
- longDescription = ''Add a progress bar to your enumerables
- (Lists, Maps, Streams, Ranges, etc.) in a
- second.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/antipax/tqdm_elixir";
- };
- } // packageOverrides)
- ) {};
-
- tqdm = tqdm_0_0_2;
-
- tracing_helper_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tracing_helper";
- version = "0.0.3";
- src = fetchHex {
- pkg = "tracing_helper";
- version = "0.0.3";
- sha256 =
- "a1d22c5901ed688acab63c0195aba2826f774a8d7e7f1b882878b715cd4688fb";
- };
-
- meta = {
- description = ''TracingHelper is a helper module with predefined
- tracing functions'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/andrzejsliwa/tracing_helper";
- };
- } // packageOverrides)
- ) {};
-
- tracing_helper = tracing_helper_0_0_3;
-
- trackline_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- timex_1_0_2,
- exml_0_1_0,
- exmerl_0_1_1,
- erlsom_1_4_1,
- apex_0_3_7
- }:
- buildMix ({
- name = "trackline";
- version = "0.0.1";
- src = fetchHex {
- pkg = "trackline";
- version = "0.0.1";
- sha256 =
- "42ee5d56b2ec0c55715e7f03a9aacd6d7ce8543519e9ec696335348eb1a24f7c";
- };
- beamDeps = [
- timex_1_0_2
- exml_0_1_0
- exmerl_0_1_1
- erlsom_1_4_1
- apex_0_3_7
- ];
-
- meta = {
- description = ''A GPX parser for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/andrewhao/trackline";
- };
- } // packageOverrides)
- ) {};
-
- trackline = trackline_0_0_1;
-
- trackstar_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- erlsom_1_4_1
- }:
- buildMix ({
- name = "trackstar";
- version = "0.0.1";
- src = fetchHex {
- pkg = "trackstar";
- version = "0.0.1";
- sha256 =
- "04a7634755da273b640737c8bef015f5ef4360524940fa763c3100e13db47cd4";
- };
- beamDeps = [ poison_2_1_0 erlsom_1_4_1 ];
-
- meta = {
- longDescription = ''Trackstar is a GPX parser. Specify the path
- to a GPX file and it will output a GeoJSON of
- the track as a LineString. It currently works
- with Strava-exported GPX files.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/andydangerous/trackstar";
- };
- } // packageOverrides)
- ) {};
-
- trackstar = trackstar_0_0_1;
-
- tradie_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tradie";
- version = "0.0.1";
- src = fetchHex {
- pkg = "tradie";
- version = "0.0.1";
- sha256 =
- "d317c61c9bd9ab46184df8036057855e676d8598905c6708b9a9e26af3b7fd04";
- };
-
- meta = {
- longDescription = ''Execute multiple tasks in parallel, allowing
- retry for each task, and a global timeout. Based
- loosely on
- http://theerlangelist.com/article/beyond_taskasync.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/madlep/tradie";
- };
- } // packageOverrides)
- ) {};
-
- tradie = tradie_0_0_1;
-
- trailing_format_plug_0_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "trailing_format_plug";
- version = "0.0.4";
- src = fetchHex {
- pkg = "trailing_format_plug";
- version = "0.0.4";
- sha256 =
- "16e2485b7069c8e025460d183d4711d9c5bbf46ae532dde859cc6623d12bfc71";
- };
- beamDeps = [ plug_1_1_5 cowboy_1_0_4 ];
-
- meta = {
- longDescription = ''An elixir plug to support legacy APIs that
- use a rails-like trailing format:
- http://api.dev/resources.format'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/mschae/trailing_format_plug";
- };
- } // packageOverrides)
- ) {};
-
- trailing_format_plug = trailing_format_plug_0_0_4;
-
- transducer_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "transducer";
- version = "0.1.0";
- src = fetchHex {
- pkg = "transducer";
- version = "0.1.0";
- sha256 =
- "89533238e42bace715485c5113bb5c39beecb333c00f4624ae85d5c0f6e96db4";
- };
-
- meta = {
- longDescription = ''Composable algorithmic transformations.
- Transducers let you combine reduction operations
- like `map`, `filter`, `take_while`, `take`, and
- so on into a single reducing function. As with
- Stream, but in contrast to Enum, all operations
- are performed for each item before the next item
- in the enumerable is processed. One difference
- with the Stream module is that the transducers`
- reducing functions don`t have to produce an
- enumerable, while Stream module transformations
- always do.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/garyposter/elixir-transducer";
- };
- } // packageOverrides)
- ) {};
-
- transducer = transducer_0_1_0;
-
- travis_ex_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "travis_ex";
- version = "0.0.2";
- src = fetchHex {
- pkg = "travis_ex";
- version = "0.0.2";
- sha256 =
- "80589ec01596dfc1e02cef61ce0adc3c9b73977b56a528e214c37af079efa10a";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Travis-ci API client library for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/duksis/travis_ex";
- };
- } // packageOverrides)
- ) {};
-
- travis_ex = travis_ex_0_0_2;
-
- trello_1_3_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "trello";
- version = "1.3.0";
- src = fetchHex {
- pkg = "trello";
- version = "1.3.0";
- sha256 =
- "776d6514b766a9290b102bf8682dd13d1b63b1cab68fd73880a6da3b81014cd6";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Trello wrapper for elixir api'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mikaak/trello-elixir";
- };
- } // packageOverrides)
- ) {};
-
- trello = trello_1_3_0;
-
- trie_1_4_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "trie";
- version = "1.4.0";
- src = fetchHex {
- pkg = "trie";
- version = "1.4.0";
- sha256 =
- "befef786527fd17678716f9dc86a064a11811e7087094967204715804a23ea4b";
- };
-
- meta = {
- description = ''Erlang Trie Implementation'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/okeuday/trie";
- };
- } // packageOverrides)
- ) {};
-
- trie_1_5_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "trie";
- version = "1.5.1";
- src = fetchHex {
- pkg = "trie";
- version = "1.5.1";
- sha256 =
- "4b845dccfca8962b90584e98d270e2ff43e2e181bb046c4aae0e0f457679f98d";
- };
-
- meta = {
- description = ''Erlang Trie Implementation'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/okeuday/trie";
- };
- } // packageOverrides)
- ) {};
-
- trie = trie_1_5_1;
-
- trot_0_5_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- plug_heartbeat_0_2_0,
- plug_0_14_0,
- cowboy_1_0_4,
- calliope_0_3_0
- }:
- buildMix ({
- name = "trot";
- version = "0.5.3";
- src = fetchHex {
- pkg = "trot";
- version = "0.5.3";
- sha256 =
- "982a4ff3a0fffe1e9cc752313fd4c45487fdd484dde7265728da4579c29354e1";
- };
- beamDeps = [
- poison_1_5_2
- plug_heartbeat_0_2_0
- plug_0_14_0
- cowboy_1_0_4
- calliope_0_3_0
- ];
-
- meta = {
- description = ''A web micro-framework based on Plug and
- Cowboy.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/hexedpackets/trot";
- };
- } // packageOverrides)
- ) {};
-
- trot = trot_0_5_3;
-
- tsuru_1_4_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "tsuru";
- version = "1.4.0";
- src = fetchHex {
- pkg = "tsuru";
- version = "1.4.0";
- sha256 =
- "7825d3b530b46a8c4ff93b3c83a31d0f2ce042ddc741a89d3776edfd9f2828f7";
- };
-
- meta = {
- description = ''A collection of useful tools for Erlang
- applications'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- tsuru = tsuru_1_4_0;
-
- tubex_0_0_7 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "tubex";
- version = "0.0.7";
- src = fetchHex {
- pkg = "tubex";
- version = "0.0.7";
- sha256 =
- "8b34ade3d0484ee5ebb1155c16454d545284d0c215bf999a206cbcc198acea83";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir wrapper of YouTube Data API v3'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/yoavlt/tubex";
- };
- } // packageOverrides)
- ) {};
-
- tubex = tubex_0_0_7;
-
- tunnerl_0_2_2 = callPackage
- (
- {
- buildRebar3,
- packageOverrides ? {},
- fetchHex,
- ranch_1_2_1,
- lager_3_0_2
- }:
- buildRebar3 ({
- name = "tunnerl";
- version = "0.2.2";
- src = fetchHex {
- pkg = "tunnerl";
- version = "0.2.2";
- sha256 =
- "8b630b43d77f5c92901d6a1909be7ce3c8cd5668fa05263e2fcdf73b00d63bd0";
- };
-
- beamDeps = [ ranch_1_2_1 lager_3_0_2 ];
-
- meta = {
- description = ''SOCKS4 and SOCKS5 proxy server'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/surik/tunnerl";
- };
- } // packageOverrides)
- ) {};
-
- tunnerl = tunnerl_0_2_2;
-
- tvdb_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "tvdb";
- version = "0.0.1";
- src = fetchHex {
- pkg = "tvdb";
- version = "0.0.1";
- sha256 =
- "627d0ce97938039748960550abe9bebe1f55be39701f85e85ff9f2b6e4af9f00";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Wrapper for TVDb API'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/markman123/tvdb";
- };
- } // packageOverrides)
- ) {};
-
- tvdb = tvdb_0_0_1;
-
- twilex_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "twilex";
- version = "0.0.2";
- src = fetchHex {
- pkg = "twilex";
- version = "0.0.2";
- sha256 =
- "b032ee0327c90a9a0545756d771778129d6ded10dfade86b2c8dd1eb80fb56de";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''A Twilio client for elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/hisea/twilex";
- };
- } // packageOverrides)
- ) {};
-
- twilex = twilex_0_0_2;
-
- type_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "type";
- version = "0.0.2";
- src = fetchHex {
- pkg = "type";
- version = "0.0.2";
- sha256 =
- "1553ec18df7781cc1144477e075ac3c907aa7900db308d9d43cf7cfbeeb7a8ac";
- };
-
- meta = {
- description = ''A module for checking the type of an argument'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/jeffreybaird/type";
- };
- } // packageOverrides)
- ) {};
-
- type = type_0_0_2;
-
- typeformx_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "typeformx";
- version = "0.0.1";
- src = fetchHex {
- pkg = "typeformx";
- version = "0.0.1";
- sha256 =
- "8f6f1613f53f8c5012eb6d05276f5d305bdb9d4b0e94926680b536d0e1d94a62";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''An Elixir client library for the Typeform API
- (typeform.io)'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/netflakes/TypeformX";
- };
- } // packageOverrides)
- ) {};
-
- typeformx = typeformx_0_0_1;
-
- tzdata_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tzdata";
- version = "0.0.1";
- src = fetchHex {
- pkg = "tzdata";
- version = "0.0.1";
- sha256 =
- "67020b94ec70faceef822dc5bffea0361c4fc9d812c8872c4edb6a2084b16b25";
- };
-
- meta = {
- description = ''Tzdata is a parser and library for the tz
- database.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lau/tzdata";
- };
- } // packageOverrides)
- ) {};
-
- tzdata_0_1_201603 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "tzdata";
- version = "0.1.201603";
- src = fetchHex {
- pkg = "tzdata";
- version = "0.1.201603";
- sha256 =
- "77598cedfb09cfdfb8f431c51131eb84229c46b2c5a7eebdf5904b2b8f003225";
- };
-
- meta = {
- description = ''Tzdata is a parser and library for the tz
- database.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lau/tzdata";
- };
- } // packageOverrides)
- ) {};
-
- tzdata_0_5_8 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, hackney_1_6_0 }:
- buildMix ({
- name = "tzdata";
- version = "0.5.8";
- src = fetchHex {
- pkg = "tzdata";
- version = "0.5.8";
- sha256 =
- "218ab89e51fb297f1e4bf512e9e551b8214d361e61b7683179da303ba5be8c60";
- };
- beamDeps = [ hackney_1_6_0 ];
-
- meta = {
- description = ''Tzdata is a parser and library for the tz
- database.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lau/tzdata";
- };
- } // packageOverrides)
- ) {};
-
- tzdata = tzdata_0_5_8;
-
- ua_classifier_1_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "ua_classifier";
- version = "1.0.0";
- src = fetchHex {
- pkg = "ua_classifier";
- version = "1.0.0";
- sha256 =
- "59c3b3ed96a10fe05e91202a3ca983b40215c41dde0733fe6dd8a6841b6e315d";
- };
- compilePorts = true;
- buildPlugins = [ pc ];
-
-
- meta = {
- description = ''Erlang User Agent Classifier - NIF for
- WeatherChannel dClass'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/zotonic/ua_classifier";
- };
- } // packageOverrides)
- ) {};
-
- ua_classifier = ua_classifier_1_0_0;
-
- ua_inspector_0_11_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poolboy_1_5_1 }:
- buildMix ({
- name = "ua_inspector";
- version = "0.11.1";
- src = fetchHex {
- pkg = "ua_inspector";
- version = "0.11.1";
- sha256 =
- "943787d2a766ed8fd50e30f6787c9775304bd1215ffbdb5fe0b445153af8d02b";
- };
- beamDeps = [ poolboy_1_5_1 ];
-
- meta = {
- description = ''User agent parser library'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/elixytics/ua_inspector";
- };
- } // packageOverrides)
- ) {};
-
- ua_inspector = ua_inspector_0_11_1;
-
- uber_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "uber";
- version = "0.1.0";
- src = fetchHex {
- pkg = "uber";
- version = "0.1.0";
- sha256 =
- "bf3dde22ad6207577ea1093649394d968ef94725fdc56d5ea6afd22d12886d9a";
- };
-
- meta = {
- description = ''Utilities for working with the UBER hypermedia
- format'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/gamache/uber.ex";
- };
- } // packageOverrides)
- ) {};
-
- uber = uber_0_1_0;
-
- udpflux_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "udpflux";
- version = "0.0.2";
- src = fetchHex {
- pkg = "udpflux";
- version = "0.0.2";
- sha256 =
- "0a6d0003b818364bad9ed8bc55b8789b8fc129d055799cd517a551445fe0649e";
- };
-
- meta = {
- description = ''An opinionated UDP-only InfluxDB client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/timbuchwaldt/udpflux";
- };
- } // packageOverrides)
- ) {};
-
- udpflux = udpflux_0_0_2;
-
- ueberauth_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "ueberauth";
- version = "0.2.0";
- src = fetchHex {
- pkg = "ueberauth";
- version = "0.2.0";
- sha256 =
- "d6ee9cfe96be0e2b4005cb482b8e29c20ae0d6f7332ea9f686397c4ab20bf4de";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''An Elixir Authentication System for Plug-based
- Web Applications'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ueberauth/ueberauth";
- };
- } // packageOverrides)
- ) {};
-
- ueberauth = ueberauth_0_2_0;
-
- ueberauth_identity_0_2_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- ueberauth_0_2_0,
- plug_1_1_5
- }:
- buildMix ({
- name = "ueberauth_identity";
- version = "0.2.3";
- src = fetchHex {
- pkg = "ueberauth_identity";
- version = "0.2.3";
- sha256 =
- "ebbb4d7fe6c94053486a32794ab2a561f004f01fd1099c7e0a69901dc32c51ca";
- };
- beamDeps = [ ueberauth_0_2_0 plug_1_1_5 ];
-
- meta = {
- description = ''An Ueberauth strategy for basic
- username/password'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ueberauth/ueberauth_identity";
- };
- } // packageOverrides)
- ) {};
-
- ueberauth_identity = ueberauth_identity_0_2_3;
-
- ueberauth_twitter_0_2_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- ueberauth_0_2_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "ueberauth_twitter";
- version = "0.2.2";
- src = fetchHex {
- pkg = "ueberauth_twitter";
- version = "0.2.2";
- sha256 =
- "911a227b8290e8d65cee8d45015477d4ea51dbcf637c8a41ff88b34fcc5ab65a";
- };
- beamDeps = [ ueberauth_0_2_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''An Uberauth strategy for Twitter
- authentication.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ueberauth/ueberauth_twitter";
- };
- } // packageOverrides)
- ) {};
-
- ueberauth_twitter = ueberauth_twitter_0_2_2;
-
- uk_postcode_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "uk_postcode";
- version = "0.3.0";
- src = fetchHex {
- pkg = "uk_postcode";
- version = "0.3.0";
- sha256 =
- "a03250f6896bef8851f243856d36952e7776a8d2fa654aa4d3336d841cbb59f8";
- };
-
- meta = {
- longDescription = ''UK postcode parsing and validation library.
- Validate full postcodes or parts of a postcode,
- and can extract parts of a full postcode. '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KushalP/uk_postcode";
- };
- } // packageOverrides)
- ) {};
-
- uk_postcode = uk_postcode_0_3_0;
-
- unicode_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, earmark_0_2_1 }:
- buildMix ({
- name = "unicode";
- version = "0.0.1";
- src = fetchHex {
- pkg = "unicode";
- version = "0.0.1";
- sha256 =
- "646bd8c3c9967a26b14aaa167e1bd08451d9db885d2736046b5fe5ada04bd2d6";
- };
- beamDeps = [ earmark_0_2_1 ];
-
- meta = {
- longDescription = ''The _Unicode_ package provides functionality
- to check properties of unicode codepoints,
- graphemes and strings. This is often useful when
- checking or validating the contents of strings
- in situations where using Regular Expressions is
- not necessary and/or too slow. The Unicode
- package is based on Version 8.0.0 of the Unicode
- standard.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/Qqwy/elixir-unicode";
- };
- } // packageOverrides)
- ) {};
-
- unicode = unicode_0_0_1;
-
- unit_fun_0_5_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "unit_fun";
- version = "0.5.1";
- src = fetchHex {
- pkg = "unit_fun";
- version = "0.5.1";
- sha256 =
- "adc90b1e6363234d2507b6f1af08186831fb556ee8c8cb62d13fb03b8c3cc93c";
- };
-
- meta = {
- description = ''Library for adding units/dimensions to numeric
- types.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/meadsteve/unit_fun";
- };
- } // packageOverrides)
- ) {};
-
- unit_fun = unit_fun_0_5_1;
-
- units_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "units";
- version = "1.0.0";
- src = fetchHex {
- pkg = "units";
- version = "1.0.0";
- sha256 =
- "edac76cb036b993ef35781701fc561b4a6c95e4d7c89dba0d6f96ae3077b8ffe";
- };
-
- meta = {
- description = ''Common unit conversions for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/solatis/units";
- };
- } // packageOverrides)
- ) {};
-
- units = units_1_0_0;
-
- untappd_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- exjsx_3_2_0
- }:
- buildMix ({
- name = "untappd";
- version = "0.0.1";
- src = fetchHex {
- pkg = "untappd";
- version = "0.0.1";
- sha256 =
- "f4560612cd78002202234660cf248f004c91ade8c10dc87ad136eb5d8f49d66a";
- };
- beamDeps = [ httpoison_0_8_3 exjsx_3_2_0 ];
-
- meta = {
- description = ''Elixir wrapper for the Untappd API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/nimi/untappd";
- };
- } // packageOverrides)
- ) {};
-
- untappd = untappd_0_0_1;
-
- until_then_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, calendar_0_14_2 }:
- buildMix ({
- name = "until_then";
- version = "0.0.1";
- src = fetchHex {
- pkg = "until_then";
- version = "0.0.1";
- sha256 =
- "9bc5c61346d18a770efc25e5f3cb55c9cb68fe2d7ff179964ac8b314d779c111";
- };
- beamDeps = [ calendar_0_14_2 ];
-
- meta = {
- longDescription = ''This library tells you how many milliseconds
- to the next occurrence of a scheduled event.
- This is very convenient to combine with
- `:timer.sleep/1` or `Process.send_after/3` as a
- means of repeatedly invoking some code on a
- schedule and not having those invocations
- drift.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/NoRedInk/until_then";
- };
- } // packageOverrides)
- ) {};
-
- until_then = until_then_0_0_1;
-
- uri_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "uri";
- version = "0.1.0";
- src = fetchHex {
- pkg = "uri";
- version = "0.1.0";
- sha256 =
- "3833c3b5745fc0822df86c3a3591219048026fea8a535223b440d26029218996";
- };
-
- meta = {
- description = ''URI Parsing/Encoding Library'';
-
- };
- } // packageOverrides)
- ) {};
-
- uri = uri_0_1_0;
-
- urilib_0_1_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "urilib";
- version = "0.1.1";
- src = fetchHex {
- pkg = "urilib";
- version = "0.1.1";
- sha256 =
- "6000180e6977263e5996921f243e0c152aad29c87d202f8a650acb412c5aa758";
- };
-
- meta = {
- description = ''A RFC-3986 URI Library for parsing and building
- URIs'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/gmr/urilib";
- };
- } // packageOverrides)
- ) {};
-
- urilib = urilib_0_1_1;
-
- url_tincture_0_0_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "url_tincture";
- version = "0.0.6";
- src = fetchHex {
- pkg = "url_tincture";
- version = "0.0.6";
- sha256 =
- "00a00bfca54cea1f5d9b340c90d9ed52ad86fe7bc8b657f3cc27c7404c33c1f5";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- description = ''A package to reduce extended forms of URLs to a
- canonical reference'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/craigwaterman/url_tincture";
- };
- } // packageOverrides)
- ) {};
-
- url_tincture = url_tincture_0_0_6;
-
- url_unroller_0_0_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "url_unroller";
- version = "0.0.3";
- src = fetchHex {
- pkg = "url_unroller";
- version = "0.0.3";
- sha256 =
- "65a46b7335060111bdc5ad164548361f3c7ff5a39ff9493a9109dd20b98498b9";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- description = ''A simple url unroller/unshortener'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/semanticart/url_unroller";
- };
- } // packageOverrides)
- ) {};
-
- url_unroller = url_unroller_0_0_3;
-
- usefulness_0_0_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "usefulness";
- version = "0.0.6";
- src = fetchHex {
- pkg = "usefulness";
- version = "0.0.6";
- sha256 =
- "993b6d5ef4a8c4a4c254c92c49290f245ea34f071a9acd100abd654b381ec238";
- };
-
- meta = {
- description = ''Useful things'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/b-filip/usefulness";
- };
- } // packageOverrides)
- ) {};
-
- usefulness = usefulness_0_0_6;
-
- user_agent_parser_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "user_agent_parser";
- version = "1.0.1";
- src = fetchHex {
- pkg = "user_agent_parser";
- version = "1.0.1";
- sha256 =
- "ba049dfe5d9c611a0ba3ac13c9ef0d17ea49e8bdfab68c54e7415423f32aa74f";
- };
-
- meta = {
- longDescription = ''A simple Elixir package for parsing user
- agent strings with the help of BrowserScope`s UA
- database'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/romul/uap-elixir";
- };
- } // packageOverrides)
- ) {};
-
- user_agent_parser = user_agent_parser_1_0_1;
-
- uuid_0_1_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "uuid";
- version = "0.1.5";
- src = fetchHex {
- pkg = "uuid";
- version = "0.1.5";
- sha256 =
- "5cfb91972f5cacb0bcb2f00414d5747dd575d84b864c96f668ab3b729cc08422";
- };
-
- meta = {
- description = ''UUID generator and utilities for Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/zyro/elixir-uuid";
- };
- } // packageOverrides)
- ) {};
-
- uuid_1_1_4 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "uuid";
- version = "1.1.4";
- src = fetchHex {
- pkg = "uuid";
- version = "1.1.4";
- sha256 =
- "55ceed2fe12062e3e0bf19baa118d0ac64eb6edd79f242aaaf090236f09965f0";
- };
-
- meta = {
- description = ''UUID generator and utilities for Elixir.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/zyro/elixir-uuid";
- };
- } // packageOverrides)
- ) {};
-
- uuid = uuid_1_1_4;
-
- vagrant_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "vagrant";
- version = "0.0.1";
- src = fetchHex {
- pkg = "vagrant";
- version = "0.0.1";
- sha256 =
- "805a78a9ee586546d0716ddc9afc3417630c48faab4606cf54c863b10a05ce52";
- };
-
- meta = {
- description = ''Vagrant CLI Wrapper'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/mobileoverlord/vagrant";
- };
- } // packageOverrides)
- ) {};
-
- vagrant = vagrant_0_0_1;
-
- varpool_1_5_1 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "varpool";
- version = "1.5.1";
- src = fetchHex {
- pkg = "varpool";
- version = "1.5.1";
- sha256 =
- "ff6059bdcd0efad606e8c54ee623cfeaef59778c18e343dd772e84d99d188e26";
- };
-
- meta = {
- description = ''Erlang Process Pools as a Local Variable'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/okeuday/varpool";
- };
- } // packageOverrides)
- ) {};
-
- varpool = varpool_1_5_1;
-
- vector_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "vector";
- version = "0.3.0";
- src = fetchHex {
- pkg = "vector";
- version = "0.3.0";
- sha256 =
- "e1f7645d090d58c9efc63046be1ade8b7a431c6428460c3290d6eb6da85cba45";
- };
-
- meta = {
- longDescription = ''Library of common vector functions for use in
- geometric or graphical calculations.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pkinney/vector_ex";
- };
- } // packageOverrides)
- ) {};
-
- vector = vector_0_3_0;
-
- verhoeff_0_1_2 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "verhoeff";
- version = "0.1.2";
- src = fetchHex {
- pkg = "verhoeff";
- version = "0.1.2";
- sha256 =
- "1110f266fb3e2b69c7ba29cdae13e583f32af99e6a24843cefa04690c529e8f9";
- };
-
- meta = {
- description = ''The Verhoeff algorithm implementation'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/mururu/verhoeff";
- };
- } // packageOverrides)
- ) {};
-
- verhoeff = verhoeff_0_1_2;
-
- verify_origin_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "verify_origin";
- version = "0.1.0";
- src = fetchHex {
- pkg = "verify_origin";
- version = "0.1.0";
- sha256 =
- "90834033676cb0ca632f208f489f6eb92ae94323fe7243efba577e1deb031167";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''A library for using Origin header checking to
- prevent CSRF'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/danmcclain/verify_origin";
- };
- } // packageOverrides)
- ) {};
-
- verify_origin = verify_origin_0_1_0;
-
- vex_0_5_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "vex";
- version = "0.5.5";
- src = fetchHex {
- pkg = "vex";
- version = "0.5.5";
- sha256 =
- "fade5440a742304214d1cb53d5ce6bd39dafb6e2ae87e5ce36041a7aa4c365f9";
- };
-
- meta = {
- description = ''An extensible data validation library for
- Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/CargoSense/vex";
- };
- } // packageOverrides)
- ) {};
-
- vex = vex_0_5_5;
-
- viktor_0_1_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "viktor";
- version = "0.1.1";
- src = fetchHex {
- pkg = "viktor";
- version = "0.1.1";
- sha256 =
- "9796d7174806bae878082d53befc1efcd1a374715650afc9956ed63f648227fe";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Client API wrapper for League of Legends API.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/josephyi/viktor";
- };
- } // packageOverrides)
- ) {};
-
- viktor = viktor_0_1_1;
-
- virus_total_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- jsx_2_8_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "virus_total";
- version = "0.0.1";
- src = fetchHex {
- pkg = "virus_total";
- version = "0.0.1";
- sha256 =
- "bed3680d17c98f978a90f5b443b6e269ee0a3f2239d2262502d8d10ee042ebfa";
- };
- beamDeps = [ jsx_2_8_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir OTP application for the VirusTotal Public
- API v2.0'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/dtykocki/virus_total";
- };
- } // packageOverrides)
- ) {};
-
- virus_total = virus_total_0_0_1;
-
- vmstats_2_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "vmstats";
- version = "2.0.0";
- src = fetchHex {
- pkg = "vmstats";
- version = "2.0.0";
- sha256 =
- "5cfac88ae597762dc38fcec0b56012ca7a2fbfcc00936326f63f5ddca4da0b53";
- };
-
- meta = {
- description = ''Tiny application to gather VM statistics'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/ferd/vmstats";
- };
- } // packageOverrides)
- ) {};
-
- vmstats = vmstats_2_0_0;
-
- voxpop_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "voxpop";
- version = "0.0.2";
- src = fetchHex {
- pkg = "voxpop";
- version = "0.0.2";
- sha256 =
- "74e3a74fb71aea428eeaea9c4b1e6705568070a014e7bc1d158be1000e3e8c88";
- };
-
- meta = {
- description = ''Voxpop generates text from declarative
- grammars.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/zovafit/voxpop";
- };
- } // packageOverrides)
- ) {};
-
- voxpop = voxpop_0_0_2;
-
- wallaby_0_5_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poolboy_1_5_1,
- poison_2_1_0,
- httpoison_0_8_3,
- dialyze_0_2_1
- }:
- buildMix ({
- name = "wallaby";
- version = "0.5.0";
- src = fetchHex {
- pkg = "wallaby";
- version = "0.5.0";
- sha256 =
- "0ff4debbefb06e76affa7dfb09072898e744471e8e0b41e7b665382969015265";
- };
- beamDeps = [
- poolboy_1_5_1
- poison_2_1_0
- httpoison_0_8_3
- dialyze_0_2_1
- ];
-
- meta = {
- description = ''Concurrent feature tests for elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/keathley/wallaby";
- };
- } // packageOverrides)
- ) {};
-
- wallaby = wallaby_0_5_0;
-
- watcher_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "watcher";
- version = "1.0.0";
- src = fetchHex {
- pkg = "watcher";
- version = "1.0.0";
- sha256 =
- "53620951438e857d24f1ef324f94f42b90e8d6069dd6553ec4e6331370418b2b";
- };
-
- meta = {
- description = ''Watcher for GenEvent'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/edgurgel/watcher";
- };
- } // packageOverrides)
- ) {};
-
- watcher = watcher_1_0_0;
-
- weather_report_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- trie_1_5_1,
- sweet_xml_0_6_1,
- httpoison_0_8_3,
- feeder_2_0_0
- }:
- buildMix ({
- name = "weather_report";
- version = "0.2.0";
- src = fetchHex {
- pkg = "weather_report";
- version = "0.2.0";
- sha256 =
- "d052a6b7d2a6c5a7e2c310f8a0be2fe70ee1a62ef2b0b89e1a804016c6fbeed5";
- };
- beamDeps = [
- trie_1_5_1
- sweet_xml_0_6_1
- httpoison_0_8_3
- feeder_2_0_0
- ];
-
- meta = {
- longDescription = ''Get weather forecasts from the National
- Oceanic and Atmospheric Administration! As the
- NOAA is a United States government agency, only
- forecasts in the US are supported.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sschneider1207/weather_report";
- };
- } // packageOverrides)
- ) {};
-
- weather_report = weather_report_0_2_0;
-
- web_push_encryption_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, httpoison_0_8_3 }:
- buildMix ({
- name = "web_push_encryption";
- version = "0.1.1";
- src = fetchHex {
- pkg = "web_push_encryption";
- version = "0.1.1";
- sha256 =
- "64f3c28f0ab40d3f1366285a8d9166b44959be56525f0a32db0a33d7cfb3feb2";
- };
- beamDeps = [ httpoison_0_8_3 ];
-
- meta = {
- description = ''Web push encryption lilbrary'';
- license = stdenv.lib.licenses.mit;
- homepage =
- "https://github.com/tuvistavie/elixir-web-push-encryption";
- };
- } // packageOverrides)
- ) {};
-
- web_push_encryption = web_push_encryption_0_1_1;
-
- web_socket_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_4_0,
- plug_0_12_2,
- cowboy_1_0_4
- }:
- buildMix ({
- name = "web_socket";
- version = "0.0.1";
- src = fetchHex {
- pkg = "web_socket";
- version = "0.0.1";
- sha256 =
- "b0afdac11840d17b2a2af5cc1939416fac13f64209083e06e6873002ae44ce12";
- };
- beamDeps = [ poison_1_4_0 plug_0_12_2 cowboy_1_0_4 ];
-
- meta = {
- description = ''Modular web framework '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/slogsdon/plug-web-socket";
- };
- } // packageOverrides)
- ) {};
-
- web_socket = web_socket_0_0_1;
-
- webassembly_0_6_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "webassembly";
- version = "0.6.1";
- src = fetchHex {
- pkg = "webassembly";
- version = "0.6.1";
- sha256 =
- "687cc567c6c58e154ca5f5bd45986c6fda530c42702ab7c6007f6cb663db4137";
- };
-
- meta = {
- longDescription = ''WebAssembly is a web DSL for Elixir. You
- create html structure straight using do blocks.
- Means, you can intermix html-building blocks
- with full Elixir syntax. DSL output is an
- iolist, which you can flatten to string, but
- better use is to just feed it to the socket (via
- Plug & Cowboy). WebAssembly aims to have 100%
- test coverage.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/herenowcoder/webassembly";
- };
- } // packageOverrides)
- ) {};
-
- webassembly = webassembly_0_6_1;
-
- webmentions_0_1_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpotion_2_2_2,
- floki_0_7_2
- }:
- buildMix ({
- name = "webmentions";
- version = "0.1.0";
- src = fetchHex {
- pkg = "webmentions";
- version = "0.1.0";
- sha256 =
- "5409b9237578fd67601b77c601093ab599a1bc507a6e1457a853c20e516c3d81";
- };
- beamDeps = [ httpotion_2_2_2 floki_0_7_2 ];
-
- meta = {
- description = ''A Webmentions
- (https://indiewebcamp.com/Webmention) module for
- Elixir'';
- license = stdenv.lib.licenses.agpl3;
- homepage = "https://github.com/ckruse/webmentions-elixir";
- };
- } // packageOverrides)
- ) {};
-
- webmentions = webmentions_0_1_0;
-
- webpay_0_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "webpay";
- version = "0.0.4";
- src = fetchHex {
- pkg = "webpay";
- version = "0.0.4";
- sha256 =
- "abab40fc7fda25a55d3a3dce4327d3f322df378432a9ed5e7c43e553989f467e";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir Webpay API wrapper'';
-
- };
- } // packageOverrides)
- ) {};
-
- webpay = webpay_0_0_4;
-
- websocket_client_1_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "websocket_client";
- version = "1.1.0";
- src = fetchHex {
- pkg = "websocket_client";
- version = "1.1.0";
- sha256 =
- "21c3d0df073634f2ca349af5b54a61755d637d6390c34d8d57c064f68ca92acd";
- };
-
- meta = {
- description = ''Erlang websocket client'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sanmiguel/websocket_client";
- };
- } // packageOverrides)
- ) {};
-
- websocket_client = websocket_client_1_1_0;
-
- wechat_check_signature_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "wechat_check_signature";
- version = "0.0.1";
- src = fetchHex {
- pkg = "wechat_check_signature";
- version = "0.0.1";
- sha256 =
- "5c5bb053c15082e12ad6da485fc4f711efa9198107368a42456aeafcf870caec";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''An Elixir Plug for checking wechat signature.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/octocandy/wechat_check_signature";
- };
- } // packageOverrides)
- ) {};
-
- wechat_check_signature = wechat_check_signature_0_0_1;
-
- wechat_mp_auth_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- mimetype_parser_0_1_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "wechat_mp_auth";
- version = "0.0.2";
- src = fetchHex {
- pkg = "wechat_mp_auth";
- version = "0.0.2";
- sha256 =
- "da88ac42f476eb8bb594cc702bd2e085c93adf6ebd7bf245e507cacf77e78ab9";
- };
- beamDeps = [ poison_2_1_0 mimetype_parser_0_1_2 httpoison_0_8_3
- ];
-
- meta = {
- description = ''An Elixir WeChat Media Platform Authentication
- Client Library.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/he9qi/wechat_mp_auth";
- };
- } // packageOverrides)
- ) {};
-
- wechat_mp_auth = wechat_mp_auth_0_0_2;
-
- wechatex_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, plug_1_1_5 }:
- buildMix ({
- name = "wechatex";
- version = "0.0.1";
- src = fetchHex {
- pkg = "wechatex";
- version = "0.0.1";
- sha256 =
- "211971a79d38326dbf5e603ee00165708eb17670f2a84e54df929191c6fef81c";
- };
- beamDeps = [ plug_1_1_5 ];
-
- meta = {
- description = ''Wechat plugins for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/octocandy/wechatex";
- };
- } // packageOverrides)
- ) {};
-
- wechatex = wechatex_0_0_1;
-
- what3words_1_0_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "what3words";
- version = "1.0.0";
- src = fetchHex {
- pkg = "what3words";
- version = "1.0.0";
- sha256 =
- "a704976567fd49cc6450eb0de10a7a39acb49b8db5b9ea7b9d9c1491b7453bf7";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- description = ''Wrapper for the What3Words API'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lucidstack/w3w-elixir-wrapper";
- };
- } // packageOverrides)
- ) {};
-
- what3words = what3words_1_0_0;
-
- white_bread_2_7_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "white_bread";
- version = "2.7.0";
- src = fetchHex {
- pkg = "white_bread";
- version = "2.7.0";
- sha256 =
- "8938204a78b9081a2c097cb1c39e19037356f4d71a011897b1d51d728ba15946";
- };
-
- meta = {
- longDescription = ''Story BDD tool based on cucumber. Parses
- Gherkin formatted feature files and executes
- them as tests.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/meadsteve/white-bread";
- };
- } // packageOverrides)
- ) {};
-
- white_bread = white_bread_2_7_0;
-
- whois_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "whois";
- version = "0.0.1";
- src = fetchHex {
- pkg = "whois";
- version = "0.0.1";
- sha256 =
- "71c21201c0bcf9934503a21e693e380fcf0e91d29728492dce182b15ff686636";
- };
-
- meta = {
- description = ''Pure Elixir WHOIS client and parser.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/utkarshkukreti/whois.ex";
- };
- } // packageOverrides)
- ) {};
-
- whois = whois_0_0_1;
-
- witchcraft_0_4_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- quark_1_0_2,
- algae_0_10_0
- }:
- buildMix ({
- name = "witchcraft";
- version = "0.4.2";
- src = fetchHex {
- pkg = "witchcraft";
- version = "0.4.2";
- sha256 =
- "cdd6379d5a8b0baab3b79b0c9b87473d8292e0d9a80fa2e21fac61d31218609f";
- };
- beamDeps = [ quark_1_0_2 algae_0_10_0 ];
-
- meta = {
- description = ''Common algebraic structures and functions'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/robot-overlord/witchcraft";
- };
- } // packageOverrides)
- ) {};
-
- witchcraft = witchcraft_0_4_2;
-
- wizard_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "wizard";
- version = "0.1.0";
- src = fetchHex {
- pkg = "wizard";
- version = "0.1.0";
- sha256 =
- "cc22faf9e76f50592906b816027fef4ee1942a59005cf8c831c7f76e48b9193e";
- };
-
- meta = {
- description = ''Wizard is a math and statistics library for
- Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/raywan/wizard";
- };
- } // packageOverrides)
- ) {};
-
- wizard = wizard_0_1_0;
-
- wizardry_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- plug_1_1_5,
- comeonin_1_6_0
- }:
- buildMix ({
- name = "wizardry";
- version = "0.0.1";
- src = fetchHex {
- pkg = "wizardry";
- version = "0.0.1";
- sha256 =
- "4a85b8c3e5813dee20aa0d5503811568743644883723c9b226436616c9a779a3";
- };
- beamDeps = [ plug_1_1_5 comeonin_1_6_0 ];
-
- meta = {
- description = ''Simple, low-level user account framework for
- Phoenix Framework'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/knrz/wizardry";
- };
- } // packageOverrides)
- ) {};
-
- wizardry = wizardry_0_0_1;
-
- woolly_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "woolly";
- version = "0.1.2";
- src = fetchHex {
- pkg = "woolly";
- version = "0.1.2";
- sha256 =
- "34677dae0bcca0c66fd611d6528e1d0532247e0ad9478a4b469476058308b40d";
- };
-
- meta = {
- longDescription = ''Woolly is the text mining and natural
- language toolkit for the Elixir programming
- language.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pjhampton/Woolly";
- };
- } // packageOverrides)
- ) {};
-
- woolly = woolly_0_1_2;
-
- word_smith_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "word_smith";
- version = "0.1.2";
- src = fetchHex {
- pkg = "word_smith";
- version = "0.1.2";
- sha256 =
- "481e643c5d26f113235ee577ea9b11c2c639228e0573670329c4385ee6d4cb32";
- };
-
- meta = {
- longDescription = ''General text utility library to help with
- string manipulation not found in the standard
- Elixir library.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/benfalk/word_smith";
- };
- } // packageOverrides)
- ) {};
-
- word_smith = word_smith_0_1_2;
-
- work_queue_0_0_3 = callPackage
- (
- {
- buildMix, packageOverrides ? {}, fetchHex, pipe_while_ok_0_0_2
- }:
- buildMix ({
- name = "work_queue";
- version = "0.0.3";
- src = fetchHex {
- pkg = "work_queue";
- version = "0.0.3";
- sha256 =
- "31b000cf454ee0a8f90408ea10c33ee6cdd062256a7dd3aac7fe67c48fcbb424";
- };
- beamDeps = [ pipe_while_ok_0_0_2 ];
-
- meta = {
- description = ''A simple implement of the Hungry Consumer model
- of concurrent servers. '';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/pragdave/work_queue";
- };
- } // packageOverrides)
- ) {};
-
- work_queue = work_queue_0_0_3;
-
- worker_pool_1_0_4 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "worker_pool";
- version = "1.0.4";
- src = fetchHex {
- pkg = "worker_pool";
- version = "1.0.4";
- sha256 =
- "7854a3b94e9624728db3a0475d00e7d0728adf3bf2ee3802bbf8ca10356d6f64";
- };
-
- meta = {
- description = ''Erlang Worker Pool'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/inaka/worker_pool";
- };
- } // packageOverrides)
- ) {};
-
- worker_pool_2_0_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "worker_pool";
- version = "2.0.0";
- src = fetchHex {
- pkg = "worker_pool";
- version = "2.0.0";
- sha256 =
- "915d3a1276d3c00c1438ae49785ff974f7b36772d5a13ad6a2c487e7c005f272";
- };
-
- meta = {
- description = ''Erlang Worker Pool'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/inaka/worker_pool";
- };
- } // packageOverrides)
- ) {};
-
- worker_pool = worker_pool_2_0_0;
-
- workex_0_10_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, exactor_2_2_0 }:
- buildMix ({
- name = "workex";
- version = "0.10.0";
- src = fetchHex {
- pkg = "workex";
- version = "0.10.0";
- sha256 =
- "9bb48e3ff0294021ecc78d86d4a7521dbe46e129ae9e51a46c9f2a67a63e9cbd";
- };
- beamDeps = [ exactor_2_2_0 ];
-
- meta = {
- description = ''A behaviour for simple flow control and
- backpressure.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sasa1977/workex";
- };
- } // packageOverrides)
- ) {};
-
- workex = workex_0_10_0;
-
- workshop_0_5_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "workshop";
- version = "0.5.1";
- src = fetchHex {
- pkg = "workshop";
- version = "0.5.1";
- sha256 =
- "f6eaab9360764e83cca6892d939357e505fe163412b22acca7ea4fe307c8bed2";
- };
-
- meta = {
- longDescription = ''Mix tasks for creating and running
- interactive workshops for teaching people how to
- program in Elixir, and other things.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/gausby/workshop";
- };
- } // packageOverrides)
- ) {};
-
- workshop = workshop_0_5_1;
-
- world_json_0_1_6 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_1_3_1 }:
- buildMix ({
- name = "world_json";
- version = "0.1.6";
- src = fetchHex {
- pkg = "world_json";
- version = "0.1.6";
- sha256 =
- "f91493355bc522e6ee58eed6d21fca41c32f246052c1324cb5f08b2eb1eb5e83";
- };
- beamDeps = [ poison_1_3_1 ];
-
- meta = {
- description = ''topojson country and state/province collections
- for elixir/erlang'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/camshaft/world_json_ex";
- };
- } // packageOverrides)
- ) {};
-
- world_json = world_json_0_1_6;
-
- wpa_supplicant_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "wpa_supplicant";
- version = "0.2.0";
- src = fetchHex {
- pkg = "wpa_supplicant";
- version = "0.2.0";
- sha256 =
- "40c86728b254dd9a9a96d862049a85ccf8b8ce9d1fe27985fe5d7c7a32c56bb6";
- };
-
- meta = {
- longDescription = ''Elixir interface to the wpa_supplicant
- daemon. The wpa_supplicant provides application
- support for scanning for access points, managing
- Wi-Fi connections, and handling all of the
- security and other parameters associated with
- Wi-Fi.'';
- license = with stdenv.lib.licenses; [ asl20 free ];
- homepage = "https://github.com/fhunleth/wpa_supplicant.ex";
- };
- } // packageOverrides)
- ) {};
-
- wpa_supplicant = wpa_supplicant_0_2_0;
-
- ws_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "ws";
- version = "0.0.1";
- src = fetchHex {
- pkg = "ws";
- version = "0.0.1";
- sha256 =
- "31185c57989f16c4d337974cf1896bb8da452b4f08258a48583cce211fbcf316";
- };
-
- meta = {
- description = ''An RFC 6455 WebSocket implementation.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/";
- };
- } // packageOverrides)
- ) {};
-
- ws = ws_0_0_1;
-
- wx_utils_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "wx_utils";
- version = "0.0.2";
- src = fetchHex {
- pkg = "wx_utils";
- version = "0.0.2";
- sha256 =
- "78bb6d423327e7cf41446a35741fe079fb138a4671d0a01e70223f6219afc3d4";
- };
-
- meta = {
- description = ''All of the erlang wx macros exposed as normal
- functions.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/sschneider1207/wx_utils";
- };
- } // packageOverrides)
- ) {};
-
- wx_utils = wx_utils_0_0_2;
-
- wykop_api_0_0_4 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "wykop_api";
- version = "0.0.4";
- src = fetchHex {
- pkg = "wykop_api";
- version = "0.0.4";
- sha256 =
- "0c2acade581168e5cdf3d1dbde53183bc1c49882c8ba8793e045f20d5a9a26d0";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Library for Wykop API.'';
- license = stdenv.lib.licenses.cc0;
- homepage = "https://github.com/remiq/wykop_api_elixir";
- };
- } // packageOverrides)
- ) {};
-
- wykop_api = wykop_api_0_0_4;
-
- xain_0_5_3 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "xain";
- version = "0.5.3";
- src = fetchHex {
- pkg = "xain";
- version = "0.5.3";
- sha256 =
- "c71c2b8180b317a361b4691cf6e9e72d1cf2ad00f7e31f5f5e72d79489eb6e24";
- };
-
- meta = {
- description = ''An html DSL package.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/smpallen99/xain";
- };
- } // packageOverrides)
- ) {};
-
- xain = xain_0_5_3;
-
- xe_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- floki_0_8_1
- }:
- buildMix ({
- name = "xe";
- version = "0.0.1";
- src = fetchHex {
- pkg = "xe";
- version = "0.0.1";
- sha256 =
- "53d693612db1343c36a7bbe6286c23f7ccfdbd44500c2a38970743238d230a77";
- };
- beamDeps = [ httpoison_0_8_3 floki_0_8_1 ];
-
- meta = {
- description = ''Real time conversion for currencies'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/paulodiniz/xe";
- };
- } // packageOverrides)
- ) {};
-
- xe = xe_0_0_1;
-
- xepcache_1_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, depcache_1_2_2 }:
- buildMix ({
- name = "xepcache";
- version = "1.0.1";
- src = fetchHex {
- pkg = "xepcache";
- version = "1.0.1";
- sha256 =
- "b163b26145c2ab3f37ec004dc24ca49c53c1c7b50529c068e94cfcfd78ec62dd";
- };
- beamDeps = [ depcache_1_2_2 ];
-
- meta = {
- longDescription = ''A wrapper around Erlang`s depcache, an
- in-memory caching server. depcache bases its
- caching around ETS but can also switch to using
- the in-process dictionary for maintaining a
- process-local cache. Convenient functions are
- provided for getting/setting cache values, with
- ttl and cache key dependencies, as well as a
- memo function for caching the result of function
- executions.'';
- license = stdenv.lib.licenses.apsl20;
- homepage = "https://github.com/arjan/xepcache";
- };
- } // packageOverrides)
- ) {};
-
- xepcache = xepcache_1_0_1;
-
- xfighter_0_2_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "xfighter";
- version = "0.2.1";
- src = fetchHex {
- pkg = "xfighter";
- version = "0.2.1";
- sha256 =
- "67bb43379cd89b4b95f65f02ad5421719723d262fdbe7e399fb82ac7f3b490a8";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''An API wrapper for the programming game
- Stockfighter.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/bitchef/xfighter";
- };
- } // packageOverrides)
- ) {};
-
- xfighter = xfighter_0_2_1;
-
- xjs_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, poison_2_1_0 }:
- buildMix ({
- name = "xjs";
- version = "0.1.1";
- src = fetchHex {
- pkg = "xjs";
- version = "0.1.1";
- sha256 =
- "51f93b5008fb73ad6d9320bc97892cd861171852a59408b02823b03fe8c1b751";
- };
- beamDeps = [ poison_2_1_0 ];
-
- meta = {
- description = ''elixir syntax, javascript semantics'';
- license = stdenv.lib.licenses.isc;
- homepage = "https://github.com/aaron-lebo/xjs";
- };
- } // packageOverrides)
- ) {};
-
- xjs = xjs_0_1_1;
-
- xkcd_0_0_1 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_2_1_0,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "xkcd";
- version = "0.0.1";
- src = fetchHex {
- pkg = "xkcd";
- version = "0.0.1";
- sha256 =
- "1c757360b9c5ff3d098e9c04874ed273289ea890e4d87e7dd99164633fe061b5";
- };
- beamDeps = [ poison_2_1_0 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''Uses the XKCD JSON API to retrieve the
- random, specific and the latest XKCD comic.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/notdevinclark/xkcd";
- };
- } // packageOverrides)
- ) {};
-
- xkcd = xkcd_0_0_1;
-
- xlsxir_1_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, erlsom_1_4_1 }:
- buildMix ({
- name = "xlsxir";
- version = "1.3.0";
- src = fetchHex {
- pkg = "xlsxir";
- version = "1.3.0";
- sha256 =
- "8c5985daeafaa388b63dde1f9827d650c5c964a0d4c1a91aba9ff8463c6d7833";
- };
- beamDeps = [ erlsom_1_4_1 ];
-
- meta = {
- longDescription = ''Xlsx file parser. Supports large files,
- multiple worksheets and ISO 8601 date formats.
- Data is extracted to an Erlang Term Storage
- (ETS) table and is accessed through various
- functions. Tested with Excel and LibreOffice.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/kennellroxco/xlsxir";
- };
- } // packageOverrides)
- ) {};
-
- xlsxir = xlsxir_1_3_0;
-
- xml_builder_0_0_8 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "xml_builder";
- version = "0.0.8";
- src = fetchHex {
- pkg = "xml_builder";
- version = "0.0.8";
- sha256 =
- "51922bc50e0ef79c757d1016eda2a486f8688cd7307c4519102ea1fea4c5a3cd";
- };
-
- meta = {
- description = ''XML builder for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/joshnuss/xml_builder";
- };
- } // packageOverrides)
- ) {};
-
- xml_builder = xml_builder_0_0_8;
-
- xml_to_keyword_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "xml_to_keyword";
- version = "0.0.1";
- src = fetchHex {
- pkg = "xml_to_keyword";
- version = "0.0.1";
- sha256 =
- "64433848f0ed0ad8f26f1c6e1a6509a6fbaf017701577bd8122bfbb6ee277e97";
- };
-
- meta = {
- longDescription = ''This is an Elixir package that can convert
- xml into Elixir`s Keyword List, which is
- compilable with XmlBuilder
- (joshnuss/xml_builder) package'';
- license = stdenv.lib.licenses.free;
- };
- } // packageOverrides)
- ) {};
-
- xml_to_keyword = xml_to_keyword_0_0_1;
-
- xmlrpc_0_9_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "xmlrpc";
- version = "0.9.1";
- src = fetchHex {
- pkg = "xmlrpc";
- version = "0.9.1";
- sha256 =
- "b2f6941248fa2e55e89dcb69304f58a7cc4203ce68b986260836933be8fac879";
- };
-
- meta = {
- longDescription = ''XML-RPC encoder/decder for Elixir. Supports
- all valid datatypes. Input (ie untrusted) is
- parsed with erlsom against an xml-schema for
- security.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/ewildgoose/elixir-xml_rpc";
- };
- } // packageOverrides)
- ) {};
-
- xmlrpc_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "xmlrpc";
- version = "1.0.0";
- src = fetchHex {
- pkg = "xmlrpc";
- version = "1.0.0";
- sha256 =
- "8b7dc690a64df7e72d192e9211a20084079933272c14c3e9c158eb101025a7ec";
- };
-
- meta = {
- longDescription = ''XML-RPC encoder/decder for Elixir. Supports
- all valid datatypes. Input (ie untrusted) is
- parsed with erlsom against an xml-schema for
- security.'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/ewildgoose/elixir-xml_rpc";
- };
- } // packageOverrides)
- ) {};
-
- xmlrpc = xmlrpc_1_0_0;
-
- xoauth2_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- mock_0_1_3,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "xoauth2";
- version = "0.0.3";
- src = fetchHex {
- pkg = "xoauth2";
- version = "0.0.3";
- sha256 =
- "4a43a0bca1707b579c6a141524666006dd25ed2efdc19aee5d6eeedf6efc3418";
- };
- beamDeps = [ poison_1_5_2 mock_0_1_3 httpoison_0_8_3 ];
-
- meta = {
- description = ''A simple XOAuth2 module for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/craigp/elixir_xoauth2";
- };
- } // packageOverrides)
- ) {};
-
- xoauth2 = xoauth2_0_0_3;
-
- xxhash_0_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "xxhash";
- version = "0.2.0";
- src = fetchHex {
- pkg = "xxhash";
- version = "0.2.0";
- sha256 =
- "ed57fd84e2c4fc440c28fa6a59d2c2ec0d3957b58dfd05cf06da8824ee6494d8";
- };
-
- meta = {
- description = ''Native Elixir xxHash port.'';
- license = stdenv.lib.licenses.free;
- homepage = "https://github.com/ttvd/elixir-xxhash";
- };
- } // packageOverrides)
- ) {};
-
- xxhash = xxhash_0_2_0;
-
- y_process_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "y_process";
- version = "0.0.1";
- src = fetchHex {
- pkg = "y_process";
- version = "0.0.1";
- sha256 =
- "3329d3fbe253d605b1f7a91a601c672ff4bc0e7b8c960871d82c964e92372bcb";
- };
-
- meta = {
- description = ''GenServer wrapper behaviour for pubsub between
- processes.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/gmtprime/y_process";
- };
- } // packageOverrides)
- ) {};
-
- y_process = y_process_0_0_1;
-
- yahoo_fx_0_2_0 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- time_seer_0_0_6,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "yahoo_fx";
- version = "0.2.0";
- src = fetchHex {
- pkg = "yahoo_fx";
- version = "0.2.0";
- sha256 =
- "e06b6986c483cad62081e19fba3089f3eab4a4f1e1cc06cd17aa45d34dd14913";
- };
- beamDeps = [ time_seer_0_0_6 httpoison_0_8_3 ];
-
- meta = {
- longDescription = ''YahooFx is an Elixir library for getting
- currency exchange rates from Yahoo Finance'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/lau/yahoo_fx";
- };
- } // packageOverrides)
- ) {};
-
- yahoo_fx = yahoo_fx_0_2_0;
-
- yaml_elixir_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "yaml_elixir";
- version = "1.0.0";
- src = fetchHex {
- pkg = "yaml_elixir";
- version = "1.0.0";
- sha256 =
- "8d318d459561678bbe42bdcc7282ebe9dd7538f34045812054edf226634bf4a7";
- };
-
- meta = {
- description = ''Yaml parser for Elixir based on native Erlang
- implementation.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KamilLelonek/yaml-elixir";
- };
- } // packageOverrides)
- ) {};
-
- yaml_elixir_1_2_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "yaml_elixir";
- version = "1.2.0";
- src = fetchHex {
- pkg = "yaml_elixir";
- version = "1.2.0";
- sha256 =
- "7827069a57fc1d830c3025acbb9611f4cd51ee139e8e75de85d0c4e835df4c16";
- };
-
- meta = {
- description = ''Yaml parser for Elixir based on native Erlang
- implementation.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/KamilLelonek/yaml-elixir";
- };
- } // packageOverrides)
- ) {};
-
- yaml_elixir = yaml_elixir_1_2_0;
-
- yaml_encoder_0_0_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "yaml_encoder";
- version = "0.0.2";
- src = fetchHex {
- pkg = "yaml_encoder";
- version = "0.0.2";
- sha256 =
- "ff3713e793daed297bca7252651deafd15c5f2f353a4ab03bf3f13a71fcb60a6";
- };
-
- meta = {
- description = ''Simple module to encode data to YAML. Not ready
- for production, still WIP.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pilu/yaml_encoder";
- };
- } // packageOverrides)
- ) {};
-
- yaml_encoder = yaml_encoder_0_0_2;
-
- yes_msg_0_1_0 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "yes_msg";
- version = "0.1.0";
- src = fetchHex {
- pkg = "yes_msg";
- version = "0.1.0";
- sha256 =
- "45e0a13d87cf84fa50001b27f898b470c610207947e4ddb1b1160804b4e62e0e";
- };
-
- meta = {
- description = ''Yet another simple message (YES) parser for
- Erlang.'';
- license = stdenv.lib.licenses.mit;
- };
- } // packageOverrides)
- ) {};
-
- yes_msg = yes_msg_0_1_0;
-
- yocingo_0_0_3 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- httpoison_0_8_3,
- exjsx_3_2_0,
- earmark_0_2_1
- }:
- buildMix ({
- name = "yocingo";
- version = "0.0.3";
- src = fetchHex {
- pkg = "yocingo";
- version = "0.0.3";
- sha256 =
- "e222ea0050a5678568d463f8ae7cf7ccd8efba4dfee1637eb0e52c1a1c7809f1";
- };
- beamDeps = [ httpoison_0_8_3 exjsx_3_2_0 earmark_0_2_1 ];
-
- meta = {
- longDescription = ''This is a full Telegram Bot API. With this
- module you can create your own Telegram Bot.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/Yawolf/yocingo";
- };
- } // packageOverrides)
- ) {};
-
- yocingo = yocingo_0_0_3;
-
- ytx_0_0_5 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex, rapidax_0_0_3 }:
- buildMix ({
- name = "ytx";
- version = "0.0.5";
- src = fetchHex {
- pkg = "ytx";
- version = "0.0.5";
- sha256 =
- "a30877517201e1c964627782345273fa7ae2157591d1ae6f5663333f370db6f6";
- };
- beamDeps = [ rapidax_0_0_3 ];
-
- meta = {
- description = ''Youtube API Client for Elixir'';
- license = stdenv.lib.licenses.asl20;
- homepage = "https://github.com/victorlcampos/ytx";
- };
- } // packageOverrides)
- ) {};
-
- ytx = ytx_0_0_5;
-
- yubico_0_1_4 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "yubico";
- version = "0.1.4";
- src = fetchHex {
- pkg = "yubico";
- version = "0.1.4";
- sha256 =
- "0609f63f3b6141e56014b5247526448a41bf9f61431800891b8c219310f425ad";
- };
-
- meta = {
- description = ''Client implementing the Yubico Validation
- Protocol Version 2.0.'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/project-fifo/erlang-yubico";
- };
- } // packageOverrides)
- ) {};
-
- yubico = yubico_0_1_4;
-
- yuri_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "yuri";
- version = "1.0.0";
- src = fetchHex {
- pkg = "yuri";
- version = "1.0.0";
- sha256 =
- "4a4c851f7ea20141201a9b69eaefb300b420e6c94a1513519aaef39f63d939c5";
- };
-
- meta = {
- description = ''Simple struct for representing URIs.'';
- license = stdenv.lib.licenses.wtfpl;
- homepage = "https://github.com/kemonomachi/yuri";
- };
- } // packageOverrides)
- ) {};
-
- yuri = yuri_1_0_0;
-
- yyid_0_1_2 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "yyid";
- version = "0.1.2";
- src = fetchHex {
- pkg = "yyid";
- version = "0.1.2";
- sha256 =
- "37fb0acf8e7f30e66fbba18326b357aeaeb19b671b59d4beb8c8bd943370eeab";
- };
-
- meta = {
- longDescription = ''Generates random tokens that look like type 4
- UUIDs: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx '';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/janlelis/yyid.ex";
- };
- } // packageOverrides)
- ) {};
-
- yyid = yyid_0_1_2;
-
- zarex_0_3_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "zarex";
- version = "0.3.0";
- src = fetchHex {
- pkg = "zarex";
- version = "0.3.0";
- sha256 =
- "b4c59af6ccc9c0ffea797920a7f66cdaaa498cda83e4bc4c077ff09cb3b21961";
- };
-
- meta = {
- description = ''Filename sanitization for Elixir'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/ricn/zarex";
- };
- } // packageOverrides)
- ) {};
-
- zarex = zarex_0_3_0;
-
- zbase32_1_0_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "zbase32";
- version = "1.0.0";
- src = fetchHex {
- pkg = "zbase32";
- version = "1.0.0";
- sha256 =
- "bea25493cb512cf0d0ee4e1140c4dc276a27cc299c9b304117ec7b7e4af557b6";
- };
-
- meta = {
- longDescription = ''Efficient implementation of z-base-32, Phil
- Zimmermann`s human-oriented base-32 encoding.
- z-base-32 is a Base32 encoding designed to be
- easier for human use and more compact. It
- includes 1, 8 and 9 but excludes l, v and 2. It
- also permutes the alphabet so that the easier
- characters are the ones that occur more
- frequently. It compactly encodes bitstrings
- whose length in bits is not a multiple of 8, and
- omits trailing padding characters. z-base-32 was
- used in Mnet open source project, and is
- currently used in Phil Zimmermann`s ZRTP
- protocol, and in the Tahoe-LAFS open source
- project.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/pspdfkit-labs/zbase32";
- };
- } // packageOverrides)
- ) {};
-
- zbase32 = zbase32_1_0_0;
-
- zigzag_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "zigzag";
- version = "0.0.1";
- src = fetchHex {
- pkg = "zigzag";
- version = "0.0.1";
- sha256 =
- "27a151e219cf0dcabda9977aad3fbae7b8c366c88a88846e830bc4364f31ed95";
- };
-
- meta = {
- description = ''Zigzag is a fast and flexible parallel processing
- library for Elixir.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/utkarshkukreti/zigzag.ex";
- };
- } // packageOverrides)
- ) {};
-
- zigzag = zigzag_0_0_1;
-
- zip_stream_0_1_0 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "zip_stream";
- version = "0.1.0";
- src = fetchHex {
- pkg = "zip_stream";
- version = "0.1.0";
- sha256 =
- "a712e24d5fe74e3761c74f3e05cb03df0aa9440f3edee957445f9c9be73c9a4e";
- };
-
- meta = {
- longDescription = ''Library to read zip file in a stream. Zip
- file binary stream -> stream of {:new_file,name}
- or uncompressed_bin Erlang zlib library only
- allows deflate decompress stream. But Erlang zip
- library does not allow content streaming.'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/awetzel/zip_stream";
- };
- } // packageOverrides)
- ) {};
-
- zip_stream = zip_stream_0_1_0;
-
- zipcloudx_0_0_2 = callPackage
- (
- {
- buildMix,
- packageOverrides ? {},
- fetchHex,
- poison_1_5_2,
- httpoison_0_8_3
- }:
- buildMix ({
- name = "zipcloudx";
- version = "0.0.2";
- src = fetchHex {
- pkg = "zipcloudx";
- version = "0.0.2";
- sha256 =
- "1e474ec0229b6dd1404c34fbd2a851d136d9549d5ecccbd01d017baac64b264e";
- };
- beamDeps = [ poison_1_5_2 httpoison_0_8_3 ];
-
- meta = {
- description = ''Elixir zipcloud API wrapper'';
-
- };
- } // packageOverrides)
- ) {};
-
- zipcloudx = zipcloudx_0_0_2;
-
- zipflow_0_0_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "zipflow";
- version = "0.0.1";
- src = fetchHex {
- pkg = "zipflow";
- version = "0.0.1";
- sha256 =
- "1b6e43e3a40529e41fbbb47d27470a3842834be066b676b68f5b0bfed68c8f39";
- };
-
- meta = {
- description = ''stream zip archives while building them'';
- license = stdenv.lib.licenses.bsd3;
- homepage = "https://github.com/dgvncsz0f/zipflow";
- };
- } // packageOverrides)
- ) {};
-
- zipflow = zipflow_0_0_1;
-
- zipper_tree_0_1_1 = callPackage
- (
- { buildMix, packageOverrides ? {}, fetchHex }:
- buildMix ({
- name = "zipper_tree";
- version = "0.1.1";
- src = fetchHex {
- pkg = "zipper_tree";
- version = "0.1.1";
- sha256 =
- "df6e81d6be9c9ac582bcde541e263d1379485f5cbb5b7cd1b55cd031fe7741ea";
- };
-
- meta = {
- description = ''Methods for travelsal and modification of Trees
- using a zipper. '';
- license = stdenv.lib.licenses.wtfpl;
- homepage = "https://github.com/Dkendal/zipper_tree";
- };
- } // packageOverrides)
- ) {};
-
- zipper_tree = zipper_tree_0_1_1;
-
- zlist_1_0_3 = callPackage
- (
- { buildRebar3, packageOverrides ? {}, fetchHex }:
- buildRebar3 ({
- name = "zlist";
- version = "1.0.3";
- src = fetchHex {
- pkg = "zlist";
- version = "1.0.3";
- sha256 =
- "c5ed3928628cfc9041afb6b1ee3d73d5c85473e6d3ce0f4cb6b1fcb20a207b89";
- };
-
- meta = {
- description = ''Erlang lazy list library'';
- license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/egobrain/zlist";
- };
- } // packageOverrides)
- ) {};
-
- zlist = zlist_1_0_3;
-
- };
-in stdenv.lib.fix' (stdenv.lib.extends overrides packages)
\ No newline at end of file
diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/pkgs/development/beam-modules/hex-registry-snapshot.nix
deleted file mode 100644
index fbd2950b6d53..000000000000
--- a/pkgs/development/beam-modules/hex-registry-snapshot.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, writeText, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
- pname = "hex-registry";
- rev = "11d7a24e9f53f52490ce255a6248e71128e73aa1";
- version = "unstable-2018-07-12";
-
- src = fetchFromGitHub {
- inherit rev;
- owner = "erlang-nix";
- repo = "hex-pm-registry-snapshots";
- sha256 = "0dbpcrdh6jqmvnm1ysmy7ixyc95vnbqmikyx5kk77qwgyd43fqgi";
- };
-
- installPhase = ''
- mkdir -p "$out/var/hex"
- zcat "registry.ets.gz" > "$out/var/hex/registry.ets"
- '';
-
- setupHook = writeText "setupHook.sh" ''
- export HEX_REGISTRY_SNAPSHOT="$1/var/hex/registry.ets"
- '';
-
- meta = {
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/beam-modules/mix-bootstrap b/pkgs/development/beam-modules/mix-bootstrap
index d7a912ee1ed7..7e31def71fa8 100755
--- a/pkgs/development/beam-modules/mix-bootstrap
+++ b/pkgs/development/beam-modules/mix-bootstrap
@@ -25,8 +25,7 @@
-record(data, {version
, erl_libs
, root
- , name
- , registry_snapshot}).
+ , name}).
-define(LOCAL_HEX_REGISTRY, "registry.ets").
main(Args) ->
@@ -51,8 +50,7 @@ gather_required_data_from_the_environment(_) ->
{ok, #data{ version = guard_env("version")
, erl_libs = os:getenv("ERL_LIBS", [])
, root = code:root_dir()
- , name = guard_env("name")
- , registry_snapshot = guard_env("HEX_REGISTRY_SNAPSHOT")}}.
+ , name = guard_env("name")}}.
-spec guard_env(string()) -> string().
guard_env(Name) ->
diff --git a/pkgs/development/chez-modules/chez-matchable/default.nix b/pkgs/development/chez-modules/chez-matchable/default.nix
new file mode 100644
index 000000000000..2b3de233f9b7
--- /dev/null
+++ b/pkgs/development/chez-modules/chez-matchable/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, chez }:
+
+stdenv.mkDerivation rec {
+ pname = "chez-matchable";
+ version = "20160306";
+
+ src = fetchFromGitHub {
+ owner = "fedeinthemix";
+ repo = "chez-matchable";
+ rev = "v${version}";
+ sha256 = "02qn7x348p23z1x5lwhkyj7i8z6mgwpzpnwr8dyina0yzsdkr71s";
+ };
+
+ buildInputs = [ chez ];
+
+ buildPhase = ''
+ make PREFIX=$out CHEZ=${chez}/bin/scheme
+ '';
+
+ installPhase = ''
+ make install PREFIX=$out CHEZ=${chez}/bin/scheme
+ '';
+
+ doCheck = false;
+
+ meta = {
+ description = "This is a Library for ChezScheme providing the protable hygenic pattern matcher by Alex Shinn";
+ homepage = https://github.com/fedeinthemix/chez-matchable/;
+ maintainers = [ stdenv.lib.maintainers.jitwit ];
+ license = stdenv.lib.licenses.publicDomain;
+ };
+
+}
diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix
new file mode 100644
index 000000000000..3614e97d9eac
--- /dev/null
+++ b/pkgs/development/chez-modules/chez-mit/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, chez, chez-srfi }:
+
+stdenv.mkDerivation {
+ pname = "chez-mit";
+ version = "1.0";
+
+ src = fetchgit {
+ url = "https://github.com/fedeinthemix/chez-mit.git";
+ rev = "68f3d7562e77f694847dc74dabb5ecbd106cd6be";
+ sha256 = "0c7i3b6i90xk96nmxn1pc9272a4yal4v40dm1a4ybdi87x53zkk0";
+ };
+
+ buildInputs = [ chez chez-srfi ];
+
+ buildPhase = ''
+ export CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv9.5-site
+ make PREFIX=$out CHEZ=${chez}/bin/scheme
+ '';
+
+ installPhase = ''
+ make install PREFIX=$out CHEZ=${chez}/bin/scheme
+ '';
+
+ doCheck = false;
+
+ meta = {
+ description = "This is a MIT/GNU Scheme compatibility library for Chez Scheme";
+ homepage = https://github.com/fedeinthemix/chez-mit/;
+ maintainers = [ stdenv.lib.maintainers.jitwit ];
+ license = stdenv.lib.licenses.free;
+ };
+
+}
diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix
new file mode 100644
index 000000000000..ceebef11363e
--- /dev/null
+++ b/pkgs/development/chez-modules/chez-scmutils/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, chez, chez-srfi, chez-mit }:
+
+stdenv.mkDerivation {
+ pname = "chez-scmutils";
+ version = "1.0";
+
+ src = fetchgit {
+ url = "https://github.com/fedeinthemix/chez-scmutils.git";
+ rev = "5eaeea6289fd239358d7eed99cc9588528fb52b2";
+ sha256 = "0lb05wlf8qpgg8y0gdsyaxg1nbfx1qbaqdjvygrp64ndn8fnhq7l";
+ };
+
+ buildInputs = [ chez chez-srfi chez-mit ];
+
+ buildPhase = ''
+ export CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv9.5-site:${chez-mit}/lib/csv9.5-site
+ make PREFIX=$out CHEZ=${chez}/bin/scheme
+ '';
+
+ installPhase = ''
+ make install PREFIX=$out CHEZ=${chez}/bin/scheme
+ '';
+
+ doCheck = false;
+
+ meta = {
+ description = "This is a port of the ‘MIT Scmutils’ library to Chez Scheme";
+ homepage = https://github.com/fedeinthemix/chez-scmutils/;
+ maintainers = [ stdenv.lib.maintainers.jitwit ];
+ license = stdenv.lib.licenses.gpl3;
+ };
+
+}
diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/development/chez-modules/chez-srfi/default.nix
new file mode 100644
index 000000000000..7f88b8fe7b0b
--- /dev/null
+++ b/pkgs/development/chez-modules/chez-srfi/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, chez }:
+
+stdenv.mkDerivation {
+ pname = "chez-srfi";
+ version = "1.0";
+
+ src = fetchgit {
+ url = "https://github.com/fedeinthemix/chez-srfi.git";
+ rev = "5770486c2a85d0e3dd4ac62a97918e7c394ea507";
+ sha256 = "1s47v7b7w0ycd2g6gyv8qbzmh4jjln5iday8n9l3m996ns8is9zj";
+ };
+
+ buildInputs = [ chez ];
+
+ buildPhase = ''
+ make PREFIX=$out CHEZ=${chez}/bin/scheme
+ '';
+
+ installPhase = ''
+ make install PREFIX=$out CHEZ=${chez}/bin/scheme
+ '';
+
+ doCheck = false;
+
+ meta = {
+ description = "This package provides a collection of SRFI libraries for Chez Scheme";
+ homepage = https://github.com/fedeinthemix/chez-srfi/;
+ maintainers = [ stdenv.lib.maintainers.jitwit ];
+ license = stdenv.lib.licenses.free;
+ };
+
+}
diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix
index accedf9a7af7..44f72a93c3a3 100644
--- a/pkgs/development/compilers/abcl/default.nix
+++ b/pkgs/development/compilers/abcl/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, ant, jre, jdk}:
stdenv.mkDerivation rec {
pname = "abcl";
- version = "1.5.0";
+ version = "1.6.0";
# or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
src = fetchurl {
url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz";
- sha256 = "1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj";
+ sha256 = "0hvbcsffr8n2xwdixc8wyw1bfl9fxn2gyy0c4nma7j9zbn0wwgw9";
};
configurePhase = ''
mkdir nix-tools
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
index 03857627952d..5e402b2d728b 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
@@ -28,16 +28,13 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name;
# Remove some broken manpages.
rm -rf $out/Home/man/ja*
- # for backward compatibility
- ln -s $out/Contents/Home $out/jre
-
ln -s $out/Contents/Home/* $out/
mkdir -p $out/nix-support
# Set JAVA_HOME automatically.
cat <> $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index 509050209fb2..fe38f2b21633 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -54,7 +54,7 @@ let result = stdenv.mkDerivation rec {
# Set JAVA_HOME automatically.
cat <> "$out/nix-support/setup-hook"
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
index 403bd96efb0e..e40ed72c46c1 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
@@ -10,34 +10,34 @@
"version": "11.0.4"
},
"armv6l": {
- "build": "7",
- "sha256": "3fbe418368e6d5888d0f15c4751139eb60d9785b864158a001386537fa46f67e",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz",
- "version": "11.0.3"
+ "build": "10",
+ "sha256": "c6b1fda3f8807028cbfcc34a4ded2e8a5a6b6239d2bcc1f06673ea6b1530df94",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.5_10.tar.gz",
+ "version": "11.0.5"
},
"armv7l": {
- "build": "7",
- "sha256": "3fbe418368e6d5888d0f15c4751139eb60d9785b864158a001386537fa46f67e",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz",
- "version": "11.0.3"
+ "build": "10",
+ "sha256": "c6b1fda3f8807028cbfcc34a4ded2e8a5a6b6239d2bcc1f06673ea6b1530df94",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.5_10.tar.gz",
+ "version": "11.0.5"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "11",
- "sha256": "90c33cf3f2ed0bd773f648815de7347e69cfbb3416ef3bf41616ab1c4aa0f5a8",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz",
- "version": "11.0.4"
+ "build": "10",
+ "sha256": "6dd0c9c8a740e6c19149e98034fba8e368fd9aa16ab417aa636854d40db1a161",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.5_10.tar.gz",
+ "version": "11.0.5"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "11",
- "sha256": "b1099cccc80a3f434728c9bc3b8a90395793b625f4680ca05267cf635143d64d",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jdk_x64_linux_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
- "version": "11.0.4"
+ "build": "10",
+ "sha256": "6ead0515aecb24c6a8f5f3800a070b7d20a66c8f26cba5dad137824da590a532",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10_openj9-0.17.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.5_10_openj9-0.17.0.tar.gz",
+ "version": "11.0.5"
}
}
},
@@ -52,20 +52,20 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "11",
- "sha256": "70d2cc675155476f1d8516a7ae6729d44681e4fad5a6fc8dfa65cab36a67b7e0",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_linux_hotspot_11.0.4_11.tar.gz",
- "version": "11.0.4"
+ "build": "10",
+ "sha256": "2f08c469c9a8adea1b6ee3444ba2a8242a7e99d87976a077faf037a9eb7f884b",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.5_10.tar.gz",
+ "version": "11.0.5"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "11",
- "sha256": "c2601e7cb22af7a910e03883280cee805074656104d6d3dcaaf30e3bbb832690",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jre_x64_linux_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
- "version": "11.0.4"
+ "build": "10",
+ "sha256": "2b68ea68d41281238a9dbe494cec762bd97fe34cf4fb6ba44ee1ce66bcec9d38",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10_openj9-0.17.0/OpenJDK11U-jre_x64_linux_openj9_11.0.5_10_openj9-0.17.0.tar.gz",
+ "version": "11.0.5"
}
}
}
@@ -76,20 +76,20 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "11",
- "sha256": "a50b211f475b9497311c9b65594764d7b852b1653f249582bb20fc3c302846a5",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_mac_hotspot_11.0.4_11.tar.gz",
- "version": "11.0.4"
+ "build": "10",
+ "sha256": "0825d0d3177832320b697944cd8e7b2e7fe3893fafe8bfcf33ee3631aa5ca96b",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jdk_x64_mac_hotspot_11.0.5_10.tar.gz",
+ "version": "11.0.5"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "11",
- "sha256": "7c09678d9c2d9dd0366693c6ab27bed39c76a23e7ac69b8a25c794e99dcf3ba7",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jdk_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
- "version": "11.0.4"
+ "build": "10",
+ "sha256": "97dc8234b73e233316b5dfdca75af9a0d54aa23b1309b1a68fd0a5d2fa928e05",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10.1_openj9-0.17.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.5_10_openj9-0.17.0.tar.gz",
+ "version": "11.0.5"
}
}
},
@@ -98,20 +98,20 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "11",
- "sha256": "1647fded28d25e562811f7bce2092eb9c21d30608843b04250c023b40604ff26",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_mac_hotspot_11.0.4_11.tar.gz",
- "version": "11.0.4"
+ "build": "10",
+ "sha256": "dfd212023321ebb41bce8cced15b4668001e86ecff6bffdd4f2591ccaae41566",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10/OpenJDK11U-jre_x64_mac_hotspot_11.0.5_10.tar.gz",
+ "version": "11.0.5"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "11",
- "sha256": "1a8e84bae517a848aa5f25c7b04f26ab3a3bfffaa7fdf9be24e1f83325e46766",
- "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jre_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
- "version": "11.0.4"
+ "build": "10",
+ "sha256": "ea6bd0be4562e766c035b997447c059d10d5d2e58ca464c57f9078858da1c967",
+ "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.5%2B10.1_openj9-0.17.0/OpenJDK11U-jre_x64_mac_openj9_11.0.5_10_openj9-0.17.0.tar.gz",
+ "version": "11.0.5"
}
}
}
@@ -122,56 +122,56 @@
"jdk": {
"hotspot": {
"aarch64": {
- "build": "10",
- "sha256": "652776586ede124189dc218174b5922cc97feac81021ad81905900b349a352d2",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz",
- "version": "8.0.222"
+ "build": "9",
+ "sha256": "35799a2fd4b467115aff1bc3a54853b5131ba9068e53e1ab0fbe5521a3f2ba83",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz",
+ "version": "8.0.232"
},
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "10",
- "sha256": "37356281345b93feb4212e6267109b4409b55b06f107619dde4960e402bafa77",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz",
- "version": "8.0.222"
+ "build": "9",
+ "sha256": "7b7884f2eb2ba2d47f4c0bf3bb1a2a95b73a3a7734bd47ebf9798483a7bcc423",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz",
+ "version": "8.0.232"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "10",
- "sha256": "20cff719c6de43f8bb58c7f59e251da7c1fa2207897c9a4768c8c669716dc819",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jdk_x64_linux_openj9_8u222b10_openj9-0.15.1.tar.gz",
- "version": "8.0.222"
+ "build": "9",
+ "sha256": "abea758c7e102f3c4a3be8757ee0ce039a70e2d498c160400dfb83c6f7004dbf",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09_openj9-0.17.0/OpenJDK8U-jdk_x64_linux_openj9_8u232b09_openj9-0.17.0.tar.gz",
+ "version": "8.0.232"
}
}
},
"jre": {
"hotspot": {
"aarch64": {
- "build": "10",
- "sha256": "dfaf5a121f7606c54bd6232793677a4267eddf65d29cde352b84d84edbccbb51",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u222b10.tar.gz",
- "version": "8.0.222"
+ "build": "9",
+ "sha256": "4540db665260fdc84ae2f191e21beec9168a70a4227718bee5edd317707e2fda",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_aarch64_linux_hotspot_8u232b09.tar.gz",
+ "version": "8.0.232"
},
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "10",
- "sha256": "a418ce895c8bf3ca2e7b2f423f038b8b093941684c9430f2e40da0982e12b52d",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_x64_linux_hotspot_8u222b10.tar.gz",
- "version": "8.0.222"
+ "build": "9",
+ "sha256": "bd06b84a1fc10e0a555431bc49a84e86df45de0be93c8ee4d09d13513219843b",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_x64_linux_hotspot_8u232b09.tar.gz",
+ "version": "8.0.232"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "10",
- "sha256": "ae56994a7c8e8c19939c0c2ff8fe5a850eb2f23845c499aa5ede26deb3d5ad28",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jre_x64_linux_openj9_8u222b10_openj9-0.15.1.tar.gz",
- "version": "8.0.222"
+ "build": "9",
+ "sha256": "30bdfdb38901d4807d96a72a33b83f7a4f40255e11a88853c1e8732acc4644a7",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09_openj9-0.17.0/OpenJDK8U-jre_x64_linux_openj9_8u232b09_openj9-0.17.0.tar.gz",
+ "version": "8.0.232"
}
}
}
@@ -182,20 +182,20 @@
"packageType": "jdk",
"vmType": "hotspot",
"x86_64": {
- "build": "10",
- "sha256": "9605fd00d2960934422437f601c7a9a1c5537309b9199d5bc75f84f20cd29a76",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u222b10.tar.gz",
- "version": "8.0.222"
+ "build": "9",
+ "sha256": "c237b2c2c32c893e4ee60cdac8c4bcc34ca731a5445986c03b95cf79918e40c3",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jdk_x64_mac_hotspot_8u232b09.tar.gz",
+ "version": "8.0.232"
}
},
"openj9": {
"packageType": "jdk",
"vmType": "openj9",
"x86_64": {
- "build": "10",
- "sha256": "df185e167756332163633a826b329db067f8a721f7d5d27f0b353a35fc415de0",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jdk_x64_mac_openj9_8u222b10_openj9-0.15.1.tar.gz",
- "version": "8.0.222"
+ "build": "9",
+ "sha256": "168079dcc20f62ac4409800c78d23a63ba7c665e58cd7ac8bde21ebbbb2b6d48",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09.1_openj9-0.17.0/OpenJDK8U-jdk_x64_mac_openj9_8u232b09_openj9-0.17.0.tar.gz",
+ "version": "8.0.232"
}
}
},
@@ -204,20 +204,20 @@
"packageType": "jre",
"vmType": "hotspot",
"x86_64": {
- "build": "10",
- "sha256": "b3ac2436534cea932ccf665b317dbf5ffc0ee065efca808b22b6c2d795ca1b90",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_x64_mac_hotspot_8u222b10.tar.gz",
- "version": "8.0.222"
+ "build": "9",
+ "sha256": "5ec5f11dbc81ab65641b765e1ef2f924736c0d1cc797cb95b078598d9d863afd",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09/OpenJDK8U-jre_x64_mac_hotspot_8u232b09.tar.gz",
+ "version": "8.0.232"
}
},
"openj9": {
"packageType": "jre",
"vmType": "openj9",
"x86_64": {
- "build": "10",
- "sha256": "d5754413d7bc3a3233aaa7f8465451fbdabaf2a0c2a91743155bf135a3047ec8",
- "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jre_x64_mac_openj9_8u222b10_openj9-0.15.1.tar.gz",
- "version": "8.0.222"
+ "build": "9",
+ "sha256": "60b70aa16c8ca38b96c305003f3d9871897555d0b4039b8e1f8db9ceeab16d53",
+ "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09.1_openj9-0.17.0/OpenJDK8U-jre_x64_mac_openj9_8u232b09_openj9-0.17.0.tar.gz",
+ "version": "8.0.232"
}
}
}
diff --git a/pkgs/development/compilers/bs-platform/bs-platform-62.nix b/pkgs/development/compilers/bs-platform/bs-platform-62.nix
new file mode 100644
index 000000000000..d2913caaee64
--- /dev/null
+++ b/pkgs/development/compilers/bs-platform/bs-platform-62.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchFromGitHub, ninja, nodejs, python3 }:
+let
+ version = "6.2.1";
+ ocaml-version = "4.06.1";
+ src = fetchFromGitHub {
+ owner = "BuckleScript";
+ repo = "bucklescript";
+ rev = "${version}";
+ sha256 = "0zx9nq7cik0c60n3rndqfqy3vdbj5lcrx6zcqcz2d60jjxi1z32y";
+ fetchSubmodules = true;
+ };
+ ocaml = import ./ocaml.nix {
+ bs-version = version;
+ version = ocaml-version;
+ inherit stdenv;
+ src = "${src}/ocaml";
+ };
+in
+stdenv.mkDerivation {
+ inherit src version;
+ pname = "bs-platform";
+ BS_RELEASE_BUILD = "true";
+ buildInputs = [ nodejs python3 ];
+
+ patchPhase = ''
+ sed -i 's:./configure.py --bootstrap:python3 ./configure.py --bootstrap:' ./scripts/install.js
+
+ mkdir -p ./native/${ocaml-version}/bin
+ ln -sf ${ocaml}/bin/* ./native/${ocaml-version}/bin
+
+ rm -f vendor/ninja/snapshot/ninja.linux
+ cp ${ninja}/bin/ninja vendor/ninja/snapshot/ninja.linux
+ '';
+
+ configurePhase = ''
+ node scripts/ninja.js config
+ '';
+
+ buildPhase = ''
+ node scripts/ninja.js build
+ '';
+
+ installPhase = ''
+ node scripts/install.js
+
+ mkdir -p $out/bin
+
+ cp -rf jscomp lib vendor odoc_gen native $out
+ cp bsconfig.json package.json $out
+
+ ln -s $out/lib/bsb $out/bin/bsb
+ ln -s $out/lib/bsc $out/bin/bsc
+ ln -s $out/lib/bsrefmt $out/bin/bsrefmt
+ '';
+}
diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix
new file mode 100644
index 000000000000..5eb11671ca90
--- /dev/null
+++ b/pkgs/development/compilers/bs-platform/default.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchFromGitHub, ninja, nodejs, python3, ... }:
+let
+ meta = with stdenv.lib; {
+ description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code.";
+ homepage = https://bucklescript.github.io;
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ turbomack gamb ];
+ platforms = platforms.all;
+ };
+in
+{
+ bs-platform-621 = import ./bs-platform-62.nix {
+ inherit stdenv fetchFromGitHub ninja nodejs python3;
+ } // { inherit meta; };
+}
diff --git a/pkgs/development/compilers/bs-platform/ocaml.nix b/pkgs/development/compilers/bs-platform/ocaml.nix
new file mode 100644
index 000000000000..1f2fdd571f3d
--- /dev/null
+++ b/pkgs/development/compilers/bs-platform/ocaml.nix
@@ -0,0 +1,16 @@
+{ stdenv, src, version, bs-version }:
+stdenv.mkDerivation rec {
+ inherit src version;
+ name = "ocaml-${version}+bs-${bs-version}";
+ configurePhase = ''
+ ./configure -prefix $out
+ '';
+ buildPhase = ''
+ make -j9 world.opt
+ '';
+
+ meta = with stdenv.lib; {
+ branch = "4.06";
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix
index 235ec4090391..e02880b314eb 100644
--- a/pkgs/development/compilers/carp/default.nix
+++ b/pkgs/development/compilers/carp/default.nix
@@ -1,21 +1,22 @@
{ stdenv, fetchFromGitHub, makeWrapper, clang, haskellPackages }:
-haskellPackages.mkDerivation {
+haskellPackages.mkDerivation rec {
pname = "carp";
- version = "unstable-2018-09-15";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "carp-lang";
repo = "Carp";
- rev = "cf9286c35cab1c170aa819f7b30b5871b9e812e6";
- sha256 = "1k6kdxbbaclhi40b9p3fgbkc1x6pc4v0029xjm6gny6pcdci2cli";
+ rev = "v${version}";
+ sha256 = "07yk3gy4l6h3k7sh8al7lgwk75a13zxwfp7siqpb5gnnqr1z3brc";
};
buildDepends = [ makeWrapper ];
executableHaskellDepends = with haskellPackages; [
- HUnit blaze-markup blaze-html split cmdargs
+ HUnit blaze-markup blaze-html split cmdargs ansi-terminal cmark
+ edit-distance
];
isExecutable = true;
diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix
index 34512fc8ef05..4112a74d5eee 100644
--- a/pkgs/development/compilers/chicken/4/chicken.nix
+++ b/pkgs/development/compilers/chicken/4/chicken.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.call-cc.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+ maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ];
platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
description = "A portable compiler for the Scheme programming language";
longDescription = ''
diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix
index d0f3b8a4e261..8f796d09ee56 100644
--- a/pkgs/development/compilers/chicken/4/egg2nix.nix
+++ b/pkgs/development/compilers/chicken/4/egg2nix.nix
@@ -22,6 +22,6 @@ eggDerivation {
homepage = https://github.com/the-kenny/egg2nix;
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.the-kenny ];
+ maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ];
};
}
diff --git a/pkgs/development/compilers/chicken/4/eggDerivation.nix b/pkgs/development/compilers/chicken/4/eggDerivation.nix
index 4dc7ebe66717..cd340c221743 100644
--- a/pkgs/development/compilers/chicken/4/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/4/eggDerivation.nix
@@ -8,7 +8,7 @@
let
libPath = "${chicken}/var/lib/chicken/${toString chicken.binaryVersion}/";
overrides = import ./overrides.nix;
- baseName = (builtins.parseDrvName name).name;
+ baseName = stdenv.lib.getName name;
override = if builtins.hasAttr baseName overrides
then
builtins.getAttr baseName overrides
diff --git a/pkgs/development/compilers/chicken/4/eggs.nix b/pkgs/development/compilers/chicken/4/eggs.nix
index 1f786f127c91..6e6f104f8a0c 100644
--- a/pkgs/development/compilers/chicken/4/eggs.nix
+++ b/pkgs/development/compilers/chicken/4/eggs.nix
@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs, stdenv }:
rec {
inherit (pkgs) eggDerivation fetchegg;
@@ -16,35 +16,6 @@ rec {
];
};
- blob-utils = eggDerivation {
- name = "blob-utils-1.0.3";
-
- src = fetchegg {
- name = "blob-utils";
- version = "1.0.3";
- sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml";
- };
-
- buildInputs = [
- setup-helper
- string-utils
- ];
- };
-
- check-errors = eggDerivation {
- name = "check-errors-1.13.0";
-
- src = fetchegg {
- name = "check-errors";
- version = "1.13.0";
- sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi";
- };
-
- buildInputs = [
- setup-helper
- ];
- };
-
defstruct = eggDerivation {
name = "defstruct-1.6";
@@ -60,31 +31,29 @@ rec {
};
http-client = eggDerivation {
- name = "http-client-0.7.1";
+ name = "http-client-0.18";
src = fetchegg {
name = "http-client";
- version = "0.7.1";
- sha256 = "1s03zgmb7kb99ld0f2ylqgicrab9qgza53fkgsqvg7bh5njmzhxr";
+ version = "0.18";
+ sha256 = "1b9x66kfcglld4xhm06vba00gw37vr07c859kj7lmwnk9nwhcplg";
};
buildInputs = [
intarweb
uri-common
- message-digest
- md5
- string-utils
+ simple-md5
sendfile
];
};
intarweb = eggDerivation {
- name = "intarweb-1.3";
+ name = "intarweb-1.7";
src = fetchegg {
name = "intarweb";
- version = "1.3";
- sha256 = "0izlby78c25py29bdcbc0vapb6h7xgchqrzi6i51d0rb3mnwy88h";
+ version = "1.7";
+ sha256 = "1arjgn5g4jfdzj3nlrhxk235qwf6k6jxr14yhnncnfbgdb820xp8";
};
buildInputs = [
@@ -94,92 +63,13 @@ rec {
];
};
- lookup-table = eggDerivation {
- name = "lookup-table-1.13.5";
-
- src = fetchegg {
- name = "lookup-table";
- version = "1.13.5";
- sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb";
- };
-
- buildInputs = [
- setup-helper
- check-errors
- miscmacros
- record-variants
- synch
- ];
- };
-
matchable = eggDerivation {
- name = "matchable-3.3";
+ name = "matchable-3.7";
src = fetchegg {
name = "matchable";
- version = "3.3";
- sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990";
- };
-
- buildInputs = [
-
- ];
- };
-
- md5 = eggDerivation {
- name = "md5-3.1.0";
-
- src = fetchegg {
- name = "md5";
- version = "3.1.0";
- sha256 = "0bka43nx8x9b0b079qpvml2fl20km19ny0qjmhwzlh6rwmzazj2a";
- };
-
- buildInputs = [
- message-digest
- ];
- };
-
- message-digest = eggDerivation {
- name = "message-digest-3.1.0";
-
- src = fetchegg {
- name = "message-digest";
- version = "3.1.0";
- sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s";
- };
-
- buildInputs = [
- setup-helper
- miscmacros
- check-errors
- variable-item
- blob-utils
- string-utils
- ];
- };
-
- miscmacros = eggDerivation {
- name = "miscmacros-2.96";
-
- src = fetchegg {
- name = "miscmacros";
- version = "2.96";
- sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc";
- };
-
- buildInputs = [
-
- ];
- };
-
- record-variants = eggDerivation {
- name = "record-variants-0.5.1";
-
- src = fetchegg {
- name = "record-variants";
- version = "0.5.1";
- sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h";
+ version = "3.7";
+ sha256 = "1vc9rpb44fhn0n91hzglin986dw9zj87fikvfrd7j308z22a41yh";
};
buildInputs = [
@@ -188,12 +78,12 @@ rec {
};
sendfile = eggDerivation {
- name = "sendfile-1.7.29";
+ name = "sendfile-1.8.3";
src = fetchegg {
name = "sendfile";
- version = "1.7.29";
- sha256 = "1dc02cbkx5kixhbqjy26g6gs680vy7krc9qis1p1v4aa0b2lgj7k";
+ version = "1.8.3";
+ sha256 = "036x4xdndx7qly94afnag5b9idd1yymdm8d832w2cy054y7lxqsi";
};
buildInputs = [
@@ -201,13 +91,13 @@ rec {
];
};
- setup-helper = eggDerivation {
- name = "setup-helper-1.5.4";
+ simple-md5 = eggDerivation {
+ name = "simple-md5-0.0.1";
src = fetchegg {
- name = "setup-helper";
- version = "1.5.4";
- sha256 = "1k644y0md2isdcvazqfm4nyc8rh3dby6b0j3r4na4w8ryspqp6gj";
+ name = "simple-md5";
+ version = "0.0.1";
+ sha256 = "1h0b51p9wl1dl3pzs39hdq3hk2qnjgn8n750bgmh0651g4lzmq3i";
};
buildInputs = [
@@ -215,38 +105,6 @@ rec {
];
};
- string-utils = eggDerivation {
- name = "string-utils-1.2.4";
-
- src = fetchegg {
- name = "string-utils";
- version = "1.2.4";
- sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1";
- };
-
- buildInputs = [
- setup-helper
- miscmacros
- lookup-table
- check-errors
- ];
- };
-
- synch = eggDerivation {
- name = "synch-2.1.2";
-
- src = fetchegg {
- name = "synch";
- version = "2.1.2";
- sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00";
- };
-
- buildInputs = [
- setup-helper
- check-errors
- ];
- };
-
uri-common = eggDerivation {
name = "uri-common-1.4";
@@ -264,32 +122,16 @@ rec {
};
uri-generic = eggDerivation {
- name = "uri-generic-2.41";
+ name = "uri-generic-2.46";
src = fetchegg {
name = "uri-generic";
- version = "2.41";
- sha256 = "1r5jbzjllbnmhm5n0m3fcx0g6dc2c2jzp1dcndkfmxz0cl99zxac";
+ version = "2.46";
+ sha256 = "10ivf4xlmr6jcm00l2phq1y73hjv6g3qgr38ycc8rw56wv6sbm4g";
};
buildInputs = [
matchable
- defstruct
- ];
- };
-
- variable-item = eggDerivation {
- name = "variable-item-1.3.1";
-
- src = fetchegg {
- name = "variable-item";
- version = "1.3.1";
- sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n";
- };
-
- buildInputs = [
- setup-helper
- check-errors
];
};
}
diff --git a/pkgs/development/compilers/chicken/4/setup-hook.sh b/pkgs/development/compilers/chicken/4/setup-hook.sh
index b0d9b53b5378..661dc08c090c 100644
--- a/pkgs/development/compilers/chicken/4/setup-hook.sh
+++ b/pkgs/development/compilers/chicken/4/setup-hook.sh
@@ -1,7 +1,6 @@
addChickenRepositoryPath() {
addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_EXTRA "$1/lib/chicken/8/"
- # addToSearchPathWithCustomDelimiter \; CHICKEN_INCLUDE_PATH "$1/share/"
- export CHICKEN_INCLUDE_PATH="$1/share;$CHICKEN_INCLUDE_PATH"
+ export CHICKEN_INCLUDE_PATH="$1/share${CHICKEN_INCLUDE_PATH:+;$CHICKEN_INCLUDE_PATH}"
}
addEnvHooks "$targetOffset" addChickenRepositoryPath
diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix
index 5fefce12dbf1..fb280795d889 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.call-cc.org/;
license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+ maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ];
platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix
description = "A portable compiler for the Scheme programming language";
longDescription = ''
diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/development/compilers/chicken/5/egg2nix.nix
index 21e12849b3ad..77ed32cafe1a 100644
--- a/pkgs/development/compilers/chicken/5/egg2nix.nix
+++ b/pkgs/development/compilers/chicken/5/egg2nix.nix
@@ -24,6 +24,6 @@ eggDerivation {
homepage = https://github.com/the-kenny/egg2nix;
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
- maintainers = [ stdenv.lib.maintainers.the-kenny ];
+ maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ];
};
}
diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix
index 3dc1c4afce98..8d4a62776d0e 100644
--- a/pkgs/development/compilers/chicken/5/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix
@@ -7,7 +7,7 @@
let
overrides = import ./overrides.nix;
- baseName = (builtins.parseDrvName name).name;
+ baseName = stdenv.lib.getName name;
override = if builtins.hasAttr baseName overrides
then
builtins.getAttr baseName overrides
diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix
index a8e3ee5976e8..a35b1f058919 100644
--- a/pkgs/development/compilers/chicken/5/eggs.nix
+++ b/pkgs/development/compilers/chicken/5/eggs.nix
@@ -47,12 +47,12 @@ rec {
};
srfi-13 = eggDerivation {
- name = "srfi-13-0.2.1";
+ name = "srfi-13-0.3";
src = fetchegg {
name = "srfi-13";
- version = "0.2.1";
- sha256 = "0204i7fhc4dy0l89lbi2lv9cjndrvwyrk68z3wy7x445jb4ky1gq";
+ version = "0.3";
+ sha256 = "0yaw9i6zhpxl1794pirh168clprjgmsb0xlr96drirjzsslgm3zp";
};
buildInputs = [
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 409ac03d92f7..03a914695a06 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
, coreutils, git, gmp, nettools, openssl_1_0_2, readline, tzdata, libxml2, libyaml
-, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib
+, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib, pkgconfig
, callPackage }:
# We need multiple binaries as a given binary isn't always able to build
@@ -38,8 +38,14 @@ let
'';
};
- generic = { version, sha256, binary, doCheck ? true }:
- let compiler = stdenv.mkDerivation rec {
+ commonBuildInputs = extraBuildInputs: [
+ boehmgc libatomic_ops pcre libevent libyaml zlib libxml2 openssl_1_0_2
+ ] ++ extraBuildInputs
+ ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
+
+
+ generic = ({ version, sha256, binary, doCheck ? true, extraBuildInputs ? [] }:
+ lib.fix (compiler: stdenv.mkDerivation {
pname = "crystal";
inherit doCheck version;
@@ -50,6 +56,8 @@ let
inherit sha256;
};
+ outputs = [ "out" "lib" "bin" ];
+
# we are almost able to run the full test suite now
postPatch = ''
substituteInPlace src/crystal/system/unix/time.cr \
@@ -72,14 +80,9 @@ let
--replace '`hostname`' '`${nettools}/bin/hostname`'
'';
- buildInputs = [
- boehmgc libatomic_ops pcre libevent libyaml
- llvm zlib openssl_1_0_2
- ] ++ stdenv.lib.optionals stdenv.isDarwin [
- libiconv
- ];
+ buildInputs = commonBuildInputs extraBuildInputs;
- nativeBuildInputs = [ binary makeWrapper which ];
+ nativeBuildInputs = [ binary makeWrapper which pkgconfig llvm ];
makeFlags = [
"CRYSTAL_CONFIG_VERSION=${version}"
@@ -91,22 +94,27 @@ let
FLAGS = [
"--release"
- "--no-debug"
"--single-module" # needed for deterministic builds
];
+ # This makes sure we don't keep depending on the previous version of
+ # crystal used to build this one.
+ CRYSTAL_LIBRARY_PATH = "${placeholder "lib"}/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 -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 -Dm755 .build/crystal $bin/bin/crystal
+ wrapProgram $bin/bin/crystal \
+ --suffix PATH : ${lib.makeBinPath [ pkgconfig clang which ]} \
+ --suffix CRYSTAL_PATH : lib:$lib/crystal \
+ --suffix CRYSTAL_LIBRARY_PATH : ${
+ lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
+ }
+ install -dm755 $lib/crystal
+ cp -r src/* $lib/crystal/
install -dm755 $out/share/doc/crystal/api
cp -r docs/* $out/share/doc/crystal/api/
@@ -119,6 +127,10 @@ let
install -Dm644 -t $out/share/licenses/crystal LICENSE README.md
+ mkdir -p $out
+ ln -s $bin/bin $out/bin
+ ln -s $lib $out/lib
+
runHook postInstall
'';
@@ -147,7 +159,7 @@ let
maintainers = with maintainers; [ manveru david50407 peterhoeg ];
platforms = builtins.attrNames archs;
};
- }; in compiler;
+ }));
in rec {
binaryCrystal_0_26 = genericBinary {
@@ -212,7 +224,22 @@ in rec {
binary = binaryCrystal_0_29;
};
- crystal = crystal_0_30;
+ crystal_0_31 = generic {
+ version = "0.31.1";
+ sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8";
+ doCheck = false; # 5 checks are failing now
+ binary = crystal_0_30;
+ };
+
+ crystal_0_32 = generic {
+ version = "255bfc5fa925b95b72e34b26ad997fb2b3f83059";
+ sha256 = "1dgk36cj5lwhs1c4zp0s1c9hjk0h3vljq6zwhlnzkl1xs7cgzim1";
+ doCheck = false; # 5 checks are failing now
+ binary = crystal_0_31;
+ extraBuildInputs = [ readline ];
+ };
+
+ crystal = crystal_0_31;
crystal2nix = callPackage ./crystal2nix.nix {};
}
diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix
new file mode 100644
index 000000000000..2e93c0b661b6
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/common.nix
@@ -0,0 +1,220 @@
+args@
+{ version
+, sha256
+, url ? ""
+, name ? ""
+, developerProgram ? false
+, runPatches ? []
+, addOpenGLRunpath
+, alsaLib
+, expat
+, fetchurl
+, fontconfig
+, freetype
+, gcc
+, gdk-pixbuf
+, glib
+, glibc
+, gtk2
+, lib
+, makeWrapper
+, ncurses5
+, perl
+, python27
+, requireFile
+, stdenv
+, unixODBC
+, xorg
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+ pname = "cudatoolkit";
+ inherit version runPatches;
+
+ dontPatchELF = true;
+ dontStrip = true;
+
+ src =
+ if developerProgram then
+ requireFile {
+ message = ''
+ This nix expression requires that ${args.name} is already part of the store.
+ Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the CUDA toolkit
+ at https://developer.nvidia.com/cuda-toolkit, and run the following command in the download directory:
+ nix-prefetch-url file://\$PWD/${args.name}
+ '';
+ inherit (args) name sha256;
+ }
+ else
+ fetchurl {
+ inherit (args) url sha256;
+ };
+
+ outputs = [ "out" "lib" "doc" ];
+
+ nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ];
+ buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
+ runtimeDependencies = [
+ ncurses5 expat python27 zlib glibc
+ xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
+ gtk2 glib fontconfig freetype unixODBC alsaLib
+ ];
+
+ rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
+
+ unpackPhase = ''
+ sh $src --keep --noexec
+
+ ${lib.optionalString (lib.versionOlder version "10.1") ''
+ cd pkg/run_files
+ sh cuda-linux*.run --keep --noexec
+ sh cuda-samples*.run --keep --noexec
+ mv pkg ../../$(basename $src)
+ cd ../..
+ rm -rf pkg
+
+ for patch in $runPatches; do
+ sh $patch --keep --noexec
+ mv pkg $(basename $patch)
+ done
+ ''}
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir $out
+ ${lib.optionalString (lib.versionOlder version "10.1") ''
+ cd $(basename $src)
+ export PERL5LIB=.
+ perl ./install-linux.pl --prefix="$out"
+ cd ..
+ for patch in $runPatches; do
+ cd $(basename $patch)
+ perl ./install_patch.pl --silent --accept-eula --installdir="$out"
+ cd ..
+ done
+ ''}
+ ${lib.optionalString (lib.versionAtLeast version "10.1") ''
+ cd pkg/builds/cuda-toolkit
+ mv * $out/
+ ''}
+
+ rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
+
+ ${lib.optionalString (lib.versionOlder version "10.1") ''
+ # let's remove the 32-bit libraries, they confuse the lib64->lib mover
+ rm -rf $out/lib
+ ''}
+
+ # Remove some cruft.
+ ${lib.optionalString ((lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1"))
+ "rm $out/bin/uninstall*"}
+
+ # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
+ if [ -d "$out"/cuda-samples ]; then
+ mv "$out"/cuda-samples "$out"/samples
+ fi
+
+ # Change the #error on GCC > 4.9 to a #warning.
+ sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/'
+
+ # Fix builds with newer glibc version
+ sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h"
+
+ # Ensure that cmake can find CUDA.
+ mkdir -p $out/nix-support
+ echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
+
+ # Move some libraries to the lib output so that programs that
+ # depend on them don't pull in this entire monstrosity.
+ mkdir -p $lib/lib
+ mv -v $out/lib64/libcudart* $lib/lib/
+
+ # Remove OpenCL libraries as they are provided by ocl-icd and driver.
+ rm -f $out/lib64/libOpenCL*
+ ${lib.optionalString (lib.versionAtLeast version "10.1") ''
+ mv $out/lib64 $out/lib
+ ''}
+
+ # Set compiler for NVCC.
+ wrapProgram $out/bin/nvcc \
+ --prefix PATH : ${gcc}/bin
+
+ # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
+ wrapProgram $out/bin/nvprof \
+ --prefix LD_LIBRARY_PATH : $out/lib
+ '' + lib.optionalString (lib.versionOlder version "8.0") ''
+ # Hack to fix building against recent Glibc/GCC.
+ echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook
+ '' + ''
+ runHook postInstall
+ '';
+
+ postInstall = ''
+ for b in nvvp nsight; do
+ wrapProgram "$out/bin/$b" \
+ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+ done
+ '';
+
+ preFixup = ''
+ while IFS= read -r -d ''$'\0' i; do
+ if ! isELF "$i"; then continue; fi
+ echo "patching $i..."
+ if [[ ! $i =~ \.so ]]; then
+ patchelf \
+ --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i
+ fi
+ if [[ $i =~ libcudart ]]; then
+ rpath2=
+ else
+ rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
+ fi
+ patchelf --set-rpath "$rpath2" --force-rpath $i
+ done < <(find $out $lib $doc -type f -print0)
+ '';
+
+ # Set RPATH so that libcuda and other libraries in
+ # /run/opengl-driver(-32)/lib can be found. See the explanation in
+ # addOpenGLRunpath. Don't try to figure out which libraries really need
+ # it, just patch all (but not the stubs libraries). Note that
+ # --force-rpath prevents changing RPATH (set above) to RUNPATH.
+ postFixup = ''
+ addOpenGLRunpath --force-rpath {$out,$lib}/lib/lib*.so
+ '';
+
+ # cuda-gdb doesn't run correctly when not using sandboxing, so
+ # temporarily disabling the install check. This should be set to true
+ # when we figure out how to get `cuda-gdb --version` to run correctly
+ # when not using sandboxing.
+ doInstallCheck = false;
+ postInstallCheck = let
+ in ''
+ # Smoke test binaries
+ pushd $out/bin
+ for f in *; do
+ case $f in
+ crt) continue;;
+ nvcc.profile) continue;;
+ nsight_ee_plugins_manage.sh) continue;;
+ uninstall_cuda_toolkit_6.5.pl) continue;;
+ computeprof|nvvp|nsight) continue;; # GUIs don't feature "--version"
+ *) echo "Executing '$f --version':"; ./$f --version;;
+ esac
+ done
+ popd
+ '';
+ passthru = {
+ cc = gcc;
+ majorVersion = lib.versions.majorMinor version;
+ };
+
+ meta = with stdenv.lib; {
+ description = "A compiler for NVIDIA GPUs, math libraries, and tools";
+ homepage = "https://developer.nvidia.com/cuda-toolkit";
+ platforms = [ "x86_64-linux" ];
+ license = licenses.unfree;
+ };
+}
+
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 0a7b74b465f4..6531316fa12b 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -1,196 +1,15 @@
-{ lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses5, expat, python27, zlib
-, gcc48, gcc49, gcc5, gcc6, gcc7
-, xorg, gtk2, gdk-pixbuf, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
-, addOpenGLRunpath
+{ lib
+, callPackage
+, fetchurl
+, gcc48
+, gcc49
+, gcc5
+, gcc6
+, gcc7
}:
let
-
- common =
- args@{ gcc, version, sha256
- , url ? ""
- , name ? ""
- , developerProgram ? false
- , python ? python27
- , runPatches ? []
- }:
-
- stdenv.mkDerivation rec {
- pname = "cudatoolkit";
- inherit version runPatches;
-
- dontPatchELF = true;
- dontStrip = true;
-
- src =
- if developerProgram then
- requireFile {
- message = ''
- This nix expression requires that ${args.name} is already part of the store.
- Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the CUDA toolkit
- at https://developer.nvidia.com/cuda-toolkit, and run the following command in the download directory:
- nix-prefetch-url file://\$PWD/${args.name}
- '';
- inherit (args) name sha256;
- }
- else
- fetchurl {
- inherit (args) url sha256;
- };
-
- outputs = [ "out" "lib" "doc" ];
-
- nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ];
- buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
- runtimeDependencies = [
- ncurses5 expat python zlib glibc
- xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
- gtk2 glib fontconfig freetype unixODBC alsaLib
- ];
-
- rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64";
-
- unpackPhase = ''
- sh $src --keep --noexec
-
- cd pkg/run_files
- sh cuda-linux*.run --keep --noexec
- sh cuda-samples*.run --keep --noexec
- mv pkg ../../$(basename $src)
- cd ../..
- rm -rf pkg
-
- for patch in $runPatches; do
- sh $patch --keep --noexec
- mv pkg $(basename $patch)
- done
- '';
-
- installPhase = ''
- runHook preInstall
- mkdir $out
- cd $(basename $src)
- export PERL5LIB=.
- perl ./install-linux.pl --prefix="$out"
- cd ..
- for patch in $runPatches; do
- cd $(basename $patch)
- perl ./install_patch.pl --silent --accept-eula --installdir="$out"
- cd ..
- done
-
- rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
-
- # let's remove the 32-bit libraries, they confuse the lib64->lib mover
- rm -rf $out/lib
-
- # Remove some cruft.
- ${lib.optionalString (lib.versionAtLeast version "7.0") "rm $out/bin/uninstall*"}
-
- # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
- if [ -d "$out"/cuda-samples ]; then
- mv "$out"/cuda-samples "$out"/samples
- fi
-
- # Change the #error on GCC > 4.9 to a #warning.
- sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/'
-
- # Fix builds with newer glibc version
- sed -i "1 i#define _BITS_FLOATN_H" "$out/include/host_defines.h"
-
- # Ensure that cmake can find CUDA.
- mkdir -p $out/nix-support
- echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
-
- # Move some libraries to the lib output so that programs that
- # depend on them don't pull in this entire monstrosity.
- mkdir -p $lib/lib
- mv -v $out/lib64/libcudart* $lib/lib/
-
- # Remove OpenCL libraries as they are provided by ocl-icd and driver.
- rm -f $out/lib64/libOpenCL*
-
- # Set compiler for NVCC.
- wrapProgram $out/bin/nvcc \
- --prefix PATH : ${gcc}/bin
-
- # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
- wrapProgram $out/bin/nvprof \
- --prefix LD_LIBRARY_PATH : $out/lib
- '' + lib.optionalString (lib.versionOlder version "8.0") ''
- # Hack to fix building against recent Glibc/GCC.
- echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook
- '' + ''
- runHook postInstall
- '';
-
- postInstall = ''
- for b in nvvp nsight; do
- wrapProgram "$out/bin/$b" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
- done
- '';
-
- preFixup = ''
- while IFS= read -r -d ''$'\0' i; do
- if ! isELF "$i"; then continue; fi
- echo "patching $i..."
- if [[ ! $i =~ \.so ]]; then
- patchelf \
- --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i
- fi
- if [[ $i =~ libcudart ]]; then
- rpath2=
- else
- rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
- fi
- patchelf --set-rpath "$rpath2" --force-rpath $i
- done < <(find $out $lib $doc -type f -print0)
- '';
-
- # Set RPATH so that libcuda and other libraries in
- # /run/opengl-driver(-32)/lib can be found. See the explanation in
- # addOpenGLRunpath. Don't try to figure out which libraries really need
- # it, just patch all (but not the stubs libraries). Note that
- # --force-rpath prevents changing RPATH (set above) to RUNPATH.
- postFixup = ''
- addOpenGLRunpath --force-rpath {$out,$lib}/lib/lib*.so
- '';
-
- # cuda-gdb doesn't run correctly when not using sandboxing, so
- # temporarily disabling the install check. This should be set to true
- # when we figure out how to get `cuda-gdb --version` to run correctly
- # when not using sandboxing.
- doInstallCheck = false;
- postInstallCheck = let
- in ''
- # Smoke test binaries
- pushd $out/bin
- for f in *; do
- case $f in
- crt) continue;;
- nvcc.profile) continue;;
- nsight_ee_plugins_manage.sh) continue;;
- uninstall_cuda_toolkit_6.5.pl) continue;;
- computeprof|nvvp|nsight) continue;; # GUIs don't feature "--version"
- *) echo "Executing '$f --version':"; ./$f --version;;
- esac
- done
- popd
- '';
- passthru = {
- cc = gcc;
- majorVersion = lib.versions.majorMinor version;
- };
-
- meta = with stdenv.lib; {
- description = "A compiler for NVIDIA GPUs, math libraries, and tools";
- homepage = "https://developer.nvidia.com/cuda-toolkit";
- platforms = [ "x86_64-linux" ];
- license = licenses.unfree;
- };
- };
-
+ common = callPackage ./common.nix;
in rec {
cudatoolkit_6 = common {
version = "6.0.37";
@@ -302,5 +121,21 @@ in rec {
gcc = gcc7;
};
- cudatoolkit_10 = cudatoolkit_10_0;
+ cudatoolkit_10_1 = common {
+ version = "10.1.243";
+ url = "https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run";
+ sha256 = "0caxhlv2bdq863dfp6wj7nad66ml81vasq2ayf11psvq2b12vhp7";
+
+ gcc = gcc7;
+ };
+
+ cudatoolkit_10_2 = common {
+ version = "10.2.89";
+ url = "http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run";
+ sha256 = "04fasl9sjkb1jvchvqgaqxprnprcz7a8r52249zp2ijarzyhf3an";
+
+ gcc = gcc7;
+ };
+
+ cudatoolkit_10 = cudatoolkit_10_2;
}
diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix
index bede9fa4aa68..a7b2aa6be748 100644
--- a/pkgs/development/compilers/ecl/16.1.2.nix
+++ b/pkgs/development/compilers/ecl/16.1.2.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation {
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/16.1.2-getcwd.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
sha256 = "1fbi8gn7rv8nqff5mpaijsrch3k3z7qc5cn4h1vl8qrr8xwqlqhb";
})
+ ./ecl-1.16.2-libffi-3.3-abi.patch
];
hardeningDisable = [ "format" ];
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index 33ed690772ea..375b38f1dc68 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -35,6 +35,10 @@ stdenv.mkDerivation {
inherit (s) url sha256;
};
+ patches = [
+ ./libffi-3.3-abi.patch
+ ];
+
configureFlags = [
(if threadSupport then "--enable-threads" else "--disable-threads")
"--with-gmp-prefix=${gmp.dev}"
diff --git a/pkgs/development/compilers/ecl/ecl-1.16.2-libffi-3.3-abi.patch b/pkgs/development/compilers/ecl/ecl-1.16.2-libffi-3.3-abi.patch
new file mode 100644
index 000000000000..28dd7d0805b3
--- /dev/null
+++ b/pkgs/development/compilers/ecl/ecl-1.16.2-libffi-3.3-abi.patch
@@ -0,0 +1,15 @@
+diff --git a/src/c/ffi.d b/src/c/ffi.d
+index 8861303e..8a959c23 100644
+--- a/src/c/ffi.d
++++ b/src/c/ffi.d
+@@ -145,8 +145,8 @@ static struct {
+ #elif defined(X86_WIN64)
+ {@':win64', FFI_WIN64},
+ #elif defined(X86_ANY) || defined(X86) || defined(X86_64)
+- {@':cdecl', FFI_SYSV},
+- {@':sysv', FFI_SYSV},
++ {@':cdecl', FFI_UNIX64},
++ {@':sysv', FFI_UNIX64},
+ {@':unix64', FFI_UNIX64},
+ #endif
+ };
diff --git a/pkgs/development/compilers/ecl/libffi-3.3-abi.patch b/pkgs/development/compilers/ecl/libffi-3.3-abi.patch
new file mode 100644
index 000000000000..0a2b5f4dd568
--- /dev/null
+++ b/pkgs/development/compilers/ecl/libffi-3.3-abi.patch
@@ -0,0 +1,15 @@
+diff --git a/src/c/ffi.d b/src/c/ffi.d
+index 8174977a..caa69f39 100644
+--- a/src/c/ffi.d
++++ b/src/c/ffi.d
+@@ -133,8 +133,8 @@ static struct {
+ #elif defined(X86_WIN64)
+ {@':win64', FFI_WIN64},
+ #elif defined(X86_ANY) || defined(X86) || defined(X86_64)
+- {@':cdecl', FFI_SYSV},
+- {@':sysv', FFI_SYSV},
++ {@':cdecl', FFI_UNIX64},
++ {@':sysv', FFI_UNIX64},
+ {@':unix64', FFI_UNIX64},
+ #endif
+ };
diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index ef445faec923..314a2d0fc525 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";
src = fetchurl {
- url = http://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip;
+ url = https://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip;
sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri";
};
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://factorcode.org;
+ homepage = https://factorcode.org;
license = licenses.bsd2;
description = "A concatenative, stack-based programming language";
diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix
index 5353862424a0..14610af10ae5 100644
--- a/pkgs/development/compilers/fasm/bin.nix
+++ b/pkgs/development/compilers/fasm/bin.nix
@@ -3,11 +3,11 @@
stdenvNoCC.mkDerivation rec {
pname = "fasm-bin";
- version = "1.73.16";
+ version = "1.73.18";
src = fetchurl {
url = "https://flatassembler.net/fasm-${version}.tgz";
- sha256 = "1jaqm7w458ny37fsw3fln17kw31rcsk8kyadci45qcbw6jspmn7k";
+ sha256 = "0m88vi8ac9mlak430nyrg3nxsj0fzy3yli8kk0mqsw8rqw2pfvqb";
};
installPhase = ''
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 06c2aa838c5a..ae96d5a1ef90 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -7,6 +7,7 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
+, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which
@@ -23,6 +24,7 @@
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
, name ? "gcc"
, libcCross ? null
+, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
@@ -47,10 +49,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
+# threadsCross is just for MinGW
+assert threadsCross != null -> stdenv.targetPlatform.isWindows;
+
with stdenv.lib;
with builtins;
-let version = "4.8.5";
+let majorVersion = "4";
+ version = "${majorVersion}.8.5";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -96,69 +102,8 @@ let version = "4.8.5";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
- stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
in
@@ -166,7 +111,8 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
- name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
+ pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
+ inherit version;
builder = ../builder.sh;
@@ -232,98 +178,47 @@ stdenv.mkDerivation ({
++ (optional hostPlatform.isDarwin gnused)
;
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- '';
+ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langJava langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- "--enable-lto"
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langJava "java"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
+ cloog
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
- optionals (cloog != null) [
- "--with-cloog=${cloog}"
- "--disable-cloog-version-check"
- "--enable-cloog-backend=isl"
- ] ++
-
- # Java options
- optionals langJava [
- "--with-ecj-jar=${javaEcj}"
-
- # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See
- # .
- "--enable-java-home"
- "--with-java-home=\${prefix}/lib/jvm/jre"
- ] ++
- optional javaAwtGtk "--enable-java-awt=gtk" ++
- optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langJava javaAwtGtk javaAntlr javaEcj
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
@@ -366,24 +261,13 @@ stdenv.mkDerivation ({
++ optionals javaAwtGtk [ gmp mpfr ]
));
- EXTRA_TARGET_FLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
- ] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ]);
-
- EXTRA_TARGET_LDFLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
- ] ++ (if crossStageStatic then [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ] else [
- "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
- "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
- ]));
+ inherit
+ (import ../common/extra-target-flags.nix {
+ inherit stdenv crossStageStatic libcCross threadsCross;
+ })
+ EXTRA_TARGET_FLAGS
+ EXTRA_TARGET_LDFLAGS
+ ;
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index ebcf20d4e099..5194f607f3b6 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -7,6 +7,7 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
+, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which
@@ -23,6 +24,7 @@
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
, name ? "gcc"
, libcCross ? null
+, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
@@ -47,10 +49,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
+# threadsCross is just for MinGW
+assert threadsCross != null -> stdenv.targetPlatform.isWindows;
+
with stdenv.lib;
with builtins;
-let version = "4.9.4";
+let majorVersion = "4";
+ version = "${majorVersion}.9.4";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -101,72 +107,8 @@ let version = "4.9.4";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
- stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
in
@@ -174,7 +116,8 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
- name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
+ pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
+ inherit version;
builder = ../builder.sh;
@@ -241,102 +184,47 @@ stdenv.mkDerivation ({
++ (optional hostPlatform.isDarwin gnused)
;
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- sed -i -e "s/-lrt//g" libstdc++-v3/configure
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- ''
- + stdenv.lib.optionalString (langJava || langGo) ''
- export lib=$out;
- '';
+ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langJava langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- "--enable-lto"
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langJava "java"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
+ cloog
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
- optionals (cloog != null) [
- "--with-cloog=${cloog}"
- "--disable-cloog-version-check"
- "--enable-cloog-backend=isl"
- ] ++
-
- # Java options
- optionals langJava [
- "--with-ecj-jar=${javaEcj}"
-
- # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See
- # .
- "--enable-java-home"
- "--with-java-home=\${prefix}/lib/jvm/jre"
- ] ++
- optional javaAwtGtk "--enable-java-awt=gtk" ++
- optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langJava javaAwtGtk javaAntlr javaEcj
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
@@ -379,24 +267,13 @@ stdenv.mkDerivation ({
++ optionals javaAwtGtk [ gmp mpfr ]
));
- EXTRA_TARGET_FLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
- ] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ]);
-
- EXTRA_TARGET_LDFLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
- ] ++ (if crossStageStatic then [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ] else [
- "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
- "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
- ]));
+ inherit
+ (import ../common/extra-target-flags.nix {
+ inherit stdenv crossStageStatic libcCross threadsCross;
+ })
+ EXTRA_TARGET_FLAGS
+ EXTRA_TARGET_LDFLAGS
+ ;
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 0adedb6f8420..cddfd58aa53b 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -7,6 +7,7 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
+, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which
@@ -23,6 +24,7 @@
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
, name ? "gcc"
, libcCross ? null
+, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
@@ -45,10 +47,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
+# threadsCross is just for MinGW
+assert threadsCross != null -> stdenv.targetPlatform.isWindows;
+
with stdenv.lib;
with builtins;
-let version = "5.5.0";
+let majorVersion = "5";
+ version = "${majorVersion}.5.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -61,6 +67,10 @@ let version = "5.5.0";
++ optional stdenv.hostPlatform.isMusl (fetchpatch {
url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff;
sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm";
+ })
+ ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch {
+ url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch";
+ sha256 = "074bl5n27d1ksa31pvzj4vd8xd46r118k0w94gdv3s1vydg7mah0";
});
javaEcj = fetchurl {
@@ -88,72 +98,8 @@ let version = "5.5.0";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
- stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
in
@@ -161,7 +107,8 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
- name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
+ pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
+ inherit version;
builder = ../builder.sh;
@@ -247,101 +194,48 @@ stdenv.mkDerivation ({
++ (optional hostPlatform.isDarwin gnused)
;
+ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langJava langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- "--enable-lto"
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langJava "java"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
-
- # Java options
- optionals langJava [
- "--with-ecj-jar=${javaEcj}"
-
- # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See
- # .
- "--enable-java-home"
- "--with-java-home=\${prefix}/lib/jvm/jre"
- ] ++
- optional javaAwtGtk "--enable-java-awt=gtk" ++
- optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
- "--disable-libsanitizer"
- "--disable-symvers"
- "libat_cv_have_ifunc=no"
- "--disable-gnu-indirect-function"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langJava javaAwtGtk javaAntlr javaEcj
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
@@ -384,24 +278,13 @@ stdenv.mkDerivation ({
++ optionals javaAwtGtk [ gmp mpfr ]
));
- EXTRA_TARGET_FLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
- ] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ]);
-
- EXTRA_TARGET_LDFLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
- ] ++ (if crossStageStatic then [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ] else [
- "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
- "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
- ]));
+ inherit
+ (import ../common/extra-target-flags.nix {
+ inherit stdenv crossStageStatic libcCross threadsCross;
+ })
+ EXTRA_TARGET_FLAGS
+ EXTRA_TARGET_LDFLAGS
+ ;
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 959b5e62381e..3ac4fa7032a7 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, noSysDirs
+{ stdenv, targetPackages, fetchurl, fetchpatch, fetchFromGitHub, noSysDirs
, langC ? true, langCC ? true, langFortran ? false
, langObjC ? stdenv.targetPlatform.isDarwin
, langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -7,7 +7,9 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
+, enableLTO ? true
, texinfo ? null
+, flex
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, libmpc, gettext, which
, libelf # optional, for link-time optimizations (LTO)
@@ -23,6 +25,7 @@
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
, name ? "gcc"
, libcCross ? null
+, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
@@ -45,10 +48,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
+# threadsCross is just for MinGW
+assert threadsCross != null -> stdenv.targetPlatform.isWindows;
+
with stdenv.lib;
with builtins;
-let version = "6.5.0";
+let majorVersion = "6";
+ version = "${majorVersion}.5.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -58,7 +65,10 @@ let version = "6.5.0";
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langFortran ../gfortran-driving.patch
++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
- ;
+ ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch {
+ url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch";
+ sha256 = "1c449jgm1vx9g4kv82bxmvlgrwb8f6kwkl0gqmjlmhf7f4hjy2nr";
+ });
javaEcj = fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
@@ -85,74 +95,8 @@ let version = "6.5.0";
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
- "--disable-libmpx"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
- stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
in
@@ -160,11 +104,17 @@ in
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
- name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
+ pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
+ inherit version;
builder = ../builder.sh;
- src = fetchurl {
+ src = if stdenv.targetPlatform.isVc4 then fetchFromGitHub {
+ owner = "itszor";
+ repo = "gcc-vc4";
+ rev = "e90ff43f9671c760cf0d1dd62f569a0fb9bf8918";
+ sha256 = "0gxf66hwqk26h8f853sybphqa5ca0cva2kmrw5jsiv6139g0qnp8";
+ } else fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby";
};
@@ -229,7 +179,8 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl)
- ++ (optional javaAwtGtk pkgconfig);
+ ++ (optional javaAwtGtk pkgconfig)
+ ++ (optional (stdenv.targetPlatform.isVc4) flex);
# For building runtime libs
depsBuildTarget =
@@ -251,104 +202,48 @@ stdenv.mkDerivation ({
++ (optional hostPlatform.isDarwin gnused)
;
+ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- ''
- + stdenv.lib.optionalString (langJava || langGo) ''
- export lib=$out;
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langJava langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- "--enable-lto"
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langJava "java"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
-
- # Java options
- optionals langJava [
- "--with-ecj-jar=${javaEcj}"
-
- # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See
- # .
- "--enable-java-home"
- "--with-java-home=\${prefix}/lib/jvm/jre"
- ] ++
- optional javaAwtGtk "--enable-java-awt=gtk" ++
- optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
- "--disable-libsanitizer"
- "--disable-symvers"
- "libat_cv_have_ifunc=no"
- "--disable-gnu-indirect-function"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langJava javaAwtGtk javaAntlr javaEcj
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
@@ -391,24 +286,13 @@ stdenv.mkDerivation ({
++ optionals javaAwtGtk [ gmp mpfr ]
));
- EXTRA_TARGET_FLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
- ] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ]);
-
- EXTRA_TARGET_LDFLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
- ] ++ (if crossStageStatic then [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ] else [
- "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
- "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
- ]));
+ inherit
+ (import ../common/extra-target-flags.nix {
+ inherit stdenv crossStageStatic libcCross threadsCross;
+ })
+ EXTRA_TARGET_FLAGS
+ EXTRA_TARGET_LDFLAGS
+ ;
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 39b3e4734fe2..237cb455f9fa 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -17,6 +17,7 @@
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
, name ? "gcc"
, libcCross ? null
+, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
@@ -35,10 +36,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
+# threadsCross is just for MinGW
+assert threadsCross != null -> stdenv.targetPlatform.isWindows;
+
with stdenv.lib;
with builtins;
-let version = "7.4.0";
+let majorVersion = "7";
+ version = "${majorVersion}.5.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -59,90 +64,28 @@ let version = "7.4.0";
})
++ optional langFortran ../gfortran-driving.patch
++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
- ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch;
+ ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
+ ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch {
+ url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch";
+ sha256 = "1nyjnshpq5gbcbbpfv27hy4ajvycmgkpiabkjlxnnrnq1d99k1ay";
+ });
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
- "--disable-libmpx"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- # No final libdecnumber (it may work only in 386)
- "--disable-decimal-float"
- ]));
- stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
in
stdenv.mkDerivation ({
- name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
+ pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
+ inherit version;
builder = ../builder.sh;
src = fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
- sha256 = "0lgy170b0pp60j9cczqkmaqyjjb584vfamj4c30swd7k0j6y5pgd";
+ sha256 = "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq";
};
inherit patches;
@@ -228,91 +171,50 @@ stdenv.mkDerivation ({
++ (optional hostPlatform.isDarwin gnused)
;
+ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+
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) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- (if enableLTO then "--enable-lto" else "--disable-lto")
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
- "--disable-libsanitizer"
- "--disable-symvers"
- "libat_cv_have_ifunc=no"
- "--disable-gnu-indirect-function"
- ]
- ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"
+ langC
+ langCC
+ langFortran
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ } ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"
++ optional targetPlatform.isNetBSD "--disable-libcilkrts"
;
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
@@ -342,24 +244,13 @@ stdenv.mkDerivation ({
LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
- EXTRA_TARGET_FLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
- ] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ]);
-
- EXTRA_TARGET_LDFLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
- ] ++ (if crossStageStatic then [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ] else [
- "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
- "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
- ]));
+ inherit
+ (import ../common/extra-target-flags.nix {
+ inherit stdenv crossStageStatic libcCross threadsCross;
+ })
+ EXTRA_TARGET_FLAGS
+ EXTRA_TARGET_LDFLAGS
+ ;
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 52f568b2ed94..c9302cc4f740 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, noSysDirs
+{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
, langC ? true, langCC ? true, langFortran ? false
, langObjC ? stdenv.targetPlatform.isDarwin
, langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -17,6 +17,7 @@
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
, name ? "gcc"
, libcCross ? null
+, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
@@ -35,10 +36,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
+# threadsCross is just for MinGW
+assert threadsCross != null -> stdenv.targetPlatform.isWindows;
+
with stdenv.lib;
with builtins;
-let version = "8.3.0";
+let majorVersion = "8";
+ version = "${majorVersion}.3.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -51,83 +56,22 @@ let version = "8.3.0";
}) */
++ optional langFortran ../gfortran-driving.patch
++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
- ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch;
+ ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
+ ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch {
+ url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch";
+ sha256 = "1in5kvcknlpi9z1vvjw6jfmwy8k12zvbqlqfnq84qpm99r0rh00a";
+ });
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
- "--disable-libmpx"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
- stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
in
stdenv.mkDerivation ({
- name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+ pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
+ inherit version;
builder = ../builder.sh;
@@ -219,88 +163,47 @@ stdenv.mkDerivation ({
++ (optional hostPlatform.isDarwin gnused)
;
+ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- (if enableLTO then "--enable-lto" else "--disable-lto")
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
- "--disable-libsanitizer"
- "--disable-symvers"
- "libat_cv_have_ifunc=no"
- "--disable-gnu-indirect-function"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
@@ -328,24 +231,13 @@ stdenv.mkDerivation ({
LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
- EXTRA_TARGET_FLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
- ] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ]);
-
- EXTRA_TARGET_LDFLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
- ] ++ (if crossStageStatic then [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ] else [
- "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
- "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
- ]));
+ inherit
+ (import ../common/extra-target-flags.nix {
+ inherit stdenv crossStageStatic libcCross threadsCross;
+ })
+ EXTRA_TARGET_FLAGS
+ EXTRA_TARGET_LDFLAGS
+ ;
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index de4d893b99e2..9698f4db2861 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, noSysDirs
+{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
, langC ? true, langCC ? true, langFortran ? false
, langObjC ? stdenv.targetPlatform.isDarwin
, langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -6,6 +6,7 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
+, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which
@@ -16,6 +17,7 @@
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
, name ? "gcc"
, libcCross ? null
+, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
@@ -34,10 +36,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
+# threadsCross is just for MinGW
+assert threadsCross != null -> stdenv.targetPlatform.isWindows;
+
with stdenv.lib;
with builtins;
-let version = "9.2.0";
+let majorVersion = "9";
+ version = "${majorVersion}.2.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -49,83 +55,22 @@ let version = "9.2.0";
sha256 = ""; # TODO: uncomment and check hash when available.
}) */
++ optional langFortran ../gfortran-driving.patch
- ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch;
+ ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch
+ ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch {
+ url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch";
+ sha256 = "1in5kvcknlpi9z1vvjw6jfmwy8k12zvbqlqfnq84qpm99r0rh00a";
+ });
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
- "--disable-libmpx"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
- stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
in
stdenv.mkDerivation ({
- name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+ pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
+ inherit version;
builder = ../builder.sh;
@@ -217,88 +162,47 @@ stdenv.mkDerivation ({
++ (optional hostPlatform.isDarwin gnused)
;
+ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- "--enable-lto"
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
- (if (enableMultilib || targetPlatform.isAvr)
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ++ optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
- "--disable-libsanitizer"
- "--disable-symvers"
- "libat_cv_have_ifunc=no"
- "--disable-gnu-indirect-function"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
buildFlags = optional
- (bootstrap && hostPlatform == buildPlatform)
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
(if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
@@ -326,24 +230,13 @@ stdenv.mkDerivation ({
LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
- EXTRA_TARGET_FLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
- ] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ]);
-
- EXTRA_TARGET_LDFLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
- ] ++ (if crossStageStatic then [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ] else [
- "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
- "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
- ]));
+ inherit
+ (import ../common/extra-target-flags.nix {
+ inherit stdenv crossStageStatic libcCross threadsCross;
+ })
+ EXTRA_TARGET_FLAGS
+ EXTRA_TARGET_LDFLAGS
+ ;
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
new file mode 100644
index 000000000000..3b96f432e96c
--- /dev/null
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -0,0 +1,174 @@
+{ stdenv
+, targetPackages
+
+, crossStageStatic, libcCross
+, version
+
+, gmp, mpfr, libmpc, libelf, isl
+, cloog ? null
+
+, enableLTO
+, enableMultilib
+, enablePlugin
+, enableShared
+
+, langC
+, langCC
+, langFortran
+, langJava ? false, javaAwtGtk ? false, javaAntlr ? null, javaEcj ? null
+, langGo
+, langObjC
+, langObjCpp
+}:
+
+assert cloog != null -> stdenv.lib.versionOlder version "5";
+assert langJava -> stdenv.lib.versionOlder version "7";
+
+let
+ inherit (stdenv)
+ buildPlatform hostPlatform targetPlatform
+ lib;
+
+ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
+ crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
+
+ crossConfigureFlags =
+ # Ensure that -print-prog-name is able to find the correct programs.
+ [
+ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
+ "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld"
+ ]
+ ++ (if crossStageStatic then [
+ "--disable-libssp"
+ "--disable-nls"
+ "--without-headers"
+ "--disable-threads"
+ "--disable-libgomp"
+ "--disable-libquadmath"
+ "--disable-shared"
+ "--disable-libatomic" # requires libc
+ "--disable-decimal-float" # requires libc
+ "--disable-libmpx" # requires libc
+ ] ++ lib.optionals crossMingw [
+ "--with-headers=${lib.getDev libcCross}/include"
+ "--with-gcc"
+ "--with-gnu-as"
+ "--with-gnu-ld"
+ "--disable-debug"
+ "--enable-sjlj-exceptions"
+ "--disable-win32-registry"
+ ] else [
+ (if crossDarwin then "--with-sysroot=${lib.getLib libcCross}/share/sysroot"
+ else "--with-headers=${lib.getDev libcCross}${libcCross.incdir or "/include"}")
+ "--enable-__cxa_atexit"
+ "--enable-long-long"
+ "--enable-threads=${if targetPlatform.isUnix then "posix"
+ else if targetPlatform.isWindows then "mcf"
+ else "single"}"
+ "--enable-nls"
+ "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+ ] ++ lib.optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
+ # libsanitizer requires netrom/netrom.h which is not
+ # available in uclibc.
+ "--disable-libsanitizer"
+ # In uclibc cases, libgomp needs an additional '-ldl'
+ # and as I don't know how to pass it, I disable libgomp.
+ "--disable-libgomp"
+ ] ++ lib.optionals (targetPlatform.libc == "musl") [
+ # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
+ "--disable-libmpx"
+ ] ++ lib.optionals crossMingw [
+ "--enable-sjlj-exceptions"
+ "--enable-hash-synchronization"
+ "--enable-libssp"
+ "--disable-nls"
+ "--with-dwarf2"
+ # To keep ABI compatibility with upstream mingw-w64
+ "--enable-fully-dynamic-string"
+ ] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib"
+ ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
+ );
+
+ configureFlags =
+ # Basic dependencies
+ [
+ "--with-gmp-include=${gmp.dev}/include"
+ "--with-gmp-lib=${gmp.out}/lib"
+ "--with-mpfr-include=${mpfr.dev}/include"
+ "--with-mpfr-lib=${mpfr.out}/lib"
+ "--with-mpc=${libmpc}"
+ ]
+ ++ lib.optional (libelf != null) "--with-libelf=${libelf}"
+ ++ lib.optional (!(crossMingw && crossStageStatic))
+ "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include"
+
+ # Basic configuration
+ ++ [
+ (lib.enableFeature enableLTO "lto")
+ "--disable-libstdcxx-pch"
+ "--without-included-gettext"
+ "--with-system-zlib"
+ "--enable-static"
+ "--enable-languages=${
+ lib.concatStrings (lib.intersperse ","
+ ( lib.optional langC "c"
+ ++ lib.optional langCC "c++"
+ ++ lib.optional langFortran "fortran"
+ ++ lib.optional langJava "java"
+ ++ lib.optional langGo "go"
+ ++ lib.optional langObjC "objc"
+ ++ lib.optional langObjCpp "obj-c++"
+ ++ lib.optionals crossDarwin [ "objc" "obj-c++" ]
+ )
+ )
+ }"
+ ]
+
+ ++ (if (enableMultilib || targetPlatform.isAvr)
+ then ["--enable-multilib" "--disable-libquadmath"]
+ else ["--disable-multilib"])
+ ++ lib.optional (!enableShared) "--disable-shared"
+ ++ [
+ (lib.enableFeature enablePlugin "plugin")
+ ]
+
+ # Optional features
+ ++ lib.optional (isl != null) "--with-isl=${isl}"
+ ++ lib.optionals (cloog != null) [
+ "--with-cloog=${cloog}"
+ "--disable-cloog-version-check"
+ "--enable-cloog-backend=isl"
+ ]
+
+ # Java options
+ ++ lib.optionals langJava [
+ "--with-ecj-jar=${javaEcj}"
+
+ # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See
+ # .
+ "--enable-java-home"
+ "--with-java-home=\${prefix}/lib/jvm/jre"
+ ]
+ ++ lib.optional javaAwtGtk "--enable-java-awt=gtk"
+ ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}"
+
+ ++ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; })
+ ++ lib.optional (targetPlatform != hostPlatform) crossConfigureFlags
+ ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap"
+
+ # Platform-specific flags
+ ++ lib.optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"
+ ++ lib.optionals hostPlatform.isSunOS [
+ "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
+ # On Illumos/Solaris GNU as is preferred
+ "--with-gnu-as" "--without-gnu-ld"
+ ]
+ ++ lib.optionals (targetPlatform == hostPlatform && targetPlatform.libc == "musl") [
+ "--disable-libsanitizer"
+ "--disable-symvers"
+ "libat_cv_have_ifunc=no"
+ "--disable-gnu-indirect-function"
+ ]
+ ;
+
+in configureFlags
diff --git a/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/pkgs/development/compilers/gcc/common/extra-target-flags.nix
new file mode 100644
index 000000000000..bce9a8d47381
--- /dev/null
+++ b/pkgs/development/compilers/gcc/common/extra-target-flags.nix
@@ -0,0 +1,30 @@
+{ stdenv, crossStageStatic, libcCross, threadsCross }:
+
+let
+ inherit (stdenv) lib hostPlatform targetPlatform;
+in
+
+{
+ EXTRA_TARGET_FLAGS = let
+ mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([
+ "-idirafter ${lib.getDev dep}${dep.incdir or "/include"}"
+ ] ++ stdenv.lib.optionals (! crossStageStatic) [
+ "-B${lib.getLib dep}${dep.libdir or "/lib"}"
+ ]);
+ in mkFlags libcCross
+ ++ lib.optionals (!crossStageStatic) (mkFlags threadsCross)
+ ;
+
+ EXTRA_TARGET_LDFLAGS = let
+ mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([
+ "-Wl,-L${lib.getLib dep}${dep.libdir or "/lib"}"
+ ] ++ (if crossStageStatic then [
+ "-B${lib.getLib dep}${dep.libdir or "/lib"}"
+ ] else [
+ "-Wl,-rpath,${lib.getLib dep}${dep.libdir or "/lib"}"
+ "-Wl,-rpath-link,${lib.getLib dep}${dep.libdir or "/lib"}"
+ ]));
+ in mkFlags libcCross
+ ++ lib.optionals (!crossStageStatic) (mkFlags threadsCross)
+ ;
+}
diff --git a/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix b/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix
new file mode 100644
index 000000000000..f8822c6dba0e
--- /dev/null
+++ b/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix
@@ -0,0 +1 @@
+"740f233da00c4fb5bcc225b2e29768824bcecc58"
diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix
new file mode 100644
index 000000000000..4c86d37e2434
--- /dev/null
+++ b/pkgs/development/compilers/gcc/common/pre-configure.nix
@@ -0,0 +1,12 @@
+{ lib, version, hostPlatform, langJava ? false, langGo }:
+
+assert langJava -> lib.versionOlder version "7";
+
+lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+ export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
+ export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
+ export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
+ export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
+'' + lib.optionalString (lib.versionOlder version "7" && (langJava || langGo)) ''
+ export lib=$out;
+''
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index a07f6f1feb2f..0441296ef179 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, noSysDirs
+{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
, langC ? true, langCC ? true, langFortran ? false
, langObjC ? stdenv.targetPlatform.isDarwin
, langObjCpp ? stdenv.targetPlatform.isDarwin
@@ -6,6 +6,7 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
+, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which
@@ -16,6 +17,7 @@
, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins
, name ? "gcc"
, libcCross ? null
+, threadsCross ? null # for MinGW
, crossStageStatic ? false
, # Strip kills static libs of other archs (hence no cross)
stripped ? stdenv.hostPlatform == stdenv.buildPlatform
@@ -35,10 +37,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null;
# The go frontend is written in c++
assert langGo -> langCC;
+# threadsCross is just for MinGW
+assert threadsCross != null -> stdenv.targetPlatform.isWindows;
+
with stdenv.lib;
with builtins;
-let version = "7-20170409";
+let majorVersion = "7";
+ version = "${majorVersion}-20170409";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@@ -46,81 +52,22 @@ let version = "7-20170409";
[ ]
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
- ++ optional langFortran ../gfortran-driving.patch;
+ ++ optional langFortran ../gfortran-driving.patch
+ ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch {
+ url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch";
+ sha256 = "1nyjnshpq5gbcbbpfv27hy4ajvycmgkpiabkjlxnnrnq1d99k1ay";
+ });
/* Cross-gcc settings (build == host != target) */
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
- crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
- crossConfigureFlags =
- # Ensure that -print-prog-name is able to find the correct programs.
- [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
- "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
- (if crossMingw && crossStageStatic then [
- "--with-headers=${libcCross}/include"
- "--with-gcc"
- "--with-gnu-as"
- "--with-gnu-ld"
- "--with-gnu-ld"
- "--disable-shared"
- "--disable-nls"
- "--disable-debug"
- "--enable-sjlj-exceptions"
- "--enable-threads=win32"
- "--disable-win32-registry"
- "--disable-libmpx" # requires libc
- ] else if crossStageStatic then [
- "--disable-libssp"
- "--disable-nls"
- "--without-headers"
- "--disable-threads"
- "--disable-libgomp"
- "--disable-libquadmath"
- "--disable-shared"
- "--disable-libatomic" # requires libc
- "--disable-decimal-float" # requires libc
- "--disable-libmpx" # requires libc
- ] else [
- (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
- else "--with-headers=${getDev libcCross}/include")
- "--enable-__cxa_atexit"
- "--enable-long-long"
- ] ++
- (if crossMingw then [
- "--enable-threads=win32"
- "--enable-sjlj-exceptions"
- "--enable-hash-synchronization"
- "--enable-libssp"
- "--disable-nls"
- "--with-dwarf2"
- # To keep ABI compatibility with upstream mingw-w64
- "--enable-fully-dynamic-string"
- ] else
- optionals (targetPlatform.libc == "uclibc") [
- # libsanitizer requires netrom/netrom.h which is not
- # available in uclibc.
- "--disable-libsanitizer"
- # In uclibc cases, libgomp needs an additional '-ldl'
- # and as I don't know how to pass it, I disable libgomp.
- "--disable-libgomp"
- ]
- ++ optional (targetPlatform.libc == "newlib") "--with-newlib"
- ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc"
- ++ [
- "--enable-threads=${if targetPlatform.isUnix then "posix"
- else if targetPlatform.isWindows then "win32"
- else "single"}"
- "--enable-nls"
- "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
- ]));
- stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
- crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
-
- bootstrap = targetPlatform == hostPlatform;
+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
in
stdenv.mkDerivation ({
- name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+ pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}";
+ inherit version;
builder = ../builder.sh;
@@ -182,84 +129,48 @@ stdenv.mkDerivation ({
++ (optional hostPlatform.isDarwin gnused)
;
+ depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross;
+
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
- preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
- export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
- export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
- export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
- export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
- '';
+ preConfigure = import ../common/pre-configure.nix {
+ inherit (stdenv) lib;
+ inherit version hostPlatform langGo;
+ };
dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
- configureFlags =
- # Basic dependencies
- [
- "--with-gmp-include=${gmp.dev}/include"
- "--with-gmp-lib=${gmp.out}/lib"
- "--with-mpfr-include=${mpfr.dev}/include"
- "--with-mpfr-lib=${mpfr.out}/lib"
- "--with-mpc=${libmpc}"
- ] ++
- optional (libelf != null) "--with-libelf=${libelf}" ++
- optional (!(crossMingw && crossStageStatic))
- "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+ configureFlags = import ../common/configure-flags.nix {
+ inherit
+ stdenv
+ targetPackages
+ crossStageStatic libcCross
+ version
- # Basic configuration
- [
- "--enable-lto"
- "--disable-libstdcxx-pch"
- "--without-included-gettext"
- "--with-system-zlib"
- "--enable-static"
- "--enable-languages=${
- concatStrings (intersperse ","
- ( optional langC "c"
- ++ optional langCC "c++"
- ++ optional langFortran "fortran"
- ++ optional langGo "go"
- ++ optional langObjC "objc"
- ++ optional langObjCpp "obj-c++"
- ++ optionals crossDarwin [ "objc" "obj-c++" ]
- )
- )
- }"
- ] ++
+ gmp mpfr libmpc libelf isl
- (if enableMultilib
- then ["--enable-multilib" "--disable-libquadmath"]
- else ["--disable-multilib"]) ++
- optional (!enableShared) "--disable-shared" ++
- (if enablePlugin
- then ["--enable-plugin"]
- else ["--disable-plugin"]) ++
+ enableLTO
+ enableMultilib
+ enablePlugin
+ enableShared
- # Optional features
- optional (isl != null) "--with-isl=${isl}" ++
-
-
- (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
- optional (targetPlatform != hostPlatform) crossConfigureFlags ++
- optional (!bootstrap) "--disable-bootstrap" ++
-
- # Platform-specific flags
- optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
- optionals hostPlatform.isSunOS [
- "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
- # On Illumos/Solaris GNU as is preferred
- "--with-gnu-as" "--without-gnu-ld"
- ]
- ;
+ langC
+ langCC
+ langFortran
+ langGo
+ langObjC
+ langObjCpp
+ ;
+ };
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
- buildFlags = if bootstrap then
- (if profiledCompiler then "profiledbootstrap" else "bootstrap")
- else "";
+ buildFlags = optional
+ (targetPlatform == hostPlatform && hostPlatform == buildPlatform)
+ (if profiledCompiler then "profiledbootstrap" else "bootstrap");
dontStrip = !stripped;
NIX_STRIP_DEBUG = !stripped;
@@ -287,24 +198,13 @@ stdenv.mkDerivation ({
LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));
- EXTRA_TARGET_FLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
- ] ++ optionals (! crossStageStatic) [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ]);
-
- EXTRA_TARGET_LDFLAGS = optionals
- (targetPlatform != hostPlatform && libcCross != null)
- ([
- "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}"
- ] ++ (if crossStageStatic then [
- "-B${libcCross.out}${libcCross.libdir or "/lib"}"
- ] else [
- "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}"
- "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
- ]));
+ inherit
+ (import ../common/extra-target-flags.nix {
+ inherit stdenv crossStageStatic libcCross threadsCross;
+ })
+ EXTRA_TARGET_FLAGS
+ EXTRA_TARGET_LDFLAGS
+ ;
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix
index a9618a7e0667..5f0347aa9a66 100644
--- a/pkgs/development/compilers/gerbil/unstable.nix
+++ b/pkgs/development/compilers/gerbil/unstable.nix
@@ -1,14 +1,15 @@
-{ stdenv, callPackage, fetchFromGitHub, gambit-unstable }:
+{ stdenv, callPackage, fetchFromGitHub, gambit, gambit-unstable }:
callPackage ./build.nix {
- version = "unstable-2019-08-11";
- git-version = "0.16-DEV-132-gcb58f9a3";
- gambit = gambit-unstable;
+ version = "unstable-2019-11-15";
+ git-version = "0.15.1-461-gee22de62";
+ #gambit = gambit-unstable;
+ gambit = gambit;
src = fetchFromGitHub {
owner = "vyzo";
repo = "gerbil";
- rev = "cb58f9a30630a6f3e85a55f2c1dcc654f517ffed";
- sha256 = "18jh64v1gi6z3pks9zf19f2wcjpv21cs270dnaq617kgwp53vysh";
+ rev = "ee22de628a656ee59c6c72bc25d7b2e25a4ece2f";
+ sha256 = "1n1j596b91k9xcmv22l72nga6wv20bka2q51ik2jw2vkcw8zkc1c";
};
inherit stdenv;
}
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 52fb926cdc68..73c7e4708d5c 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation (rec {
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index cdbcb8e1aedc..f285e271c624 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -125,7 +125,7 @@ stdenv.mkDerivation (rec {
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix
index 95bbab3cb3e1..6872cea4e2a2 100644
--- a/pkgs/development/compilers/ghc/8.8.1.nix
+++ b/pkgs/development/compilers/ghc/8.8.1.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation (rec {
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 565c545e48c3..8d22c0a674bc 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -2,11 +2,14 @@
# build-tools
, bootPkgs
-, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3, m4, sphinx
+, autoconf, autoreconfHook, automake, coreutils, fetchgit, fetchpatch, perl, python3, m4, sphinx
, bash
, libiconv ? null, ncurses
+, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
+ !stdenv.targetPlatform.isWindows, elfutils # for DWARF support
+
, useLLVM ? !stdenv.targetPlatform.isx86
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
@@ -27,7 +30,7 @@
, # Whetherto build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
-, version ? "8.9.20190924"
+, version ? "8.10.20191119"
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@@ -73,7 +76,8 @@ let
# Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
- ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+ ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
+ ++ stdenv.lib.optional enableDwarf elfutils;
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
@@ -89,8 +93,8 @@ stdenv.mkDerivation (rec {
src = fetchgit {
url = "https://gitlab.haskell.org/ghc/ghc.git/";
- rev = "795986aaf33e2ffc233836b86a92a77366c91db2";
- sha256 = "0a111x6c53r07q5qdg6c8mnydqp0wh4mpxmw7ga4x5wlap8i0bji";
+ rev = "0418c38d55c7a47967187dce2db5ea2ab1021b1e";
+ sha256 = "1d8g30ii0w4xh6fh61bxbalsqqyanny99nn3p727fx7favnhgvxi";
};
enableParallelBuilding = true;
@@ -98,13 +102,6 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
patches = [
- (fetchpatch { # https://github.com/haskell/haddock/issues/900
- url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff";
- name = "loadpluginsinmodules.diff";
- sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1";
- extraPrefix = "utils/haddock/";
- stripLen = 1;
- })
];
postPatch = "patchShebangs .";
@@ -120,7 +117,7 @@ stdenv.mkDerivation (rec {
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
# and more generally have a faster linker.
- export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isLinux ".gold"}"
+ export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -176,13 +173,17 @@ stdenv.mkDerivation (rec {
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
+ ] ++ stdenv.lib.optional enableDwarf [
+ "--enable-dwarf-unwind"
+ "--with-libdw-includes=${stdenv.lib.getDev elfutils}/include"
+ "--with-libdw-libraries=${stdenv.lib.getLib elfutils}/lib"
];
# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;
nativeBuildInputs = [
- perl autoconf automake m4 python3 sphinx
+ perl autoconf autoreconfHook automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
];
diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
index 56b69ea267f9..943866d5f24e 100644
--- a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
+++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
@@ -16,7 +16,7 @@
}:
runCommand "configured-ghcjs-src" {
- buildInputs = [
+ nativeBuildInputs = [
perl
autoconf
automake
diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
new file mode 100644
index 000000000000..2080a643959d
--- /dev/null
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, rustPlatform, fetchFromGitHub, Security }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "gleam";
+ version = "0.5.0";
+
+ src = fetchFromGitHub {
+ owner = "lpil";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "17h573fm5b1f71ivyipl76p0vw7injm7j3cbg6plkfizcb1j5m7f";
+ };
+
+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+ cargoSha256 = "04v1gj5nmmcizyrsg6b87qsfzw2zqi57vf1zlnq8680yc54qdah9";
+
+ meta = with stdenv.lib; {
+ description = "A statically typed language for the Erlang VM";
+ homepage = "https://gleam.run/";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ filalex77 ];
+ };
+}
diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix
index e051d41993cc..949190903673 100644
--- a/pkgs/development/compilers/go-jsonnet/default.nix
+++ b/pkgs/development/compilers/go-jsonnet/default.nix
@@ -1,33 +1,24 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
-buildGoPackage rec {
+buildGoModule rec {
pname = "go-jsonnet";
- version = "0.13.0";
-
- goPackagePath = "github.com/google/go-jsonnet";
-
- # regenerate deps.nix using following steps:
- #
- # go get -u github.com/google/go-jsonnet
- # cd $GOPATH/src/github.com/google/go-jsonnet
- # git checkout
- # dep init
- # dep2nix
- goDeps = ./deps.nix;
+ version = "0.14.0";
src = fetchFromGitHub {
- rev = "v${version}";
owner = "google";
repo = "go-jsonnet";
- sha256 = "0x95sqhrw4pscxq0q8781wix0w881k9my5kn5nf6k0fg1d6qlgiy";
- fetchSubmodules = true;
+ rev = "v${version}";
+ sha256 = "1q0mpydh8h0zrml605q9r259y8584kbwcr9g4sqcb1n13b4d1sgp";
};
- meta = {
+ modSha256 = "1b6hz5a66hhlzpcv1badxr1b4nmk4lw0507d5jks7lqzvvwd0sxq";
+
+ subPackages = [ "cmd/jsonnet" ];
+
+ meta = with lib; {
description = "An implementation of Jsonnet in pure Go";
- maintainers = with lib.maintainers; [ nshalman ];
- license = lib.licenses.asl20;
- homepage = https://github.com/google/go-jsonnet;
- platforms = lib.platforms.unix;
+ homepage = "https://github.com/google/go-jsonnet";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ nshalman ];
};
}
diff --git a/pkgs/development/compilers/go-jsonnet/deps.nix b/pkgs/development/compilers/go-jsonnet/deps.nix
deleted file mode 100644
index 1f413a16d81d..000000000000
--- a/pkgs/development/compilers/go-jsonnet/deps.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
- {
- goPackagePath = "github.com/fatih/color";
- fetch = {
- type = "git";
- url = "https://github.com/fatih/color";
- rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
- sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
- };
- }
- {
- 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 = "1311e847b0cb909da63b5fecfb5370aa66236465";
- sha256 = "0rqfh1rj6f5wm8p2ky7inm8g10152p7w6n2cli17kf9gad797i8h";
- };
- }
- {
- goPackagePath = "github.com/sergi/go-diff";
- fetch = {
- type = "git";
- url = "https://github.com/sergi/go-diff";
- rev = "1744e2970ca51c86172c8190fadad617561ed6e7";
- sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "4c4f7f33c9ed00de01c4c741d2177abfcfe19307";
- sha256 = "191001bxqyc3xfs46nnqmm7jdk0r73vk7a4zqngfl7zwjv9smwsq";
- };
- }
-]
\ No newline at end of file
diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix
index 95c51e2e880b..6b7c99c07436 100644
--- a/pkgs/development/compilers/go/1.13.nix
+++ b/pkgs/development/compilers/go/1.13.nix
@@ -30,11 +30,11 @@ in
stdenv.mkDerivation rec {
pname = "go";
- version = "1.13.3";
+ version = "1.13.5";
src = fetchurl {
url = "https://dl.google.com/go/go${version}.src.tar.gz";
- sha256 = "1pz3423gw3z2zwcmk9l2c6v68w5is39gndq7502c9mbm8c226wag";
+ sha256 = "1zr6lravlmyld57nnymkcr092pys4pr8qy0ans1rj3dkl3i5dlr7";
};
# perl is used for testing go vet
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
--replace '#!/usr/bin/env bash' '#!${runtimeShell}'
# Patch the mimetype database location which is missing on NixOS.
- substituteInPlace src/mime/type_unix.go \
- --replace '/etc/mime.types' '${mailcap}/etc/mime.types'
+ # but also allow static binaries built with NixOS to run outside nix
+ sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go
# Disabling the 'os/http/net' tests (they want files not available in
# chroot builds)
@@ -97,7 +97,10 @@ stdenv.mkDerivation rec {
rm src/net/cgo_unix_test.go
'' + optionalString stdenv.isLinux ''
- sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
+ # prepend the nix path to the zoneinfo files but also leave the original value for static binaries
+ # that run outside a nix server
+ sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
+
'' + optionalString stdenv.isAarch32 ''
echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash
'' + optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 1052f1f1ae1e..0dd852a1ef16 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -61,7 +61,9 @@ stdenv.mkDerivation rec {
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
'' + lib.optionalString stdenv.isLinux ''
- sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
+ # prepend the nix path to the zoneinfo files but also leave the original value for static binaries
+ # that run outside a nix server
+ sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
# Find the loader dynamically
LOADER="$(find ${lib.getLib libc}/lib -name ld-linux\* | head -n 1)"
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 61e3b6c16aee..11a94ebcce59 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -270,7 +270,7 @@ in rec {
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
cat < $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
postFixup = openjdk.postFixup or null;
@@ -293,7 +293,7 @@ in rec {
# gfortran readline bzip2 lzma pcre.dev curl ed ## WIP: fastr dependencies
];
postUnpack = ''
- cp ${stdenv.cc.cc}/include/c++/${stdenv.cc.cc.version}/stdlib.h \
+ cp ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/stdlib.h \
$sourceRoot/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include
cp ${truffleMake} $TMP && mv *truffle.make truffle.make
rm $sourceRoot/truffle/src/libffi/patches/others/0001-Add-mx-bootstrap-Makefile.patch
@@ -318,7 +318,7 @@ in rec {
--replace 'protected String compilerCommand = "cc";' 'protected String compilerCommand = "${stdenv.cc}/bin/cc";'
# prevent cyclical imports caused by identical names
substituteInPlace sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include/stdlib.h \
- --replace '# include ' '# include "${stdenv.cc.cc}/include/c++/${stdenv.cc.cc.version}/cstdlib"'
+ --replace '# include ' '# include "${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/cstdlib"'
# dragonegg can't seem to compile on nix, so let's not require it
substituteInPlace sulong/mx.sulong/suite.py \
--replace '"requireDragonegg" : True,' '"requireDragonegg" : False,'
diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix
index 84cb38aa8d11..e180455cb7cd 100644
--- a/pkgs/development/compilers/graalvm/enterprise-edition.nix
+++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix
@@ -72,7 +72,7 @@ let
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
cat < $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix
index c8fbffcc164a..a365761b014f 100644
--- a/pkgs/development/compilers/intel-graphics-compiler/default.nix
+++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix
@@ -24,13 +24,13 @@ in
stdenv.mkDerivation rec {
pname = "intel-graphics-compiler";
- version = "1.0.10";
+ version = "1.0.2878";
src = fetchFromGitHub {
owner = "intel";
repo = "intel-graphics-compiler";
rev = "igc-${version}";
- sha256 = "1yqd2zvvvxxxzb5d3v0f03n0jdivid5l2cj11dw7ff7xz7jwiv2i";
+ sha256 = "0rgij1013fy2x2szfchy3z6390mjfqw3nz4zprcb5v2v6mpvcj4l";
};
nativeBuildInputs = [ clang cmake bison flex llvm python ];
diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/development/compilers/jasmin/default.nix
new file mode 100644
index 000000000000..ef1b3055190e
--- /dev/null
+++ b/pkgs/development/compilers/jasmin/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, fetchurl
+, unzip
+, jdk
+, ant
+, makeWrapper
+, jre
+, callPackage
+}:
+
+stdenv.mkDerivation rec {
+ pname = "jasmin";
+ version = "2.4";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/jasmin/jasmin-${version}/jasmin-${version}.zip";
+ sha256 = "17a41vr96glcdrdbk88805wwvv1r6w8wg7if23yhd0n6rrl0r8ga";
+ };
+
+ nativeBuildInputs = [ unzip jdk ant makeWrapper ];
+
+ buildPhase = "ant all";
+ installPhase =
+ ''
+ install -Dm644 jasmin.jar $out/share/java/jasmin.jar
+ mkdir -p $out/bin
+ makeWrapper ${jre}/bin/java $out/bin/jasmin \
+ --add-flags "-jar $out/share/java/jasmin.jar"
+ '';
+
+ passthru.tests = {
+ minimal-module = callPackage ./test-assemble-hello-world {};
+ };
+
+ meta = with stdenv.lib; {
+ description = "An assembler for the Java Virtual Machine";
+ homepage = "http://jasmin.sourceforge.net/";
+ downloadPage = "https://sourceforge.net/projects/jasmin/files/latest/download";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fgaz ];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j b/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j
new file mode 100644
index 000000000000..564e6c8a9aa2
--- /dev/null
+++ b/pkgs/development/compilers/jasmin/test-assemble-hello-world/HelloWorld.j
@@ -0,0 +1,31 @@
+.class public HelloWorld
+.super java/lang/Object
+
+;
+; standard initializer (calls java.lang.Object's initializer)
+;
+.method public ()V
+ aload_0
+ invokenonvirtual java/lang/Object/()V
+ return
+.end method
+
+;
+; main() - prints out Hello World
+;
+.method public static main([Ljava/lang/String;)V
+ .limit stack 2 ; up to two items can be pushed
+
+ ; push System.out onto the stack
+ getstatic java/lang/System/out Ljava/io/PrintStream;
+
+ ; push a string onto the stack
+ ldc "Hello World!"
+
+ ; call the PrintStream.println() method.
+ invokevirtual java/io/PrintStream/println(Ljava/lang/String;)V
+
+ ; done
+ return
+.end method
+
diff --git a/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix b/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix
new file mode 100644
index 000000000000..1840edffa779
--- /dev/null
+++ b/pkgs/development/compilers/jasmin/test-assemble-hello-world/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, jasmin, jre }:
+
+stdenv.mkDerivation {
+ name = "jasmin-test-assemble-hello-world";
+ meta.timeout = 60;
+ buildCommand = ''
+ ${jasmin}/bin/jasmin ${./HelloWorld.j}
+ ${jre}/bin/java HelloWorld | grep "Hello World"
+ touch $out
+ '';
+}
+
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 12a75eb8f143..6ad3f96bf59d 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.3.50";
+ version = "1.3.61";
in stdenv.mkDerivation {
inherit version;
pname = "kotlin";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
- sha256 = "1v66pnk810agf26khwdv7l8jpc11x6na5fyqxs9jvxdpls8l0hk9";
+ sha256 = "073vb402b03llscgr298iih5lc3y1dn1qxyid2i9hiyrsld1a09r";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index f50da39a6249..6b67e2cc8561 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -6,7 +6,8 @@
let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
self = stdenv.mkDerivation ({
- name = "clang-${version}";
+ pname = "clang";
+ inherit version;
src = fetch "cfe" "16vnv3msnvx33dydd17k2cq0icndi1a06bg5vcxkrhjjb1rqlwv1";
@@ -91,7 +92,7 @@ let
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
- name = "clang-manpages-${version}";
+ pname = "clang-manpages";
buildPhase = ''
make docs-clang-man
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index c443303f3739..317a5ea06f48 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -24,7 +24,8 @@ let
in
stdenv.mkDerivation ({
- name = "llvm-${version}";
+ pname = "llvm";
+ inherit version;
src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s";
@@ -173,7 +174,7 @@ stdenv.mkDerivation ({
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
- name = "llvm-manpages-${version}";
+ pname = "llvm-manpages";
buildPhase = ''
make docs-llvm-man
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index 7a3b151f8358..6695609b8ecd 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -6,7 +6,8 @@
let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
self = stdenv.mkDerivation ({
- name = "clang-${version}";
+ pname = "clang";
+ inherit version;
src = fetch "cfe" "0018520c4qxf5hgjdqgpz2dgl3faf4gsz87fdlb8zdmx99rfk77s";
@@ -87,7 +88,7 @@ let
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
- name = "clang-manpages-${version}";
+ pname = "clang-manpages";
buildPhase = ''
make docs-clang-man
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index a99b3fa96ae9..d26af8438e73 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -23,7 +23,8 @@ let
in
stdenv.mkDerivation ({
- name = "llvm-${version}";
+ pname = "llvm";
+ inherit version;
src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm";
@@ -156,7 +157,7 @@ stdenv.mkDerivation ({
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
- name = "llvm-manpages-${version}";
+ pname = "llvm-manpages";
buildPhase = ''
make docs-llvm-man
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index ff9064f455ec..d093379b3c99 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -6,7 +6,8 @@
let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
self = stdenv.mkDerivation ({
- name = "clang-${version}";
+ pname = "clang";
+ inherit version;
src = fetch "cfe" "0rxn4rh7rrnsqbdgp4gzc8ishbkryhpl1kd3mpnxzpxxhla3y93w";
@@ -87,7 +88,7 @@ let
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
- name = "clang-manpages-${version}";
+ pname = "clang-manpages";
buildPhase = ''
make docs-clang-man
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index a250c9fefac7..c6d2c09c2df6 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -26,7 +26,8 @@ let
in
stdenv.mkDerivation ({
- name = "llvm-${version}";
+ pname = "llvm";
+ inherit version;
src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn";
@@ -154,7 +155,7 @@ stdenv.mkDerivation ({
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
- name = "llvm-manpages-${version}";
+ pname = "llvm-manpages";
buildPhase = ''
make docs-llvm-man
diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix
index e49c8387f7ef..5ac9a7a2672a 100644
--- a/pkgs/development/compilers/llvm/7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/7/clang/default.nix
@@ -6,7 +6,8 @@
let
self = stdenv.mkDerivation ({
- name = "clang-${version}";
+ pname = "clang";
+ inherit version;
src = fetch "cfe" "0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9";
@@ -93,7 +94,7 @@ let
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
- name = "clang-manpages-${version}";
+ pname = "clang-manpages";
buildPhase = ''
make docs-clang-man
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix
index 5d7266f39ecd..a7d4bcb86962 100644
--- a/pkgs/development/compilers/llvm/7/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix
@@ -7,6 +7,10 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+ NIX_CFLAGS_COMPILE = [
+ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
+ ];
+
cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false || stdenv.isDarwin) [
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix
index 7a0716a6eb38..f6f9970d7a6e 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libc++/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }:
+{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version
+, enableShared ? ! stdenv.hostPlatform.isMusl }:
stdenv.mkDerivation {
pname = "libc++";
@@ -31,7 +32,8 @@ stdenv.mkDerivation {
"-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
"-DLIBCXX_LIBCPPABI_VERSION=2"
"-DLIBCXX_CXX_ABI=libcxxabi"
- ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1";
+ ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"
+ ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ;
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix
index 522c8d1a163b..9067bf43a8fa 100644
--- a/pkgs/development/compilers/llvm/7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/7/libc++abi.nix
@@ -1,4 +1,6 @@
-{ stdenv, cmake, fetch, libcxx, llvm, version }:
+{ stdenv, cmake, fetch, libcxx, llvm, version
+ # on musl the shared objects don't build
+, enableShared ? ! stdenv.hostPlatform.isMusl }:
stdenv.mkDerivation {
pname = "libc++abi";
@@ -11,13 +13,15 @@ stdenv.mkDerivation {
postUnpack = ''
unpackFile ${libcxx.src}
unpackFile ${llvm.src}
- export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
+ cmakeFlagsArray=($cmakeFlagsArray -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*) )
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export TRIPLE=x86_64-apple-darwin
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
'';
+ cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBCXXABI_ENABLE_SHARED=OFF";
+
installPhase = if stdenv.isDarwin
then ''
for file in lib/*.dylib; do
@@ -34,10 +38,10 @@ stdenv.mkDerivation {
else ''
install -d -m 755 $out/include $out/lib
install -m 644 lib/libc++abi.a $out/lib
- install -m 644 lib/libc++abi.so.1.0 $out/lib
+ ${stdenv.lib.optionalString enableShared "install -m 644 lib/libc++abi.so.1.0 $out/lib"}
install -m 644 ../include/cxxabi.h $out/include
- ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
- ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
+ ${stdenv.lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so"}
+ ${stdenv.lib.optionalString enableShared "ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1"}
'';
meta = {
diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix
index 068791406e83..c56bbfd0eab9 100644
--- a/pkgs/development/compilers/llvm/7/llvm.nix
+++ b/pkgs/development/compilers/llvm/7/llvm.nix
@@ -30,7 +30,8 @@ let
imap (i: _: concatStringsSep "." (take i parts)) parts;
in stdenv.mkDerivation ({
- name = "llvm-${version}";
+ pname = "llvm";
+ inherit version;
src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v";
polly_src = fetch "polly" "16qkns4ab4x0azrvhy4j7cncbyb2rrbdrqj87zphvqxm5pvm8m1h";
@@ -94,6 +95,9 @@ in stdenv.mkDerivation ({
rm test/tools/llvm-dwarfdump/X86/debug_addr_dwarf4.s
rm test/tools/llvm-dwarfdump/X86/debug_addr_unsupported_version.s
rm test/tools/llvm-dwarfdump/X86/debug_addr_version_mismatch.s
+ '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
+ # Seems to require certain floating point hardware (NEON?)
+ rm test/ExecutionEngine/frem.ll
'' + ''
patchShebangs test/BugPoint/compile-custom.ll.py
'';
@@ -172,7 +176,7 @@ in stdenv.mkDerivation ({
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
- name = "llvm-manpages-${version}";
+ pname = "llvm-manpages";
buildPhase = ''
make docs-llvm-man
diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix
index 6911089250e8..8c540e45b286 100644
--- a/pkgs/development/compilers/llvm/8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/8/clang/default.nix
@@ -6,7 +6,8 @@
let
self = stdenv.mkDerivation ({
- name = "clang-${version}";
+ pname = "clang";
+ inherit version;
src = fetch "cfe" "0ihnbdl058gvl2wdy45p5am55bq8ifx8m9mhcsgj9ax8yxlzvvvh";
@@ -105,7 +106,7 @@ let
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
- name = "clang-manpages-${version}";
+ pname = "clang-manpages";
buildPhase = ''
make docs-clang-man
diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix
index 88788852862f..344ff7256755 100644
--- a/pkgs/development/compilers/llvm/8/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix
@@ -7,6 +7,10 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+ NIX_CFLAGS_COMPILE = [
+ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
+ ];
+
cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix
index 160e2a723666..b556a638f1f6 100644
--- a/pkgs/development/compilers/llvm/8/llvm.nix
+++ b/pkgs/development/compilers/llvm/8/llvm.nix
@@ -28,7 +28,8 @@ let
concatStringsSep "." (take 1 (splitVersion release_version));
in stdenv.mkDerivation ({
- name = "llvm-${version}";
+ pname = "llvm";
+ inherit version;
src = fetch "llvm" "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24";
polly_src = fetch "polly" "1lfjdz3ilj5xmjxvicd8f5ykybks67ry2pdb777352r3mzlgg8g8";
@@ -150,7 +151,7 @@ in stdenv.mkDerivation ({
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {
- name = "llvm-manpages-${version}";
+ pname = "llvm-manpages";
buildPhase = ''
make docs-llvm-man
diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix
index 9a333ad7c115..5826f0fbb35e 100644
--- a/pkgs/development/compilers/llvm/9/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix
@@ -7,6 +7,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python llvm ];
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+ NIX_CFLAGS_COMPILE = [
+ "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
+ ];
+
cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
"-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
"-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix
index 9bc7e1fc20ba..c8f78f5f7f21 100644
--- a/pkgs/development/compilers/llvm/9/llvm.nix
+++ b/pkgs/development/compilers/llvm/9/llvm.nix
@@ -75,6 +75,15 @@ in stdenv.mkDerivation (rec {
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
# valgrind unhappy with musl or glibc, but fails w/musl only
rm test/CodeGen/AArch64/wineh4.mir
+ '' + optionalString stdenv.hostPlatform.isAarch32 ''
+ # skip failing X86 test cases on 32-bit ARM
+ rm test/DebugInfo/X86/convert-debugloc.ll
+ rm test/DebugInfo/X86/convert-inlined.ll
+ rm test/DebugInfo/X86/convert-linked.ll
+ rm test/tools/dsymutil/X86/op-convert.test
+ '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
+ # Seems to require certain floating point hardware (NEON?)
+ rm test/ExecutionEngine/frem.ll
'' + ''
patchShebangs test/BugPoint/compile-custom.ll.py
diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix
index 1e9b77cfb79b..adfde05e6584 100644
--- a/pkgs/development/compilers/manticore/default.nix
+++ b/pkgs/development/compilers/manticore/default.nix
@@ -1,15 +1,15 @@
{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }:
let
- rev= "4528ccacdfd53d36f5959c005b27cd7ab6175b83";
+ rev = "7376cb20ba5285a6b076a73c821e4743809c1d9d";
in stdenv.mkDerivation {
pname = "manticore";
- version = "2019.09.20";
+ version = "2019.12.03";
src = fetchFromGitHub {
owner = "ManticoreProject";
repo = "manticore";
- sha256 = "1xz7msiq5x2c56zjxydbxlj6r001mm5zszcda6f6v5qfmmd1bakz";
+ sha256 = "17h3ar7d6145dyrm006r3gd5frk3v4apjk383n78dh4vlniv1ay2";
inherit rev;
};
diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix
index 03f3d56fd93d..e4c756e9c7d3 100644
--- a/pkgs/development/compilers/mruby/default.nix
+++ b/pkgs/development/compilers/mruby/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "mruby";
- version = "2.0.1";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "mruby";
repo = "mruby";
rev = version;
- sha256 = "1zm2d5kj9fnfx8ifj8ysrrr838ipwmvz35byzjhprakrg64911p9";
+ sha256 = "1y072c7dh9jf8xwy7kia6cb4dkpspq4zf24ssn7zm5f46p4waxni";
};
nativeBuildInputs = [ ruby bison ];
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 48808bf356b9..dee0b351a609 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "nim";
- version = "1.0.2";
+ version = "1.0.4";
src = fetchurl {
url = "https://nim-lang.org/download/${pname}-${version}.tar.xz";
- sha256 = "1rjinrs119c8i6wzz5fzjfml7n7kbd5hb9642g4rr8qxkq4sx83k";
+ sha256 = "1q5fx9g40bk4ajghi856w5l34fmrl7avq5j6p0dr2xa4l52ib149";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 9557d0a79aeb..d39c0d86fd57 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -12,16 +12,18 @@ in
{ stdenv, fetchurl, ncurses, buildEnv
, libX11, xorgproto, useX11 ? safeX11 stdenv
+, aflSupport ? false
, flambdaSupport ? false
}:
assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips;
+assert aflSupport -> stdenv.lib.versionAtLeast version "4.05";
assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03";
let
useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optional optionals optionalString;
- name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}";
+ name = "ocaml${optionalString aflSupport "+afl"}${optionalString flambdaSupport "+flambda"}-${version}";
in
let
@@ -41,11 +43,16 @@ stdenv.mkDerivation (args // {
};
prefixKey = "-prefix ";
- configureFlags = optionals useX11 (
- if stdenv.lib.versionAtLeast version "4.08"
- then [ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"]
- else [ "-x11lib" x11lib "-x11include" x11inc ])
- ++ optional flambdaSupport "-flambda"
+ configureFlags =
+ let flags = new: old:
+ if stdenv.lib.versionAtLeast version "4.08"
+ then new else old
+ ; in
+ optionals useX11 (flags
+ [ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"]
+ [ "-x11lib" x11lib "-x11include" x11inc ])
+ ++ optional aflSupport (flags "--with-afl" "-afl-instrument")
+ ++ optional flambdaSupport (flags "--enable-flambda" "-flambda")
;
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix
index 57911f2d58e6..e365b9b28b35 100644
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -106,7 +106,7 @@ let
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
cat < $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
EOF
'';
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 1a5848cd1a68..4debf10c0cb4 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -193,6 +193,11 @@ let
mkdir $out/lib/openjdk/jre
lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
+ # Make sure cmm/*.pf are not symlinks:
+ # https://youtrack.jetbrains.com/issue/IDEA-147272
+ rm -rf $out/lib/openjdk/jre/lib/cmm
+ ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
+
# Setup fallback fonts
${lib.optionalString (!headless) ''
mkdir -p $jre/lib/openjdk/jre/lib/fonts
@@ -231,7 +236,7 @@ let
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
cat < $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
EOF
'';
diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix
index 4c808302b4fa..0b659b95aa8b 100644
--- a/pkgs/development/compilers/openjdk/darwin/11.nix
+++ b/pkgs/development/compilers/openjdk/darwin/11.nix
@@ -44,7 +44,7 @@ let
# Set JAVA_HOME automatically.
cat <> $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix
index d2fef9bb4812..bc7a33932b27 100644
--- a/pkgs/development/compilers/openjdk/darwin/8.nix
+++ b/pkgs/development/compilers/openjdk/darwin/8.nix
@@ -44,7 +44,7 @@ let
# Set JAVA_HOME automatically.
cat <> $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix
index 58e4ba990149..c954a8e2cf85 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -44,7 +44,7 @@ let
# Set JAVA_HOME automatically.
cat <> $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 094bd57e6e98..03121daf961f 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -114,7 +114,7 @@ let
# Set JAVA_HOME automatically.
mkdir -p $out/nix-support
cat < $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
EOF
'';
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index e80d81dc5a00..a96e703b28cf 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -156,7 +156,7 @@ let result = stdenv.mkDerivation rec {
# Set JAVA_HOME automatically.
cat <> $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
@@ -201,4 +201,4 @@ let result = stdenv.mkDerivation rec {
platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms
};
-}; in stdenv.lib.trivial.warn "Public updates for Oracle Java SE 8 released after January 2019 will not be available for business, commercial or production use without a commercial license. See https://java.com/en/download/release_notice.jsp for more information." result
+}; in result
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 4540a3016106..987c86ba2649 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
# under the 3-clause BSD license. The rest is 2-clause BSD license.
license = with licenses; [ bsd3 bsd2 ];
platforms = platforms.unix;
- maintainers = [ maintainers.fuuzetsu ];
+ maintainers = [ ];
};
}
diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix
index 26ef76382a3a..86a13a776cee 100644
--- a/pkgs/development/compilers/osl/default.nix
+++ b/pkgs/development/compilers/osl/default.nix
@@ -8,13 +8,13 @@ in clangStdenv.mkDerivation rec {
# In theory this could use GCC + Clang rather than just Clang,
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
name = "openshadinglanguage-${version}";
- version = "1.10.7";
+ version = "1.10.8";
src = fetchFromGitHub {
owner = "imageworks";
repo = "OpenShadingLanguage";
- rev = "Release-1.10.7";
- sha256 = "15grach34grp8x65sq8xzs2s6nfzjhn4blpfnaicw46jdi4c2w59";
+ rev = "Release-1.10.8";
+ sha256 = "1vfdbs1yprr22nx64ff89jcqabfw0md8drifpbzqn2v6ipc8gz6a";
};
cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ];
diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix
index 370c08f001a7..70a56e6f41ed 100644
--- a/pkgs/development/compilers/polyml/5.6.nix
+++ b/pkgs/development/compilers/polyml/5.6.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.lgpl21;
platforms = with stdenv.lib.platforms; linux;
maintainers = [ #Add your name here!
- stdenv.lib.maintainers.z77z
+ stdenv.lib.maintainers.maggesi
];
};
}
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index eef972a2cc3c..db1c7613f65b 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = https://www.polyml.org/;
license = licenses.lgpl21;
platforms = with platforms; (linux ++ darwin);
- maintainers = with maintainers; [ z77z yurrriq ];
+ maintainers = with maintainers; [ maggesi yurrriq ];
};
}
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 5ab13d5f761f..7be5fd993aef 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
homepage = https://www.polyml.org/;
license = licenses.lgpl21;
platforms = with platforms; (linux ++ darwin);
- maintainers = with maintainers; [ z77z yurrriq ];
+ maintainers = with maintainers; [ maggesi yurrriq ];
};
}
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 7e525648691d..071709fa2d1c 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, llvm, makeWrapper, pcre2, coreutils, which, libressl,
+{ stdenv, fetchFromGitHub, llvm, makeWrapper, pcre2, coreutils, which, libressl, libxml2,
cc ? stdenv.cc, lto ? !stdenv.isDarwin }:
stdenv.mkDerivation ( rec {
pname = "ponyc";
- version = "0.32.0";
+ version = "0.33.0";
src = fetchFromGitHub {
owner = "ponylang";
repo = pname;
rev = version;
- sha256 = "07ai5lr0zdrcdmfjxsypp33fpj8lnak7y5177s7qd19163z0ia20";
+ sha256 = "0a0sw902nrayg0s1zrkhfpvrmdqw19nif67hsv0ijrckcq37bjcz";
};
- buildInputs = [ llvm makeWrapper which ];
+ buildInputs = [ llvm makeWrapper which libxml2 ];
propagatedBuildInputs = [ cc ];
# Disable problematic networking tests
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index 6719293af2a7..23e7f3b28f7f 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "pony-stable";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "ponylang";
repo = "pony-stable";
rev = version;
- sha256 = "1wiinw35bp3zpq9kx61x2zvid7ln00jrw052ah8801s0d9dbwrdr";
+ sha256 = "0nzvsqvl315brp3yb4j5kl82xnkmib4jk416jjc7yrz4k3jgr278";
};
buildInputs = [ ponyc ];
diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index 7a6778216873..f1126fdeddfd 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -18,19 +18,19 @@ let
in stdenv.mkDerivation rec {
pname = "purescript";
- version = "0.13.3";
+ version = "0.13.5";
src =
if stdenv.isDarwin
then
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
- sha256 = "04ylhqadj7wnclhiar9il6fkrxmh9qkz6fpas7z3b37w4qg0gshl";
+ sha256 = "19bb50m0cd738r353blgy21d842b3yj58xfbplk7bz59jawj9lym";
}
else
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
- sha256 = "1xcn694qfql87pdjh09hhvfvpakzxb2hagss61vh9msqq3s96l3z";
+ sha256 = "016wvwypgb4859f0n1lqsqv9a8cca2y8g7d6ffvzx6rncd115gxi";
};
diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix
new file mode 100644
index 000000000000..ced0855597c1
--- /dev/null
+++ b/pkgs/development/compilers/rasm/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+ pname = "rasm";
+ version = "0.117";
+
+ src = fetchurl {
+ url = "www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip";
+ sha256 = "1hwily4cfays59qm7qd1ax48i7cpbxhs5l9mfpyn7m2lxsfqrl3z";
+ };
+
+ sourceRoot = ".";
+
+ nativeBuildInputs = [ unzip ];
+
+ buildPhase = ''
+ # according to official documentation
+ cc rasm_v*.c -O2 -lm -lrt -march=native -o rasm
+ '';
+
+ installPhase = ''
+ install -Dt $out/bin rasm
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "http://www.roudoudou.com/rasm/";
+ description = "Z80 assembler";
+ # use -n option to display all licenses
+ license = licenses.mit; # expat version
+ maintainers = [ maintainers.genesis ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 5ade7fd6fbae..20286dcc43c9 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-reason-${version}";
- version = "3.5.0";
+ version = "3.5.1";
src = fetchFromGitHub {
owner = "facebook";
repo = "reason";
- rev = "ea207004e021efef5a92ecd011d9d5b9b16bbded";
- sha256 = "0cdjy7sw15rlk63prrwy8lavqrz8fqwsgwr19ihvj99x332r98kk";
+ rev = "aea245a43eb44034d2fccac7028b640a437af239";
+ sha256 = "0ff7rjxbsg9zkq6sxlm9bkx7yk8x2cvras7z8436msczgd1wmmyf";
};
nativeBuildInputs = [ makeWrapper ];
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/rtop \
--prefix PATH : "${utop}/bin" \
- --set CAML_LD_LIBRARY_PATH ${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib:$CAML_LD_LIBRARY_PATH \
- --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH
+ --prefix CAML_LD_LIBRARY_PATH : "${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib" \
+ --prefix OCAMLPATH : "$out/lib/ocaml/${ocaml.version}/site-lib"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index 3856ced250e7..99519c53fcda 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
pname = "rgbds";
- version = "0.3.8";
+ version = "0.3.9";
src = fetchFromGitHub {
owner = "rednex";
repo = "rgbds";
rev = "v${version}";
- sha256 = "0db37z886026svhj6qnc3wk56sndbnz1vi41gn2k3bl6ppbnjlpk";
+ sha256 = "0pzd9ig3ahpgq7jbj82grllxx1v01d620insr2m8h0c6jj25n5hv";
};
nativeBuildInputs = [ bison flex pkg-config libpng ];
installFlags = "PREFIX=\${out}";
diff --git a/pkgs/development/compilers/rust/1_38_0.nix b/pkgs/development/compilers/rust/1_38_0.nix
new file mode 100644
index 000000000000..be43e074228d
--- /dev/null
+++ b/pkgs/development/compilers/rust/1_38_0.nix
@@ -0,0 +1,21 @@
+import ./default.nix {
+ rustcVersion = "1.38.0";
+ rustcSha256 = "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4";
+
+ # Note: the version MUST be one version prior to the version we're
+ # building
+ bootstrapVersion = "1.37.0";
+
+ # fetch hashes by running `print-hashes.sh 1.37.0`
+ bootstrapHashes = {
+ i686-unknown-linux-gnu = "74510e0e52a55e65a9f716673c2cda4d2bd427e2453541c6993c77c3ec04acf9";
+ x86_64-unknown-linux-gnu = "cb573229bfd32928177c3835fdeb62d52da64806b844bc1095c6225b0665a1cb";
+ arm-unknown-linux-gnueabihf = "272739fbb23cf6c2040c1813af9c8c7f386cac37d9de638f22a1816eb96bc0ae";
+ armv7-unknown-linux-gnueabihf = "5b87b877f0ed20c6a09ce26e7a15d8c61b26b62484b97e78a51099d0efefec98";
+ aarch64-unknown-linux-gnu = "263ef98fa3a6b2911b56f89c06615cdebf6ef676eb9b2493ad1539602f79b6ba";
+ i686-apple-darwin = "e45d0c4d882fc6c404ffa6fe790294f4ea96384a2b48804adbf723f3635477a8";
+ x86_64-apple-darwin = "b2310c97ffb964f253c4088c8d29865f876a49da2a45305493af5b5c7a3ca73d";
+ };
+
+ selectRustPackage = pkgs: pkgs.rust_1_38_0;
+}
diff --git a/pkgs/development/compilers/rust/1_39_0.nix b/pkgs/development/compilers/rust/1_39_0.nix
new file mode 100644
index 000000000000..e86be63bf3a5
--- /dev/null
+++ b/pkgs/development/compilers/rust/1_39_0.nix
@@ -0,0 +1,29 @@
+# New rust versions should first go to staging.
+# Things to check after updating:
+# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
+# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
+# This testing can be also done by other volunteers as part of the pull
+# request review, in case platforms cannot be covered.
+# 2. The LLVM version used for building should match with rust upstream.
+# 3. Firefox and Thunderbird should still build on x86_64-linux.
+import ./default.nix {
+ rustcVersion = "1.39.0";
+ rustcSha256 = "0mwkc1bnil2cfyf6nglpvbn2y0zfbv44zfhsd5qg4c9rm6vgd8dl";
+
+ # Note: the version MUST be one version prior to the version we're
+ # building
+ bootstrapVersion = "1.38.0";
+
+ # fetch hashes by running `print-hashes.sh 1.38.0`
+ bootstrapHashes = {
+ i686-unknown-linux-gnu = "41aed8a350e24a0cac1444ed99b3dd24a90bc581dd88cb420c6e547d6b5f57af";
+ x86_64-unknown-linux-gnu = "adda26b3f0609dbfbdc2019da4a20101879b9db2134fae322a4e863a069ec221";
+ arm-unknown-linux-gnueabihf = "0603a3d3d16ae8f3b3b117eb699e8f3ef7532a6f6d3c29d13e7d4614fc3c9e7a";
+ armv7-unknown-linux-gnueabihf = "8b1bf1680a61a643d6b5c7a3b1a1ce88448652756395e20ba5846739cbd085c4";
+ aarch64-unknown-linux-gnu = "06afd6d525326cea95c3aa658aaa8542eab26f44235565bb16913ac9d12b7bda";
+ i686-apple-darwin = "cdbf2807774bed350a3af6f41d7f7dd7ceff28777cde310c3ba90033188eb2f8";
+ x86_64-apple-darwin = "bd301b78ddcd5d4553962b115e1dca5436dd3755ed323f86f4485769286a8a5a";
+ };
+
+ selectRustPackage = pkgs: pkgs.rust_1_39_0;
+}
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 7b774d066b7f..7c0b46d55931 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -1,38 +1,11 @@
-{ stdenv, fetchurl, callPackage }:
+{ stdenv, fetchurl, rust, callPackage, version, hashes }:
let
- # Note: the version MUST be one version prior to the version we're
- # building
- version = "1.37.0";
-
- # fetch hashes by running `print-hashes.sh 1.37.0`
- hashes = {
- i686-unknown-linux-gnu = "74510e0e52a55e65a9f716673c2cda4d2bd427e2453541c6993c77c3ec04acf9";
- x86_64-unknown-linux-gnu = "cb573229bfd32928177c3835fdeb62d52da64806b844bc1095c6225b0665a1cb";
- armv7-unknown-linux-gnueabihf = "5b87b877f0ed20c6a09ce26e7a15d8c61b26b62484b97e78a51099d0efefec98";
- aarch64-unknown-linux-gnu = "263ef98fa3a6b2911b56f89c06615cdebf6ef676eb9b2493ad1539602f79b6ba";
- i686-apple-darwin = "e45d0c4d882fc6c404ffa6fe790294f4ea96384a2b48804adbf723f3635477a8";
- x86_64-apple-darwin = "b2310c97ffb964f253c4088c8d29865f876a49da2a45305493af5b5c7a3ca73d";
- };
-
- platform =
- if stdenv.hostPlatform.system == "i686-linux"
- then "i686-unknown-linux-gnu"
- else if stdenv.hostPlatform.system == "x86_64-linux"
- then "x86_64-unknown-linux-gnu"
- else if stdenv.hostPlatform.system == "armv7l-linux"
- then "armv7-unknown-linux-gnueabihf"
- else if stdenv.hostPlatform.system == "aarch64-linux"
- then "aarch64-unknown-linux-gnu"
- else if stdenv.hostPlatform.system == "i686-darwin"
- then "i686-apple-darwin"
- else if stdenv.hostPlatform.system == "x86_64-darwin"
- then "x86_64-apple-darwin"
- else throw "missing bootstrap url for platform ${stdenv.hostPlatform.system}";
+ platform = rust.toRustTarget stdenv.hostPlatform;
src = fetchurl {
url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz";
- sha256 = hashes.${platform};
+ sha256 = hashes.${platform} or (throw "missing bootstrap url for platform ${platform}");
};
in callPackage ./binary.nix
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index a39cd785cf7c..60e31c6def47 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -1,3 +1,9 @@
+{ rustcVersion
+, rustcSha256
+, bootstrapVersion
+, bootstrapHashes
+, selectRustPackage
+}:
{ stdenv, lib
, buildPackages
, newScope, callPackage
@@ -5,17 +11,25 @@
, llvmPackages_5
, pkgsBuildTarget, pkgsBuildBuild
}: rec {
- makeRustPlatform = { rustc, cargo, ... }: {
+ toRustTarget = platform: with platform.parsed; let
+ cpu_ = {
+ "armv7a" = "armv7";
+ "armv7l" = "armv7";
+ "armv6l" = "arm";
+ }.${cpu.name} or cpu.name;
+ in "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}";
+
+ makeRustPlatform = { rustc, cargo, ... }: rec {
rust = {
inherit rustc cargo;
};
- buildRustPackage = callPackage ../../../build-support/rust {
- inherit rustc cargo;
+ fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix {
+ inherit cargo;
+ };
- fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix {
- inherit cargo;
- };
+ buildRustPackage = callPackage ../../../build-support/rust {
+ inherit rustc cargo fetchcargo;
};
rustcSrc = callPackage ./rust-src.nix {
@@ -36,21 +50,27 @@
# cycles / purify builds). In this way, nixpkgs would be in control of all
# bootstrapping.
packages = {
- prebuilt = callPackage ./bootstrap.nix {};
+ prebuilt = callPackage ./bootstrap.nix {
+ version = bootstrapVersion;
+ hashes = bootstrapHashes;
+ };
stable = lib.makeScope newScope (self: let
# Like `buildRustPackages`, but may also contain prebuilt binaries to
# break cycle. Just like `bootstrapTools` for nixpkgs as a whole,
# nothing in the final package set should refer to this.
bootstrapRustPackages = self.buildRustPackages.overrideScope' (_: _:
lib.optionalAttrs (stdenv.buildPlatform == stdenv.hostPlatform)
- buildPackages.rust.packages.prebuilt);
+ (selectRustPackage buildPackages).packages.prebuilt);
bootRustPlatform = makeRustPlatform bootstrapRustPackages;
in {
# Packages suitable for build-time, e.g. `build.rs`-type stuff.
- buildRustPackages = buildPackages.rust.packages.stable;
+ buildRustPackages = (selectRustPackage buildPackages).packages.stable;
# Analogous to stdenv
rustPlatform = makeRustPlatform self.buildRustPackages;
rustc = self.callPackage ./rustc.nix ({
+ version = rustcVersion;
+ sha256 = rustcSha256;
+
# Use boot package set to break cycle
rustPlatform = bootRustPlatform;
} // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) {
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh
index 7eb00a30ad73..1d46fe376d4b 100755
--- a/pkgs/development/compilers/rust/print-hashes.sh
+++ b/pkgs/development/compilers/rust/print-hashes.sh
@@ -10,6 +10,7 @@ set -euo pipefail
PLATFORMS=(
i686-unknown-linux-gnu
x86_64-unknown-linux-gnu
+ arm-unknown-linux-gnueabihf
armv7-unknown-linux-gnueabihf
aarch64-unknown-linux-gnu
i686-apple-darwin
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 430d22f76532..ca9bf05b7e7d 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -1,28 +1,30 @@
{ stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
, fetchurl, file, python2
-, llvm_7, darwin, git, cmake, rustPlatform
+, llvm_9, darwin, git, cmake, rust, rustPlatform
, pkgconfig, openssl
, which, libffi
, withBundledLLVM ? false
+, version
+, sha256
}:
let
inherit (stdenv.lib) optional optionalString;
inherit (darwin.apple_sdk.frameworks) Security;
- llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; };
- llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; };
- llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; };
+ llvmSharedForBuild = pkgsBuildBuild.llvm_9.override { enableSharedLibraries = true; };
+ llvmSharedForHost = pkgsBuildHost.llvm_9.override { enableSharedLibraries = true; };
+ llvmSharedForTarget = pkgsBuildTarget.llvm_9.override { enableSharedLibraries = true; };
# For use at runtime
- llvmShared = llvm_7.override { enableSharedLibraries = true; };
+ llvmShared = llvm_9.override { enableSharedLibraries = true; };
in stdenv.mkDerivation rec {
pname = "rustc";
- version = "1.38.0";
+ inherit version;
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
- sha256 = "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4";
+ inherit sha256;
};
__darwinAllowLocalNetworking = true;
@@ -51,9 +53,9 @@ in stdenv.mkDerivation rec {
# We need rust to build rust. If we don't provide it, configure will try to download it.
# Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py
configureFlags = let
- setBuild = "--set=target.${stdenv.buildPlatform.config}";
- setHost = "--set=target.${stdenv.hostPlatform.config}";
- setTarget = "--set=target.${stdenv.targetPlatform.config}";
+ setBuild = "--set=target.${rust.toRustTarget stdenv.buildPlatform}";
+ setHost = "--set=target.${rust.toRustTarget stdenv.hostPlatform}";
+ setTarget = "--set=target.${rust.toRustTarget stdenv.targetPlatform}";
ccForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}cc";
cxxForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}c++";
ccForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}cc";
@@ -66,9 +68,9 @@ in stdenv.mkDerivation rec {
"--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo"
"--enable-rpath"
"--enable-vendor"
- "--build=${stdenv.buildPlatform.config}"
- "--host=${stdenv.hostPlatform.config}"
- "--target=${stdenv.targetPlatform.config}"
+ "--build=${rust.toRustTarget stdenv.buildPlatform}"
+ "--host=${rust.toRustTarget stdenv.hostPlatform}"
+ "--target=${rust.toRustTarget stdenv.targetPlatform}"
"${setBuild}.cc=${ccForBuild}"
"${setHost}.cc=${ccForHost}"
diff --git a/pkgs/development/compilers/rust/setup-hook.sh b/pkgs/development/compilers/rust/setup-hook.sh
index 7078ec7060b9..5d4eb642fec0 100644
--- a/pkgs/development/compilers/rust/setup-hook.sh
+++ b/pkgs/development/compilers/rust/setup-hook.sh
@@ -1,4 +1,4 @@
# Fix 'failed to open: /homeless-shelter/.cargo/.package-cache' in rust 1.36.
-if [[ -z $IN_NIX_SHELL && -z $CARGO_HOME ]]; then
+if [[ -z ${IN_NIX_SHELL-} && -z ${CARGO_HOME-} ]]; then
export CARGO_HOME=$TMPDIR
fi
diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix
index 5a01e295e49e..675e91b302a7 100644
--- a/pkgs/development/compilers/scala/dotty-bare.nix
+++ b/pkgs/development/compilers/scala/dotty-bare.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, ncurses }:
stdenv.mkDerivation rec {
- version = "0.14.0-RC1";
+ version = "0.20.0-RC1";
pname = "dotty-bare";
src = fetchurl {
url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz";
- sha256 = "0nrgsyhqjlpvnjqgb18pryr8q7knq3dq25jhp98s4wh76nssm1zr";
+ sha256 = "08qs3m32cbh6516gcwraa1b5k935awmjxls6kg6xll722hkdd9l6";
};
propagatedBuildInputs = [ jre ncurses.dev ] ;
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
homepage = http://dotty.epfl.ch/;
license = licenses.bsd3;
platforms = platforms.all;
- maintainers = [maintainers.karolchmist];
+ maintainers = [maintainers.karolchmist maintainers.virusdave];
};
}
diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix
index 89912ac9ad6b..a79c9a702c4f 100644
--- a/pkgs/development/compilers/smlnj/default.nix
+++ b/pkgs/development/compilers/smlnj/default.nix
@@ -1,32 +1,47 @@
{ stdenv, fetchurl }:
let
- version = "110.91";
+ version = "110.95";
baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
+ isArch64 = stdenv.system == "x86_64-linux";
+
+ arch = if isArch64
+ then "64"
+ else "32";
+
+ boot32 = { url = "${baseurl}/boot.x86-unix.tgz";
+ sha256 = "07bcrvjphyin1ygjbymcqhd1mbfk4hff82wmxcllh77lr28l5dxf"; };
+ boot64 = { url = "${baseurl}/boot.amd64-unix.tgz";
+ sha256 = "1zn96a83kb6bn6228yfjsvb58m2qxw9k4j3qz0p9c8za479w4ch6"; };
+
+ bootBinary = if isArch64
+ then boot64
+ else boot32;
+
sources = map fetchurl [
- { url = "${baseurl}/config.tgz"; sha256 = "00vbg2kpwgkf272m697p5hd35pawficbrifchn7dnd519wpdx436"; }
- { url = "${baseurl}/cm.tgz"; sha256 = "0wxb0s2fwh7lbb3z2pfvmvhk5v0gm75kchkv7gg9f895ahyvm6yd"; }
- { url = "${baseurl}/compiler.tgz"; sha256 = "0iq06ycivy562i59vvbma9zi575zw1djhdfkcy0bn7m9kfzzbgkh"; }
- { url = "${baseurl}/runtime.tgz"; sha256 = "0km8p4vmy3m38xv0rl8d3mh2nlk2mvx010npm34gs374bmmzc7z9"; }
- { url = "${baseurl}/system.tgz"; sha256 = "16d5vs1rn7ly6jxjm08222cj0sry73pr57xpc9d6k286b1v0910b"; }
- { url = "${baseurl}/MLRISC.tgz"; sha256 = "1c9sw8zm90ykas5nwbhk2wic7sxkjrylb610x37v46m5ips1wlma"; }
- { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "09ka20ym7ahrpj4r6vc5phflc8y57dj09qvwk8ambfwb2p2274sw"; }
- { url = "${baseurl}/old-basis.tgz"; sha256 = "1bhq9fv6p8diz489h9571g0xrsi8yx7h6gh9410255klxjrw964h"; }
- { url = "${baseurl}/ckit.tgz"; sha256 = "1lq9ljai0shc6hszx5v6bqmkz16a3f295mfg7q622apzgzark3vd"; }
- { url = "${baseurl}/nlffi.tgz"; sha256 = "1xjmlwiclgckj73z5hz3hnqlavp3ax9sfvgc0rvj3xpy3i3n6axj"; }
- { url = "${baseurl}/cml.tgz"; sha256 = "1sjzipxnvr9dgcg16bllfk3b46ac9f8h353nh1ccykwwq4whi9bf"; }
- { url = "${baseurl}/eXene.tgz"; sha256 = "04clbchrlqx5v35gkbydbfnpl720i4nqijkshiwn0v592n4xfdf4"; }
- { url = "${baseurl}/ml-lpt.tgz"; sha256 = "0max073nzwv7vx13caj7zmlhslvxlgg8rj52278g7f6fqcrwp5cf"; }
- { url = "${baseurl}/ml-lex.tgz"; sha256 = "0x2mbg45l71049sgvvkl6bnqc5svz70vh1m1rbf3xk41z5bapcgr"; }
- { url = "${baseurl}/ml-yacc.tgz"; sha256 = "0a1pbwpw1y6d1xn9yjarqpmybrxqwp5snp28by36745h1jvb1p1b"; }
- { url = "${baseurl}/ml-burg.tgz"; sha256 = "119mq5jrbkn9vf9fgb0wyz483hf26al9hwb91xpmlmfx5qqnfzik"; }
- { url = "${baseurl}/pgraph.tgz"; sha256 = "1s7jmh3q88rz29bk02y3gzdqrgvk484j5ji8bn7s6fc78m50nqp8"; }
- { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1gzf1pbmw2cn5w6f5qfdm3d6n6069n1nnzz6z4v7mr07x54c6mdv"; }
- { url = "${baseurl}/heap2asm.tgz"; sha256 = "09cgj568a9x017awysjdx35mlp5zkdmc2fs67fvnm5ifl7ivfs8j"; }
- { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1g4xhcxychs9q25x7a5lvqfamq52c5ljlx84bc5cazvpkhixyg04"; }
- { url = "${baseurl}/doc.tgz"; sha256 = "1l0x91dscizk2pyj1lw595r84h1h0shxh0x5hva891717a1hfa51"; }
- { url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "0f6x4nfhrgm1z4dx862df2yaffdh1sd6zx2lyb2vph5mhp7x9n58"; }
- { url = "${baseurl}/asdl.tgz"; sha256 = "1pi3m21jllyd2h0zpz4bajskfv58g6pjhpprqiwgmikn6w1pryp8"; }
+ bootBinary
+ { url = "${baseurl}/config.tgz"; sha256 = "09srqxkxl86iaz6l6dz83c1apsac0pxpfq6b74i6l0nfl261jibw"; }
+ { url = "${baseurl}/cm.tgz"; sha256 = "0gh8inrb07z597axw8qipwyx52m8nac5d5r0rvgzvdnnjg9nr9zy"; }
+ { url = "${baseurl}/compiler.tgz"; sha256 = "1kk6jwzyc261l5nii3n8rwccmgvcj1mg5fgycfsfsiyyy1v8xfx7"; }
+ { url = "${baseurl}/runtime.tgz"; sha256 = "17i069h5cv411sgzx3ynlf4v3wlrxiba9bwy1b0x0cyhs879kppc"; }
+ { url = "${baseurl}/system.tgz"; sha256 = "0s8ij3wfxpjrmrwxrgrirfxjj8vkda6l32j88al5q1ic3ncwc58s"; }
+ { url = "${baseurl}/MLRISC.tgz"; sha256 = "1v2d3gjxrcgc95x5glqcw0nfp13aapkcw03fyi70m3k1yc61izmz"; }
+ { url = "${baseurl}/smlnj-lib.tgz"; sha256 = "04i11ki8v9s7yz3lg6b0djhi03zzkzav0b5cr81ypxlkmf4hh6bp"; }
+ { url = "${baseurl}/old-basis.tgz"; sha256 = "1ryqpy0n7c9gd995ndmjvaci74f95nr8n1jjgm28yd1sn7hnavhi"; }
+ { url = "${baseurl}/ckit.tgz"; sha256 = "18mcs3j8c5gq9cmck7r175am60blaznqmhzyir622yfc8fpw1map"; }
+ { url = "${baseurl}/nlffi.tgz"; sha256 = "16mrl5aqbgsgljxa3z8kj5max9drddml34bq7rn1i78594jfvkwk"; }
+ { url = "${baseurl}/cml.tgz"; sha256 = "00x784nv1pi6534k3vva26i9qx84cvw242vgwbs5020zkm6gvrmn"; }
+ { url = "${baseurl}/eXene.tgz"; sha256 = "143825h36v6z77kwvrvpszgwnhmjs3yldb18i9z4lwkqfb4kn7f7"; }
+ { url = "${baseurl}/ml-lpt.tgz"; sha256 = "17ly9h9ry8r94dx6lkas6w2cxknwkpma4z9pj8rgzmd3w6qm7j1z"; }
+ { url = "${baseurl}/ml-lex.tgz"; sha256 = "1ja3l2kiq17754c58mwdiqi25f7ax0cji2wk0vq4872iwwxc22px"; }
+ { url = "${baseurl}/ml-yacc.tgz"; sha256 = "1m48nkwvw87yg39sjihlw8na5m34bzz3d4zpfbjaj2f75fkjy3jf"; }
+ { url = "${baseurl}/ml-burg.tgz"; sha256 = "13nbvbah7bn8gjm4gi41m412vpl69wd6d3x3wzbb6xpia9vm4z4j"; }
+ { url = "${baseurl}/pgraph.tgz"; sha256 = "1aizkl8avz01kx221xy5z7a1a1b5xqn2hrk66wr8d0iav2nh5c98"; }
+ { url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1c80xgck9sb2rm554nfg4f5mpjkdbrwkcx88pj120056225l10vx"; }
+ { url = "${baseurl}/heap2asm.tgz"; sha256 = "1n68drd7as5dy20ccfvgd9cmnhfpfvz7g3f0gc8kpaqaz3vpy36g"; }
+ { url = "${baseurl}/smlnj-c.tgz"; sha256 = "1b6svh2kk5211rq73fdwx3sf80d2rshf0dmkkrq5mw4852nzqz3p"; }
+ { url = "${baseurl}/doc.tgz"; sha256 = "021yzhy9maypq4ahz0d0qpr601spndg583fn9mapv6rl42kwhjq6"; }
+ { url = "${baseurl}/asdl.tgz"; sha256 = "0nqavqcbidwnphbbwjrxhpy8glbyad51wy0cpqimbsw3sgns0zkd"; }
];
in stdenv.mkDerivation {
pname = "smlnj";
@@ -37,6 +52,7 @@ in stdenv.mkDerivation {
patchPhase = ''
sed -i '/PATH=/d' config/_arch-n-opsys base/runtime/config/gen-posix-names.sh
echo SRCARCHIVEURL="file:/$TMP" > config/srcarchiveurl
+ patch --verbose config/_heap2exec ${./heap2exec.diff}
'';
unpackPhase = ''
@@ -50,7 +66,7 @@ in stdenv.mkDerivation {
'';
buildPhase = ''
- ./config/install.sh
+ ./config/install.sh -default ${arch}
'';
installPhase = ''
@@ -67,7 +83,7 @@ in stdenv.mkDerivation {
description = "Standard ML of New Jersey, a compiler";
homepage = http://smlnj.org;
license = licenses.bsd3;
- platforms = [ "i686-linux" ];
+ platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ thoughtpolice ];
};
}
diff --git a/pkgs/development/compilers/smlnj/heap2exec.diff b/pkgs/development/compilers/smlnj/heap2exec.diff
new file mode 100644
index 000000000000..ef21a8e7f072
--- /dev/null
+++ b/pkgs/development/compilers/smlnj/heap2exec.diff
@@ -0,0 +1,9 @@
+@@ -35,7 +35,7 @@
+ BIN_DIR=${SMLNJ_HOME}/bin
+ fi
+
+-ARCH_N_OPSYS=`"$BIN_DIR/.arch-n-opsys $SIZE_OPT"`
++ARCH_N_OPSYS=`$BIN_DIR/.arch-n-opsys $SIZE_OPT`
+ if [ "$?" != "0" ]; then
+ die "unable to determine architecture/operating system"
+ fi
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index a39a6c4a2e4f..35ee7de7a2dc 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -10,13 +10,13 @@ let
in
stdenv.mkDerivation rec {
pname = "souffle";
- version = "1.6.1";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "souffle-lang";
repo = "souffle";
rev = version;
- sha256 = "004c5iicjnlzn1yz1k7a28s4xdqx00016rr870drdq2z30mxfgz8";
+ sha256 = "0px8kh5875q2iyza4ylpa6vxpy6qxg0qvn2idk1j6dcdf5pdryph";
};
nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ];
diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix
new file mode 100644
index 000000000000..015c955000c2
--- /dev/null
+++ b/pkgs/development/compilers/tinygo/default.nix
@@ -0,0 +1,35 @@
+{ lib, buildGoModule, fetchFromGitHub, llvm, clang-unwrapped, lld, avrgcc
+, avrdude, openocd, gcc-arm-embedded, makeWrapper }:
+
+buildGoModule rec {
+ pname = "tinygo";
+ version = "0.10.0";
+
+ src = fetchFromGitHub {
+ owner = "tinygo-org";
+ repo = "tinygo";
+ rev = "v${version}";
+ sha256 = "03di8500dqk25giiajglcdf2gbc0jidsn8qsw2sxmkmnd1np7gyd";
+ };
+
+ modSha256 = "0r3lfi1bj550sf3b7ysz62c2c33f8zfli8208xixj3jadycb6r3z";
+ enableParallelBuilding = true;
+ subPackages = [ "." ];
+ buildInputs = [ llvm clang-unwrapped makeWrapper ];
+ propagatedBuildInputs = [ lld avrgcc avrdude openocd gcc-arm-embedded ];
+
+ postInstall = ''
+ mkdir -p $out/share/tinygo
+ cp -a lib src targets $out/share/tinygo
+ wrapProgram $out/bin/tinygo --prefix "TINYGOROOT" : "$out/share/tinygo"
+ ln -sf $out/bin $out/share/tinygo
+ '';
+
+ meta = with lib; {
+ homepage = "https://tinygo.org/";
+ description = "Go compiler for small places";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ chiiruno ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix
index d4e536484c46..2a8c07fa0fe0 100644
--- a/pkgs/development/compilers/unison/default.nix
+++ b/pkgs/development/compilers/unison/default.nix
@@ -4,18 +4,18 @@
stdenv.mkDerivation rec {
pname = "unison-code-manager";
- milestone_id = "M1d";
+ milestone_id = "M1g";
version = "1.0.${milestone_id}-alpha";
src = if (stdenv.isDarwin) then
fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz";
- sha256 = "0cgkqwniw2fclsxgx6b1kgjmylqnn67kjs61iygzbpip8nvcm7pv";
+ sha256 = "186y7y7ffg976w01cbb8am84ajbifb7lcnsc4g3x262mkswr7lry";
}
else
fetchurl {
url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz";
- sha256 = "0rpz40d23daad16r2s4appiay3brbk0awp38yamavlr6dh23c9ws";
+ sha256 = "1ki9car1clpaspnl5jb5qnr6nzv108q279n8m8bjm8azfcnl61ab";
};
# The tarball is just the prebuilt binary, in the archive root.
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Modern, statically-typed purely functional language";
- homepage = http://unisonweb.org/posts/;
- license = licenses.free;
+ homepage = https://unisonweb.org/;
+ license = with licenses; [ mit bsd3 ];
maintainers = [ maintainers.virusdave ];
platforms = [ "x86_64-darwin" "x86_64-linux" ];
};
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 8079daf59a53..d84503caa607 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -106,18 +106,18 @@ in rec {
};
vala_0_40 = generic {
- version = "0.40.16";
- sha256 = "0vv25fmr9jqiqf080vak1x4raa4w3cz3n5ysjglqsq9qfx304i7b";
+ version = "0.40.18";
+ sha256 = "1f7cdkjdysg4dcri1wbzdddm46amk2s48jkwb5ghpdvhjb4l5j2m";
};
vala_0_44 = generic {
- version = "0.44.8";
- sha256 = "0f7pc496zvxfhbkhg8ayxykjas6f55mgv452wsnh0bz5zbxm8xrl";
+ version = "0.44.11";
+ sha256 = "06spdvm9q9k4riq1d2fxkyc8d88bcv460v360465iy1lnj3z9x2s";
};
vala_0_46 = generic {
- version = "0.46.2";
- sha256 = "1g20fzcwh3j7ab46jalabyi005h2in0cp7xj0yga4b8hx29h61wj";
+ version = "0.46.5";
+ sha256 = "07fv895sp9wq74b20qig7hic0r4ynrr5pfaqba02r44xb794fy0s";
};
vala = vala_0_46;
diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix
index 3d955c4394b0..147ec13c5556 100644
--- a/pkgs/development/compilers/x11basic/default.nix
+++ b/pkgs/development/compilers/x11basic/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "X11basic";
- version = "1.26";
+ version = "1.27";
src = fetchFromGitHub {
owner = "kollokollo";
repo = pname;
rev = version;
- sha256 = "0rwj9cf496xailply0rgw695bzdladh2dhy7vdqac1pwbkl53nvd";
+ sha256 = "1hpxzdqnjl1fiwgs2vrjg4kxm29c7pqwk3g1m4p5pm4x33a3d1q2";
};
buildInputs = [
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index d4caabc6cb83..d05ec1a682aa 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
# Set JAVA_HOME automatically.
cat <> $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index 5f345c87355f..5fe2473bac6d 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation {
# Set JAVA_HOME automatically.
cat <> $out/nix-support/setup-hook
- if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+ if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
EOF
'';
diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index 898272d402b6..588172aea61c 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -5,8 +5,8 @@ let params =
"8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; };
"8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
"8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; };
- "8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; };
- "8.9" = { version = "0.10.1"; sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; };
+ "8.8" = { version = "0.10.3"; sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; };
+ "8.9" = { version = "0.10.3"; sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; };
};
param = params.${coq.coq-version};
in
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://github.com/coq-ext-lib/coq-ext-lib;
description = "A collection of theories and plugins that may be useful in other Coq developments";
- maintainers = with maintainers; [ jwiegley ];
+ maintainers = with maintainers; [ jwiegley ptival ];
platforms = coq.meta.platforms;
};
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 6798236591c4..3c0a9632c95c 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -108,7 +108,7 @@ let
'';
meta = with stdenv.lib; {
- homepage = http://ssr.msr-inria.inria.fr/;
+ homepage = "https://math-comp.github.io/";
license = licenses.cecill-b;
maintainers = [ maintainers.vbgl maintainers.jwiegley ];
platforms = coq.meta.platforms;
diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix
index 86a1301d3c76..fee6de7b35bf 100644
--- a/pkgs/development/coq-modules/paco/default.nix
+++ b/pkgs/development/coq-modules/paco/default.nix
@@ -1,13 +1,36 @@
-{stdenv, fetchurl, coq, unzip}:
+{stdenv, fetchFromGitHub, coq, unzip}:
+
+let
+ versions = {
+ pre_8_6 = rec {
+ rev = "v${version}";
+ version = "1.2.8";
+ sha256 = "05fskx5x1qgaf9qv626m38y5izichzzqc7g2rglzrkygbskrrwsb";
+ };
+ post_8_6 = rec {
+ rev = "v${version}";
+ version = "4.0.0";
+ sha256 = "1ncrdyijkgf0s2q4rg1s9r2nrcb17gq3jz63iqdlyjq3ylv8gyx0";
+ };
+ };
+ params = {
+ "8.5" = versions.pre_8_6;
+ "8.6" = versions.post_8_6;
+ "8.7" = versions.post_8_6;
+ "8.8" = versions.post_8_6;
+ "8.9" = versions.post_8_6;
+ };
+ param = params.${coq.coq-version};
+in
stdenv.mkDerivation rec {
-
+ inherit (param) version;
name = "coq-paco-${coq.coq-version}-${version}";
- version = "1.2.8";
- src = fetchurl {
- url = "http://plv.mpi-sws.org/paco/paco-${version}.zip";
- sha256 = "1lcmdr0y2d7gzyvr8dal3pi7fibbd60bpi1l32fw89xiyrgqhsqy";
+ src = fetchFromGitHub {
+ inherit (param) rev sha256;
+ owner = "snu-sf";
+ repo = "paco";
};
buildInputs = with coq.ocamlPackages; [ ocaml camlp5 unzip ];
@@ -24,12 +47,12 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://plv.mpi-sws.org/paco/;
description = "A Coq library implementing parameterized coinduction";
- maintainers = with maintainers; [ jwiegley ];
+ maintainers = with maintainers; [ jwiegley ptival ];
platforms = coq.meta.platforms;
};
passthru = {
- compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+ compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
};
}
diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix
index d1e7ac882d79..a260beb51044 100644
--- a/pkgs/development/em-modules/generic/default.nix
+++ b/pkgs/development/em-modules/generic/default.nix
@@ -10,8 +10,8 @@ pkgs.stdenv.mkDerivation (
args //
{
- pname = "emscripten-${args.pname or (builtins.parseDrvName args.name).name}";
- version = args.version or (builtins.parseDrvName args.name).version;
+ pname = "emscripten-${lib.getName args}";
+ version = lib.getVersion args;
buildInputs = [ emscripten python ] ++ buildInputs;
nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs;
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 9adebe512471..b3c583da51e4 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -10,6 +10,9 @@
# A function to override the go-modules derivation
, overrideModAttrs ? (_oldAttrs : {})
+# path to go.mod and go.sum directory
+, modRoot ? "./"
+
# modSha256 is the sha256 of the vendored dependencies
, modSha256
@@ -58,7 +61,7 @@ let
export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go"
mkdir -p "''${GOPATH}/pkg/mod/cache/download"
-
+ cd "${modRoot}"
runHook postConfigure
'';
@@ -98,8 +101,11 @@ let
export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go"
+ export GOSUMDB=off
export GOPROXY=file://${go-modules}
+ cd "$modRoot"
+
runHook postConfigure
'';
diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index b3386aaf24bf..03d777d5c880 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/pkgs/development/go-packages/generic/default.nix
@@ -84,6 +84,8 @@ let
GOHOSTARCH = go.GOHOSTARCH or null;
GOHOSTOS = go.GOHOSTOS or null;
+ GO111MODULE = "off";
+
GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
configurePhase = args.configurePhase or ''
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c9ac52c46ea9..90030c0c8d1a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -74,7 +74,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
- sha256 = "0gfb7r3pj2cdzbm2lbymlx27kgy2adnvlzpv4s3lmdfpyzgflf1y";
+ sha256 = "04l1yrjq7n4nlzkmkg73xp6p7vpw1iq53mrmyb8162wqb7zapg4f";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@@ -275,6 +275,7 @@ self: super: {
dlist = dontCheck super.dlist;
docopt = dontCheck super.docopt; # http://hydra.cryp.to/build/499172/log/raw
dom-selector = dontCheck super.dom-selector; # http://hydra.cryp.to/build/497670/log/raw
+ dotenv = dontCheck super.dotenv; # Tests fail because of missing test file on version 0.8.0.2 fixed on version 0.8.0.4
dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw
DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw
ed25519 = dontCheck super.ed25519;
@@ -288,6 +289,7 @@ self: super: {
ghc-parmake = dontCheck super.ghc-parmake;
ghcid = dontCheck super.ghcid;
git-vogue = dontCheck super.git-vogue;
+ github-rest = dontCheck super.github-rest; # test suite needs the network
gitlib-cmdline = dontCheck super.gitlib-cmdline;
GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50
hackport = dontCheck super.hackport;
@@ -321,8 +323,8 @@ self: super: {
influxdb = dontCheck super.influxdb;
itanium-abi = dontCheck super.itanium-abi;
katt = dontCheck super.katt;
- language-slice = dontCheck super.language-slice;
language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275
+ language-slice = dontCheck super.language-slice;
ldap-client = dontCheck super.ldap-client;
lensref = dontCheck super.lensref;
lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25
@@ -368,6 +370,8 @@ self: super: {
separated = dontCheck super.separated;
shadowsocks = dontCheck super.shadowsocks;
shake-language-c = dontCheck super.shake-language-c;
+ snap-core = dontCheck super.snap-core;
+ sourcemap = dontCheck super.sourcemap;
static-resources = dontCheck super.static-resources;
strive = dontCheck super.strive; # fails its own hlint test with tons of warnings
svndump = dontCheck super.svndump;
@@ -384,14 +388,17 @@ self: super: {
webdriver = dontCheck super.webdriver;
webdriver-angular = dontCheck super.webdriver-angular;
xsd = dontCheck super.xsd;
- snap-core = dontCheck super.snap-core;
- sourcemap = dontCheck super.sourcemap;
zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57
# These test suites run for ages, even on a fast machine. This is nuts.
Random123 = dontCheck super.Random123;
systemd = dontCheck super.systemd;
+ # use the correct version of network
+ systemd_2_2_0 = dontCheck (super.systemd_2_2_0.override {
+ network = self.network_3_1_1_1;
+ });
+
# https://github.com/eli-frey/cmdtheline/issues/28
cmdtheline = dontCheck super.cmdtheline;
@@ -509,7 +516,9 @@ self: super: {
else dontCheck super.tasty-discover);
# generic-deriving bound is too tight
- aeson = doJailbreak super.aeson;
+ # aeson 1.4.6.0 needs Diff 0.4.0 to do tests but nixpkgs is still at 0.3.4
+ # https://github.com/bos/aeson/issues/740
+ aeson = dontCheck (doJailbreak super.aeson);
# containers >=0.4 && <0.6 is too tight
# https://github.com/RaphaelJ/friday/issues/34
@@ -1048,8 +1057,7 @@ self: super: {
generateOptparseApplicativeCompletion "dhall" (
dontCheck super.dhall
);
- dhall_1_27_0 = dontCheck super.dhall_1_27_0;
-
+ dhall_1_28_0 = dontCheck super.dhall_1_28_0;
# Missing test files in source distribution, fixed once 1.4.0 is bumped
# https://github.com/dhall-lang/dhall-haskell/pull/997
@@ -1076,6 +1084,7 @@ self: super: {
# The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
haddock-library = doJailbreak (dontCheck super.haddock-library);
+ haddock-library_1_8_0 = doJailbreak super.haddock-library_1_8_0;
# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
@@ -1114,8 +1123,23 @@ self: super: {
# https://github.com/snapframework/xmlhtml/pull/37
xmlhtml = doJailbreak super.xmlhtml;
- # Generate shell completions
- purescript = generateOptparseApplicativeCompletion "purs" super.purescript;
+ purescript =
+ let
+ purescriptWithOverrides = super.purescript.override {
+ # PureScript requires an older version of happy.
+ happy = self.happy_1_19_9;
+ };
+
+ # PureScript is built against LTS-13, so we need to jailbreak it to
+ # accept more recent versions of the libraries it requires.
+ jailBrokenPurescript = doJailbreak purescriptWithOverrides;
+
+ # Haddocks for PureScript can't be built.
+ # https://github.com/purescript/purescript/pull/3745
+ dontHaddockPurescript = dontHaddock jailBrokenPurescript;
+ in
+ # Generate shell completions
+ generateOptparseApplicativeCompletion "purs" dontHaddockPurescript;
# https://github.com/kcsongor/generic-lens/pull/65
generic-lens = dontCheck super.generic-lens;
@@ -1166,18 +1190,6 @@ self: super: {
# test suite failure: https://github.com/jgm/pandoc/issues/5582
pandoc = dontCheck super.pandoc;
- # The latest release version is ancient. You really need this tool from git.
- haskell-ci = generateOptparseApplicativeCompletion "haskell-ci"
- (addBuildDepend (overrideSrc (dontCheck super.haskell-ci) {
- version = "20190814-git";
- src = pkgs.fetchFromGitHub {
- owner = "haskell-CI";
- repo = "haskell-ci";
- rev = "70918d80b6fd43aca7e4d00ba0d2ea116b666556";
- sha256 = "0bzp959qy74zmqq75f60rcixpjbvvyrb5a8zp2nyql3nm9vxzy5k";
- };
- }) (with self; [temporary lattices Cabal_3_0_0_0]));
-
# Fix build with attr-2.4.48 (see #53716)
xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
@@ -1202,8 +1214,8 @@ self: super: {
temporary-resourcet = doJailbreak super.temporary-resourcet;
# Requires dhall >= 1.23.0
- ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_27_0; };
- dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_27_0; };
+ ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_28_0; };
+ dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_28_0; };
# Test suite doesn't work with current QuickCheck
# https://github.com/pruvisto/heap/issues/11
@@ -1213,7 +1225,7 @@ self: super: {
constraints-deriving = dontCheck super.constraints-deriving;
# need newer version of ghc-libparser
- hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_1; };
+ hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_8_1_20191204; };
# https://github.com/sol/hpack/issues/366
hpack = self.hpack_0_33_0;
@@ -1233,8 +1245,9 @@ self: super: {
'';
});
- # The LTS-14.x version of optparse-applicative is too old.
- cabal-plan = super.cabal-plan.override { optparse-applicative = self.optparse-applicative_0_15_1_0; };
+ # The LTS-14.x version of their dependencies are too old.
+ cabal-plan = super.cabal-plan.overrideScope (self: super: { optparse-applicative = self.optparse-applicative_0_15_1_0; ansi-terminal = self.ansi-terminal_0_10_2; base-compat = self.base-compat_0_11_0; semialign = self.semialign_1_1; time-compat = doJailbreak super.time-compat; });
+ hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_22_0; };
# Version bounds for http-client are too strict:
# https://github.com/bitnomial/prometheus/issues/34
@@ -1274,22 +1287,44 @@ self: super: {
# polysemy-plugin requires polysemy >= 1.2.0.0
polysemy = self.polysemy_1_2_3_0;
-
- # The polysemy-plugin tests failed because it couldn't find
- # the polysemy-plugin package in the doctests:
- # https://github.com/NixOS/nixpkgs/issues/71164
- # I've addressed this with a PR upstream:
- # https://github.com/polysemy-research/polysemy/pull/265
- # the patch of which is applied here.
- polysemy-plugin = appendPatch (addSetupDepend super.polysemy-plugin self.cabal-doctest) (pkgs.fetchpatch {
- url = "https://github.com/polysemy-research/polysemy/pull/265.patch";
- sha256 = "19237js70chq84w7vqgvj49n6bs9lp95k13ia3xzbr1r9yyrfkhq";
- stripLen = 1;
- });
-
polysemy-zoo = self.polysemy-zoo_0_6_0_1;
# https://github.com/Happstack/web-routes-th/pull/3
web-routes-th = doJailbreak super.web-routes-th;
+ # Remove for hail > 0.2.0.0
+ hail = overrideCabal super.hail (drv: {
+ patches = [
+ (pkgs.fetchpatch {
+ # Relax dependency constraints,
+ # upstream PR: https://github.com/james-preston/hail/pull/13
+ url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/13.patch";
+ sha256 = "039p5mqgicbhld2z44cbvsmam3pz0py3ybaifwrjsn1y69ldsmkx";
+ })
+ (pkgs.fetchpatch {
+ # Relax dependency constraints,
+ # upstream PR: https://github.com/james-preston/hail/pull/15
+ url = "https://patch-diff.githubusercontent.com/raw/james-preston/hail/pull/15.patch";
+ sha256 = "03kdvr8hxi6isb8yxp5rgcmz855n19m1yacn3d56a4i58j2mldjw";
+ })
+ ];
+ });
+
+ # Needs the corresponding version of haskell-src-exts.
+ haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_22_0; };
+
+ # https://github.com/Daniel-Diaz/HaTeX/issues/144
+ HaTeX = dontCheck super.HaTeX;
+
+ # https://github.com/kazu-yamamoto/dns/issues/150
+ dns = dontCheck super.dns;
+
+ # needs newer version of the systemd package
+ spacecookie = super.spacecookie.override { systemd = self.systemd_2_2_0; };
+
+ # ghcide needs the latest versions of haskell-lsp.
+ ghcide = super.ghcide.override { haskell-lsp = self.haskell-lsp_0_18_0_0; lsp-test = self.lsp-test_0_8_2_0; };
+ haskell-lsp_0_18_0_0 = super.haskell-lsp_0_18_0_0.override { haskell-lsp-types = self.haskell-lsp-types_0_18_0_0; };
+ lsp-test_0_8_2_0 = (dontCheck super.lsp-test_0_8_2_0).override { haskell-lsp = self.haskell-lsp_0_18_0_0; };
+
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 5c54a90ce7e7..b785c5314797 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -67,22 +67,50 @@ self: super: {
# TODO: remove when upstream accepts https://github.com/snapframework/io-streams-haproxy/pull/17
io-streams-haproxy = doJailbreak super.io-streams-haproxy; # base >=4.5 && <4.13
snap-server = doJailbreak super.snap-server;
+ xmobar = doJailbreak super.xmobar;
# use latest version to fix the build
+ brick = self.brick_0_50_1;
+ dbus = self.dbus_1_2_11;
+ doctemplates = self.doctemplates_0_8;
+ exact-pi = doJailbreak super.exact-pi;
generics-sop = self.generics-sop_0_5_0_0;
hackage-db = self.hackage-db_2_1_0;
+ haddock-library = self.haddock-library_1_8_0;
+ haskell-src-meta = self.haskell-src-meta_0_8_5;
+ haskell-src-meta_0_8_5 = dontCheck super.haskell-src-meta_0_8_5;
+ HaTeX = self.HaTeX_3_22_0_0;
+ HsYAML = self.HsYAML_0_2_1_0;
+ json-autotype = doJailbreak super.json-autotype;
lens = self.lens_4_18_1;
memory = self.memory_0_15_0;
microlens = self.microlens_0_4_11_2;
+ microlens-ghc = self.microlens-ghc_0_4_11_1;
+ microlens-mtl = self.microlens-mtl_0_2_0_1;
+ microlens-platform = self.microlens-platform_0_4_0;
+ microlens-th = self.microlens-th_0_4_3_2;
+ network = self.network_3_1_1_1;
optparse-applicative = self.optparse-applicative_0_15_1_0;
+ pandoc = self.pandoc_2_9;
+ pandoc-types = self.pandoc-types_1_20;
+ prettyprinter = self.prettyprinter_1_5_1;
primitive = dontCheck super.primitive_0_7_0_0; # evaluating the test suite gives an infinite recursion
regex-base = self.regex-base_0_94_0_0;
+ regex-compat = self.regex-compat_0_95_2_0;
regex-pcre-builtin = self.regex-pcre-builtin_0_95_1_1_8_43;
regex-posix = self.regex-posix_0_96_0_0;
- regex-tdfa = self.regex-tdfa_1_3_0;
+ regex-tdfa = self.regex-tdfa_1_3_1_0;
shelly = self.shelly_1_9_0;
+ singletons = self.singletons_2_6;
+ skylighting = self.skylighting_0_8_3;
+ skylighting-core = self.skylighting-core_0_8_3;
sop-core = self.sop-core_0_5_0_0;
+ texmath = self.texmath_0_12;
+ th-desugar = self.th-desugar_1_10;
tls = self.tls_1_5_2;
+ trifecta = self.trifecta_2_1;
+ vty = self.vty_5_26;
+ xml-conduit = overrideCabal super.xml-conduit (drv: { version = "1.9.0.0"; sha256 = "1p57v127882rxvvmwjmvnqdmk3x2wg1z4d8y03849h0xaz1vid0w"; });
xmonad-contrib = self.xmonad-contrib_0_16;
# These packages don't work and need patching and/or an update.
@@ -95,18 +123,8 @@ self: super: {
sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
});
foundation = dontCheck super.foundation;
- haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
- url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
- sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
- });
vault = dontHaddock super.vault;
- monad-par = dontCheck super.monad-par; # test suite does not compile in monad-par-0.3.4.8
- # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved
- alex = appendPatch super.alex (pkgs.fetchpatch {
- url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch";
- sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
- });
# https://github.com/snapframework/snap-core/issues/288
snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail = Fail.fail' ''"; });
# needs a release
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 611e7a24e0ec..0645db14eb0b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
- # LTS Haskell 14.12
+ # LTS Haskell 14.17
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -55,24 +55,24 @@ default-package-overrides:
- adjunctions ==4.4
- adler32 ==0.1.2.0
- advent-of-code-api ==0.1.2.3
- - aeson ==1.4.5.0
+ - aeson ==1.4.6.0
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.0
- aeson-casing ==0.2.0.0
- aeson-compat ==0.3.9
- - aeson-diff ==1.1.0.7
+ - aeson-diff ==1.1.0.8
- aeson-extra ==0.4.1.3
- aeson-generic-compat ==0.0.1.3
- aeson-iproute ==0.2
- aeson-picker ==0.1.0.5
- aeson-pretty ==0.8.8
- - aeson-qq ==0.8.2
+ - aeson-qq ==0.8.3
- aeson-utils ==0.3.0.2
- aeson-yak ==0.1.1.3
- al ==0.1.4.2
- alarmclock ==0.7.0.2
- alerts ==0.1.2.0
- - alex ==3.2.4
+ - alex ==3.2.5
- alg ==0.2.12.0
- algebraic-graphs ==0.4
- Allure ==0.9.5.0
@@ -84,102 +84,13 @@ default-package-overrides:
- alternative-vector ==0.0.0
- alternators ==1.0.0.0
- ALUT ==2.4.0.3
- - amazonka ==1.6.1
- - amazonka-apigateway ==1.6.1
- - amazonka-application-autoscaling ==1.6.1
- - amazonka-appstream ==1.6.1
- - amazonka-athena ==1.6.1
- - amazonka-autoscaling ==1.6.1
- - amazonka-budgets ==1.6.1
- - amazonka-certificatemanager ==1.6.1
- - amazonka-cloudformation ==1.6.1
- - amazonka-cloudfront ==1.6.1
- - amazonka-cloudhsm ==1.6.1
- - amazonka-cloudsearch ==1.6.1
- - amazonka-cloudsearch-domains ==1.6.1
- - amazonka-cloudtrail ==1.6.1
- - amazonka-cloudwatch ==1.6.1
- - amazonka-cloudwatch-events ==1.6.1
- - amazonka-cloudwatch-logs ==1.6.1
- - amazonka-codebuild ==1.6.1
- - amazonka-codecommit ==1.6.1
- - amazonka-codedeploy ==1.6.1
- - amazonka-codepipeline ==1.6.1
- - amazonka-cognito-identity ==1.6.1
- - amazonka-cognito-idp ==1.6.1
- - amazonka-cognito-sync ==1.6.1
- - amazonka-config ==1.6.1
- - amazonka-core ==1.6.1
- - amazonka-datapipeline ==1.6.1
- - amazonka-devicefarm ==1.6.1
- - amazonka-discovery ==1.6.1
- - amazonka-dms ==1.6.1
- - amazonka-ds ==1.6.1
- - amazonka-dynamodb ==1.6.1
- - amazonka-dynamodb-streams ==1.6.1
- - amazonka-ecr ==1.6.1
- - amazonka-ecs ==1.6.1
- - amazonka-efs ==1.6.1
- - amazonka-elasticache ==1.6.1
- - amazonka-elasticbeanstalk ==1.6.1
- - amazonka-elasticsearch ==1.6.1
- - amazonka-elastictranscoder ==1.6.1
- - amazonka-elb ==1.6.1
- - amazonka-elbv2 ==1.6.1
- - amazonka-emr ==1.6.1
- - amazonka-gamelift ==1.6.1
- - amazonka-glacier ==1.6.1
- - amazonka-glue ==1.6.1
- - amazonka-health ==1.6.1
- - amazonka-iam ==1.6.1
- - amazonka-importexport ==1.6.1
- - amazonka-inspector ==1.6.1
- - amazonka-iot ==1.6.1
- - amazonka-iot-dataplane ==1.6.1
- - amazonka-kinesis ==1.6.1
- - amazonka-kinesis-analytics ==1.6.1
- - amazonka-kinesis-firehose ==1.6.1
- - amazonka-kms ==1.6.1
- - amazonka-lambda ==1.6.1
- - amazonka-lightsail ==1.6.1
- - amazonka-marketplace-analytics ==1.6.1
- - amazonka-marketplace-metering ==1.6.1
- - amazonka-ml ==1.6.1
- - amazonka-opsworks ==1.6.1
- - amazonka-opsworks-cm ==1.6.1
- - amazonka-pinpoint ==1.6.1
- - amazonka-polly ==1.6.1
- - amazonka-rds ==1.6.1
- - amazonka-redshift ==1.6.1
- - amazonka-rekognition ==1.6.1
- - amazonka-route53 ==1.6.1
- - amazonka-route53-domains ==1.6.1
- - amazonka-s3 ==1.6.1
- - amazonka-sdb ==1.6.1
- - amazonka-servicecatalog ==1.6.1
- - amazonka-ses ==1.6.1
- - amazonka-shield ==1.6.1
- - amazonka-sms ==1.6.1
- - amazonka-snowball ==1.6.1
- - amazonka-sns ==1.6.1
- - amazonka-sqs ==1.6.1
- - amazonka-ssm ==1.6.1
- - amazonka-stepfunctions ==1.6.1
- - amazonka-storagegateway ==1.6.1
- - amazonka-sts ==1.6.1
- - amazonka-support ==1.6.1
- - amazonka-swf ==1.6.1
- - amazonka-test ==1.6.1
- - amazonka-waf ==1.6.1
- - amazonka-workspaces ==1.6.1
- - amazonka-xray ==1.6.1
- amqp ==0.18.3
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==0.9.1
- ansi-wl-pprint ==0.6.9
- ANum ==0.2.0.2
- aos-signature ==0.1.1
- - apecs ==0.8.1
+ - apecs ==0.8.2
- apecs-gloss ==0.2.3
- apecs-physics ==0.4.2
- api-field-json-th ==0.1.0.2
@@ -200,7 +111,7 @@ default-package-overrides:
- asn1-parse ==0.9.5
- asn1-types ==0.3.3
- assert-failure ==0.1.2.2
- - assoc ==1
+ - assoc ==1.0.1
- astro ==0.4.2.1
- async ==2.2.2
- async-extra ==0.2.0.0
@@ -209,7 +120,7 @@ default-package-overrides:
- async-timer ==0.2.0.0
- atom-basic ==0.2.5
- atomic-primops ==0.8.3
- - atomic-write ==0.2.0.6
+ - atomic-write ==0.2.0.7
- attoparsec ==0.13.2.3
- attoparsec-base64 ==0.0.0
- attoparsec-binary ==0.2
@@ -220,18 +131,18 @@ default-package-overrides:
- attoparsec-uri ==0.0.7
- audacity ==0.0.2
- aur ==6.2.0.1
- - authenticate ==1.3.4
+ - authenticate ==1.3.5
- authenticate-oauth ==1.6.0.1
- auto ==0.4.3.1
- - autoexporter ==1.1.14
+ - autoexporter ==1.1.15
- auto-update ==0.1.6
- avers ==0.0.17.1
- avers-api ==0.1.0
- avers-server ==0.1.0.1
- - avro ==0.4.5.3
+ - avro ==0.4.5.4
- avwx ==0.3.0.2
- aws-cloudfront-signed-cookies ==0.2.0.1
- - aws-lambda-haskell-runtime ==2.0.1
+ - aws-lambda-haskell-runtime ==2.0.2
- backprop ==0.2.6.3
- bank-holidays-england ==0.2.0.2
- barbies ==1.1.3.0
@@ -262,10 +173,10 @@ default-package-overrides:
- benchpress ==0.2.2.12
- bench-show ==0.3.0
- bencode ==0.6.0.0
- - bencoding ==0.4.5.1
+ - bencoding ==0.4.5.2
- between ==0.11.0.0
- bibtex ==0.1.0.6
- - bifunctors ==5.5.5
+ - bifunctors ==5.5.6
- bimap ==0.4.0
- bimap-server ==0.1.0.1
- binary-bits ==0.5
@@ -311,7 +222,7 @@ default-package-overrides:
- boltzmann-samplers ==0.1.1.0
- Boolean ==0.2.4
- boolean-like ==0.1.1.0
- - boolean-normal-forms ==0.0.1
+ - boolean-normal-forms ==0.0.1.1
- boolsimplifier ==0.1.8
- boots ==0.0.100
- bordacount ==0.1.0.0
@@ -356,7 +267,7 @@ default-package-overrides:
- cabal-doctest ==1.0.8
- cabal-file-th ==0.2.6
- cabal-rpm ==1.0.1
- - cache ==0.1.1.2
+ - cache ==0.1.2.0
- cacophony ==0.10.1
- calendar-recycling ==0.0.0.1
- call-stack ==0.1.0
@@ -368,7 +279,7 @@ default-package-overrides:
- casing ==0.1.4.1
- cassava ==0.5.2.0
- cassava-conduit ==0.5.1
- - cassava-megaparsec ==2.0.0
+ - cassava-megaparsec ==2.0.1
- cassava-records ==0.1.0.4
- cast ==0.1.0.2
- caster ==0.0.3.0
@@ -397,10 +308,10 @@ default-package-overrides:
- checkers ==0.5.2
- checksum ==0.0
- chimera ==0.2.0.0
- - chiphunk ==0.1.2.0
+ - chiphunk ==0.1.2.1
- choice ==0.2.2
- chronologique ==0.3.1.1
- - chronos ==1.0.7
+ - chronos ==1.0.9
- chronos-bench ==0.2.0.2
- chunked-data ==0.3.1
- cipher-aes ==0.2.11
@@ -415,7 +326,7 @@ default-package-overrides:
- classy-prelude ==1.5.0
- classy-prelude-conduit ==1.5.0
- classy-prelude-yesod ==1.5.0
- - clay ==0.13.1
+ - clay ==0.13.3
- clientsession ==0.9.1.2
- Clipboard ==2.3.2.0
- clock ==0.8
@@ -425,7 +336,7 @@ default-package-overrides:
- clr-marshal ==0.2.0.0
- clumpiness ==0.17.0.2
- cmark ==0.6
- - cmark-gfm ==0.2.0
+ - cmark-gfm ==0.2.1
- cmdargs ==0.10.20
- codec ==0.2.1
- codec-beam ==0.2.0
@@ -444,7 +355,7 @@ default-package-overrides:
- comfort-array ==0.4
- comfort-graph ==0.0.3.1
- commutative ==0.0.2
- - comonad ==5.0.5
+ - comonad ==5.0.6
- compact ==0.1.0.1
- compactmap ==0.1.4.2.1
- compensated ==0.7.3
@@ -477,18 +388,18 @@ default-package-overrides:
- connection ==0.3.1
- connection-pool ==0.2.2
- console-style ==0.0.2.1
- - constraint ==0.1.3.0
+ - constraint ==0.1.4.0
- constraints ==0.10.1
- contravariant ==1.5.2
- - contravariant-extras ==0.3.4
+ - contravariant-extras ==0.3.5
- control-bool ==0.2.1
- control-dsl ==0.2.1.3
- control-monad-free ==0.6.2
- control-monad-omega ==0.3.2
- convertible ==1.1.1.0
- - cookie ==0.4.4
- - core-data ==0.2.0.0
- - core-text ==0.2.0.0
+ - cookie ==0.4.5
+ - core-data ==0.2.1.4
+ - core-text ==0.2.2.4
- countable ==1.0
- country ==0.1.6
- courier ==0.1.1.5
@@ -497,7 +408,7 @@ default-package-overrides:
- cprng-aes ==0.6.1
- cpu ==0.1.2
- cpuinfo ==0.1.0.1
- - cql ==4.0.1
+ - cql ==4.0.2
- cql-io ==1.1.1
- crackNum ==2.3
- crc32c ==0.0.0
@@ -563,7 +474,7 @@ default-package-overrides:
- data-diverse ==4.6.0.0
- data-diverse-lens ==4.3.0.0
- datadog ==0.2.4.0
- - data-dword ==0.3.1.2
+ - data-dword ==0.3.1.3
- data-endian ==0.1.1
- data-fix ==0.2.0
- data-has ==0.3.0.0
@@ -576,9 +487,9 @@ default-package-overrides:
- data-ordlist ==0.4.7.0
- data-ref ==0.0.2
- data-reify ==0.6.1
- - data-serializer ==0.3.4
+ - data-serializer ==0.3.4.1
- datasets ==0.4.0
- - data-textual ==0.3.0.2
+ - data-textual ==0.3.0.3
- data-tree-print ==0.1.0.2
- dataurl ==0.1.0.0
- DAV ==1.3.3
@@ -601,27 +512,27 @@ default-package-overrides:
- dependent-sum-template ==0.0.0.6
- deque ==0.4.3
- deriveJsonNoPrefix ==0.1.0.1
- - deriving-compat ==0.5.7
- - derulo ==1.0.5
+ - deriving-compat ==0.5.8
+ - derulo ==1.0.7
- detour-via-sci ==1.0.0
- dhall ==1.24.0
- dhall-bash ==1.0.21
- dhall-json ==1.3.0
- diagrams ==1.4
- - diagrams-contrib ==1.4.3
+ - diagrams-contrib ==1.4.4
- diagrams-core ==1.4.2
- - diagrams-lib ==1.4.2.3
+ - diagrams-lib ==1.4.3
- diagrams-postscript ==1.4.1
- diagrams-rasterific ==1.4.1.1
- diagrams-solve ==0.1.1
- diagrams-svg ==1.4.2
- - di-core ==1.0.3
+ - di-core ==1.0.4
- dictionary-sharing ==0.1.0.0
- Diff ==0.3.4
- digest ==0.0.1.2
- digits ==0.3.1
- dimensional ==1.3
- - di-monad ==1.3
+ - di-monad ==1.3.1
- directory-tree ==0.12.1
- direct-sqlite ==2.3.24
- discount ==0.1.1
@@ -633,18 +544,18 @@ default-package-overrides:
- dlist ==0.8.0.7
- dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1
- - dns ==4.0.0
+ - dns ==4.0.1
- dockerfile ==0.2.0
- docopt ==0.7.0.5
- doctemplates ==0.2.2.1
- doctest ==0.16.2
- doctest-discover ==0.2.0.0
- - doctest-driver-gen ==0.3.0.1
+ - doctest-driver-gen ==0.3.0.2
- doldol ==0.4.1.2
- do-list ==1.0.1
- dom-parser ==3.1.0
- do-notation ==0.1.0.2
- - dotenv ==0.8.0.2
+ - dotenv ==0.8.0.4
- dotgen ==0.4.2
- dotnet-timespan ==0.0.1.0
- double-conversion ==2.0.2.0
@@ -680,7 +591,7 @@ default-package-overrides:
- elerea ==2.9.0
- elf ==0.30
- eliminators ==0.5.1
- - elm2nix ==0.1.1
+ - elm2nix ==0.1.2
- elm-bridge ==0.5.2
- elm-core-sources ==1.0.0
- elm-export ==0.6.0.1
@@ -753,7 +664,7 @@ default-package-overrides:
- filecache ==0.4.1
- file-embed ==0.0.11
- file-embed-lzma ==0
- - filelock ==0.1.1.3
+ - filelock ==0.1.1.4
- filemanip ==0.3.6.3
- file-modules ==0.1.2.4
- filepattern ==0.1.1
@@ -773,10 +684,10 @@ default-package-overrides:
- fixed-vector-hetero ==0.5.0.0
- flac ==0.2.0
- flac-picture ==0.1.2
- - flags-applicative ==0.1.0.1
+ - flags-applicative ==0.1.0.2
- flat-mcmc ==1.5.0
- flay ==0.4
- - flexible-defaults ==0.0.2
+ - flexible-defaults ==0.0.3
- FloatingHex ==0.4
- floatshow ==0.2.4
- flow ==1.0.19
@@ -796,11 +707,11 @@ default-package-overrides:
- force-layout ==0.4.0.6
- foreign-store ==0.2
- forkable-monad ==0.2.0.3
- - forma ==1.1.2
+ - forma ==1.1.3
- format-numbers ==0.1.0.0
- formatting ==6.3.7
- foundation ==0.0.25
- - free ==5.1.2
+ - free ==5.1.3
- freenect ==1.2.1
- freer-simple ==1.2.1.1
- freetype2 ==0.1.2
@@ -823,7 +734,7 @@ default-package-overrides:
- gauge ==0.2.5
- gc ==0.0.3
- gd ==3000.7.3
- - gdp ==0.0.0.2
+ - gdp ==0.0.3.0
- general-games ==1.1.1
- generic-arbitrary ==0.1.0
- generic-data ==0.7.0.0
@@ -859,7 +770,7 @@ default-package-overrides:
- ghc-compact ==0.1.0.0
- ghc-core ==0.5.6
- ghc-exactprint ==0.6.1
- - ghcid ==0.7.6
+ - ghcid ==0.7.7
- ghci-hexcalc ==0.1.1.0
- ghcjs-codemirror ==0.0.0.2
- ghc-lib ==8.8.0.20190424
@@ -888,7 +799,7 @@ default-package-overrides:
- gingersnap ==0.3.1.0
- gi-pango ==1.0.22
- githash ==0.1.3.3
- - github-release ==1.2.4
+ - github-release ==1.2.5
- github-types ==0.2.1
- github-webhooks ==0.10.1
- gitrev ==1.3.1
@@ -936,14 +847,14 @@ default-package-overrides:
- hackage-db ==2.0.1
- hackage-security ==0.5.3.0
- haddock-library ==1.7.0
- - hadolint ==1.17.2
+ - hadolint ==1.17.3
- half ==0.3
- hamilton ==0.1.0.3
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
- - hapistrano ==0.3.9.3
+ - hapistrano ==0.3.10.0
- happy ==1.19.12
- - hasbolt ==0.1.3.5
+ - hasbolt ==0.1.3.6
- hashable ==1.2.7.0
- hashable-time ==0.2.0.2
- hashids ==1.0.2.4
@@ -956,7 +867,7 @@ default-package-overrides:
- haskell-lexer ==1.0.2
- haskell-lsp ==0.15.0.0
- haskell-lsp-types ==0.15.0.0
- - haskell-names ==0.9.6
+ - haskell-names ==0.9.7
- haskell-spacegoo ==0.2.0.1
- haskell-src ==1.0.3.0
- haskell-src-exts ==1.21.1
@@ -964,8 +875,8 @@ default-package-overrides:
- haskell-src-meta ==0.8.3
- haskey-btree ==0.3.0.1
- haskintex ==0.8.0.0
- - haskoin-core ==0.9.5
- - hasql ==1.4
+ - haskoin-core ==0.9.7
+ - hasql ==1.4.0.1
- hasql-optparse-applicative ==0.3.0.5
- hasql-pool ==0.5.1
- hasql-transaction ==0.7.2
@@ -974,7 +885,7 @@ default-package-overrides:
- haxl ==2.1.2.0
- hbeanstalk ==0.2.4
- HCodecs ==0.5.1
- - hdaemonize ==0.5.5
+ - hdaemonize ==0.5.6
- HDBC ==2.4.0.3
- HDBC-mysql ==0.7.1.0
- HDBC-session ==0.1.2.0
@@ -984,7 +895,7 @@ default-package-overrides:
- hedgehog ==1.0.1
- hedgehog-corpus ==0.1.0
- hedgehog-fn ==1.0
- - hedis ==0.12.8
+ - hedis ==0.12.10
- hedn ==0.2.0.1
- here ==1.2.13
- heredoc ==0.2.0.0
@@ -1018,7 +929,7 @@ default-package-overrides:
- hmpfr ==0.4.4
- hoauth2 ==1.8.9
- Hoed ==0.5.1
- - hOpenPGP ==2.8
+ - hOpenPGP ==2.8.5
- hopenpgp-tools ==0.21.3
- hopfli ==0.2.2.1
- hosc ==0.17
@@ -1096,9 +1007,8 @@ default-package-overrides:
- htoml ==1.0.0.3
- http2 ==1.6.5
- HTTP ==4000.3.14
- - http-api-data ==0.4.1
+ - http-api-data ==0.4.1.1
- http-client ==0.6.4
- - http-client-openssl ==0.3.0.0
- http-client-tls ==0.3.5.3
- http-common ==0.8.2.0
- http-conduit ==2.3.7.3
@@ -1118,7 +1028,7 @@ default-package-overrides:
- hvect ==0.4.0.0
- hvega ==0.3.0.1
- hw-balancedparens ==0.2.0.4
- - hw-bits ==0.7.0.8
+ - hw-bits ==0.7.1.0
- hw-conduit ==0.2.0.6
- hw-conduit-merges ==0.2.0.0
- hw-diagnostics ==0.0.0.7
@@ -1137,9 +1047,9 @@ default-package-overrides:
- hw-mquery ==0.2.0.2
- hw-packed-vector ==0.0.0.3
- hw-parser ==0.1.0.2
- - hw-prim ==0.6.2.36
+ - hw-prim ==0.6.2.39
- hw-rankselect ==0.13.0.0
- - hw-rankselect-base ==0.3.2.3
+ - hw-rankselect-base ==0.3.3.0
- hw-simd ==0.1.1.5
- hw-streams ==0.0.0.12
- hw-string-parse ==0.0.0.4
@@ -1176,9 +1086,8 @@ default-package-overrides:
- indents ==0.5.0.1
- indexed ==0.1.3
- indexed-list-literals ==0.2.1.2
- - indexed-profunctors ==0.1
- infer-license ==0.2.0
- - inflections ==0.4.0.4
+ - inflections ==0.4.0.5
- influxdb ==1.7.1.1
- ini ==0.4.1
- inj ==1.0
@@ -1186,7 +1095,7 @@ default-package-overrides:
- inline-c-cpp ==0.3.0.3
- inline-r ==0.10.2
- inliterate ==0.1.0
- - insert-ordered-containers ==0.2.3
+ - insert-ordered-containers ==0.2.2
- inspection-testing ==0.4.2.2
- instance-control ==0.1.2.0
- int-cast ==0.2.0.0
@@ -1215,7 +1124,7 @@ default-package-overrides:
- io-streams-haproxy ==1.0.1.0
- ip ==1.5.1
- ip6addr ==1.0.0
- - iproute ==1.7.7
+ - iproute ==1.7.8
- IPv6Addr ==1.1.2
- ipynb ==0.1
- ipython-kernel ==0.10.1.0
@@ -1231,15 +1140,15 @@ default-package-overrides:
- ixset-typed ==0.4.0.1
- ix-shapable ==0.1.0
- jack ==0.7.1.4
- - jose ==0.8.1.0
+ - jose ==0.8.2.0
- jose-jwt ==0.8.0
- js-dgtable ==0.5.2
- js-flot ==0.8.3
- js-jquery ==3.3.1
- json ==0.9.3
- json-alt ==1.0.0
- - json-feed ==1.0.6
- - jsonpath ==0.1.0.1
+ - json-feed ==1.0.7
+ - jsonpath ==0.1.0.2
- json-rpc ==1.0.0
- json-rpc-client ==0.2.5.0
- json-rpc-generic ==0.2.1.5
@@ -1266,7 +1175,7 @@ default-package-overrides:
- kraken ==0.1.0
- l10n ==0.1.0.1
- labels ==0.3.3
- - lackey ==1.0.9
+ - lackey ==1.0.10
- LambdaHack ==0.9.5.0
- lame ==0.2.0
- language-c ==0.8.3
@@ -1315,18 +1224,18 @@ default-package-overrides:
- libmpd ==0.9.0.10
- liboath-hs ==0.0.1.1
- libraft ==0.5.0.0
- - libyaml ==0.1.1.0
+ - libyaml ==0.1.1.1
- LibZip ==1.0.1
- lifted-async ==0.10.0.4
- lifted-base ==0.2.3.12
- - lift-generics ==0.1.2
+ - lift-generics ==0.1.3
- line ==4.0.1
- linear ==1.20.9
- linear-circuit ==0.1.0.2
- linux-file-extents ==0.2.0.0
- linux-namespaces ==0.1.3.0
- List ==0.6.2
- - ListLike ==4.6.2
+ - ListLike ==4.6.3
- listsafe ==0.1.0.1
- list-t ==1.0.4
- ListTree ==0.2.3
@@ -1343,7 +1252,7 @@ default-package-overrides:
- log-domain ==0.12
- logfloat ==0.13.3.3
- logger-thread ==0.1.0.2
- - logging-effect ==1.3.7
+ - logging-effect ==1.3.8
- logging-facade ==0.3.0
- logging-facade-syslog ==1
- logict ==0.7.0.2
@@ -1352,7 +1261,7 @@ default-package-overrides:
- lrucache ==1.2.0.1
- lrucaching ==0.3.3
- lsp-test ==0.6.1.0
- - lucid ==2.9.11
+ - lucid ==2.9.12
- lucid-extras ==0.2.2
- lxd-client-config ==0.1.0.1
- lzma ==0.0.0.3
@@ -1369,8 +1278,8 @@ default-package-overrides:
- markdown ==0.1.17.4
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- - massiv ==0.4.3.0
- - massiv-io ==0.1.7.0
+ - massiv ==0.4.4.0
+ - massiv-io ==0.1.9.0
- massiv-test ==0.1.1
- mathexpr ==0.3.0.0
- math-functions ==0.3.3.0
@@ -1378,7 +1287,7 @@ default-package-overrides:
- matrices ==0.5.0
- matrix ==0.3.6.1
- matrix-market-attoparsec ==0.1.0.8
- - matrix-static ==0.2
+ - matrix-static ==0.2.1
- maximal-cliques ==0.1.1
- mbox ==0.3.4
- mbtiles ==0.6.0.0
@@ -1388,7 +1297,7 @@ default-package-overrides:
- megaparsec-tests ==7.0.5
- mega-sdist ==0.4.0.1
- memory ==0.14.18
- - MemoTrie ==0.6.9
+ - MemoTrie ==0.6.10
- menshen ==0.0.3
- mercury-api ==0.1.0.2
- merkle-tree ==0.1.1
@@ -1415,7 +1324,7 @@ default-package-overrides:
- mime-mail-ses ==0.4.1
- mime-types ==0.1.0.9
- minimorph ==0.2.1.0
- - minio-hs ==1.5.0
+ - minio-hs ==1.5.1
- miniutter ==0.5.0.0
- mintty ==0.1.2
- miso ==1.2.0.0
@@ -1439,14 +1348,14 @@ default-package-overrides:
- monad-extras ==0.6.0
- monadic-arrays ==0.2.2
- monad-journal ==0.8.1
- - monad-logger ==0.3.30
+ - monad-logger ==0.3.31
- monad-logger-json ==0.1.0.0
- monad-logger-prefix ==0.1.11
- - monad-logger-syslog ==0.1.4.0
+ - monad-logger-syslog ==0.1.6.0
- monad-loops ==0.4.3
- monad-memo ==0.5.1
- monad-metrics ==0.2.1.4
- - monad-par ==0.3.4.8
+ - monad-par ==0.3.5
- monad-parallel ==0.7.2.3
- monad-par-extras ==0.3.3
- monad-peel ==0.2.1.2
@@ -1503,7 +1412,7 @@ default-package-overrides:
- natural-sort ==0.1.2
- natural-transformation ==0.4
- ndjson-conduit ==0.1.0.5
- - neat-interpolation ==0.3.2.4
+ - neat-interpolation ==0.3.2.5
- netlib-carray ==0.1
- netlib-comfort-array ==0.0.0.1
- netlib-ffi ==0.1.1
@@ -1517,12 +1426,12 @@ default-package-overrides:
- network-anonymous-i2p ==0.10.0
- network-attoparsec ==0.12.2
- network-bsd ==2.8.0.0
- - network-byte-order ==0.1.1.1
+ - network-byte-order ==0.1.2.0
- network-conduit-tls ==1.3.2
- network-house ==0.1.0.2
- network-info ==0.2.0.10
- - network-ip ==0.3.0.2
- - network-messagepack-rpc ==0.1.1.4
+ - network-ip ==0.3.0.3
+ - network-messagepack-rpc ==0.1.2.0
- network-multicast ==0.3.2
- network-simple ==0.4.5
- network-simple-tls ==0.3.2
@@ -1538,10 +1447,9 @@ default-package-overrides:
- nonce ==1.0.7
- nondeterminism ==1.4
- non-empty ==0.3.2
- - nonempty-containers ==0.3.2.0
+ - nonempty-containers ==0.3.1.0
- nonemptymap ==0.0.6.0
- - non-empty-sequence ==0.2.0.2
- - nonempty-vector ==0.1.0.0
+ - non-empty-sequence ==0.2.0.4
- non-negative ==0.1.2
- not-gloss ==0.7.7.0
- no-value ==1.0.0.0
@@ -1551,7 +1459,7 @@ default-package-overrides:
- numbers ==3000.2.0.2
- numeric-extras ==0.1
- numeric-prelude ==0.4.3.1
- - numhask ==0.3.0.0
+ - numhask ==0.3.1
- NumInstances ==1.4
- numtype-dk ==0.5.0.2
- nuxeo ==0.3.2
@@ -1578,15 +1486,13 @@ default-package-overrides:
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.2
- OpenGL ==3.0.3.0
- - OpenGLRaw ==3.3.3.0
+ - OpenGLRaw ==3.3.4.0
- openpgp-asciiarmor ==0.1.2
- opensource ==0.1.1.0
- openssl-streams ==1.2.2.0
- open-witness ==0.4.0.1
- operational ==0.2.3.5
- operational-class ==0.3.0.0
- - optics-core ==0.2
- - optics-extra ==0.2
- optional-args ==1.0.2
- options ==1.2.1.1
- optparse-applicative ==0.14.3.0
@@ -1638,7 +1544,7 @@ default-package-overrides:
- pcf-font-embed ==0.1.2.0
- pcg-random ==0.1.3.6
- pcre-heavy ==1.0.0.2
- - pcre-light ==0.4.0.4
+ - pcre-light ==0.4.1.0
- pcre-utils ==0.1.8.1.1
- pdfinfo ==1.5.4
- peano ==0.1.0.1
@@ -1668,7 +1574,7 @@ default-package-overrides:
- phantom-state ==0.2.1.2
- pid1 ==0.1.2.0
- pinboard ==0.10.1.4
- - pipes ==4.3.12
+ - pipes ==4.3.13
- pipes-aeson ==0.4.1.8
- pipes-attoparsec ==0.5.1.5
- pipes-binary ==0.4.2
@@ -1701,13 +1607,13 @@ default-package-overrides:
- polynomials-bernstein ==1.1.2
- polyparse ==1.12.1
- polysemy ==1.0.0.0
- - polysemy-plugin ==0.2.3.0
+ - polysemy-plugin ==0.2.4.0
- polysemy-zoo ==0.5.0.1
- pooled-io ==0.0.2.2
- port-utils ==0.2.1.0
- posix-paths ==0.2.1.6
- possibly ==1.0.0.0
- - postgresql-binary ==0.12.1.3
+ - postgresql-binary ==0.12.2
- postgresql-libpq ==0.9.4.2
- postgresql-orm ==0.5.1
- postgresql-schema ==0.1.14
@@ -1741,7 +1647,7 @@ default-package-overrides:
- primitive ==0.6.4.0
- primitive-extras ==0.7.1.1
- prim-uniq ==0.1.0.1
- - probability ==0.2.5.2
+ - probability ==0.2.6
- process-extras ==0.7.4
- product-isomorphic ==0.0.3.3
- product-profunctors ==0.10.0.0
@@ -1755,13 +1661,13 @@ default-package-overrides:
- prospect ==0.1.0.0
- protobuf ==0.2.1.2
- protobuf-simple ==0.1.1.0
- - protocol-buffers ==2.4.12
- - protocol-buffers-descriptor ==2.4.12
+ - protocol-buffers ==2.4.13
+ - protocol-buffers-descriptor ==2.4.13
- protocol-radius ==0.0.1.1
- protocol-radius-test ==0.1.0.1
- proto-lens ==0.5.1.0
- - proto-lens-arbitrary ==0.1.2.7
- - proto-lens-optparse ==0.1.1.5
+ - proto-lens-arbitrary ==0.1.2.8
+ - proto-lens-optparse ==0.1.1.6
- proto-lens-protobuf-types ==0.5.0.0
- proto-lens-protoc ==0.5.0.0
- proto-lens-runtime ==0.5.0.0
@@ -1775,7 +1681,6 @@ default-package-overrides:
- pure-zlib ==0.6.6
- pushbullet-types ==0.4.1.0
- pusher-http-haskell ==1.5.1.11
- - PyF ==0.8.1.1
- qchas ==1.1.0.1
- qm-interpolated-string ==0.3.0.0
- qnap-decrypt ==0.3.5
@@ -1803,7 +1708,7 @@ default-package-overrides:
- rando ==0.0.0.4
- random ==1.1
- random-bytestring ==0.1.3.2
- - random-fu ==0.2.7.0
+ - random-fu ==0.2.7.3
- random-shuffle ==0.0.4
- random-source ==0.3.0.6
- random-tree ==0.6.0.5
@@ -1812,12 +1717,12 @@ default-package-overrides:
- range-set-list ==0.1.3.1
- rank1dynamic ==0.4.0
- rank2classes ==1.3.1.2
- - Rasterific ==0.7.4.4
+ - Rasterific ==0.7.5
- rasterific-svg ==0.3.3.2
- - ratel ==1.0.8
- - ratel-wai ==1.1.0
+ - ratel ==1.0.9
+ - ratel-wai ==1.1.1
- rattle ==0.1
- - rattletrap ==9.0.6
+ - rattletrap ==9.0.7
- rawfilepath ==0.2.4
- rawstring-qm ==0.2.3.0
- raw-strings-qq ==1.1
@@ -1830,7 +1735,7 @@ default-package-overrides:
- reanimate ==0.1.8.0
- reanimate-svg ==0.9.3.1
- rebase ==1.3.1.1
- - record-dot-preprocessor ==0.2
+ - record-dot-preprocessor ==0.2.2
- record-hasfield ==1.0
- records-sop ==0.1.0.3
- recursion-schemes ==5.1.3
@@ -1899,7 +1804,7 @@ default-package-overrides:
- runmemo ==1.0.0.1
- rvar ==0.2.0.3
- s3-signer ==0.5.0.0
- - safe ==0.3.17
+ - safe ==0.3.18
- safecopy ==0.9.4.3
- safe-exceptions ==0.1.7.0
- safe-exceptions-checked ==0.1.0
@@ -1912,7 +1817,7 @@ default-package-overrides:
- salak-toml ==0.3.5.3
- salak-yaml ==0.3.5.3
- saltine ==0.1.0.2
- - salve ==1.0.6
+ - salve ==1.0.8
- sample-frame ==0.0.3
- sample-frame-np ==0.0.4.1
- sampling ==0.3.3
@@ -1942,7 +1847,7 @@ default-package-overrides:
- selective ==0.3
- semialign ==1
- semigroupoid-extras ==5
- - semigroupoids ==5.3.3
+ - semigroupoids ==5.3.4
- semigroups ==0.18.5
- semirings ==0.4.2
- semiring-simple ==1.0.0.1
@@ -2000,7 +1905,7 @@ default-package-overrides:
- sexpr-parser ==0.1.1.2
- SHA ==1.6.4.4
- shake-language-c ==0.12.0
- - shakespeare ==2.0.22
+ - shakespeare ==2.0.23
- shared-memory ==0.2.0.0
- shell-conduit ==4.7.0
- shell-escape ==0.2.0
@@ -2019,7 +1924,7 @@ default-package-overrides:
- simple ==0.11.3
- simple-cabal ==0.1.1
- simple-cmd ==0.2.0.1
- - simple-cmd-args ==0.1.3
+ - simple-cmd-args ==0.1.4
- simple-log ==0.9.12
- simple-reflect ==0.3.3
- simple-sendfile ==0.2.30
@@ -2044,7 +1949,7 @@ default-package-overrides:
- smallcheck-series ==0.6.1
- smoothie ==0.4.2.9
- snap-blaze ==0.2.1.5
- - snap-core ==1.0.4.0
+ - snap-core ==1.0.4.1
- snap-server ==1.1.1.1
- snowflake ==0.1.1.1
- soap ==0.2.3.6
@@ -2123,7 +2028,7 @@ default-package-overrides:
- stripe-scotty ==1.0.0.0
- stripe-signature ==1.0.0.1
- stripe-wreq ==1.0.1.0
- - strive ==5.0.8
+ - strive ==5.0.9
- structs ==0.1.2
- structured-cli ==2.5.1.0
- summoner ==1.3.0.1
@@ -2216,7 +2121,7 @@ default-package-overrides:
- text-region ==0.3.1.0
- text-short ==0.1.3
- text-show ==3.8.2
- - text-show-instances ==3.8.2
+ - text-show-instances ==3.8.3
- text-zipper ==0.10.1
- tfp ==1.0.1.1
- tf-random ==0.5
@@ -2226,7 +2131,7 @@ default-package-overrides:
- these ==1.0.1
- th-expand-syns ==0.4.5.0
- th-extras ==0.0.0.4
- - th-lift ==0.8.0.1
+ - th-lift ==0.8.1
- th-lift-instances ==0.1.14
- th-nowq ==0.1.0.3
- th-orphans ==0.13.9
@@ -2285,7 +2190,7 @@ default-package-overrides:
- transformers-bifunctors ==0.1
- transformers-compat ==0.6.5
- transformers-fix ==1.0
- - traverse-with-class ==1.0.0.0
+ - traverse-with-class ==1.0.1.0
- tree-diff ==0.1
- tree-fun ==0.8.1.0
- trifecta ==2
@@ -2317,7 +2222,7 @@ default-package-overrides:
- type-operators ==0.2.0.0
- typerep-map ==0.3.2
- type-spec ==0.4.0.0
- - tz ==0.1.3.2
+ - tz ==0.1.3.3
- tzdata ==0.1.20190325.0
- ua-parser ==0.7.5.1
- ucam-webauth ==0.1.0.0
@@ -2373,7 +2278,7 @@ default-package-overrides:
- users-test ==0.5.0.1
- utf8-light ==0.4.2
- utf8-string ==1.0.1.1
- - util ==0.1.14.0
+ - util ==0.1.14.1
- utility-ht ==0.0.14
- uuid ==1.3.13
- uuid-types ==1.0.3
@@ -2393,7 +2298,7 @@ default-package-overrides:
- vault ==0.3.1.3
- vec ==0.1.1.1
- vector ==0.12.0.3
- - vector-algorithms ==0.8.0.1
+ - vector-algorithms ==0.8.0.3
- vector-binary-instances ==0.2.5.1
- vector-buffer ==0.4.1
- vector-builder ==0.3.8
@@ -2446,13 +2351,13 @@ default-package-overrides:
- webex-teams-api ==0.2.0.0
- webex-teams-conduit ==0.2.0.0
- webex-teams-pipes ==0.2.0.0
- - web-routes ==0.27.14.2
+ - web-routes ==0.27.14.3
- web-routes-hsp ==0.24.6.1
- web-routes-wai ==0.24.3.1
- webrtc-vad ==0.1.0.3
- - websockets ==0.12.5.3
+ - websockets ==0.12.6.1
- websockets-snap ==0.10.3.1
- - weigh ==0.0.14
+ - weigh ==0.0.16
- wide-word ==0.1.0.9
- wikicfp-scraper ==0.1.0.11
- wild-bind ==0.1.2.4
@@ -2481,7 +2386,7 @@ default-package-overrides:
- writer-cps-mtl ==0.1.1.6
- writer-cps-transformers ==0.5.6.1
- ws ==0.0.5
- - wuss ==1.1.14
+ - wuss ==1.1.15
- X11 ==1.9.1
- X11-xft ==0.3.1
- x11-xim ==0.0.9.0
@@ -2492,7 +2397,7 @@ default-package-overrides:
- Xauth ==0.1
- xdg-basedir ==0.2.2
- xdg-userdirs ==0.1.0.2
- - xeno ==0.3.5.1
+ - xeno ==0.3.5.2
- xenstore ==0.1.1
- xls ==0.1.2
- xlsx ==0.7.2
@@ -2519,7 +2424,7 @@ default-package-overrides:
- xmonad-extras ==0.15.2
- xss-sanitize ==0.3.6
- xxhash-ffi ==0.2.0.0
- - yaml ==0.11.1.2
+ - yaml ==0.11.2.0
- yeshql ==4.1.0.1
- yeshql-core ==4.1.0.2
- yeshql-hdbc ==4.1.0.2
@@ -2528,8 +2433,8 @@ default-package-overrides:
- yesod-auth ==1.6.8
- yesod-auth-hashdb ==1.7.1.1
- yesod-auth-oauth2 ==0.6.1.2
- - yesod-bin ==1.6.0.3
- - yesod-core ==1.6.16.1
+ - yesod-bin ==1.6.0.4
+ - yesod-core ==1.6.17
- yesod-csp ==0.2.5.0
- yesod-eventsource ==1.6.0
- yesod-fb ==0.5.0
@@ -2539,11 +2444,11 @@ default-package-overrides:
- yesod-gitrev ==0.2.1
- yesod-newsfeed ==1.6.1.0
- yesod-paginator ==1.1.0.2
- - yesod-persistent ==1.6.0.2
+ - yesod-persistent ==1.6.0.3
- yesod-recaptcha2 ==0.3.0
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.0.1
- - yesod-test ==1.6.7
+ - yesod-test ==1.6.9
- yesod-text-markdown ==0.1.10
- yesod-websockets ==0.3.0.2
- yes-precure5-command ==5.5.3
@@ -2589,6 +2494,7 @@ extra-packages:
- haddock == 2.22.* # required on GHC 8.0.x
- haddock-api == 2.22.* # required on GHC 7.8.x
- happy <1.19.6 # newer versions break Agda
+ - happy == 1.19.9 # for purescript
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
- haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
@@ -2638,7 +2544,6 @@ package-maintainers:
- funcmp
- git-annex
- hackage-db
- - haskell-ci
- hledger
- hledger-interest
- hledger-ui
@@ -2681,6 +2586,11 @@ package-maintainers:
- Agda
roberth:
- arion-compose
+ cdepillabout:
+ - pretty-simple
+ - purescript
+ - spago
+ - termonad
unsupported-platforms:
alsa-mixer: [ x86_64-darwin ]
@@ -2941,6 +2851,7 @@ broken-packages:
- alerta
- alex-meta
- alex-prelude
+ - alex-tools
- alfred
- alg
- alga
@@ -3023,6 +2934,8 @@ broken-packages:
- apecs-stm
- apelsin
- api-builder
+ - api-rpc-factom
+ - api-rpc-pegnet
- api-tools
- api-yoti
- apiary
@@ -3083,6 +2996,7 @@ broken-packages:
- array-chunks
- array-forth
- array-primops
+ - arrayfire
- arraylist
- ArrayRef
- arrow-improve
@@ -3349,6 +3263,7 @@ broken-packages:
- biofasta
- biofastq
- biohazard
+ - BioHMM
- bioinformatics-toolkit
- biophd
- biopsl
@@ -3358,6 +3273,7 @@ broken-packages:
- bird
- BirdPP
- bisect-binary
+ - bishbosh
- bit-array
- bit-stream
- bitcoin-hs
@@ -3473,6 +3389,7 @@ broken-packages:
- buffer
- buffer-builder-aeson
- BufferedSocket
+ - buffet
- buffon
- bugzilla
- build
@@ -3531,11 +3448,13 @@ broken-packages:
- cabal-ghc-dynflags
- cabal-ghci
- cabal-graphdeps
+ - cabal-helper
- Cabal-ide-backend
- cabal-info
- cabal-install-bundle
- cabal-install-ghc72
- cabal-install-ghc74
+ - cabal-install-parsers
- cabal-meta
- cabal-mon
- cabal-nirvana
@@ -3577,7 +3496,9 @@ broken-packages:
- calculator
- caldims
- caledon
+ - calenderweek
- call
+ - call-alloy
- call-haskell-from-anything
- camfort
- campfire
@@ -3736,7 +3657,6 @@ broken-packages:
- classy-miso
- classy-parallel
- ClassyPrelude
- - clay
- clckwrks
- clckwrks-cli
- clckwrks-dot-com
@@ -3770,6 +3690,7 @@ broken-packages:
- cloud-haskell
- cloud-seeder
- cloudfront-signer
+ - cloudi
- clr-inline
- clua
- cluss
@@ -3798,6 +3719,8 @@ broken-packages:
- co-log-sys
- Coadjute
- coalpit
+ - cobot-io
+ - cobot-tools
- code-builder
- codec-beam
- codec-libevent
@@ -3849,6 +3772,7 @@ broken-packages:
- compact-socket
- compact-string
- compact-string-fix
+ - compact-word-vectors
- Compactable
- compdata-dags
- competition
@@ -3912,6 +3836,7 @@ broken-packages:
- conkin
- conlogger
- connection-string
+ - connections
- Conscript
- consistent
- const-math-ghc-plugin
@@ -4262,9 +4187,11 @@ broken-packages:
- dgim
- dgs
- dhall-check
+ - dhall-fly
- dhall-lsp-server
- dhall-nix
- dhall-to-cabal
+ - dhall-yaml
- dhcp-lease-parser
- dhrun
- dia-base
@@ -4395,7 +4322,6 @@ broken-packages:
- domplate
- dot-linker
- dot2graphml
- - dotenv
- dotfs
- doublify-toolkit
- dovin
@@ -4441,6 +4367,7 @@ broken-packages:
- dtd-text
- dtw
- dual
+ - duet
- Dung
- duplo
- Dust
@@ -4516,6 +4443,7 @@ broken-packages:
- email
- email-header
- email-postmark
+ - email-validator
- emailparse
- embeddock
- embeddock-example
@@ -4628,6 +4556,7 @@ broken-packages:
- exif
- exinst-deepseq
- exinst-hashable
+ - exist-instances
- exists
- exitcode
- expand
@@ -4657,6 +4586,7 @@ broken-packages:
- f-ree-hack-cheats-free-v-bucks-generator
- Facebook-Password-Hacker-Online-Latest-Version
- faceted
+ - factory
- Facts
- factual-api
- fadno
@@ -4751,6 +4681,7 @@ broken-packages:
- FilePather
- filepather
- Files
+ - filestore
- FileSystem
- filesystem-conduit
- filesystem-enumerator
@@ -4773,6 +4704,7 @@ broken-packages:
- first-and-last
- firstify
- FirstOrderTheory
+ - fishfood
- fit
- fits-parse
- fitsio
@@ -4843,6 +4775,7 @@ broken-packages:
- Forestry
- forger
- ForkableT
+ - forma
- formal
- FormalGrammars
- format
@@ -4863,6 +4796,7 @@ broken-packages:
- foscam-sort
- Foster
- fpco-api
+ - fplll
- fpnla-examples
- FPretty
- fptest
@@ -4948,6 +4882,10 @@ broken-packages:
- funnyprint
- funpat
- funsat
+ - fused-effects-exceptions
+ - fused-effects-lens
+ - fused-effects-random
+ - fused-effects-resumable
- fusion
- futhark
- futun
@@ -4961,6 +4899,7 @@ broken-packages:
- g2q
- g4ip
- gact
+ - galois-fft
- game-probability
- gameclock
- gamgee
@@ -5043,6 +4982,7 @@ broken-packages:
- getflag
- GGg
- ggtsTC
+ - gh-labeler
- ghc-core-smallstep
- ghc-datasize
- ghc-dump-tree
@@ -5074,7 +5014,6 @@ broken-packages:
- ghci-lib
- ghci-ng
- ghci-pretty
- - ghcide
- ghcjs-base-stub
- ghcjs-dom-jsffi
- ghcjs-fetch
@@ -5272,6 +5211,8 @@ broken-packages:
- GrowlNotify
- grpc-api-etcd
- grpc-etcd-client
+ - grpc-haskell
+ - grpc-haskell-core
- gruff
- gruff-examples
- gsc-weighting
@@ -5353,7 +5294,6 @@ broken-packages:
- Haggressive
- hahp
- haiji
- - hail
- hailgun
- hailgun-send
- hailgun-simple
@@ -5374,7 +5314,6 @@ broken-packages:
- hakyll-dir-list
- hakyll-favicon
- hakyll-filestore
- - hakyll-images
- hakyll-ogmarkup
- hakyll-R
- hakyll-sass
@@ -5404,7 +5343,6 @@ broken-packages:
- hans
- hans-pcap
- haphviz
- - hapistrano
- happindicator
- happindicator3
- happlets
@@ -5498,6 +5436,7 @@ broken-packages:
- haskell-bitmex-client
- haskell-bitmex-rest
- haskell-brainfuck
+ - haskell-ci
- haskell-cnc
- haskell-coffee
- haskell-compression
@@ -5591,6 +5530,7 @@ broken-packages:
- haskmon
- haskoin
- haskoin-bitcoind
+ - haskoin-core
- haskoin-crypto
- haskoin-node
- haskoin-protocol
@@ -5720,6 +5660,7 @@ broken-packages:
- hedgehog-classes
- hedgehog-gen-json
- hedgehog-generic
+ - hedgehog-golden
- Hedi
- hedis-config
- hedis-pile
@@ -5975,6 +5916,7 @@ broken-packages:
- hoovie
- hopencc
- hopencl
+ - hOpenPGP
- hopenpgp-tools
- hopfield
- hoppy-docs
@@ -6032,6 +5974,9 @@ broken-packages:
- hR
- hranker
- HRay
+ - hreq-client
+ - hreq-conduit
+ - hreq-core
- Hricket
- hricket
- hriemann
@@ -6242,6 +6187,7 @@ broken-packages:
- http-dispatch
- http-enumerator
- http-grammar
+ - http-io-streams
- http-kinder
- http-monad
- http-pony-serve-wai
@@ -6252,6 +6198,7 @@ broken-packages:
- http-streams
- http-wget
- http2-client-grpc
+ - http2-grpc-proto3-wire
- https-everywhere-rules
- https-everywhere-rules-raw
- httpspec
@@ -6285,6 +6232,7 @@ broken-packages:
- huttons-razor
- huzzy
- hVOIDP
+ - hw-all
- hw-balancedparens
- hw-bits
- hw-ci-assist
@@ -6645,6 +6593,7 @@ broken-packages:
- JYU-Utils
- kademlia
- kafka-client
+ - kafka-client-sync
- kaleidoscope
- Kalman
- kalman
@@ -7126,6 +7075,7 @@ broken-packages:
- mangopay
- manifold-random
- manifolds
+ - Map
- map-exts
- map-reduce-folds
- map-syntax
@@ -7150,6 +7100,10 @@ broken-packages:
- marxup
- masakazu-bot
- MASMGen
+ - mason
+ - massiv
+ - massiv-io
+ - massiv-test
- master-plan
- matchable-th
- matchers
@@ -7292,6 +7246,7 @@ broken-packages:
- mm2
- mmsyn2
- mmsyn4
+ - mmsyn6ukr
- mmtf
- mmtl
- mmtl-base
@@ -7377,6 +7332,7 @@ broken-packages:
- monoids
- monopati
- monte-carlo
+ - months
- monzo
- moo
- moonshine
@@ -7385,11 +7341,14 @@ broken-packages:
- morley
- morley-prelude
- morph
+ - morpheus-graphql-cli
- morphisms-functors
- morphisms-functors-inventory
- morphisms-objects
- morte
- mosaico-lib
+ - moto
+ - moto-postgresql
- mount
- movie-monad
- mp
@@ -7533,6 +7492,7 @@ broken-packages:
- NestedFunctor
- nestedmap
- net-mqtt
+ - net-mqtt-rpc
- net-spider
- net-spider-cli
- net-spider-pangraph
@@ -7607,6 +7567,7 @@ broken-packages:
- nirum
- nitro
- nixfromnpm
+ - nixpkgs-update
- nkjp
- nlp-scores
- nlp-scores-scripts
@@ -7632,6 +7593,7 @@ broken-packages:
- NoSlow
- not-gloss-examples
- notcpp
+ - notifications-tray-icon
- notmuch-haskell
- notmuch-web
- now-haskell
@@ -7657,6 +7619,7 @@ broken-packages:
- numhask-histogram
- numhask-prelude
- numhask-range
+ - numhask-space
- numhask-test
- Nussinov78
- Nutri
@@ -7762,6 +7725,7 @@ broken-packages:
- orgstat
- origami
- orizentic
+ - ormolu
- OrPatterns
- osc
- oscpacking
@@ -7797,12 +7761,13 @@ broken-packages:
- pairing
- pam
- panda
+ - pandoc-citeproc-preamble
+ - pandoc-crossref
- pandoc-include
- pandoc-include-code
- pandoc-japanese-filters
- pandoc-lens
- pandoc-markdown-ghci-filter
- - pandoc-placetable
- pandoc-plantuml-diagrams
- pandoc-pyplot
- pandoc-unlit
@@ -7968,6 +7933,7 @@ broken-packages:
- piet
- pig
- pinchot
+ - pine
- ping
- pinpon
- Pipe
@@ -8042,6 +8008,7 @@ broken-packages:
- pocket-dns
- point-octree
- pointfree-fancy
+ - pointful
- pointless-lenses
- pointless-rewrite
- pokemon-go-protobuf-types
@@ -8052,6 +8019,7 @@ broken-packages:
- polh-lexicon
- polimorf
- Pollutocracy
+ - poly
- poly-control
- polydata
- polydata-core
@@ -8175,6 +8143,7 @@ broken-packages:
- product
- prof2dot
- prof2pretty
+ - profunctor-optics
- progress
- progress-meter
- progressbar
@@ -8198,6 +8167,7 @@ broken-packages:
- proteome
- proto-lens-combinators
- proto-lens-descriptors
+ - proto-lens-jsonpb
- proto3-suite
- protobuf-native
- protocol-buffers-descriptor-fork
@@ -8231,7 +8201,6 @@ broken-packages:
- pure-priority-queue
- pure-priority-queue-tests
- purebred-email
- - purescript
- purescript-iso
- purescript-tsd-gen
- push-notify
@@ -8310,6 +8279,7 @@ broken-packages:
- quiver-instances
- quiver-interleave
- quiver-sort
+ - quokka
- quoridor-hs
- qux
- R-pandoc
@@ -8421,6 +8391,7 @@ broken-packages:
- Referees
- refh
- refined
+ - refined-http-api-data
- reflection-extras
- reflex
- reflex-animation
@@ -8431,6 +8402,7 @@ broken-packages:
- reflex-dom-svg
- reflex-gloss
- reflex-gloss-scene
+ - reflex-libtelnet
- reflex-orphans
- reflex-sdl2
- reflex-transformers
@@ -8440,6 +8412,7 @@ broken-packages:
- reformat
- refresht
- refurb
+ - reg-alloc
- regex-deriv
- regex-dfa
- regex-generator
@@ -8567,6 +8540,7 @@ broken-packages:
- riff
- ring-buffer
- ring-buffers
+ - rings
- riot
- risc386
- riscv-isa
@@ -8637,6 +8611,7 @@ broken-packages:
- rws
- RxHaskell
- s-expression
+ - S3
- SableCC2Hs
- safe-access
- safe-buffer-monad
@@ -8686,7 +8661,6 @@ broken-packages:
- savage
- sax
- SBench
- - sbv
- sbvPlugin
- sc2-lowlevel
- sc2-proto
@@ -8702,6 +8676,7 @@ broken-packages:
- scenegraph
- schedevr
- schedule-planner
+ - scheduler
- schedyield
- schemas
- schematic
@@ -8769,6 +8744,7 @@ broken-packages:
- Semantique
- semdoc
- semi-iso
+ - semialign-extras
- semialign-indexed
- semialign-optics
- semibounded-lattices
@@ -8977,6 +8953,7 @@ broken-packages:
- singleton-dict
- singleton-typelits
- singnal
+ - singular-factory
- sink
- siphon
- siren-json
@@ -9125,6 +9102,7 @@ broken-packages:
- sorted
- sorting
- sorty
+ - souffle-haskell
- sound-collage
- sounddelay
- soundgen
@@ -9132,7 +9110,6 @@ broken-packages:
- SourceGraph
- sousit
- soyuz
- - spacecookie
- SpaceInvaders
- spacepart
- SpacePrivateers
@@ -9195,6 +9172,7 @@ broken-packages:
- sqlvalue-list
- sqsd-local
- squeal-postgresql
+ - squeeze
- sr-extra
- srcinst
- sscan
@@ -9205,6 +9183,7 @@ broken-packages:
- sssp
- sstable
- SSTG
+ - st2
- stable-heap
- stable-maps
- stable-marriage
@@ -9219,6 +9198,7 @@ broken-packages:
- stack-run
- stack-run-auto
- stack-type
+ - stack-wrapper
- stack2cabal
- stack2nix
- stackage
@@ -9463,6 +9443,7 @@ broken-packages:
- tasty-laws
- tasty-lens
- tasty-stats
+ - tasty-tap
- Taxonomy
- TaxonomyTools
- TBC
@@ -9777,6 +9758,7 @@ broken-packages:
- twilio
- twill
- twine
+ - twirp
- twitter
- twitter-conduit
- twitter-enumerator
@@ -9987,6 +9969,7 @@ broken-packages:
- vector-space-opengl
- vector-static
- vectortiles
+ - venzone
- Verba
- verbalexpressions
- verdict
@@ -10108,6 +10091,7 @@ broken-packages:
- web-output
- web-page
- web-push
+ - web-rep
- web-routes-happstack
- web-routes-quasi
- web-routes-regular
@@ -10139,6 +10123,7 @@ broken-packages:
- websockets-simple
- websockets-simple-extra
- webwire
+ - weekdaze
- weighted
- weighted-regexp
- welshy
@@ -10310,6 +10295,7 @@ broken-packages:
- yam-servant
- yam-transaction-odbc
- yam-web
+ - yaml-combinators
- yaml-pretty-extras
- yaml-rpc
- yaml-rpc-scotty
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index f3692d48a294..472e4c66fc73 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -259,7 +259,7 @@ self: super: builtins.intersectAttrs super {
wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
# Test suite wants to connect to $DISPLAY.
- hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.libGLU_combined);
+ hsqml = dontCheck (addExtraLibraries (super.hsqml.override { qt5 = pkgs.qt5Full; }) [pkgs.libGLU pkgs.libGL]);
# Tests attempt to use NPM to install from the network into
# /homeless-shelter. Disabled.
@@ -297,10 +297,22 @@ self: super: builtins.intersectAttrs super {
);
llvm-hs =
- let dontCheckDarwin = if pkgs.stdenv.isDarwin
- then dontCheck
- else pkgs.lib.id;
- in dontCheckDarwin (super.llvm-hs.override { llvm-config = pkgs.llvm_8; });
+ let llvmHsWithLlvm8 = super.llvm-hs.override { llvm-config = pkgs.llvm_8; };
+ in
+ if pkgs.stdenv.isDarwin
+ then
+ overrideCabal llvmHsWithLlvm8 (oldAttrs: {
+ # One test fails on darwin.
+ doCheck = false;
+ # llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to
+ # the DYLD_LIBRARY_PATH environment variable. This messes up clang
+ # when called from GHC, probably because clang is version 7, but we are
+ # using LLVM8.
+ preCompileBuildDriver = oldAttrs.preCompileBuildDriver or "" + ''
+ substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()"
+ '';
+ })
+ else llvmHsWithLlvm8;
# Needs help finding LLVM.
spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;
@@ -500,8 +512,8 @@ self: super: builtins.intersectAttrs super {
# requires autotools to build
secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ];
- # tests require git
- hapistrano = addBuildTool super.hapistrano pkgs.buildPackages.git;
+ # tests require git and zsh
+ hapistrano = addBuildTools super.hapistrano [ pkgs.buildPackages.git pkgs.buildPackages.zsh ];
# This propagates this to everything depending on haskell-gi-base
haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobject-introspection;
@@ -517,9 +529,9 @@ self: super: builtins.intersectAttrs super {
# https://github.com/plow-technologies/servant-streaming/issues/12
servant-streaming-server = dontCheck super.servant-streaming-server;
- # https://github.com/haskell-servant/servant/pull/1128
- servant-client-core = if (pkgs.lib.getVersion super.servant-client-core) == "0.15" then
- appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch
+ # https://github.com/haskell-servant/servant/pull/1238
+ servant-client-core = if (pkgs.lib.getVersion super.servant-client-core) == "0.16" then
+ appendPatch super.servant-client-core ./patches/servant-client-core-redact-auth-header.patch
else
super.servant-client-core;
@@ -625,4 +637,59 @@ self: super: builtins.intersectAttrs super {
cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;
pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"];
+ spago =
+ let
+ # Spago basically compiles with LTS-14, but it requires a newer version
+ # of directory. This is to work around a bug only present on windows, so
+ # we can safely jailbreak spago and use the older directory package from
+ # LTS-14.
+ spagoWithOverrides = doJailbreak (super.spago.override {
+ # spago requires the latest version of dhall.
+ directory = self.dhall_1_28_0;
+ });
+
+ docsSearchAppJsFile = pkgs.fetchurl {
+ url = "https://github.com/spacchetti/purescript-docs-search/releases/download/v0.0.5/docs-search-app.js";
+ sha256 = "11721x455qzh40vzfmralaynn9v8b5wix86r107hhs08vhryjib2";
+ };
+
+ purescriptDocsSearchFile = pkgs.fetchurl {
+ url = "https://github.com/spacchetti/purescript-docs-search/releases/download/v0.0.5/purescript-docs-search";
+ sha256 = "16p1fmdvpwz1yswav8qjsd26c9airb22xncqw1rjnbd8lcpqx0p5";
+ };
+
+ spagoFixHpack = overrideCabal spagoWithOverrides (drv: {
+ postUnpack = (drv.postUnpack or "") + ''
+ # The source for spago is pulled directly from GitHub. It uses a
+ # package.yaml file with hpack, not a .cabal file. In the package.yaml file,
+ # it uses defaults from the master branch of the hspec repo. It will try to
+ # fetch these at build-time (but it will fail if running in the sandbox).
+ #
+ # The following line modifies the package.yaml to not pull in
+ # defaults from the hspec repo.
+ substituteInPlace "$sourceRoot/package.yaml" --replace 'defaults: hspec/hspec@master' ""
+
+ # Spago includes the following two files directly into the binary
+ # with Template Haskell. They are fetched at build-time from the
+ # `purescript-docs-search` repo above. If they cannot be fetched at
+ # build-time, they are pulled in from the `templates/` directory in
+ # the spago source.
+ #
+ # However, they are not actually available in the spago source, so they
+ # need to fetched with nix and put in the correct place.
+ # https://github.com/spacchetti/spago/issues/510
+ cp ${docsSearchAppJsFile} "$sourceRoot/templates/docs-search-app.js"
+ cp ${purescriptDocsSearchFile} "$sourceRoot/templates/purescript-docs-search"
+ '';
+ });
+
+ # Haddock generation is broken for spago.
+ # https://github.com/spacchetti/spago/issues/511
+ spagoWithoutHaddocks = dontHaddock spagoFixHpack;
+
+ # Because of the problem above with pulling in hspec defaults to the
+ # package.yaml file, the tests are disabled.
+ spagoWithoutChecks = dontCheck spagoWithoutHaddocks;
+ in
+ spagoWithoutChecks;
}
diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 96774f71730f..45c1a8fbd333 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -20,6 +20,10 @@ let
in stdenv.mkDerivation (args // {
+ # Doesn't work in the sandbox. Pass `--option sandbox relaxed` or
+ # `--option sandbox false` to be able to build this
+ __noChroot = true;
+
buildInputs = buildInputs
++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b3327e4fe571..0ec409dc8ed7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -756,18 +756,21 @@ self: {
}) {};
"AesonBson" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, bson, hspec, HUnit, text
- , unordered-containers, vector
+ ({ mkDerivation, aeson, attoparsec, base, bson, hspec, HUnit
+ , QuickCheck, scientific, text, unordered-containers, vector
}:
mkDerivation {
pname = "AesonBson";
- version = "0.2.2";
- sha256 = "1p7636bjczcwwi2c0cdzvpj95vx2fr27qnmh8pcs8hqgmisagq8s";
+ version = "0.4.0";
+ sha256 = "08ffz1fr8x5z3ipvk99wc5n363ghxrq1z0cv1yh57wx18ialk1cx";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson attoparsec base bson unordered-containers vector
+ aeson attoparsec base bson scientific text unordered-containers
+ vector
+ ];
+ testHaskellDepends = [
+ aeson base bson hspec HUnit QuickCheck scientific text
];
- testHaskellDepends = [ aeson base bson hspec HUnit text ];
description = "Mapping between Aeson's JSON and Bson objects";
license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
@@ -1509,6 +1512,8 @@ self: {
];
description = "Libary for Hidden Markov Models in HMMER3 format";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"Biobase" = callPackage
@@ -1668,8 +1673,8 @@ self: {
}:
mkDerivation {
pname = "BiobaseHTTP";
- version = "1.1.0";
- sha256 = "0y26d4aqxqpdr142y26p70v6cnrr48dhxm5nnnhqxg0lsirbxad0";
+ version = "1.2.0";
+ sha256 = "1m6lfs08zyk2xcxcmapcdfqp7afmzz3n2r3rr3qzlibwc6w7pj1d";
libraryHaskellDepends = [
aeson base BiobaseEnsembl bytestring conduit either-unwrap HTTP
http-conduit hxt mtl network Taxonomy text transformers
@@ -3163,12 +3168,14 @@ self: {
}:
mkDerivation {
pname = "ClustalParser";
- version = "1.2.3";
- sha256 = "0wjs6bsbyykrm0hjdybnap86zsnhjjifampm08dqg7fqp7f7pmpy";
+ version = "1.3.0";
+ sha256 = "0zm0n4pvs9dspfh3x7zfjs20k78mkhsqy6xkg4002b7g8c5bwkp6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base parsec text vector ];
- executableHaskellDepends = [ base cmdargs either-unwrap ];
+ executableHaskellDepends = [
+ base cmdargs either-unwrap parsec text vector
+ ];
testHaskellDepends = [ base hspec hspec-discover parsec text ];
testToolDepends = [ hspec-discover ];
description = "Libary for parsing Clustal tools output";
@@ -5207,12 +5214,13 @@ self: {
}) {};
"Enum" = callPackage
- ({ mkDerivation, base }:
+ ({ mkDerivation, base, smallcheck, tasty, tasty-hunit }:
mkDerivation {
pname = "Enum";
- version = "0.1.0.0";
- sha256 = "1zl5w5w3rqbh4awp4b4rbamkqcvnrzn944rjc84sq3rqad3wlww2";
+ version = "0.2.0.0";
+ sha256 = "0bk44zim92b5qb95byvcyy8cmbgzbxf06mp0nr765p9v48rjkr91";
libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base smallcheck tasty tasty-hunit ];
description = "Non-crashing `Enum` operations";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -8025,12 +8033,12 @@ self: {
}) {};
"HGL" = callPackage
- ({ mkDerivation, array, base, X11 }:
+ ({ mkDerivation, array, base, stm, X11 }:
mkDerivation {
pname = "HGL";
- version = "3.2.3.1";
- sha256 = "0m9y2sdlbmw0n4xad26viajr391w0clpqw1256lanidwkrxfwpfh";
- libraryHaskellDepends = [ array base X11 ];
+ version = "3.2.3.2";
+ sha256 = "087k8i0bha3mzpqa3z3c6npl5vmccg7xcwl28lbv0yzbvj1qkg38";
+ libraryHaskellDepends = [ array base stm X11 ];
description = "A simple graphics library based on X11 or Win32";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -9227,6 +9235,42 @@ self: {
license = stdenv.lib.licenses.lgpl21;
}) {};
+ "HTF_0_14_0_3" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, array, base
+ , base64-bytestring, bytestring, Cabal, containers, cpphs, Diff
+ , directory, filepath, haskell-src, HUnit, lifted-base
+ , monad-control, mtl, old-time, pretty, process, QuickCheck, random
+ , regex-compat, template-haskell, temporary, text, time, unix
+ , unordered-containers, vector, xmlgen
+ }:
+ mkDerivation {
+ pname = "HTF";
+ version = "0.14.0.3";
+ sha256 = "138gh5a2nx25czhp9qpaav2lq7ff142q4n6sbkrglfsyn48rifqp";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal process ];
+ libraryHaskellDepends = [
+ aeson array base base64-bytestring bytestring containers cpphs Diff
+ directory haskell-src HUnit lifted-base monad-control mtl old-time
+ pretty process QuickCheck random regex-compat text time unix vector
+ xmlgen
+ ];
+ libraryToolDepends = [ cpphs ];
+ executableHaskellDepends = [
+ array base cpphs directory HUnit mtl old-time random text
+ ];
+ executableToolDepends = [ cpphs ];
+ testHaskellDepends = [
+ aeson aeson-pretty base bytestring directory filepath HUnit mtl
+ process random regex-compat template-haskell temporary text
+ unordered-containers
+ ];
+ description = "The Haskell Test Framework";
+ license = stdenv.lib.licenses.lgpl21;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"HTTP" = callPackage
({ mkDerivation, array, base, bytestring, deepseq, httpd-shed
, HUnit, mtl, network, network-uri, parsec, pureMD5, split
@@ -11942,21 +11986,22 @@ self: {
"LDAPv3" = callPackage
({ mkDerivation, base, base-encoding, binary, bytestring
- , containers, deepseq, int-cast, newtype, quickcheck-instances
- , tasty, tasty-hunit, tasty-quickcheck, text-short
+ , containers, deepseq, int-cast, newtype, parsec
+ , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text
+ , text-short
}:
mkDerivation {
pname = "LDAPv3";
- version = "0.0.0.0";
- sha256 = "0522g4i24y4fj2i63hdcvab3cis88wbwaz5cv9lizsgxrwqvn40d";
+ version = "0.1.0.0";
+ sha256 = "1zsl14qd7vzgvkz77mgdl5fyh4444gw3vjl443d09wra087j94bx";
libraryHaskellDepends = [
- base binary bytestring containers deepseq int-cast newtype
- text-short
+ base binary bytestring containers deepseq int-cast newtype parsec
+ text text-short
];
testHaskellDepends = [
base base-encoding binary bytestring containers deepseq int-cast
- newtype quickcheck-instances tasty tasty-hunit tasty-quickcheck
- text-short
+ newtype parsec quickcheck-instances tasty tasty-hunit
+ tasty-quickcheck text text-short
];
description = "Lightweight Directory Access Protocol (LDAP) version 3";
license = stdenv.lib.licenses.gpl2Plus;
@@ -12441,8 +12486,8 @@ self: {
}:
mkDerivation {
pname = "ListLike";
- version = "4.6.2";
- sha256 = "0m65x8yaq7q50gznln8mga2wrc8cvjx6gw9rim8s7xqcrx6y5zjh";
+ version = "4.6.3";
+ sha256 = "10vn7gslx4zzjq547cwpzdfb4c5w3nsfis6qr03dr9c4fdzj61lx";
libraryHaskellDepends = [
array base bytestring containers deepseq dlist fmlist text
utf8-string vector
@@ -12836,15 +12881,15 @@ self: {
}:
mkDerivation {
pname = "MagicHaskeller";
- version = "0.9.6.7";
- sha256 = "0cl0lq45x8pxsbdiqg9sx39jvs8h2h32mni5zq2jb61ac7wim9g1";
+ version = "0.9.6.8";
+ sha256 = "1091s8jrynjb76wg5r53kp0siv0dgbsxsb9y2djrq1iz06h01m55";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base bytestring containers directory ghc ghc-paths hashable
haskell-src html mtl network network-uri pretty random syb
- template-haskell tf-random time
+ template-haskell tf-random time transformers
];
executableHaskellDepends = [
abstract-par array base bytestring cgi containers directory
@@ -12884,14 +12929,16 @@ self: {
}:
mkDerivation {
pname = "Map";
- version = "0.1.2.0";
- sha256 = "1fvs9im82ylfij01cn2pb21wycvb6wsj8dayaj34g3av82g9dagw";
+ version = "0.1.3.2";
+ sha256 = "03bc7mswiw5n76g34pll6dgz7f46l9gafl1bfanv74p21xjr829g";
libraryHaskellDepends = [
base containers either-both filtrable util
];
testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
description = "Class of key-value maps";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"Mapping" = callPackage
@@ -13025,8 +13072,8 @@ self: {
({ mkDerivation, base, newtype-generics }:
mkDerivation {
pname = "MemoTrie";
- version = "0.6.9";
- sha256 = "157p0pi6rrq74a35mq6zkkycv4ah7xhkbrcmnkb9xf7pznw4aq0x";
+ version = "0.6.10";
+ sha256 = "0lxsarhyhhkp58wpbp7b08scmjxq7s46jfl9vhp2yfq973hz0kaq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base newtype-generics ];
@@ -14037,8 +14084,8 @@ self: {
}:
mkDerivation {
pname = "Network-NineP";
- version = "0.4.5";
- sha256 = "1s11idqg8bvimhal86569wlw746cyyq67dxvvabnbn3q23mjkflh";
+ version = "0.4.6";
+ sha256 = "0aq8888z0fcsd18shsqjsgrpxm417cfh250vyd2660ajc0ymj3q3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -14776,8 +14823,8 @@ self: {
}:
mkDerivation {
pname = "OpenGLRaw";
- version = "3.3.3.0";
- sha256 = "0zgllb4bcash2i2cispa3j565aw3dpxs41ghmhpvyvi4a6xmyldx";
+ version = "3.3.4.0";
+ sha256 = "0gmsmysqzpm13qnyq4vvqxm4dzw25nayfd9wi5x645pympm6jqbm";
libraryHaskellDepends = [
base bytestring containers fixed half text transformers
];
@@ -15063,6 +15110,8 @@ self: {
pname = "PSQueue";
version = "1.1.0.1";
sha256 = "1cik7sw10sacsijmfhghzy54gm1qcyxw14shlp86lx8z89kcnkza";
+ revision = "1";
+ editedCabalFile = "0pswr49mg0ww0w579w4qsv5hjgcnsswdi283lxk6cvxw3wafif07";
libraryHaskellDepends = [ base ];
description = "Priority Search Queue";
license = stdenv.lib.licenses.bsd3;
@@ -15939,8 +15988,8 @@ self: {
}:
mkDerivation {
pname = "PyF";
- version = "0.8.1.1";
- sha256 = "0kwva2ia02z3l0g8vzp9029sv5y4smllc8x9y6qv599f2sy8h31w";
+ version = "0.8.1.2";
+ sha256 = "00rvzfv2xa9ibcsx6y3cpmckl2mlsmck519mp4zqllxwn1nzbb52";
libraryHaskellDepends = [
base containers haskell-src-exts haskell-src-meta megaparsec mtl
template-haskell text
@@ -16095,8 +16144,8 @@ self: {
({ mkDerivation, base, mtl, QuickCheck, random }:
mkDerivation {
pname = "QuickCheck-GenT";
- version = "0.2.1";
- sha256 = "1bf3vx2szdb0svnmhn0k7vfkv86vhfxgcfklzlf5w7y49s4369k0";
+ version = "0.2.2";
+ sha256 = "0bn594bgvavbphm5543kqljcc7hgxk4ir0fcdjw399sbfaxpn5yz";
libraryHaskellDepends = [ base mtl QuickCheck random ];
description = "A GenT monad transformer for QuickCheck library";
license = stdenv.lib.licenses.mit;
@@ -16174,15 +16223,14 @@ self: {
}:
mkDerivation {
pname = "R-pandoc";
- version = "0.2.2";
- sha256 = "1kb9dnwbkinx3wi7fr8i9a7dpl1gx08f4ysml1jacf1p6nvhi1lq";
+ version = "0.2.3";
+ sha256 = "05pb2gr0s4fjd3lj90r6hdj30bzsz16jsibmi99xi3172plyk449";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
base directory filepath pandoc-types process split
];
executableHaskellDepends = [ base pandoc-types ];
- description = "A pandoc filter to express R plots inside markdown";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -16664,8 +16712,8 @@ self: {
}:
mkDerivation {
pname = "Rasterific";
- version = "0.7.4.4";
- sha256 = "1s8d0yyh2xz8kb9476nr11jzxvgq0y9sgspgzhh9shf44fbz4gs0";
+ version = "0.7.5";
+ sha256 = "158s0w95x0yxhffcccvhil827jmv7mmbh65nbg8qypvw9j4ldb9j";
libraryHaskellDepends = [
base bytestring containers dlist FontyFruity free JuicyPixels mtl
primitive transformers vector vector-algorithms
@@ -16930,6 +16978,8 @@ self: {
];
description = "Library for accessing S3 compatible storage services";
license = stdenv.lib.licenses.gpl3Plus;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"SBench" = callPackage
@@ -18545,8 +18595,8 @@ self: {
}:
mkDerivation {
pname = "StockholmAlignment";
- version = "1.1.2";
- sha256 = "1x41m0xcmz9j4gypbl4pi6a6v53j6v37ndl8g5rq60fqfl18hizb";
+ version = "1.2.0";
+ sha256 = "0zz437d771cb4zpjzcddjl8xvz9qxmj1pyxql70lqczvqrk6k78y";
libraryHaskellDepends = [
base colour diagrams-cairo diagrams-lib directory either-unwrap
filepath parsec ParsecTools SVGFonts text vector
@@ -19046,8 +19096,8 @@ self: {
}:
mkDerivation {
pname = "Taxonomy";
- version = "1.0.3";
- sha256 = "0w4j1v2l7c8a8x0rpvq1gxbvjcw83kj84m5bw6bwx3x6gc997xxn";
+ version = "2.0.0";
+ sha256 = "1b2x0lkg5pgjk1jyanbi8g9rs1sr7llihyjhdfsg6fajklrzh3m9";
libraryHaskellDepends = [
aeson base bytestring either-unwrap fgl graphviz parsec text vector
];
@@ -20648,10 +20698,8 @@ self: {
({ mkDerivation, base, bytestring, deepseq, text, text-short }:
mkDerivation {
pname = "X";
- version = "0.3.0.0";
- sha256 = "0grjiznl8j44mq3m0jkhm9z7wcr4cywrnfmk92nk3g6ddhcyakkc";
- revision = "1";
- editedCabalFile = "1nbp0zci2sp07cr5j5xlh7gswcnj52z9dp6akh9xk4mzk3salxwq";
+ version = "0.3.1.0";
+ sha256 = "10paczbaiwag50v8ay9pl0f6whqds6y0yy14z0h8s6j04p9zd50f";
libraryHaskellDepends = [
base bytestring deepseq text text-short
];
@@ -22002,19 +22050,20 @@ self: {
"acid-state" = callPackage
({ mkDerivation, array, base, bytestring, cereal, containers
, criterion, deepseq, directory, filelock, filepath, hedgehog
- , hspec, hspec-discover, mtl, network, random, safecopy, stm
- , system-fileio, system-filepath, template-haskell, text
- , th-expand-syns, time, unix
+ , hspec, hspec-discover, mtl, network, network-bsd, random
+ , safecopy, stm, system-fileio, system-filepath, template-haskell
+ , text, th-expand-syns, time, unix
}:
mkDerivation {
pname = "acid-state";
- version = "0.15.2";
- sha256 = "08v807yxkd13m1zffw1yryifjgn7w28a31hb0sg0n3yw7vzk9ny3";
+ version = "0.16.0";
+ sha256 = "18pdxawx28wsvjah2rih6fa8mgxpkrpskfkvb5gjb1yn29dd8cmn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
array base bytestring cereal containers directory filelock filepath
- mtl network safecopy stm template-haskell th-expand-syns unix
+ mtl network network-bsd safecopy stm template-haskell
+ th-expand-syns unix
];
executableHaskellDepends = [ base directory ];
testHaskellDepends = [
@@ -22647,8 +22696,8 @@ self: {
({ mkDerivation, base, criterion, time }:
mkDerivation {
pname = "acme-year";
- version = "2016";
- sha256 = "1zvhy62hrc47idl1awbdjzrhbhqjplsfy7lpybvdhc298criygdl";
+ version = "2019";
+ sha256 = "011vpap3j0riw6y23j8c4h7610yhjq00jpcfjg2g7lagb62gmkpa";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base time ];
benchmarkHaskellDepends = [ base criterion ];
@@ -22662,8 +22711,8 @@ self: {
pname = "acme-zalgo";
version = "0.1.2.1";
sha256 = "1yd3xrdkxf3hgapi4w5vg79nxmw8y5rnyki5pqi00mca9wjspdhz";
- revision = "1";
- editedCabalFile = "1bwpaqqvp8mwpw7966xjn8zhi0rs9iqpwkhkzjxw8c885h45n1za";
+ revision = "2";
+ editedCabalFile = "1l2m9hh6mbc59h17z17gcfzgza25jj912d413pw1q37r3v4y0a1c";
libraryHaskellDepends = [ array base random ];
description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛";
license = stdenv.lib.licenses.mit;
@@ -23104,6 +23153,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "advent-of-code-api_0_2_7_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+ , directory, filepath, finite-typelits, http-api-data, http-client
+ , http-client-tls, http-media, HUnit, megaparsec, mtl, profunctors
+ , servant, servant-client, servant-client-core, stm, tagsoup, text
+ , time, time-compat
+ }:
+ mkDerivation {
+ pname = "advent-of-code-api";
+ version = "0.2.7.0";
+ sha256 = "0a1h2kwmfnhs1sj7wmnc4hgfwq45d8xl2ah0s6432k13v8lfpxwr";
+ libraryHaskellDepends = [
+ aeson base bytestring containers deepseq directory filepath
+ finite-typelits http-api-data http-client http-client-tls
+ http-media megaparsec mtl profunctors servant servant-client
+ servant-client-core stm tagsoup text time time-compat
+ ];
+ testHaskellDepends = [ base directory filepath HUnit text ];
+ description = "Advent of Code REST API bindings and servant API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"aern2-mp" = callPackage
({ mkDerivation, base, convertible, hspec, integer-logarithms, lens
, mixed-types-num, QuickCheck, regex-tdfa, rounded
@@ -23189,8 +23261,8 @@ self: {
}:
mkDerivation {
pname = "aeson";
- version = "1.4.5.0";
- sha256 = "1jhabz1lbbv6yqxqiybifi86cb5xlsadrn368n5dd0wzzc7ja4iz";
+ version = "1.4.6.0";
+ sha256 = "12s8nfsady47zlz94f7m978irwwj0l0v2x41hk8w1i14wb3b4gwj";
libraryHaskellDepends = [
attoparsec base base-compat bytestring containers deepseq dlist
ghc-prim hashable primitive scientific tagged template-haskell text
@@ -23351,8 +23423,8 @@ self: {
}:
mkDerivation {
pname = "aeson-diff";
- version = "1.1.0.7";
- sha256 = "01d48pd7d1mb9cd5yxfajln8rmjdjq8ch91s0lav4qw1azv6vp2r";
+ version = "1.1.0.8";
+ sha256 = "1pim103mywlhxssrhr0ca0gsvql52g799fk73bdj5h31ziibdsi4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -23423,8 +23495,8 @@ self: {
}:
mkDerivation {
pname = "aeson-filthy";
- version = "0.1.3";
- sha256 = "121ygm5k9qjizwjj7w5dklxs5sv0zysrnpvwb37ar4bjkcxhs0ap";
+ version = "0.1.4";
+ sha256 = "1mjlgq1h09plpllmh7manbcjnl57pmjap0kz9ahzrpv02zrfkszi";
libraryHaskellDepends = [
aeson base bytestring text time unordered-containers
];
@@ -23732,27 +23804,6 @@ self: {
}) {};
"aeson-qq" = callPackage
- ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim
- , haskell-src-meta, hspec, parsec, scientific, template-haskell
- , text, vector
- }:
- mkDerivation {
- pname = "aeson-qq";
- version = "0.8.2";
- sha256 = "0ln13jqyfh5726hdrk1rad9a6cgrrj201plmwcfcpvq18v4m5ckd";
- libraryHaskellDepends = [
- aeson attoparsec base base-compat haskell-src-meta parsec
- scientific template-haskell text vector
- ];
- testHaskellDepends = [
- aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec
- parsec scientific template-haskell text vector
- ];
- description = "JSON quasiquoter for Haskell";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "aeson-qq_0_8_3" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim
, haskell-src-meta, hspec, parsec, scientific, template-haskell
, text, vector
@@ -23771,7 +23822,6 @@ self: {
];
description = "JSON quasiquoter for Haskell";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"aeson-quick" = callPackage
@@ -23834,6 +23884,8 @@ self: {
pname = "aeson-schemas";
version = "1.0.3";
sha256 = "0fmhqibw6mw9shxh94riqq465njbgjsv539xb6sx7qpkhcck2csi";
+ revision = "1";
+ editedCabalFile = "19fk0ccb68143mj7ndp6qflksz7vlja0gbmrqqyaf1zr5z0f9q1v";
libraryHaskellDepends = [
aeson base bytestring first-class-families megaparsec
template-haskell text unordered-containers
@@ -24023,8 +24075,8 @@ self: {
}:
mkDerivation {
pname = "aeson-yaml";
- version = "1.0.2.0";
- sha256 = "1h0pk3nw8y6c2z5rd1shjm8bcdgdvg1v9iqw5hc9b6rffi332n6q";
+ version = "1.0.5.0";
+ sha256 = "0cx54xqv2w4lcnnmcwapbizxjzxaf0x2xbr7lbhcy380nx99pi73";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -24725,8 +24777,8 @@ self: {
}:
mkDerivation {
pname = "alex";
- version = "3.2.4";
- sha256 = "0cpjixgsr0b2x4s6hz4aa6gnmjw9i7xd9nlfi8m37zqlidq4v3nm";
+ version = "3.2.5";
+ sha256 = "1qz0ar9dl0zx42y1gbpd2yx09nbwxs8nw6mjmpi68z3nf098lz5p";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -24771,16 +24823,21 @@ self: {
}) {};
"alex-tools" = callPackage
- ({ mkDerivation, base, deepseq, template-haskell, text }:
+ ({ mkDerivation, base, bytestring, deepseq, template-haskell, text
+ }:
mkDerivation {
pname = "alex-tools";
- version = "0.4";
- sha256 = "0qyh3dr5nh7whv3qh431l8x4lx3nzkildlyl3xgnaxpbs8gr8sgi";
- revision = "2";
- editedCabalFile = "1hz7gdff15bxvx5jijgh6ih1m2v39nadfy2yjsb43c48p9hcn93z";
- libraryHaskellDepends = [ base deepseq template-haskell text ];
+ version = "0.5";
+ sha256 = "06ghkigqabz9h17wjpc3jwv1f4k6fajpzblzvysqzg71pfncx88m";
+ revision = "1";
+ editedCabalFile = "0br92hrl0pxw2a5k9wgzk3zwyz2dimcwwjxijgzrd2yg0s1vnm9p";
+ libraryHaskellDepends = [
+ base bytestring deepseq template-haskell text
+ ];
description = "A set of functions for a common use case of Alex";
license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"alfred" = callPackage
@@ -25476,6 +25533,22 @@ self: {
broken = true;
}) {};
+ "altsvc" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, tasty, tasty-hunit
+ , tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "altsvc";
+ version = "0.1.0.0";
+ sha256 = "0lgfj02ryc3130ymrkw179j311df2cj0ry9w32mvd77mwx48396c";
+ libraryHaskellDepends = [ base bytestring cereal ];
+ testHaskellDepends = [
+ base bytestring cereal tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "HTTP Alternative Services";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"alure" = callPackage
({ mkDerivation, alure, base, OpenAL }:
mkDerivation {
@@ -28093,18 +28166,18 @@ self: {
"amqp-utils" = callPackage
({ mkDerivation, amqp, base, bytestring, connection, containers
- , data-default-class, hinotify, magic, process, text, time, tls
- , unix, x509-system
+ , data-default-class, hinotify, magic, network, process, text, time
+ , tls, unix, x509-system
}:
mkDerivation {
pname = "amqp-utils";
- version = "0.3.7.1";
- sha256 = "1z7jf7ai7r2rlnwylqs60pqcz0h4dxj4g372c919lcvinmql1yfx";
+ version = "0.4.1.0";
+ sha256 = "1p0pvl88xp9m0b9k7nqxln3702kp4lk05f60mag3swa09rvzcg47";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
amqp base bytestring connection containers data-default-class
- hinotify magic process text time tls unix x509-system
+ hinotify magic network process text time tls unix x509-system
];
description = "Generic Haskell AMQP tools";
license = stdenv.lib.licenses.gpl3;
@@ -28647,10 +28720,8 @@ self: {
}:
mkDerivation {
pname = "ansi-pretty";
- version = "0.1.2.1";
- sha256 = "1ill2dlzbxn97smkzdqcjfx9z3fw7pgwvz6w36d92n8p7zwik23h";
- revision = "6";
- editedCabalFile = "1j2iyzf61wmwdrb8i3xynins7shjv89y4028sy13rfywsbqpjg4s";
+ version = "0.1.2.2";
+ sha256 = "0q72y2pnx5qx7jk1waq3qdry1azq07wygb9hcgjqz78lbszg19cm";
libraryHaskellDepends = [
aeson ansi-wl-pprint array base bytestring containers generics-sop
nats scientific semigroups tagged text time unordered-containers
@@ -28673,12 +28744,12 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ansi-terminal_0_10_1" = callPackage
+ "ansi-terminal_0_10_2" = callPackage
({ mkDerivation, base, colour }:
mkDerivation {
pname = "ansi-terminal";
- version = "0.10.1";
- sha256 = "1b168z688b1lg4d2bmbxmm2mj51mwm2wv0smfb1vcwjp2vzpqf9i";
+ version = "0.10.2";
+ sha256 = "0h09lia7gqchp023hbgwq4w8bmg33a02chaixdsx8nqbj8jf5558";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base colour ];
@@ -28690,21 +28761,24 @@ self: {
"ansi-terminal-game" = callPackage
({ mkDerivation, ansi-terminal, array, base, bytestring, cereal
, clock, exceptions, hspec, linebreak, mintty, mtl, QuickCheck
- , split, terminal-size, timers-tick
+ , random, split, terminal-size, timers-tick
}:
mkDerivation {
pname = "ansi-terminal-game";
- version = "0.4.0.0";
- sha256 = "1mjc62z7d6gzvwnwg2gsgf42hlv1l2xqpjy9v83my4s945p422lg";
+ version = "1.0.0.0";
+ sha256 = "0h33ih7sxzyp1a6r6ivk73lrfx6haxxzmgh56n75sa7p8vhr8f1i";
+ revision = "1";
+ editedCabalFile = "1x601p97ragf9k56qy1ndmn7g3brs8fvvmf1wcrxz1ynhndqqpjw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-terminal array base bytestring cereal clock exceptions
- linebreak mintty mtl QuickCheck split terminal-size timers-tick
+ linebreak mintty mtl QuickCheck random split terminal-size
+ timers-tick
];
testHaskellDepends = [
ansi-terminal array base bytestring cereal clock exceptions hspec
- linebreak mtl QuickCheck split terminal-size timers-tick
+ linebreak mtl QuickCheck random split terminal-size timers-tick
];
description = "sdl-like functions for terminal applications, based on ansi-terminal";
license = stdenv.lib.licenses.gpl3;
@@ -29361,8 +29435,8 @@ self: {
}:
mkDerivation {
pname = "apecs";
- version = "0.8.1";
- sha256 = "10m3lbfg97psnk3z2ml1q9g2ymwa2fnsknrh6ggp9k5c7mskslv0";
+ version = "0.8.2";
+ sha256 = "06dhq7knzxj48563ll7r1srlgq5nd2kbk5fzrf7x6yjp0w2c9kmp";
libraryHaskellDepends = [
array base containers mtl template-haskell vector
];
@@ -29573,6 +29647,28 @@ self: {
testHaskellDepends = [ base bytestring ];
description = "RPC API client for Factom";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "api-rpc-pegnet" = callPackage
+ ({ mkDerivation, aeson, aeson-casing, base, bytestring, http-client
+ , http-client-tls, http-conduit, json-alt, network, remote-json
+ , remote-json-client, remote-monad, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "api-rpc-pegnet";
+ version = "0.1.0.0";
+ sha256 = "14jb78bkdd8ywwnks3pvi8ynagsri938znyh9ylvyr5mph9ngmnc";
+ libraryHaskellDepends = [
+ aeson aeson-casing base bytestring http-client http-client-tls
+ http-conduit json-alt network remote-json remote-json-client
+ remote-monad text time transformers
+ ];
+ description = "simple json-rpc client for PegNet";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"api-tools" = callPackage
@@ -30481,6 +30577,8 @@ self: {
pname = "arbor-monad-logger";
version = "0.1.1.3";
sha256 = "1x44kavmgm7nffvnakyrmcxq03vshg15vkk8wcpvkq43dndk9jb2";
+ revision = "1";
+ editedCabalFile = "0srypscv4gd1q2h6namm507211xd3cnqv144h2pb1mayy20m9a8m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -30528,8 +30626,8 @@ self: {
}:
mkDerivation {
pname = "arbor-monad-metric-datadog";
- version = "1.1.1";
- sha256 = "1188xwwxx7ykdh7v15gqnh0kv9w1g66wp09jp1fpfyms1qj12nqj";
+ version = "1.1.2";
+ sha256 = "1wja13n9k2vad0icqsm8lydrxkgb01062ajm3y1xq7fybn5g6rbx";
libraryHaskellDepends = [
arbor-datadog arbor-monad-metric base bytestring containers
generic-lens lens mtl network resourcet stm text transformers
@@ -31323,6 +31421,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "arrayfire" = callPackage
+ ({ mkDerivation, af, base, Cabal, cabal-doctest, directory
+ , filepath, hspec, hspec-discover, parsec, QuickCheck
+ , quickcheck-classes, text, vector
+ }:
+ mkDerivation {
+ pname = "arrayfire";
+ version = "0.6.0.0";
+ sha256 = "0vm1m3bc3c29dwbpzkp0pnxnz7rah8gqrgc0p4haivm5w4r10bf8";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [ base filepath vector ];
+ librarySystemDepends = [ af ];
+ executableHaskellDepends = [ base directory parsec text vector ];
+ testHaskellDepends = [
+ base directory hspec hspec-discover QuickCheck quickcheck-classes
+ vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Haskell bindings to the ArrayFire general-purpose GPU library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {af = null;};
+
"arraylist" = callPackage
({ mkDerivation, base, hashable, initialize, MonadRandom, primitive
, smallcheck, tasty, tasty-smallcheck
@@ -32046,14 +32170,12 @@ self: {
}) {inherit (pkgs) assimp;};
"assoc" = callPackage
- ({ mkDerivation, base, bifunctors }:
+ ({ mkDerivation, base, bifunctors, tagged }:
mkDerivation {
pname = "assoc";
- version = "1";
- sha256 = "0i1jj6lrabl0fhh1iya4nxr2hw1s4xmhca5qnim93ng5znziv9n2";
- revision = "1";
- editedCabalFile = "0hcpyypnj9qwbpk079h6lnm8aa3mp3fzjilk9qwibkmnnqwwwcld";
- libraryHaskellDepends = [ base bifunctors ];
+ version = "1.0.1";
+ sha256 = "1m9n4vp190bvn2wcrd4ggfwa9pi93jp0zgx02mdgywn2zfidw020";
+ libraryHaskellDepends = [ base bifunctors tagged ];
description = "swap and assoc: Symmetric and Semigroupy Bifunctors";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -32746,8 +32868,8 @@ self: {
}:
mkDerivation {
pname = "atomic-write";
- version = "0.2.0.6";
- sha256 = "1xs3shwnlj8hmnm3q6jc8nv78z0481i5n4hrqqdmbpx8grvlnqyl";
+ version = "0.2.0.7";
+ sha256 = "03cn3ii74h0w3g4h78xsx9v2sn58r3qsr2dbdwq340xwhiwcgxdm";
libraryHaskellDepends = [
base bytestring directory filepath temporary text unix-compat
];
@@ -32815,19 +32937,19 @@ self: {
"ats-format" = callPackage
({ mkDerivation, ansi-wl-pprint, base, Cabal, cli-setup, directory
- , file-embed, filepath, language-ats, optparse-applicative, process
- , text, toml-parser
+ , filepath, language-ats, optparse-applicative, process, text
+ , toml-parser
}:
mkDerivation {
pname = "ats-format";
- version = "0.2.0.32";
- sha256 = "0waxsxj13jcxams5zz13skg46lbf5c0zkwmjap8hibrrkrrilbcv";
+ version = "0.2.0.36";
+ sha256 = "1a7mfpqc09lfk1pp237f2wrizgm2c1indgjdi810599ns19hicd2";
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [ base Cabal cli-setup filepath ];
executableHaskellDepends = [
- ansi-wl-pprint base directory file-embed language-ats
- optparse-applicative process text toml-parser
+ ansi-wl-pprint base directory language-ats optparse-applicative
+ process text toml-parser
];
description = "A source-code formatter for ATS";
license = stdenv.lib.licenses.bsd3;
@@ -32846,8 +32968,8 @@ self: {
}:
mkDerivation {
pname = "ats-pkg";
- version = "3.3.0.1";
- sha256 = "1avk5nzzpp9rjf09fxwhkj2zyi6gvsj7y9vl318xv5g1fw0cvs4w";
+ version = "3.4.0.1";
+ sha256 = "0lfmlsnxa7fvifqay4xvnkl8cpbx7a6vbfb0szvb5j0nfa8607n6";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -33491,21 +33613,18 @@ self: {
"authenticate" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
- , case-insensitive, conduit, containers, http-conduit, http-types
- , network-uri, resourcet, tagstream-conduit, text, transformers
+ , case-insensitive, conduit, containers, html-conduit, http-conduit
+ , http-types, network-uri, resourcet, text, transformers
, unordered-containers, xml-conduit
}:
mkDerivation {
pname = "authenticate";
- version = "1.3.4";
- sha256 = "1f1gjggfq114h3nrlzg2svm0j5ghp6n9zlgb3fnq2pgpzpdndm9z";
- revision = "1";
- editedCabalFile = "0ipbmf633c0kmcwwb7d51ac8s4220nfyk5xghhq66mpgna77j2c2";
+ version = "1.3.5";
+ sha256 = "10df40ycd4r45p58xzdh0vcsa401909fa99nkgd18fx5alqh84sz";
libraryHaskellDepends = [
aeson attoparsec base blaze-builder bytestring case-insensitive
- conduit containers http-conduit http-types network-uri resourcet
- tagstream-conduit text transformers unordered-containers
- xml-conduit
+ conduit containers html-conduit http-conduit http-types network-uri
+ resourcet text transformers unordered-containers xml-conduit
];
description = "Authentication methods for Haskell web applications";
license = stdenv.lib.licenses.mit;
@@ -33617,8 +33736,8 @@ self: {
({ mkDerivation, base, Cabal, directory, filepath }:
mkDerivation {
pname = "autoexporter";
- version = "1.1.14";
- sha256 = "0ijykr8qg7ijadlkn0gx3n06n14ihar8dvaddmmaab2awpmaa3l8";
+ version = "1.1.15";
+ sha256 = "061pincl8110ifm2d6jahxkgpvwid1anv3hvswbs4zqwkg6ll8lx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base Cabal directory filepath ];
@@ -33974,8 +34093,8 @@ self: {
}:
mkDerivation {
pname = "avro";
- version = "0.4.5.3";
- sha256 = "0az1mlil8h7scpma16f52zwkbi5iw6mdl6r7vywqhlgsdd2xl9kx";
+ version = "0.4.5.4";
+ sha256 = "0syf968w8vvb5x18znnzc36w5i4ab1fsdpwsph31sxz3rvsv9sr6";
libraryHaskellDepends = [
aeson array base base16-bytestring bifunctors binary bytestring
containers data-binary-ieee754 deepseq fail hashable mtl scientific
@@ -34504,8 +34623,8 @@ self: {
}:
mkDerivation {
pname = "aws-lambda-haskell-runtime";
- version = "2.0.1";
- sha256 = "0q8x5zqxql403wm9ndii42lac8737i0qhd7p7nsy3i2sswfr5gry";
+ version = "2.0.2";
+ sha256 = "11pkvq3d5w56bsqdha9cfsbqw0rhfda9bh7zipik1b0lc3mk8p0a";
libraryHaskellDepends = [
aeson base bytestring http-client http-types path path-io
safe-exceptions-checked template-haskell text
@@ -35162,8 +35281,8 @@ self: {
}:
mkDerivation {
pname = "backstop";
- version = "1.3.0.352";
- sha256 = "1790n52amkvwlm92rh6i6rxfxbw2n2cfam2sf0cx4yf160jxvyj3";
+ version = "1.3.0.354";
+ sha256 = "0r8j5qyccgl0vnjylpsn7xlrhqm588j7nsl938wj3bjn2dq8myan";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -35460,6 +35579,20 @@ self: {
broken = true;
}) {};
+ "ban-instance" = callPackage
+ ({ mkDerivation, base, template-haskell }:
+ mkDerivation {
+ pname = "ban-instance";
+ version = "0.1.0.1";
+ sha256 = "0504qsjbqbrdf9avfrhs290baszc9dickx7wknbyxwrzpzzbpggk";
+ revision = "1";
+ editedCabalFile = "1ii8z13xlnn9avkpvbwbm3m8pwvd5rrkp34n1klcdy9r96bk9pw3";
+ libraryHaskellDepends = [ base template-haskell ];
+ testHaskellDepends = [ base ];
+ description = "For when a type should never be an instance of a class";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"bank-holiday-usa" = callPackage
({ mkDerivation, base, hspec, HUnit, QuickCheck, time }:
mkDerivation {
@@ -35995,8 +36128,8 @@ self: {
pname = "base62";
version = "0.1.0.0";
sha256 = "1ns8hr9xjmrlq5lgi47630gpn8xdglk33ncqw4kjvdrb1x90iz0p";
- revision = "1";
- editedCabalFile = "13n150czdd97hrpjnrkd0wcg7ch9d5zvqlv38n61pjcds6dvvdsy";
+ revision = "2";
+ editedCabalFile = "0i1ipcawbnjf0mjdva4q8s2kw4hd4lfnygmvc81sjxd9crlwy4vm";
libraryHaskellDepends = [
base byteslice natural-arithmetic primitive small-bytearray-builder
wide-word
@@ -37185,31 +37318,6 @@ self: {
}) {};
"bencoding" = callPackage
- ({ mkDerivation, attoparsec, base, bencode, bytestring, containers
- , criterion, deepseq, ghc-prim, hspec, integer-gmp, mtl, pretty
- , QuickCheck, text
- }:
- mkDerivation {
- pname = "bencoding";
- version = "0.4.5.1";
- sha256 = "1q2xpcskpj3hk3vkk09flrnbyss1aq5yqngkxwm7qrcly2798pxa";
- revision = "1";
- editedCabalFile = "17yr0lcpsm482as9qcl44padm2ahz51al4izfq2z1p1jizih4mxv";
- libraryHaskellDepends = [
- attoparsec base bytestring deepseq ghc-prim integer-gmp mtl pretty
- text
- ];
- testHaskellDepends = [
- attoparsec base bytestring containers ghc-prim hspec QuickCheck
- ];
- benchmarkHaskellDepends = [
- attoparsec base bencode bytestring criterion deepseq ghc-prim
- ];
- description = "A library for encoding and decoding of BEncode data";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "bencoding_0_4_5_2" = callPackage
({ mkDerivation, attoparsec, base, bencode, bytestring, containers
, criterion, deepseq, ghc-prim, hspec, integer-gmp, mtl, pretty
, QuickCheck, text
@@ -37230,7 +37338,6 @@ self: {
];
description = "A library for encoding and decoding of BEncode data";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bento" = callPackage
@@ -37615,8 +37722,8 @@ self: {
}:
mkDerivation {
pname = "bifunctors";
- version = "5.5.5";
- sha256 = "0rn47q8dzv0g1fyams99p4py6q0asxdc50q9k0nj497brk738xcb";
+ version = "5.5.6";
+ sha256 = "1jnsnc0rj3vkx8rjwsf2aacla9xzdfy1am9mmjk8crxp2gkazcnc";
libraryHaskellDepends = [
base base-orphans comonad containers tagged template-haskell
th-abstraction transformers
@@ -37823,6 +37930,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bin" = callPackage
+ ({ mkDerivation, base, dec, deepseq, fin, hashable, QuickCheck }:
+ mkDerivation {
+ pname = "bin";
+ version = "0.1";
+ sha256 = "008i0yxvg9v05gby6ysq3f7ygh125p9xa5vwrcrbq5xw79igyzq5";
+ libraryHaskellDepends = [
+ base dec deepseq fin hashable QuickCheck
+ ];
+ description = "Bin: binary natural numbers";
+ license = stdenv.lib.licenses.gpl2Plus;
+ }) {};
+
"binary_0_7_6_1" = callPackage
({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal
, containers, criterion, deepseq, directory, filepath, HUnit, mtl
@@ -39069,8 +39189,8 @@ self: {
({ mkDerivation, base, bindings-DSL, portaudio, vector }:
mkDerivation {
pname = "bindings-portaudio";
- version = "0.2";
- sha256 = "0jxpp8iwb6v0g0y81vnqxqycfh4gzykq4ijn4ir8hzajy7bglb1n";
+ version = "0.2.1";
+ sha256 = "1i2r01jhf8k7820zzwqbss0z3kxd15pvdz7ss8s9gczv88nwxvxk";
libraryHaskellDepends = [ base bindings-DSL vector ];
libraryPkgconfigDepends = [ portaudio ];
description = "Low-level bindings to portaudio library";
@@ -39722,6 +39842,8 @@ self: {
];
description = "Plays chess";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"bit-array" = callPackage
@@ -40176,6 +40298,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bits-extra_0_0_1_5" = callPackage
+ ({ mkDerivation, base, criterion, doctest, doctest-discover
+ , ghc-prim, hedgehog, hspec, hspec-discover, hw-hedgehog
+ , hw-hspec-hedgehog, vector
+ }:
+ mkDerivation {
+ pname = "bits-extra";
+ version = "0.0.1.5";
+ sha256 = "1f29jn8gxmi9nrwnrykq4z88cg8zsknbw7licmf44hlid0s5glf5";
+ libraryHaskellDepends = [ base ghc-prim vector ];
+ testHaskellDepends = [
+ base doctest doctest-discover ghc-prim hedgehog hspec hw-hedgehog
+ hw-hspec-hedgehog
+ ];
+ testToolDepends = [ doctest-discover hspec-discover ];
+ benchmarkHaskellDepends = [ base criterion ghc-prim vector ];
+ description = "Useful bitwise operations";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bits-extras" = callPackage
({ mkDerivation, base, gcc_s }:
mkDerivation {
@@ -41629,25 +41772,26 @@ self: {
"boltzmann-brain" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, directory
- , edit-distance, graphviz, haskell-src-exts, hmatrix, megaparsec
- , MonadRandom, mtl, multiset, pretty-terminal, process, random
- , text, time, transformers
+ , edit-distance, filepath, graphviz, haskell-src-exts, hmatrix
+ , megaparsec, MonadRandom, mtl, multiset, pretty-terminal, process
+ , random, template-haskell, text, time, transformers
}:
mkDerivation {
pname = "boltzmann-brain";
- version = "1.4";
- sha256 = "17xny78fkqm344cddkklv4sj8c7dnps8bn1n21xa392l2zyf7mqz";
+ version = "1.6";
+ sha256 = "1k6zsj4wijvxbbf3n95b61bii3p5m257capdw382613v7wp1yh6a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base containers edit-distance graphviz haskell-src-exts
- hmatrix megaparsec MonadRandom mtl multiset pretty-terminal process
- random text time transformers
+ aeson base bytestring containers edit-distance graphviz
+ haskell-src-exts hmatrix megaparsec MonadRandom mtl multiset
+ pretty-terminal process random template-haskell text time
+ transformers
];
executableHaskellDepends = [
- aeson base bytestring containers directory megaparsec text
+ aeson base bytestring containers directory filepath megaparsec text
];
- description = "Boltzmann sampler compiler for combinatorial systems";
+ description = "Analytic sampler compiler for combinatorial systems";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -41672,15 +41816,16 @@ self: {
"bond" = callPackage
({ mkDerivation, aeson, aeson-pretty, async, base, bytestring
- , cmdargs, derive, Diff, directory, filepath, HUnit, megaparsec
- , monad-loops, mtl, pretty, process, QuickCheck, scientific
- , shakespeare, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
- , text, unordered-containers
+ , cmdargs, Diff, directory, filepath, HUnit, megaparsec
+ , monad-loops, mtl, pretty, process, QuickCheck
+ , quickcheck-arbitrary-template, scientific, shakespeare, tasty
+ , tasty-golden, tasty-hunit, tasty-quickcheck, text
+ , unordered-containers
}:
mkDerivation {
pname = "bond";
- version = "0.11.0.3";
- sha256 = "1zarrlhcp8q1impikmqsz8mnaxi8l8b4nl02qp8xm6y6gpbyhaqj";
+ version = "0.12.0.1";
+ sha256 = "0zhfhr1ya0ljvg5s0s6fpqyrb0f25qdkschblfcmf68c6xmy4ws0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -41689,12 +41834,14 @@ self: {
];
executableHaskellDepends = [
aeson async base bytestring cmdargs directory filepath megaparsec
- monad-loops process text
+ monad-loops mtl process scientific shakespeare text
+ unordered-containers
];
testHaskellDepends = [
- aeson aeson-pretty base bytestring cmdargs derive Diff directory
- filepath HUnit megaparsec monad-loops pretty QuickCheck shakespeare
- tasty tasty-golden tasty-hunit tasty-quickcheck text
+ aeson aeson-pretty base bytestring cmdargs Diff directory filepath
+ HUnit megaparsec monad-loops mtl pretty QuickCheck
+ quickcheck-arbitrary-template scientific shakespeare tasty
+ tasty-golden tasty-hunit tasty-quickcheck text unordered-containers
];
description = "Bond schema compiler and code generator";
license = stdenv.lib.licenses.mit;
@@ -41883,10 +42030,8 @@ self: {
}:
mkDerivation {
pname = "boolean-normal-forms";
- version = "0.0.1";
- sha256 = "12i0jarbv7gq2p8zw0jgh2gq3wqk6s0vsc9rd0g7c36srcmr944b";
- revision = "1";
- editedCabalFile = "1p31kqxp77xdhkszppmnzqgxp883vasrh5910qfif50lch39myfm";
+ version = "0.0.1.1";
+ sha256 = "0zsll476c7g5syfz54kwcb4d2chh9q6gh0f42847n3ja1d64gaar";
libraryHaskellDepends = [ base cond containers deepseq ];
testHaskellDepends = [
base cond containers QuickCheck tasty tasty-quickcheck
@@ -41993,8 +42138,8 @@ self: {
({ mkDerivation, base, mtl, semigroups, template-haskell, text }:
mkDerivation {
pname = "boomerang";
- version = "1.4.5.6";
- sha256 = "0zkr9w9qqrcicdm6r928a1z1svspnx6vh0b9mac4q7cd1h021ph3";
+ version = "1.4.5.7";
+ sha256 = "11ycghpgngnw0ks47h3wmp0xdfl3qw1wnwdil1vmr1b5a4gngzi1";
libraryHaskellDepends = [
base mtl semigroups template-haskell text
];
@@ -42199,6 +42344,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "boring_0_1_3" = callPackage
+ ({ mkDerivation, adjunctions, base, base-compat, bin, constraints
+ , dec, fin, generics-sop, ral, singleton-bool, streams, tagged
+ , transformers, transformers-compat, vec
+ }:
+ mkDerivation {
+ pname = "boring";
+ version = "0.1.3";
+ sha256 = "1fljlkzc5016xbq9jykh0wr1mbyfcikh818pp54djws5vm66hh6d";
+ libraryHaskellDepends = [
+ adjunctions base base-compat bin constraints dec fin generics-sop
+ ral singleton-bool streams tagged transformers transformers-compat
+ vec
+ ];
+ description = "Boring and Absurd types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"boring-game" = callPackage
({ mkDerivation, base, gloss }:
mkDerivation {
@@ -42413,35 +42577,26 @@ self: {
"box" = callPackage
({ mkDerivation, async, attoparsec, base, concurrency
- , contravariant, data-default, dejafu, doctest, exceptions, flow
- , foldl, generic-lens, lens, mmorph, pipes, profunctors, protolude
- , random, stm, streaming, text, time, transformers
- , transformers-base
+ , contravariant, dejafu, doctest, exceptions, foldl, generic-lens
+ , lens, mtl, pipes, profunctors, random, streaming, text, time
+ , transformers, transformers-base
}:
mkDerivation {
pname = "box";
- version = "0.0.1.2";
- sha256 = "11g3ig1n1myfgcfvp6gkn5lyr2gdzj4zpginwmjac1c599xiyf8i";
+ version = "0.1.0";
+ sha256 = "1q03sgz4qzm61rs5chkvk0h9qj7idxxzmyr29awkxigv18nab18h";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- async attoparsec base concurrency contravariant data-default dejafu
- exceptions flow foldl generic-lens lens mmorph pipes profunctors
- protolude random stm streaming text time transformers
+ async attoparsec base concurrency contravariant exceptions foldl
+ lens pipes profunctors streaming text time transformers
transformers-base
];
executableHaskellDepends = [
- async attoparsec base concurrency contravariant data-default dejafu
- exceptions flow foldl generic-lens lens mmorph pipes profunctors
- protolude random stm streaming text time transformers
- transformers-base
- ];
- testHaskellDepends = [
- async attoparsec base concurrency contravariant data-default dejafu
- doctest exceptions flow foldl generic-lens lens mmorph pipes
- profunctors protolude random stm streaming text time transformers
- transformers-base
+ base concurrency dejafu generic-lens lens mtl random streaming text
+ transformers
];
+ testHaskellDepends = [ base doctest ];
description = "boxes";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -42607,22 +42762,22 @@ self: {
"breve" = callPackage
({ mkDerivation, aeson, base, binary, blaze-html, bytestring
- , configurator, cryptohash, directory, hashtables, http-types, mtl
- , random, Spock, Spock-core, text, tls, transformers, wai
- , wai-extra, wai-middleware-static, warp, warp-tls, xdg-basedir
+ , configurator, cryptohash, directory, hashtables, http-api-data
+ , mtl, random, servant, servant-blaze, servant-server
+ , streaming-commons, text, tls, wai, wai-extra, warp, warp-tls
}:
mkDerivation {
pname = "breve";
- version = "0.4.5.1";
- sha256 = "1db93l3lb09rsb6yh3pkbfpyh736a9ki0q1x8s8rcp4dsy79b3va";
+ version = "0.5.0.0";
+ sha256 = "1rdamkzy502lvz773lh7zjqw76in8v46218dfj4b5xsljkh605jm";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
executableHaskellDepends = [
aeson base binary blaze-html bytestring configurator cryptohash
- directory hashtables http-types mtl random Spock Spock-core text
- tls transformers wai wai-extra wai-middleware-static warp warp-tls
- xdg-basedir
+ directory hashtables http-api-data mtl random servant servant-blaze
+ servant-server streaming-commons text tls wai wai-extra warp
+ warp-tls
];
description = "a url shortener";
license = stdenv.lib.licenses.gpl3;
@@ -42670,7 +42825,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "brick_0_50" = callPackage
+ "brick_0_50_1" = callPackage
({ mkDerivation, base, bytestring, config-ini, containers
, contravariant, data-clist, deepseq, directory, dlist, filepath
, microlens, microlens-mtl, microlens-th, QuickCheck, stm
@@ -42679,10 +42834,8 @@ self: {
}:
mkDerivation {
pname = "brick";
- version = "0.50";
- sha256 = "0g2c420zpvjv8v3y5l4jhmml279d920k9d92yga8d86jymanbvy9";
- revision = "1";
- editedCabalFile = "0sknkg4fkmxs78ysk76xhrz5mixndazxnmw7ss1j560z8z368ry0";
+ version = "0.50.1";
+ sha256 = "0wv69pbs4xqfdqw9ag32fhqhmh8djxb14h8jpyblmykirlznx77y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -42944,17 +43097,55 @@ self: {
license = stdenv.lib.licenses.agpl3;
}) {};
+ "brittany_0_12_1_1" = callPackage
+ ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
+ , containers, czipwith, data-tree-print, deepseq, directory, extra
+ , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
+ , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty
+ , random, safe, semigroups, strict, syb, text, transformers
+ , uniplate, unsafe, yaml
+ }:
+ mkDerivation {
+ pname = "brittany";
+ version = "0.12.1.1";
+ sha256 = "0nw7ymdb7xam634w42l1xjgyvpla8grcg02aj19fscw2fn9gfh7z";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base butcher bytestring cmdargs containers czipwith
+ data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+ ghc-exactprint ghc-paths monad-memo mtl multistate
+ neat-interpolation pretty random safe semigroups strict syb text
+ transformers uniplate unsafe yaml
+ ];
+ executableHaskellDepends = [
+ aeson base butcher bytestring cmdargs containers czipwith
+ data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+ ghc-exactprint ghc-paths monad-memo mtl multistate
+ neat-interpolation pretty safe semigroups strict syb text
+ transformers uniplate unsafe yaml
+ ];
+ testHaskellDepends = [
+ aeson base butcher bytestring cmdargs containers czipwith
+ data-tree-print deepseq directory extra filepath ghc ghc-boot-th
+ ghc-exactprint ghc-paths hspec monad-memo mtl multistate
+ neat-interpolation parsec pretty safe semigroups strict syb text
+ transformers uniplate unsafe yaml
+ ];
+ description = "Haskell source code formatter";
+ license = stdenv.lib.licenses.agpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"broadcast-chan" = callPackage
- ({ mkDerivation, async, base, criterion, deepseq, stm
+ ({ mkDerivation, async, base, criterion, deepseq, stm, transformers
, unliftio-core
}:
mkDerivation {
pname = "broadcast-chan";
- version = "0.2.0.2";
- sha256 = "12ax37y9i3cs8wifz01lpq0awm9c235l5xkybf13ywvyk5svb0jv";
- revision = "1";
- editedCabalFile = "1sgifhdf9l8zkc0dddnkfy8f1bkry061vm67iich489fi8nlhfjn";
- libraryHaskellDepends = [ base unliftio-core ];
+ version = "0.2.1";
+ sha256 = "1pigxkncv71p51qnhxkag6hry14jp5s2skmxxbq2pmlrkj9j6rgs";
+ libraryHaskellDepends = [ base transformers unliftio-core ];
benchmarkHaskellDepends = [ async base criterion deepseq stm ];
description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
license = stdenv.lib.licenses.bsd3;
@@ -42966,8 +43157,8 @@ self: {
}:
mkDerivation {
pname = "broadcast-chan-conduit";
- version = "0.2.0.2";
- sha256 = "1xnf1ibgnzi4xbmfgrkkfg3pkig7v8vv0xpfhhcdmnybwm2yhlli";
+ version = "0.2.1";
+ sha256 = "1n9hqmdyw3v58kv8czbvvw5sfy4il3izqvn6rk8gak84hb51brxq";
libraryHaskellDepends = [
base broadcast-chan conduit resourcet transformers unliftio-core
];
@@ -42986,8 +43177,8 @@ self: {
}:
mkDerivation {
pname = "broadcast-chan-pipes";
- version = "0.2.0.2";
- sha256 = "1brr0vjrsd53qji8pmns003m3k1s28hvr2w8875hv2fznmm8x1g7";
+ version = "0.2.1";
+ sha256 = "0yifpd97cihagflmh0xs0wcl541k89hick4h9hh8zrah72g71fqr";
libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ];
testHaskellDepends = [
base broadcast-chan-tests containers foldl pipes pipes-safe
@@ -43006,10 +43197,8 @@ self: {
}:
mkDerivation {
pname = "broadcast-chan-tests";
- version = "0.2.0.2";
- sha256 = "1m7m06pd9vfvz0rfnylpr6pjvizxv31qizri3a400rkz3zanhkym";
- revision = "2";
- editedCabalFile = "0mfld36ppfyhx2w9a99gxa8qxnik0mnznl7bvqhbbaf1ayinhx91";
+ version = "0.2.1";
+ sha256 = "01vlhxxwhkakllffw7vdqr7fcsf9m7rkwkbs8x6d5dfwb5qxs6gk";
libraryHaskellDepends = [
async base broadcast-chan clock containers optparse-applicative
paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis
@@ -43171,6 +43360,8 @@ self: {
pname = "brotli-streams";
version = "0.0.0.0";
sha256 = "14jc1nhm50razsl99d95amdf4njf75dnzx8vqkihgrgp7qisyz3z";
+ revision = "1";
+ editedCabalFile = "1mpd5wf027g1f46a9a2g1wvsaxhr1asyj5f3k69vq3226dfisnn7";
libraryHaskellDepends = [ base brotli bytestring io-streams ];
testHaskellDepends = [
base bytestring HUnit io-streams QuickCheck test-framework
@@ -43209,8 +43400,8 @@ self: {
pname = "bsb-http-chunked";
version = "0.0.0.4";
sha256 = "0z0f18yc6zlwh29c6175ivfcin325lvi4irpvv0n3cmq7vi0k0ql";
- revision = "1";
- editedCabalFile = "07k9422yaw7rz66awmc20ni17xw2bd1pn48ja79c66d5va89f6wz";
+ revision = "2";
+ editedCabalFile = "0bz62lxdbnwkfr1d4ngm8xi4y1ndpdflbv71s6h43vp5lbd546hr";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
attoparsec base blaze-builder bytestring doctest hedgehog tasty
@@ -43525,6 +43716,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "buffet" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cassava
+ , containers, directory, filepath, language-docker, mustache
+ , optparse-applicative, parsec, random, split, tasty, tasty-hunit
+ , text, typed-process, unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "buffet";
+ version = "0.3.0";
+ sha256 = "1dsnbx148yrqikqx9qfxivz52szlqaah7q6dg80m87g997x428m7";
+ isLibrary = false;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty base bytestring cassava containers directory
+ filepath language-docker mustache optparse-applicative parsec
+ random split text typed-process unordered-containers vector yaml
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ aeson base bytestring directory filepath tasty tasty-hunit text
+ typed-process unordered-containers vector yaml
+ ];
+ doHaddock = false;
+ description = "Assembles many Dockerfiles in one";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"buffon" = callPackage
({ mkDerivation, base, monad-primitive, mwc-random
, mwc-random-monad, primitive, transformers
@@ -43821,8 +44041,8 @@ self: {
}:
mkDerivation {
pname = "bulmex";
- version = "2.1.0";
- sha256 = "0awdbwh9s5wdj05fnkzr7dpp2riipv9rlvknrcxf4dpxp9c72n1g";
+ version = "4.0.0";
+ sha256 = "0892prpi8hf8mkwr6n9228bfyji0wgdz9hyh619k20f6xim13ysc";
libraryHaskellDepends = [
aeson base bytestring containers generic-lens jsaddle jsaddle-dom
keycode lens network-uri reflex reflex-dom-core reflex-dom-helpers
@@ -44306,16 +44526,16 @@ self: {
}) {};
"byteslice" = callPackage
- ({ mkDerivation, base, primitive, primitive-addr, run-st, tasty
- , tasty-hunit, tasty-quickcheck
+ ({ mkDerivation, base, bytestring, primitive, primitive-addr
+ , run-st, tasty, tasty-hunit, tasty-quickcheck
}:
mkDerivation {
pname = "byteslice";
- version = "0.1.3.0";
- sha256 = "0lx69pcac7p20zs790x6ygqlgc3vljn4wjjp1jlcnp1jv6nhfwgf";
+ version = "0.1.4.0";
+ sha256 = "0kpamfmbgc31xha3p3rm2mqgngmdivkxl4z8lr0rjbil16r02nqr";
libraryHaskellDepends = [ base primitive primitive-addr run-st ];
testHaskellDepends = [
- base primitive tasty tasty-hunit tasty-quickcheck
+ base bytestring primitive tasty tasty-hunit tasty-quickcheck
];
description = "Slicing managed and unmanaged memory";
license = stdenv.lib.licenses.bsd3;
@@ -44324,19 +44544,23 @@ self: {
}) {};
"bytesmith" = callPackage
- ({ mkDerivation, base, byteslice, bytestring, contiguous, gauge
- , primitive, run-st, tasty, tasty-hunit, tasty-quickcheck
- , text-short
+ ({ mkDerivation, base, byte-order, byteslice, bytestring
+ , contiguous, gauge, primitive, run-st, tasty, tasty-hunit
+ , tasty-quickcheck, text-short, wide-word
}:
mkDerivation {
pname = "bytesmith";
- version = "0.3.0.0";
- sha256 = "0zwa0klj1slazsvd37l33p5j2ii3ab114ic5fvd10aic37y6w82s";
+ version = "0.3.1.0";
+ sha256 = "1wkwxb9ygc6hii90jr7cjbv4s5d0l4wv0197p9jn4lj7h4i79iqd";
+ revision = "1";
+ editedCabalFile = "13maddwkl9ajczvnrsnsa9f7w20fzq8il09xh9lqhwyrz9yak4ii";
libraryHaskellDepends = [
base byteslice bytestring contiguous primitive run-st text-short
+ wide-word
];
testHaskellDepends = [
- base byteslice primitive tasty tasty-hunit tasty-quickcheck
+ base byte-order byteslice primitive tasty tasty-hunit
+ tasty-quickcheck text-short wide-word
];
benchmarkHaskellDepends = [
base byteslice bytestring gauge primitive
@@ -44782,6 +45006,8 @@ self: {
pname = "bytestring-trie";
version = "0.2.5.0";
sha256 = "1jpynpyarikxhlc4ifdswvkj0ph9fd5d0vcxhjv0lrv0zwqvv488";
+ revision = "1";
+ editedCabalFile = "1qpv52ywp8r30s3m9qyjiqiwa6clg3zp095yhs2d4533amprryly";
libraryHaskellDepends = [ base binary bytestring ];
description = "An efficient finite map from (byte)strings to values";
license = stdenv.lib.licenses.bsd3;
@@ -45228,8 +45454,8 @@ self: {
}:
mkDerivation {
pname = "cabal-cache";
- version = "1.0.1.2";
- sha256 = "10njmjlg20rcn223581q013cdmmr2q5x1w62wz7gjq32n6l9fv4r";
+ version = "1.0.1.3";
+ sha256 = "03x5p2yz6vdrhl8dnmgc7phbsmrg7x51syg41i2hjcw9bm2js8wg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -45454,8 +45680,8 @@ self: {
}:
mkDerivation {
pname = "cabal-fmt";
- version = "0.1.1";
- sha256 = "07hx1s7l5zmh7vs2zmmm56msz2m7wnzn919mvnpypvrsswmmnnd9";
+ version = "0.1.2";
+ sha256 = "0h4qxbwykddbdbiw5j140v8cin5h4aqi260wd9fddpxdpkpmdrda";
isLibrary = false;
isExecutable = true;
libraryHaskellDepends = [
@@ -45557,6 +45783,8 @@ self: {
doCheck = false;
description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"cabal-info" = callPackage
@@ -45674,6 +45902,32 @@ self: {
broken = true;
}) {};
+ "cabal-install-parsers" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring
+ , binary, binary-instances, bytestring, Cabal, containers
+ , cryptohash-sha256, directory, filepath, lukko, network-uri
+ , parsec, pretty, tar, tasty, tasty-golden, tasty-hunit, text, time
+ , transformers, tree-diff
+ }:
+ mkDerivation {
+ pname = "cabal-install-parsers";
+ version = "0.2";
+ sha256 = "14bfiw8ddfm323a8870wazdb6rlyq52ykrhhm24vd2lxg61sn4aa";
+ libraryHaskellDepends = [
+ aeson base base16-bytestring binary binary-instances bytestring
+ Cabal containers cryptohash-sha256 directory filepath lukko
+ network-uri parsec pretty tar text time transformers
+ ];
+ testHaskellDepends = [
+ ansi-terminal base bytestring Cabal containers directory filepath
+ tasty tasty-golden tasty-hunit tree-diff
+ ];
+ description = "Utilities to work with cabal-install files";
+ license = "GPL-2.0-or-later AND BSD-3-Clause";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"cabal-lenses" = callPackage
({ mkDerivation, base, Cabal, lens, strict, system-fileio
, system-filepath, text, transformers, unordered-containers
@@ -45780,18 +46034,16 @@ self: {
}) {};
"cabal-plan" = callPackage
- ({ mkDerivation, aeson, ansi-terminal, base, base-compat
+ ({ mkDerivation, aeson, ansi-terminal, async, base, base-compat
, base16-bytestring, bytestring, containers, directory, filepath
- , mtl, optics-core, optparse-applicative, parsec, process-extras
+ , mtl, optics-core, optparse-applicative, parsec, process
, semialign, singleton-bool, text, these, topograph, transformers
, vector
}:
mkDerivation {
pname = "cabal-plan";
- version = "0.6.1.0";
- sha256 = "0jb50a45aky1jljl6g84h61wrirk6gh5pwk0m0pkhd1q7zj58jgi";
- revision = "1";
- editedCabalFile = "02krq0ibb4q2ypj7cp8yclc175a2hlaa9x5x3j3i8wjkf8pyyvx1";
+ version = "0.6.2.0";
+ sha256 = "0gwbyyj4xih9barg2c589v6z82s0gx98airs6icivg301khg9fzg";
configureFlags = [ "-fexe" ];
isLibrary = true;
isExecutable = true;
@@ -45800,9 +46052,9 @@ self: {
filepath text
];
executableHaskellDepends = [
- ansi-terminal base base-compat bytestring containers directory mtl
- optics-core optparse-applicative parsec process-extras semialign
- singleton-bool text these topograph transformers vector
+ ansi-terminal async base base-compat bytestring containers
+ directory mtl optics-core optparse-applicative parsec process
+ semialign singleton-bool text these topograph transformers vector
];
description = "Library and utility for processing cabal's plan.json file";
license = stdenv.lib.licenses.gpl2Plus;
@@ -45863,6 +46115,28 @@ self: {
broken = true;
}) {};
+ "cabal-rpm_1_0_2" = callPackage
+ ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+ , http-client, http-client-tls, http-conduit, optparse-applicative
+ , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix
+ }:
+ mkDerivation {
+ pname = "cabal-rpm";
+ version = "1.0.2";
+ sha256 = "03315wka46mqz090cijz1rk69i861nm6yc0jm6xjlgrbhi4ngmri";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring Cabal directory filepath http-client
+ http-client-tls http-conduit optparse-applicative process
+ simple-cabal simple-cmd simple-cmd-args time unix
+ ];
+ description = "RPM packaging tool for Haskell Cabal-based packages";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"cabal-scripts" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -46374,8 +46648,8 @@ self: {
}:
mkDerivation {
pname = "cache";
- version = "0.1.1.2";
- sha256 = "0b0jggcbnrs0pppn60kaggxkwmg0ri7b1i4j5613abgw8bj258s8";
+ version = "0.1.2.0";
+ sha256 = "12mxziwz8qn26v5xkp0bh13jqf9hd8pi9flm68nz82p15vhcs01s";
libraryHaskellDepends = [
base clock hashable stm transformers unordered-containers
];
@@ -46384,6 +46658,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "cache_0_1_3_0" = callPackage
+ ({ mkDerivation, base, clock, hashable, hspec, stm, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "cache";
+ version = "0.1.3.0";
+ sha256 = "0d75257kvjpnv95ja50x5cs77pj8ccfr0nh9q5gzvcps83qdksa2";
+ libraryHaskellDepends = [
+ base clock hashable stm transformers unordered-containers
+ ];
+ testHaskellDepends = [ base clock hspec stm transformers ];
+ description = "An in-memory key/value store with expiration support";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cached" = callPackage
({ mkDerivation, base, containers, directory, doctest, filepath
, protolude, QuickCheck, quickcheck-assertions, shake, text
@@ -46871,6 +47162,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "calenderweek" = callPackage
+ ({ mkDerivation, base, megaparsec, optparse-generic, text, time }:
+ mkDerivation {
+ pname = "calenderweek";
+ version = "1.0.0";
+ sha256 = "10lv7c74jrw8v06vaz8assgqlvrk0spn08sw0nvzz1q0x0zbbwff";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base megaparsec optparse-generic text time
+ ];
+ description = "Commandline tool to get week of the year";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"call" = callPackage
({ mkDerivation, base, bindings-portaudio, boundingboxes, colors
, containers, control-bool, deepseq, directory, filepath, free
@@ -46900,22 +47208,24 @@ self: {
"call-alloy" = callPackage
({ mkDerivation, base, bytestring, directory, file-embed, filepath
- , hashable, hspec, process, split
+ , hashable, hspec, process, split, unix
}:
mkDerivation {
pname = "call-alloy";
- version = "0.1.0.0";
- sha256 = "07wcrvi7ajdkbv054npn6nfqq7pnndpssqx3nshiqgmh90248lb8";
+ version = "0.1.0.2";
+ sha256 = "0blimzaambck8z4sy24s7d0l4v4hcaqxfbkidj2sjvgm0xidd2gb";
libraryHaskellDepends = [
base bytestring directory file-embed filepath hashable process
- split
+ split unix
];
testHaskellDepends = [
base bytestring directory file-embed filepath hashable hspec
- process split
+ process split unix
];
description = "A simple library to call Alloy given a specification";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"call-haskell-from-anything" = callPackage
@@ -47037,13 +47347,13 @@ self: {
}) {};
"can-i-haz" = callPackage
- ({ mkDerivation, base, deepseq, hspec, HUnit }:
+ ({ mkDerivation, base, deepseq, hspec, HUnit, mtl }:
mkDerivation {
pname = "can-i-haz";
- version = "0.2.1.0";
- sha256 = "0jkk0a02mdaicyp1k4c5zgycj157d9vpmahsqji8nld8npifpl48";
- libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base deepseq hspec HUnit ];
+ version = "0.3.0.0";
+ sha256 = "0m77szr91q8p7n9c91chafzypiadi565a4k3y949m1cd3r3b0pjr";
+ libraryHaskellDepends = [ base mtl ];
+ testHaskellDepends = [ base deepseq hspec HUnit mtl ];
description = "Generic implementation of the Has and CoHas patterns";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -47226,8 +47536,8 @@ self: {
pname = "cantor-pairing";
version = "0.1.1.0";
sha256 = "03vl7qd5962kr0mi4ymgmh667948rzqiq9f1ixcvycyjz8hz0yqw";
- revision = "2";
- editedCabalFile = "0vl4b3v7qzbsd93vb0flyd6xkpayji49il97d2a6v35cliph5yw2";
+ revision = "3";
+ editedCabalFile = "0rcjz2r4l4crxxda3hjpi5kkxrh4pgdrcbw29bj5w9a4jph0d0ld";
libraryHaskellDepends = [
arithmoi base containers integer-gmp integer-logarithms
];
@@ -48138,8 +48448,8 @@ self: {
}:
mkDerivation {
pname = "cassava-megaparsec";
- version = "2.0.0";
- sha256 = "0jwhvgfkgxpxp6cci9ahp3kryr4vaxbpqgjzf8ylr2592dm2irnf";
+ version = "2.0.1";
+ sha256 = "0q4skw98nzy6icmgpwqvgw0c5pqcgi25rf7nmwh2pksvv94pi3p3";
libraryHaskellDepends = [
base bytestring cassava megaparsec unordered-containers vector
];
@@ -48246,6 +48556,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "castagnoli" = callPackage
+ ({ mkDerivation, base, byteslice, bytestring, primitive
+ , primitive-slice, primitive-unlifted, text
+ }:
+ mkDerivation {
+ pname = "castagnoli";
+ version = "0.1.0.0";
+ sha256 = "10mznwl00lmx5zmha7w0p7yx406k0qvv74x6lcms4ynq4z5hi8fj";
+ revision = "1";
+ editedCabalFile = "1yp0c8klbf81m2v7qwj22l2yh0w6q6xgnk44zwxdkgpbsjghdp14";
+ libraryHaskellDepends = [
+ base byteslice primitive primitive-slice primitive-unlifted
+ ];
+ testHaskellDepends = [ base bytestring primitive text ];
+ description = "Portable CRC-32C";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {primitive-slice = null;};
+
"caster" = callPackage
({ mkDerivation, base, bytestring, directory, fast-builder, mtl
, QuickCheck, quickcheck-instances, stm, tasty, tasty-discover
@@ -50097,24 +50427,6 @@ self: {
}) {};
"chiphunk" = callPackage
- ({ mkDerivation, base, c2hs, hashable, safe-exceptions, StateVar
- , vector-space
- }:
- mkDerivation {
- pname = "chiphunk";
- version = "0.1.2.0";
- sha256 = "0bdmvsspbnyqqf4bp8g8xggly1xs2yglh60y63633h27qdy2062b";
- libraryHaskellDepends = [
- base hashable safe-exceptions StateVar vector-space
- ];
- libraryToolDepends = [ c2hs ];
- description = "Haskell bindings for Chipmunk2D physics engine";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {};
-
- "chiphunk_0_1_2_1" = callPackage
({ mkDerivation, base, c2hs, hashable, safe-exceptions, StateVar
, vector-space
}:
@@ -50473,10 +50785,8 @@ self: {
}:
mkDerivation {
pname = "chronos";
- version = "1.0.7";
- sha256 = "0yqk43ax20sk3rpxd5s857ivbgigvd5qdq4axawzmqr2na6jlikx";
- revision = "1";
- editedCabalFile = "0rf2rcdx7cvx1aa6yb9khbgkrh08v4l52sg1w89qz0245dalw14r";
+ version = "1.0.9";
+ sha256 = "103vwpdjqk1csw8famc62ba5ck9s6yd8w5hfa6a0qj3bx9vmf9qv";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock hashable primitive
semigroups text torsor vector
@@ -50493,6 +50803,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "chronos_1_1" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+ , deepseq, doctest, hashable, HUnit, old-locale, primitive
+ , QuickCheck, semigroups, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, text, thyme, time, torsor, vector
+ }:
+ mkDerivation {
+ pname = "chronos";
+ version = "1.1";
+ sha256 = "0g41hchir6rxfnd8halg49y80pc9dr38k7b7cik18gqdasswwg6c";
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring hashable primitive semigroups text
+ torsor vector
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring doctest HUnit QuickCheck test-framework
+ test-framework-hunit test-framework-quickcheck2 text torsor
+ ];
+ benchmarkHaskellDepends = [
+ attoparsec base bytestring criterion deepseq old-locale QuickCheck
+ text thyme time vector
+ ];
+ description = "A performant time library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"chronos-bench" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, chronos
, containers, deepseq, optparse-applicative, process, terminal-size
@@ -50517,8 +50854,8 @@ self: {
({ mkDerivation, base, Cabal, chs-deps }:
mkDerivation {
pname = "chs-cabal";
- version = "0.1.0.1";
- sha256 = "0s734zls7gjihw0l27mfxyzbphq4n443vy08d47s3znri4fn6r58";
+ version = "0.1.1.0";
+ sha256 = "0zan47md9zivzc1gd1j1g0200n8d0ffx4dcmkd9vriqjsdwhqvl5";
libraryHaskellDepends = [ base Cabal chs-deps ];
description = "Cabal with c2hs dependencies";
license = stdenv.lib.licenses.bsd3;
@@ -50926,8 +51263,8 @@ self: {
pname = "circle-packing";
version = "0.1.0.6";
sha256 = "06z8irwrjxxgk5xqlpy6a9mjl44kp9pgx2xpslhgxrd31nll9vk4";
- revision = "2";
- editedCabalFile = "1ag213lv6yfzxdc4ghbywy165qblnqx5b3j9d23kc6fcyf19nfyk";
+ revision = "3";
+ editedCabalFile = "0rcv84a6bp6dll8df4pfmjl03cm87hrlrf6mbig26ifp9ql4542m";
libraryHaskellDepends = [ base ];
description = "Simple heuristic for packing discs of varying radii in a circle";
license = stdenv.lib.licenses.bsd3;
@@ -51744,15 +52081,13 @@ self: {
({ mkDerivation, base, hspec, hspec-discover, mtl, text }:
mkDerivation {
pname = "clay";
- version = "0.13.1";
- sha256 = "18r8lgzyscxnw6xdxg0jxvp2977i02fjh3n5p89fnd8qrh0r2kl4";
+ version = "0.13.3";
+ sha256 = "192lsbyj6azjs2ygpx4i47fyr8zfmvwcas8mia07ndqglk2c9csx";
libraryHaskellDepends = [ base mtl text ];
testHaskellDepends = [ base hspec hspec-discover mtl text ];
testToolDepends = [ hspec-discover ];
description = "CSS preprocessor as embedded Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"clckwrks" = callPackage
@@ -51769,8 +52104,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks";
- version = "0.25.2";
- sha256 = "087k0n6ri0pg5wmjnw3gkjaz5d627519vby9kmiagck7id7f89q9";
+ version = "0.25.4";
+ sha256 = "0mlrkyhs095b8bwsk4mjq4wys6ydn4m9nds37lxqnw6qzl6rk5hl";
enableSeparateDataOutput = true;
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
@@ -51798,8 +52133,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks-cli";
- version = "0.3.0";
- sha256 = "0ardhl27n3al945s88dmygnw42ki5sn23s59rkhbs4pdyp9yawhs";
+ version = "0.3.0.1";
+ sha256 = "0f44ndvnkivwc72lxfr779kyn20g7f4wy3prqazdhk47xvl1fps6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -51926,8 +52261,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks-plugin-media";
- version = "0.6.16.6";
- sha256 = "05gmr0y5ygsybmdp1k2xcfhbn7wix9mrwvwsv4x0has9l8xc92q1";
+ version = "0.6.16.8";
+ sha256 = "0l6rb5gjag9mxcn067yp3h0bd37jg18p3sg79gkf2pzkxyzhgwqk";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
acid-state attoparsec base blaze-html cereal clckwrks containers
@@ -51953,8 +52288,8 @@ self: {
}:
mkDerivation {
pname = "clckwrks-plugin-page";
- version = "0.4.3.18";
- sha256 = "0fgz0rxzkbavzqci4kcav1pljkhdy1mgmf3mldbxp8f88pr5lm42";
+ version = "0.4.3.19";
+ sha256 = "06lvr3sq5slcfc1r3vmip9flh5dn50mz6ar7x11zk4dm365g4vhk";
setupHaskellDepends = [ base Cabal ];
libraryHaskellDepends = [
acid-state aeson attoparsec base clckwrks containers directory
@@ -51977,14 +52312,13 @@ self: {
}:
mkDerivation {
pname = "clckwrks-theme-bootstrap";
- version = "0.4.2.1";
- sha256 = "1mkqi3qx6k86d2xr4cyxg0ym5c71ip4ijgg6mg20gf3jkjjzvha4";
+ version = "0.4.2.2";
+ sha256 = "0sa3k34m1kf6r7i42rfg5v3g1m9drisfnn2bvlfcbyk8sna7mf80";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
mtl text web-plugins
];
- libraryToolDepends = [ hsx2hs ];
description = "simple bootstrap based template for clckwrks";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -52153,8 +52487,8 @@ self: {
}:
mkDerivation {
pname = "cli-setup";
- version = "0.2.0.7";
- sha256 = "1fp1m48rpgnq3db4nvcnry3h46m7k07g8blivv0mb62w8fdm9smq";
+ version = "0.2.1.2";
+ sha256 = "0fh9lp8r73mslhwxcjpfzvm0j0qbq0prr4bkkwq2v16izg14ccda";
libraryHaskellDepends = [
base bytestring directory file-embed process
];
@@ -52612,13 +52946,15 @@ self: {
}:
mkDerivation {
pname = "cloudi";
- version = "1.7.5";
- sha256 = "08cklswxmd7x0zxkkrlwh1qy57jbqp0dv3x57xskxpmwyhws2vgs";
+ version = "1.8.0";
+ sha256 = "0j98dbyhc845y26abyp8sdcajpxvpsjcqrmcls4jnb4bhnz21jkc";
libraryHaskellDepends = [
array base binary bytestring containers network time unix zlib
];
description = "Haskell CloudI API";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"cloudyfs" = callPackage
@@ -52926,8 +53262,8 @@ self: {
}:
mkDerivation {
pname = "cmark-gfm";
- version = "0.2.0";
- sha256 = "03xflrkyw84qv3yjly5iks9311bqv5cmrmsylr763v4ph0fn7rjq";
+ version = "0.2.1";
+ sha256 = "1qbhcirg7a0r68l3ifq8q9clnkai5hyhk62jb232bjplrl6y4c23";
libraryHaskellDepends = [ base bytestring text ];
testHaskellDepends = [ base HUnit text ];
benchmarkHaskellDepends = [
@@ -53129,6 +53465,18 @@ self: {
broken = true;
}) {};
+ "cmf" = callPackage
+ ({ mkDerivation, base, containers, hedgehog }:
+ mkDerivation {
+ pname = "cmf";
+ version = "0.1";
+ sha256 = "16d83x6qggifljm7n8sqlawy79iz7lkrb6vknrr825wa0zg1bc49";
+ libraryHaskellDepends = [ base containers ];
+ testHaskellDepends = [ base containers hedgehog ];
+ description = "(C)oncurrent (M)onoidal (F)olds";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"cml" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -53396,6 +53744,81 @@ self: {
broken = true;
}) {};
+ "cobot" = callPackage
+ ({ mkDerivation, array, base, bytestring, clock, containers
+ , criterion, deepseq, hspec, lens, linear, megaparsec, mtl
+ , parallel, random, split, template-haskell, text
+ }:
+ mkDerivation {
+ pname = "cobot";
+ version = "0.1.1.0";
+ sha256 = "17cl8dh4y7wyas6afslb1d27ibjc2633dcyx6pc6zng2p36m83l9";
+ libraryHaskellDepends = [
+ array base bytestring containers deepseq lens linear megaparsec mtl
+ split template-haskell text
+ ];
+ testHaskellDepends = [
+ array base bytestring containers deepseq hspec lens linear
+ megaparsec mtl split template-haskell text
+ ];
+ benchmarkHaskellDepends = [
+ array base bytestring clock containers criterion deepseq lens
+ linear megaparsec mtl parallel random split template-haskell text
+ ];
+ description = "Computational biology toolkit to collaborate with researchers in constructive protein engineering";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "cobot-io" = callPackage
+ ({ mkDerivation, array, attoparsec, base, binary, bytestring
+ , containers, data-msgpack, deepseq, directory, hspec, http-conduit
+ , hyraxAbif, lens, linear, mtl, neat-interpolation, QuickCheck
+ , split, text, vector
+ }:
+ mkDerivation {
+ pname = "cobot-io";
+ version = "0.1.2.3";
+ sha256 = "0z4im9z5yi18kdw99d50zbcala619hba3iwka7ny5krladnz75ha";
+ libraryHaskellDepends = [
+ array attoparsec base binary bytestring containers data-msgpack
+ deepseq http-conduit hyraxAbif lens linear mtl split text vector
+ ];
+ testHaskellDepends = [
+ array attoparsec base binary bytestring containers data-msgpack
+ deepseq directory hspec http-conduit hyraxAbif lens linear mtl
+ neat-interpolation QuickCheck split text vector
+ ];
+ description = "Biological data file formats and IO";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "cobot-tools" = callPackage
+ ({ mkDerivation, array, base, bytestring, cobot, containers
+ , data-default, data-msgpack, deepseq, hspec, lens, mtl
+ , neat-interpolation, QuickCheck, random, regex-tdfa, RNA, text
+ }:
+ mkDerivation {
+ pname = "cobot-tools";
+ version = "0.1.2.1";
+ sha256 = "0qd3w9y3fps7kkpkvdh3wd54mm9z6ikr16f9f8jvn2gza0xc4l0m";
+ libraryHaskellDepends = [
+ array base bytestring cobot containers data-default data-msgpack
+ deepseq lens mtl regex-tdfa text
+ ];
+ librarySystemDepends = [ RNA ];
+ testHaskellDepends = [
+ array base bytestring cobot containers data-default data-msgpack
+ deepseq hspec lens mtl neat-interpolation QuickCheck random
+ regex-tdfa text
+ ];
+ description = "Biological data file formats and IO";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {RNA = null;};
+
"code-builder" = callPackage
({ mkDerivation, base, containers }:
mkDerivation {
@@ -53580,17 +54003,26 @@ self: {
}) {};
"codeworld-api" = callPackage
- ({ mkDerivation, base, blank-canvas, cereal, cereal-text
- , containers, ghc-prim, hashable, mtl, random, random-shuffle, text
- , time
+ ({ mkDerivation, aeson, base, base64-bytestring, blank-canvas
+ , bytestring, cereal, cereal-text, containers, deepseq
+ , dependent-sum, ghc-prim, hashable, HUnit, monad-loops, mtl
+ , random, ref-tf, reflex, template-haskell, test-framework
+ , test-framework-hunit, text, time
}:
mkDerivation {
pname = "codeworld-api";
- version = "0.3.1";
- sha256 = "13kggrhm7hvkh3c9pilzgsb7yhkdbyxzj6jmfxqf4lskws17h0bg";
+ version = "0.4.0";
+ sha256 = "0smw8xjigq1sl3rppbhvifsrzjfbhy4d41m0rpjf1d1ahvby64ja";
libraryHaskellDepends = [
- base blank-canvas cereal cereal-text containers ghc-prim hashable
- mtl random random-shuffle text time
+ aeson base base64-bytestring blank-canvas bytestring cereal
+ cereal-text containers deepseq dependent-sum ghc-prim hashable
+ monad-loops mtl random ref-tf reflex template-haskell text time
+ ];
+ testHaskellDepends = [
+ aeson base base64-bytestring blank-canvas bytestring cereal
+ cereal-text containers deepseq dependent-sum ghc-prim hashable
+ HUnit monad-loops mtl random ref-tf reflex template-haskell
+ test-framework test-framework-hunit text time
];
description = "Graphics library for CodeWorld";
license = stdenv.lib.licenses.asl20;
@@ -54776,8 +55208,8 @@ self: {
}:
mkDerivation {
pname = "comonad";
- version = "5.0.5";
- sha256 = "1l7snp2mszgnjgd0nc9kzfyd13vla0rlazqi03rwx2akcxk14n3c";
+ version = "5.0.6";
+ sha256 = "1blgp2nm9cvnsdi2bmkmly5m0gz91npjvf1i5j4pnx6imhbb1kvp";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base containers distributive tagged transformers
@@ -54968,6 +55400,24 @@ self: {
broken = true;
}) {};
+ "compact-word-vectors" = callPackage
+ ({ mkDerivation, base, primitive, QuickCheck, random, tasty
+ , tasty-hunit, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "compact-word-vectors";
+ version = "0.2.0.1";
+ sha256 = "0ix8l6vvnf62vp6716gmypwqsrs6x5pzcx5yfj24bn4gk0xak3lm";
+ libraryHaskellDepends = [ base primitive ];
+ testHaskellDepends = [
+ base primitive QuickCheck random tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "Small vectors of small integers stored very compactly";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"compactable" = callPackage
({ mkDerivation, base, containers, transformers, vector }:
mkDerivation {
@@ -55112,6 +55562,8 @@ self: {
pname = "compensated";
version = "0.7.3";
sha256 = "089xj9j3gznxz66ywapjd9kasjcnv197ipj4azgjfbpl2y11l8dg";
+ revision = "1";
+ editedCabalFile = "1ax4jq2hp5737yvi3lxvyj3c4bzkg10h4c7w3nw0hgfcn1ng49kc";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base bifunctors binary bytes cereal comonad deepseq distributive
@@ -55124,6 +55576,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "compensated_0_8" = callPackage
+ ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
+ , cabal-doctest, cereal, comonad, deepseq, distributive, doctest
+ , generic-deriving, hashable, lens, log-domain, safecopy
+ , semigroupoids, semigroups, simple-reflect, vector
+ }:
+ mkDerivation {
+ pname = "compensated";
+ version = "0.8";
+ sha256 = "1jvvsa1dqsds6ri6f746y47flwrlfxnc7jsgic2m6kvf1b700qr9";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base bifunctors binary bytes cereal comonad deepseq distributive
+ hashable lens log-domain safecopy semigroupoids semigroups vector
+ ];
+ testHaskellDepends = [
+ base doctest generic-deriving semigroups simple-reflect
+ ];
+ description = "Compensated floating-point arithmetic";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"competition" = callPackage
({ mkDerivation, base, filepath, parsec }:
mkDerivation {
@@ -55940,14 +56415,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "concurrency_1_8_0_0" = callPackage
+ "concurrency_1_8_1_0" = callPackage
({ mkDerivation, array, atomic-primops, base, exceptions
, monad-control, mtl, stm, transformers
}:
mkDerivation {
pname = "concurrency";
- version = "1.8.0.0";
- sha256 = "091nv78c4cfcrg4hwxhn97l0xr5x2n4pfh802ysxmn2zvnm9fbf4";
+ version = "1.8.1.0";
+ sha256 = "0nw5i85lzh03ppcprzpvrlp3bmdam1z50bp7ddq9mp2ycyjbvrp5";
libraryHaskellDepends = [
array atomic-primops base exceptions monad-control mtl stm
transformers
@@ -57498,12 +57973,14 @@ self: {
}:
mkDerivation {
pname = "connections";
- version = "0.0.2";
- sha256 = "06z83z172c0p0k8wycjfr26dd9nq2dgg6pjp1v8m3iy4dpmar7fq";
+ version = "0.0.2.1";
+ sha256 = "0pjvxy0167gl6yki2cvjlynzw7biifng82ybnxjmp1b4w7il2qdm";
libraryHaskellDepends = [ base containers property semigroupoids ];
testHaskellDepends = [ base hedgehog property ];
description = "Partial orders & Galois connections";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"consistent" = callPackage
@@ -57720,8 +58197,8 @@ self: {
({ mkDerivation, base, category, unconstrained }:
mkDerivation {
pname = "constraint";
- version = "0.1.3.0";
- sha256 = "0yp09vg9hx5p7ncyh8h6mhcl14kanhhjldyn892lmp0jmlm7flyy";
+ version = "0.1.4.0";
+ sha256 = "0cdncdzpgyr9a0v213g9f6fqfd4311j5rg84gh85xynp8hhh0rr4";
libraryHaskellDepends = [ base category unconstrained ];
description = "Reified constraints";
license = stdenv.lib.licenses.bsd3;
@@ -57770,8 +58247,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "constraint-tuples";
- version = "0.1.1";
- sha256 = "0jml9sqgmfz3yqpd8g7k0ki1n036a6ws4m5ywbjmcyiz6gr52czl";
+ version = "0.1.2";
+ sha256 = "16f9y0q771f3mc38g8jpr875c8grjav6sg9lwbhg7nmcvcczwqk2";
libraryHaskellDepends = [ base ];
description = "Partially applicable constraint tuples";
license = stdenv.lib.licenses.bsd3;
@@ -57943,6 +58420,8 @@ self: {
pname = "consumers";
version = "2.2.0.1";
sha256 = "14gs07nl759qfnmi44pyhj24xqmd2xl3ikwhl8s5zykavdpjaimx";
+ revision = "1";
+ editedCabalFile = "1rh1hk1zr0yd82hsam8fjjs6jsssk49lvaasd3dqyx6d4nl1y63i";
libraryHaskellDepends = [
base containers exceptions extra hpqtypes lifted-base
lifted-threads log-base monad-control monad-time mtl stm time
@@ -58308,24 +58787,6 @@ self: {
}) {};
"contravariant-extras" = callPackage
- ({ mkDerivation, base, base-prelude, contravariant, semigroups
- , template-haskell, tuple-th
- }:
- mkDerivation {
- pname = "contravariant-extras";
- version = "0.3.4";
- sha256 = "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n";
- revision = "1";
- editedCabalFile = "1h2955ahga6i4fn7k8v66l03v77p6fhsac6ck8gpabkc08ij60wp";
- libraryHaskellDepends = [
- base base-prelude contravariant semigroups template-haskell
- tuple-th
- ];
- description = "Extras for the \"contravariant\" package";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "contravariant-extras_0_3_5" = callPackage
({ mkDerivation, base, base-prelude, contravariant, semigroups
, template-haskell, tuple-th
}:
@@ -58339,7 +58800,6 @@ self: {
];
description = "Extras for the \"contravariant\" package";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"control" = callPackage
@@ -58810,8 +59270,8 @@ self: {
}:
mkDerivation {
pname = "cookie";
- version = "0.4.4";
- sha256 = "1qy09i0jh2z9i9avy2khf8a8afq4fqgnv0fyrszgfg4kmq2fsi9j";
+ version = "0.4.5";
+ sha256 = "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh";
libraryHaskellDepends = [
base bytestring data-default-class deepseq text time
];
@@ -58855,12 +59315,15 @@ self: {
}:
mkDerivation {
pname = "copilot";
- version = "3.0.1";
- sha256 = "0sfvrk8ik6zaim6xlkvlnz3rnrqbiqvq7i6yxjiba74qx5w8yv4m";
+ version = "3.1";
+ sha256 = "1dw7bkmadwsncd39pkngaxglfsnrnc9km7y8ld0l9bkiiw136x2w";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
base copilot-c99 copilot-core copilot-language copilot-libraries
copilot-theorem directory filepath optparse-applicative
];
+ executableHaskellDepends = [ base copilot-c99 copilot-libraries ];
description = "A stream DSL for writing embedded C programs";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -58874,8 +59337,8 @@ self: {
}:
mkDerivation {
pname = "copilot-c99";
- version = "3.0.2";
- sha256 = "02987kxwsrxcjicgfnj55prabiv12y5d1s82nr34kk3scrlixl1y";
+ version = "3.1";
+ sha256 = "1cwypmis5dcdzjasq03wcas4lnml7l4a4ymw1v55aybfmz94mxc3";
libraryHaskellDepends = [
base containers copilot-core directory filepath language-c99
language-c99-simple language-c99-util mtl pretty
@@ -58903,14 +59366,12 @@ self: {
}) {};
"copilot-core" = callPackage
- ({ mkDerivation, base, containers, dlist, mtl, pretty, random }:
+ ({ mkDerivation, base, containers, dlist, mtl, pretty }:
mkDerivation {
pname = "copilot-core";
- version = "3.0.1";
- sha256 = "0gq55db39fsg3kim83s86nw58f9wbg59nlrhi4ic70864iv55zs8";
- libraryHaskellDepends = [
- base containers dlist mtl pretty random
- ];
+ version = "3.1";
+ sha256 = "08xz5s0b2fd5igja5wiaq93ignx6bsf942rg4hy42fmh4c03hylp";
+ libraryHaskellDepends = [ base containers dlist mtl pretty ];
description = "An intermediate representation for Copilot";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -58921,8 +59382,8 @@ self: {
}:
mkDerivation {
pname = "copilot-language";
- version = "3.0.1";
- sha256 = "1vx656vdjvdbsd3zv5cpb9xjvj85ylfqbbk8iibkbdgbq6sm11f6";
+ version = "3.1";
+ sha256 = "0hdk8418l30vz9lv7c4bzh8m5gn8knpvg296b14n66si9g36qglp";
libraryHaskellDepends = [
array base containers copilot-core copilot-theorem data-reify
ghc-prim mtl
@@ -58939,8 +59400,8 @@ self: {
}:
mkDerivation {
pname = "copilot-libraries";
- version = "3.0";
- sha256 = "0xrv37m770qnc722iv5x67kjic11q2sd1bcx2b0gr93p54frbjs4";
+ version = "3.1";
+ sha256 = "094hjzg22b55n4kv89ccr7pbgqpbd0z8f5myn93nyw6yqpmpp30v";
libraryHaskellDepends = [
array base containers copilot-language data-reify mtl parsec
];
@@ -58974,8 +59435,8 @@ self: {
}:
mkDerivation {
pname = "copilot-theorem";
- version = "3.0";
- sha256 = "1h8gjlfhl473d6h8zafmqv3dzdhmgpyp8bsvysfzb7s2ga5hwnrq";
+ version = "3.1";
+ sha256 = "15vnl5lg9s6h9s98f1nvva3ab0gdn3a5314mxdfxxa53ywmiq2a0";
libraryHaskellDepends = [
ansi-terminal base bimap containers copilot-core data-default
directory mtl parsec pretty process random transformers xml
@@ -59046,8 +59507,8 @@ self: {
}:
mkDerivation {
pname = "core-data";
- version = "0.2.0.0";
- sha256 = "1lzvs99qqw8nvgqqz080zdsxl5vdxdmnffxl8s26c7p41izycp5n";
+ version = "0.2.1.4";
+ sha256 = "1arrw5xbzxpwqzpxcyw13lv4sazn5pzv448crw54284kyi798hc3";
libraryHaskellDepends = [
aeson base bytestring containers core-text hashable prettyprinter
prettyprinter-ansi-terminal scientific text unordered-containers
@@ -59057,25 +59518,6 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "core-data_0_2_1_0" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, core-text
- , hashable, prettyprinter, prettyprinter-ansi-terminal, scientific
- , text, unordered-containers, vector
- }:
- mkDerivation {
- pname = "core-data";
- version = "0.2.1.0";
- sha256 = "1d4sf0383kcc7wzy1bld1hlagf9g934bwnx6xdvj45grdkj8l787";
- libraryHaskellDepends = [
- aeson base bytestring containers core-text hashable prettyprinter
- prettyprinter-ansi-terminal scientific text unordered-containers
- vector
- ];
- description = "Convenience wrappers around common data structures and encodings";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"core-haskell" = callPackage
({ mkDerivation, base, haskeline, haskell-src-exts, hint }:
mkDerivation {
@@ -59102,8 +59544,8 @@ self: {
}:
mkDerivation {
pname = "core-program";
- version = "0.2.2.0";
- sha256 = "1k92rj2y48hdr844rnp1wqksm1blq7jahxfqqq21f252vyjj06pq";
+ version = "0.2.2.4";
+ sha256 = "0l30qvn118bb6vj39ca6wl7ynhf7hkwq7pbh60vhcmwcr20rj4b1";
libraryHaskellDepends = [
async base bytestring chronologique core-data core-text directory
exceptions filepath hashable hinotify hourglass mtl prettyprinter
@@ -59123,32 +59565,14 @@ self: {
}:
mkDerivation {
pname = "core-text";
- version = "0.2.0.0";
- sha256 = "1rkbz43vnjv8vv68xh98qcp59lmahw4sdpfnhvgrh92wj0namifk";
- libraryHaskellDepends = [
- base bytestring deepseq fingertree hashable prettyprinter
- prettyprinter-ansi-terminal template-haskell text text-short
- ];
- description = "A text type based on a finger tree over UTF-8 fragments";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "core-text_0_2_2_1" = callPackage
- ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable
- , prettyprinter, prettyprinter-ansi-terminal, template-haskell
- , text, text-short
- }:
- mkDerivation {
- pname = "core-text";
- version = "0.2.2.1";
- sha256 = "0bql1ksfblnplhj4rbzsjwjbdqdy3z28c51i63q6vhy20mr3bxqk";
+ version = "0.2.2.4";
+ sha256 = "1lfxphm5y9irrs225vr0gbvb129lxzfr0xjxy23dz6d0cc3pr1ph";
libraryHaskellDepends = [
base bytestring deepseq fingertree hashable prettyprinter
prettyprinter-ansi-terminal template-haskell text text-short
];
description = "A rope type based on a finger tree over UTF-8 fragments";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"corebot-bliki" = callPackage
@@ -59460,6 +59884,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "country_0_2" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
+ , ghc-prim, hashable, primitive, QuickCheck, quickcheck-classes
+ , scientific, tasty, tasty-quickcheck, text, unordered-containers
+ }:
+ mkDerivation {
+ pname = "country";
+ version = "0.2";
+ sha256 = "09qimpqgg4zhiiyw13n5r1ckswr5x3m8k1hdx9hwhd52j45zhbkg";
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring deepseq ghc-prim hashable
+ primitive scientific text unordered-containers
+ ];
+ testHaskellDepends = [
+ base QuickCheck quickcheck-classes tasty tasty-quickcheck
+ ];
+ description = "Country data type and functions";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"country-codes" = callPackage
({ mkDerivation, aeson, base, deepseq, HTF, HUnit, shakespeare
, text
@@ -59734,8 +60179,8 @@ self: {
({ mkDerivation, base, containers, directory, parallel }:
mkDerivation {
pname = "cpsa";
- version = "3.6.4";
- sha256 = "05q3di6p3xr3qmw36bpbc4dzhjrfl7vf3v44i5v7shxpma2qylpf";
+ version = "3.6.5";
+ sha256 = "03qf4gd28097ra0vndizxxdqvqdgl4p3cl41w9r0rfcw4367bzjf";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -59819,8 +60264,8 @@ self: {
}:
mkDerivation {
pname = "cql";
- version = "4.0.1";
- sha256 = "021qaz6qvbdp76gdyfcs07wnnq6k6r1cmqky0g3giinjdrm4qac9";
+ version = "4.0.2";
+ sha256 = "0b6806ahmg4yacx5wc4v53gihhkwywajhqm13kb11nxabww3lapl";
libraryHaskellDepends = [
base bytestring cereal containers Decimal iproute network
template-haskell text time transformers uuid vector
@@ -60398,19 +60843,17 @@ self: {
}) {};
"crf-chain1" = callPackage
- ({ mkDerivation, array, base, binary, containers, data-lens
+ ({ mkDerivation, array, base, binary, containers, data-lens-light
, logfloat, monad-codec, parallel, random, sgd, vector
- , vector-binary, vector-th-unbox
+ , vector-binary-instances, vector-th-unbox
}:
mkDerivation {
pname = "crf-chain1";
- version = "0.2.2";
- sha256 = "0v0mmpvn9qma3xz92s13ywk9p5czxzshh2rf06hb2zqqq5m6iwhq";
- revision = "1";
- editedCabalFile = "16h297h22wfkq8sgvfxm4gv7wi7pz7pl481b6lgk04rw23bgd2x2";
+ version = "0.2.3";
+ sha256 = "0k805zqjqixicf4s0gs04jc1gijckcnrb3w43sykhhsbz194p0s2";
libraryHaskellDepends = [
- array base binary containers data-lens logfloat monad-codec
- parallel random sgd vector vector-binary vector-th-unbox
+ array base binary containers data-lens-light logfloat monad-codec
+ parallel random sgd vector vector-binary-instances vector-th-unbox
];
description = "First-order, linear-chain conditional random fields";
license = stdenv.lib.licenses.bsd3;
@@ -60964,6 +61407,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "crypto-keys-ssh" = callPackage
+ ({ mkDerivation, base, base64-bytestring, binary, bytestring }:
+ mkDerivation {
+ pname = "crypto-keys-ssh";
+ version = "0.1.0.0";
+ sha256 = "17r15w7rw6klcw5nlq6acka7rq3kba3vikwggb2fssr8x7wfrm5r";
+ libraryHaskellDepends = [
+ base base64-bytestring binary bytestring
+ ];
+ description = "Like crypto-pubkey-openssh but not dependent on any specific crypto library";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"crypto-multihash" = callPackage
({ mkDerivation, base, base58-bytestring, bytestring, containers
, cryptonite, hspec, memory, QuickCheck, string-conversions
@@ -62205,6 +62661,8 @@ self: {
pname = "cue-sheet";
version = "2.0.1";
sha256 = "0papll3xcq2ipmya61jr71gf3zx2swmys829x5sbz7lv6abj9r3i";
+ revision = "1";
+ editedCabalFile = "0md9051a0jp4vkss15dyyf1w7ylpqmvzfdj9xb1rgj95s1x7cx2g";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers exceptions megaparsec mtl QuickCheck
@@ -62405,8 +62863,8 @@ self: {
}:
mkDerivation {
pname = "curry-base";
- version = "1.1.0";
- sha256 = "1hxac2mx7irphcyhljwivx1w6j6li0s7gl54yb50na6qpna7arqg";
+ version = "1.1.1";
+ sha256 = "0dczgya46jk80j8b7sswjcck64hzw7fifipixnhylhlfvd1cqdlb";
libraryHaskellDepends = [
base containers directory extra filepath mtl parsec pretty time
transformers
@@ -62417,24 +62875,26 @@ self: {
}) {};
"curry-frontend" = callPackage
- ({ mkDerivation, base, Cabal, containers, curry-base, directory
- , extra, filepath, mtl, network-uri, pretty, process, set-extra
- , transformers
+ ({ mkDerivation, base, bytestring, Cabal, containers, curry-base
+ , directory, extra, file-embed, filepath, mtl, network-uri, pretty
+ , process, set-extra, template-haskell, transformers
}:
mkDerivation {
pname = "curry-frontend";
- version = "1.0.3";
- sha256 = "0dqmmvn6iziyzdmig1gbcpdpbpg1hjp57pldzcv03fm2bjhq0a4q";
+ version = "1.0.4";
+ sha256 = "1dfljqyrp9w0sw3zmyy9rglpnjv14qj8ky1yjslmiaanjnl0m07b";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base containers curry-base directory extra filepath mtl network-uri
- pretty process set-extra transformers
+ base bytestring containers curry-base directory extra file-embed
+ filepath mtl network-uri pretty process set-extra template-haskell
+ transformers
];
executableHaskellDepends = [
- base containers curry-base directory extra filepath mtl network-uri
- pretty process set-extra transformers
+ base bytestring containers curry-base directory extra file-embed
+ filepath mtl network-uri pretty process set-extra template-haskell
+ transformers
];
testHaskellDepends = [ base Cabal curry-base filepath ];
description = "Compile the functional logic language Curry to several intermediate formats";
@@ -63925,6 +64385,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "data-diverse_4_7_0_0" = callPackage
+ ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
+ , hspec, tagged
+ }:
+ mkDerivation {
+ pname = "data-diverse";
+ version = "4.7.0.0";
+ sha256 = "0ccbb8kf2spaa2h6k10y26zzaij1w28vrifhc8c1ljlvsmc9dkf3";
+ libraryHaskellDepends = [
+ base containers deepseq ghc-prim tagged
+ ];
+ testHaskellDepends = [ base hspec tagged ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "Extensible records and polymorphic variants";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"data-diverse-lens" = callPackage
({ mkDerivation, base, data-diverse, data-has, hspec, lens
, profunctors, tagged
@@ -63942,22 +64420,6 @@ self: {
}) {};
"data-dword" = callPackage
- ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty
- , tasty-quickcheck, template-haskell
- }:
- mkDerivation {
- pname = "data-dword";
- version = "0.3.1.2";
- sha256 = "084invjg8zj7ndxnz9clqmq06ch47k1d9lhxwap6xs0x4807crvb";
- libraryHaskellDepends = [
- base data-bword ghc-prim hashable template-haskell
- ];
- testHaskellDepends = [ base tasty tasty-quickcheck ];
- description = "Stick two binary words together to get a bigger one";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "data-dword_0_3_1_3" = callPackage
({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty
, tasty-quickcheck, template-haskell
}:
@@ -63971,7 +64433,6 @@ self: {
testHaskellDepends = [ base tasty tasty-quickcheck ];
description = "Stick two binary words together to get a bigger one";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"data-easy" = callPackage
@@ -64568,8 +65029,8 @@ self: {
({ mkDerivation, attoparsec, base, binary, containers, text }:
mkDerivation {
pname = "data-named";
- version = "0.6.1";
- sha256 = "14xhjp13hq2d9raybw50v85pax54xb1niczd6f32gvn8cdd28pji";
+ version = "0.6.2";
+ sha256 = "03f4xc4ayql17s48ajza2ny79j885mcmp0x3mrwcfdc42dlnd7nb";
libraryHaskellDepends = [ attoparsec base binary containers text ];
description = "Data types for named entities";
license = stdenv.lib.licenses.bsd3;
@@ -64827,24 +65288,6 @@ self: {
}) {};
"data-serializer" = callPackage
- ({ mkDerivation, base, binary, bytestring, cereal, data-endian
- , parsers, semigroups, split, tasty, tasty-quickcheck
- }:
- mkDerivation {
- pname = "data-serializer";
- version = "0.3.4";
- sha256 = "1ijy8l5lxmm8wpzx4h2vh9q21zz66xgh979s32aa4b16l9m1b4z7";
- libraryHaskellDepends = [
- base binary bytestring cereal data-endian parsers semigroups split
- ];
- testHaskellDepends = [
- base binary bytestring cereal tasty tasty-quickcheck
- ];
- description = "Common API for serialization libraries";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "data-serializer_0_3_4_1" = callPackage
({ mkDerivation, base, binary, bytestring, cereal, data-endian
, parsers, semigroups, split, tasty, tasty-quickcheck
}:
@@ -64860,7 +65303,6 @@ self: {
];
description = "Common API for serialization libraries";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"data-size" = callPackage
@@ -65026,26 +65468,6 @@ self: {
}) {};
"data-textual" = callPackage
- ({ mkDerivation, base, bytestring, parsers, QuickCheck
- , test-framework, test-framework-quickcheck2, text, text-latin1
- , text-printer, type-hint
- }:
- mkDerivation {
- pname = "data-textual";
- version = "0.3.0.2";
- sha256 = "0c4qs923dj4jnvvkjvbij0c1yg922iw66140cq6wb1m4h6q31ia4";
- libraryHaskellDepends = [
- base bytestring parsers text text-latin1 text-printer
- ];
- testHaskellDepends = [
- base parsers QuickCheck test-framework test-framework-quickcheck2
- text-printer type-hint
- ];
- description = "Human-friendly textual representations";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "data-textual_0_3_0_3" = callPackage
({ mkDerivation, base, bytestring, parsers, QuickCheck
, test-framework, test-framework-quickcheck2, text, text-latin1
, text-printer, type-hint
@@ -65063,7 +65485,6 @@ self: {
];
description = "Human-friendly textual representations";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"data-timeout" = callPackage
@@ -67433,8 +67854,8 @@ self: {
}:
mkDerivation {
pname = "dependent-monoidal-map";
- version = "0.1.1.0";
- sha256 = "0l5nj7jalyca6vv9aqsx0j799vrr65cm1jzh17fcnwkxair3lkgx";
+ version = "0.1.1.1";
+ sha256 = "0i3zgngcdli6hw09h985ca4n7l9cpsrxalbhg8lbq32hwh7dim89";
libraryHaskellDepends = [
aeson base constraints constraints-extras dependent-map
dependent-sum dependent-sum-aeson-orphans
@@ -67863,8 +68284,8 @@ self: {
}:
mkDerivation {
pname = "deriving-compat";
- version = "0.5.7";
- sha256 = "0bp4f0is84cv139s35669dv23mcp6lhp2wall72yvkk12lp2l2mg";
+ version = "0.5.8";
+ sha256 = "1dznwypw0w935z30zi9pf9k4mr5yfl6jfp43nv9vx3f6zy5gip9r";
libraryHaskellDepends = [
base containers ghc-boot-th ghc-prim template-haskell
th-abstraction transformers transformers-compat
@@ -67906,8 +68327,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "derulo";
- version = "1.0.5";
- sha256 = "1pyal6rhnyhqx8gwyh42vf66i18y9nplmqka546ikzps439rvmly";
+ version = "1.0.7";
+ sha256 = "0ph4szgn009asgcpd6rzdach41jzyrwilk4x9vnrqk3mjk36zxy5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -68166,8 +68587,8 @@ self: {
}:
mkDerivation {
pname = "df1";
- version = "0.3.1";
- sha256 = "0a1fpi9r6nivjxlknfyfkwdgnq5m6qmf68z46m3xjvy0md40caij";
+ version = "0.3.2";
+ sha256 = "1iywyrz2pfdpichfq6n77x8fpmfikj20rhkgnrwcf63ichav6xfp";
libraryHaskellDepends = [
attoparsec base bytestring containers text time
];
@@ -68320,37 +68741,37 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "dhall_1_27_0" = callPackage
- ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
- , bytestring, case-insensitive, cborg, cborg-json, containers
+ "dhall_1_28_0" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
+ , base, bytestring, case-insensitive, cborg, cborg-json, containers
, contravariant, cryptonite, data-fix, deepseq, Diff, directory
, doctest, dotgen, either, exceptions, filepath, foldl, gauge
, generic-random, hashable, haskeline, http-client, http-client-tls
, http-types, lens-family-core, megaparsec, memory, mockery, mtl
- , network-uri, optparse-applicative, parsers, prettyprinter
- , prettyprinter-ansi-terminal, profunctors, QuickCheck
- , quickcheck-instances, repline, scientific, semigroups, serialise
- , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit
- , tasty-quickcheck, template-haskell, text, th-lift-instances
- , transformers, transformers-compat, turtle, unordered-containers
- , uri-encode, vector
+ , network-uri, optparse-applicative, parsers, pretty-simple
+ , prettyprinter, prettyprinter-ansi-terminal, profunctors
+ , QuickCheck, quickcheck-instances, repline, scientific, semigroups
+ , serialise, special-values, spoon, tasty, tasty-expected-failure
+ , tasty-hunit, tasty-quickcheck, template-haskell, text
+ , th-lift-instances, transformers, transformers-compat, turtle
+ , unordered-containers, uri-encode, vector
}:
mkDerivation {
pname = "dhall";
- version = "1.27.0";
- sha256 = "04hpf0g8anhynrc3gd96cg1z4qadrk2xg9094qjm68d2kv6zx2g1";
+ version = "1.28.0";
+ sha256 = "0kiw8a9im768j304s80pv90vp1hh38v7fxfh2bb4hmglh3a8kc21";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson aeson-pretty ansi-terminal base bytestring case-insensitive
- cborg cborg-json containers contravariant cryptonite data-fix
- deepseq Diff directory dotgen either exceptions filepath hashable
- haskeline http-client http-client-tls http-types lens-family-core
- megaparsec memory mtl network-uri optparse-applicative parsers
- prettyprinter prettyprinter-ansi-terminal profunctors repline
- scientific serialise template-haskell text th-lift-instances
- transformers transformers-compat unordered-containers uri-encode
- vector
+ aeson aeson-pretty ansi-terminal atomic-write base bytestring
+ case-insensitive cborg cborg-json containers contravariant
+ cryptonite data-fix deepseq Diff directory dotgen either exceptions
+ filepath hashable haskeline http-client http-client-tls http-types
+ lens-family-core megaparsec memory mtl network-uri
+ optparse-applicative parsers pretty-simple prettyprinter
+ prettyprinter-ansi-terminal profunctors repline scientific
+ serialise template-haskell text th-lift-instances transformers
+ transformers-compat unordered-containers uri-encode vector
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -68390,14 +68811,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "dhall-bash_1_0_24" = callPackage
+ "dhall-bash_1_0_25" = callPackage
({ mkDerivation, base, bytestring, containers, dhall
, neat-interpolation, optparse-generic, shell-escape, text
}:
mkDerivation {
pname = "dhall-bash";
- version = "1.0.24";
- sha256 = "0llc8232qrlrhzdww5a1blqdsxpf3ra9hcdjwgahcfxsk1gh4z9g";
+ version = "1.0.25";
+ sha256 = "0bxfx2hj06q1w1372zc7cfibsqw2hckz5116zz447mz5zmcfkjv3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -68431,6 +68852,40 @@ self: {
broken = true;
}) {};
+ "dhall-fly" = callPackage
+ ({ mkDerivation, aeson, aeson-casing, aeson-yaml, base, bytestring
+ , dhall, dhall-json, hspec, hspec-discover, optparse-applicative
+ , ordered-containers, scientific, text, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "dhall-fly";
+ version = "0.2.2";
+ sha256 = "1pp5lzg8nv1j0y9mrjb4zd9immd7i14ri0x2rgp7zjs86ygcmlf7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-casing base dhall optparse-applicative
+ ordered-containers scientific text transformers
+ unordered-containers vector
+ ];
+ executableHaskellDepends = [
+ aeson aeson-casing aeson-yaml base bytestring dhall dhall-json
+ optparse-applicative ordered-containers scientific text
+ transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson aeson-casing base dhall hspec optparse-applicative
+ ordered-containers scientific text transformers
+ unordered-containers vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Translate concourse config from Dhall to YAML";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"dhall-json" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, dhall, exceptions, lens, libyaml, optparse-applicative
@@ -68461,7 +68916,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "dhall-json_1_5_0" = callPackage
+ "dhall-json_1_6_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal
, base, bytestring, containers, dhall, exceptions, filepath
, optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
@@ -68470,8 +68925,8 @@ self: {
}:
mkDerivation {
pname = "dhall-json";
- version = "1.5.0";
- sha256 = "1xr2p1k4bx6djbq5z8bd77vv0w77vfb0xgbsz3b9g03g6w4zifsd";
+ version = "1.6.0";
+ sha256 = "1fb3w7p2blnxqc6q3q620vpr0fpqs2my7hh33ykh7jpzs7p031h5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -68515,15 +68970,13 @@ self: {
, data-default, dhall, dhall-json, directory, doctest, filepath
, haskell-lsp, haskell-lsp-types, hslogger, lens, lens-family-core
, lsp-test, megaparsec, mtl, network-uri, optparse-applicative
- , prettyprinter, rope-utf16-splay, tasty, tasty-hspec, text
- , transformers, unordered-containers, uri-encode
+ , prettyprinter, QuickCheck, rope-utf16-splay, tasty, tasty-hspec
+ , text, transformers, unordered-containers, uri-encode
}:
mkDerivation {
pname = "dhall-lsp-server";
- version = "1.0.2";
- sha256 = "1q5kncgy4cdys27j43jfwsnjcg8nr1w4i0ip910c6w56x1p7vnnv";
- revision = "1";
- editedCabalFile = "18j3fiskp6i4kccbhp3zc0dfvxnq29gyq3yq9vylq9gx0kh98jyd";
+ version = "1.0.3";
+ sha256 = "1ym7v3blgj4ccchg6cpyxpllp6xz6fh8kfyy3i0b1kd5lzm90s0n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -68534,8 +68987,8 @@ self: {
];
executableHaskellDepends = [ base optparse-applicative ];
testHaskellDepends = [
- base directory doctest filepath haskell-lsp-types lsp-test tasty
- tasty-hspec text
+ base directory doctest filepath haskell-lsp-types lsp-test
+ QuickCheck tasty tasty-hspec text
];
description = "Language Server Protocol (LSP) server for Dhall";
license = stdenv.lib.licenses.mit;
@@ -68549,8 +69002,8 @@ self: {
}:
mkDerivation {
pname = "dhall-nix";
- version = "1.1.9";
- sha256 = "153r0h4qdfnw7bw4hfbh1imx5hrxh419qny3zj3d0bmsidf8gakr";
+ version = "1.1.10";
+ sha256 = "04fb8l9qh70fqa50ck0hz8134s1bmcyscbf5xg5ylnxpdrs3n7as";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -68612,6 +69065,36 @@ self: {
broken = true;
}) {};
+ "dhall-yaml" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall
+ , dhall-json, exceptions, HsYAML, HsYAML-aeson
+ , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
+ , tasty, tasty-expected-failure, tasty-hunit, text, vector
+ }:
+ mkDerivation {
+ pname = "dhall-yaml";
+ version = "1.0.0";
+ sha256 = "05jhcvikm3rbcf9jzw747x70c3dsslcij977yhqks0c59nr9pqn6";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring dhall dhall-json HsYAML HsYAML-aeson
+ optparse-applicative text vector
+ ];
+ executableHaskellDepends = [
+ aeson ansi-terminal base bytestring dhall dhall-json exceptions
+ optparse-applicative prettyprinter prettyprinter-ansi-terminal text
+ ];
+ testHaskellDepends = [
+ base bytestring dhall dhall-json tasty tasty-expected-failure
+ tasty-hunit text
+ ];
+ description = "Convert between Dhall and YAML";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"dhcp-lease-parser" = callPackage
({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty
, tasty-hunit, text
@@ -68673,8 +69156,8 @@ self: {
}:
mkDerivation {
pname = "di";
- version = "1.2";
- sha256 = "0d4ywmnibg9h12bah4bdh03fs2l50f5s590kv45baz010bcqyx0b";
+ version = "1.3";
+ sha256 = "13d503xhmnj2br9m4r4xx58hd2p8jsj8hxf9b4k4451p31kbzs54";
libraryHaskellDepends = [
base containers df1 di-core di-df1 di-handle di-monad exceptions
];
@@ -68688,8 +69171,8 @@ self: {
}:
mkDerivation {
pname = "di-core";
- version = "1.0.3";
- sha256 = "1rfza96ljcf754mj44m2ffm51k9v6c0ii2sqqnddjkva3h3hx47h";
+ version = "1.0.4";
+ sha256 = "0wrj2ndzk9r7izjvwkjjmqb3gg1zy93ch7j7fdalzadzzsd4sqsm";
libraryHaskellDepends = [
base containers safe-exceptions stm time
];
@@ -68707,8 +69190,8 @@ self: {
}:
mkDerivation {
pname = "di-df1";
- version = "1.0.2";
- sha256 = "1imk26njmr7hj56227yxgshjh4dicgr2c9bpc2m9nvsw2qbqslfh";
+ version = "1.2";
+ sha256 = "0bixrinmmb496j55c3vlh914nq6zfsaxq0pp2fcdxhwig1y53fgr";
libraryHaskellDepends = [
base df1 di-core di-handle di-monad stm
];
@@ -68739,8 +69222,8 @@ self: {
}:
mkDerivation {
pname = "di-monad";
- version = "1.3";
- sha256 = "019k7jc3lvh6cgmrgdjq13hcvh6ar76n38li4nviikqbsvxmpqsl";
+ version = "1.3.1";
+ sha256 = "190n6hwa7xs4b75bfvk4k2kn3rq8hkgs52f9plxfixlrl7jympgm";
libraryHaskellDepends = [
base containers di-core exceptions mtl pipes stm transformers
];
@@ -68920,10 +69403,8 @@ self: {
}:
mkDerivation {
pname = "diagrams-contrib";
- version = "1.4.3";
- sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5";
- revision = "3";
- editedCabalFile = "0mm1mmagx6q8g6dxk1cagqka38z6393ihp0lvf6095prlvidasqs";
+ version = "1.4.4";
+ sha256 = "043jpr7lqg708lzmv6cqys7312lfdwnf8ijcnpl4jkbvcwl87c1m";
libraryHaskellDepends = [
base circle-packing colour containers cubicbezier data-default
data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -69066,15 +69547,13 @@ self: {
, dual-tree, exceptions, filepath, fingertree, fsnotify, hashable
, intervals, JuicyPixels, lens, linear, monoid-extras, mtl
, numeric-extras, optparse-applicative, process, profunctors
- , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text
- , transformers, unordered-containers
+ , QuickCheck, semigroups, tagged, tasty, tasty-hunit
+ , tasty-quickcheck, text, transformers, unordered-containers
}:
mkDerivation {
pname = "diagrams-lib";
- version = "1.4.2.3";
- sha256 = "175yzi5kw4yd8ykdkpf64q85c7j3p89l90m3h6qcsx9ipv6av9r5";
- revision = "3";
- editedCabalFile = "157y2qdsh0aczs81vzlm377mks976mpv6y3aqnchwsnr7apzp8ai";
+ version = "1.4.3";
+ sha256 = "0gqrcyjyp3p78vmfxvhfjbkkl2xvwcv3qyyinbdcmalb5zb8vyy6";
libraryHaskellDepends = [
active adjunctions array base bytestring cereal colour containers
data-default-class diagrams-core diagrams-solve directory
@@ -69084,8 +69563,8 @@ self: {
transformers unordered-containers
];
testHaskellDepends = [
- base deepseq diagrams-solve distributive lens numeric-extras tasty
- tasty-hunit tasty-quickcheck
+ base deepseq diagrams-solve distributive lens numeric-extras
+ QuickCheck tasty tasty-hunit tasty-quickcheck
];
benchmarkHaskellDepends = [ base criterion diagrams-core ];
description = "Embedded domain-specific language for declarative graphics";
@@ -69144,8 +69623,8 @@ self: {
}:
mkDerivation {
pname = "diagrams-pgf";
- version = "1.4.1";
- sha256 = "00nw2zraanwb20wl9iaynw0kffwshgmy94yn50pgj3vlykj399lr";
+ version = "1.4.1.1";
+ sha256 = "10glg5pqy8zw6l77wnskcawl8da0c10sqfg9dx2jydksd3xpns2f";
libraryHaskellDepends = [
base bytestring bytestring-builder colour containers diagrams-core
diagrams-lib directory filepath hashable JuicyPixels mtl
@@ -69174,6 +69653,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "diagrams-postscript_1_5" = callPackage
+ ({ mkDerivation, base, bytestring, containers, data-default-class
+ , diagrams-core, diagrams-lib, hashable, lens, monoid-extras, mtl
+ , semigroups, split, statestack
+ }:
+ mkDerivation {
+ pname = "diagrams-postscript";
+ version = "1.5";
+ sha256 = "00j58mc84srjvrf21v6zjxxlbw6b8ahhn1jmbq697w8kw3cvygpa";
+ libraryHaskellDepends = [
+ base bytestring containers data-default-class diagrams-core
+ diagrams-lib hashable lens monoid-extras mtl semigroups split
+ statestack
+ ];
+ description = "Postscript backend for diagrams drawing EDSL";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"diagrams-qrcode" = callPackage
({ mkDerivation, array, base, colour, diagrams-core, diagrams-lib
}:
@@ -69211,6 +69709,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "diagrams-rasterific_1_4_2" = callPackage
+ ({ mkDerivation, base, bytestring, containers, data-default-class
+ , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity
+ , hashable, JuicyPixels, lens, mtl, optparse-applicative
+ , Rasterific
+ }:
+ mkDerivation {
+ pname = "diagrams-rasterific";
+ version = "1.4.2";
+ sha256 = "161rsy3g59n3sfrbfyvd4i4hszl0zm59w21b7pk6w88n0bk8gf2l";
+ libraryHaskellDepends = [
+ base bytestring containers data-default-class diagrams-core
+ diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
+ lens mtl optparse-applicative Rasterific
+ ];
+ testHaskellDepends = [ base diagrams-core diagrams-lib ];
+ description = "Rasterific backend for diagrams";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"diagrams-reflex" = callPackage
({ mkDerivation, base, colour, containers, diagrams-core
, diagrams-lib, lens, monoid-extras, mtl, reflex, reflex-dom
@@ -69283,6 +69802,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "diagrams-svg_1_4_3" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, colour
+ , containers, diagrams-core, diagrams-lib, filepath, hashable
+ , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative
+ , semigroups, split, svg-builder, text
+ }:
+ mkDerivation {
+ pname = "diagrams-svg";
+ version = "1.4.3";
+ sha256 = "1ysv6cz0fngrndl4wjmw4hrdj2rik5fxa1dkxzwnlgf1xwpvxgk8";
+ libraryHaskellDepends = [
+ base base64-bytestring bytestring colour containers diagrams-core
+ diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
+ optparse-applicative semigroups split svg-builder text
+ ];
+ description = "SVG backend for diagrams drawing EDSL";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"diagrams-tikz" = callPackage
({ mkDerivation, base, diagrams-core, diagrams-lib, dlist, mtl }:
mkDerivation {
@@ -69944,8 +70483,8 @@ self: {
}:
mkDerivation {
pname = "digit";
- version = "0.8";
- sha256 = "0m3m9c2452b0x7ccglkz7mr3ivi7r98qa44zwfnf7a55d6xckfa9";
+ version = "0.9";
+ sha256 = "0xyghgg8kzjrvhrcjizqnbprcyq5a3ma3x0dfijrdvbyd3lzghvm";
libraryHaskellDepends = [
base lens parsers scientific semigroupoids semigroups
template-haskell
@@ -70163,8 +70702,8 @@ self: {
}:
mkDerivation {
pname = "dino";
- version = "0.1.1";
- sha256 = "05n0zsl9wvwilnmh28s89cda8a72qfbnhwkbbnw9yihpbamx59z9";
+ version = "0.1.2";
+ sha256 = "0sk7p89fmjynykk7djfn8cmmjrqyv5pml9ny2dycr1n86cnxr88x";
libraryHaskellDepends = [
ansi-wl-pprint base containers errors exceptions hashable
monad-loops mtl text transformers tree-view unordered-containers
@@ -70845,8 +71384,8 @@ self: {
}:
mkDerivation {
pname = "diskhash";
- version = "0.0.4.0";
- sha256 = "03kc5jc63726vk3airvwag69855rilanvjvqcqxi3ylvjg2p9dil";
+ version = "0.0.4.2";
+ sha256 = "0rjbjjvvr75ki8kw8y3xf1z8x8cg46h10c73600lcz3bnxba188c";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
base bytestring directory HUnit QuickCheck test-framework
@@ -72013,17 +72552,14 @@ self: {
"dns" = callPackage
({ mkDerivation, array, async, attoparsec, auto-update, base
- , base16-bytestring, base64-bytestring, bytestring, Cabal
- , cabal-doctest, containers, cryptonite, doctest, hourglass, hspec
- , iproute, mtl, network, psqueues, QuickCheck, word8
+ , base16-bytestring, base64-bytestring, bytestring, containers
+ , cryptonite, doctest, hourglass, hspec, iproute, mtl, network
+ , psqueues, QuickCheck, word8
}:
mkDerivation {
pname = "dns";
- version = "4.0.0";
- sha256 = "0gq0y8pw4x8fja0f3hhwpbxh4rg2i8nzfnp2rxh2py49qfhg38mj";
- revision = "1";
- editedCabalFile = "0cg5jhn5g28qspkinx44zyz0yn08ddcsylhmvlpp4clyb9zlz1si";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
+ version = "4.0.1";
+ sha256 = "1jv89bdhvwb51d9h9157k2r1cg7x0gzari91lddwvghrkx8v9k90";
libraryHaskellDepends = [
array async attoparsec auto-update base base16-bytestring
base64-bytestring bytestring containers cryptonite hourglass
@@ -72032,6 +72568,7 @@ self: {
testHaskellDepends = [
base bytestring doctest hspec iproute network QuickCheck word8
];
+ doHaddock = false;
testTarget = "spec";
description = "DNS library in Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -72391,7 +72928,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "doctemplates_0_7" = callPackage
+ "doctemplates_0_8" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, criterion
, doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific
, tasty, tasty-golden, tasty-hunit, temporary, text
@@ -72399,16 +72936,16 @@ self: {
}:
mkDerivation {
pname = "doctemplates";
- version = "0.7";
- sha256 = "061llh59b69a84175z5wp0y0s2nw461kmf2w986wd5qcrjanxi62";
+ version = "0.8";
+ sha256 = "0zhnhdpbh0cyh6nr655yfik135gssa1qhfhzsvaph2n1qwq1l6nn";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base containers doclayout filepath HsYAML mtl parsec safe
scientific text text-conversions unordered-containers vector
];
testHaskellDepends = [
- aeson base bytestring doclayout filepath Glob tasty tasty-golden
- tasty-hunit temporary text
+ aeson base bytestring containers doclayout filepath Glob tasty
+ tasty-golden tasty-hunit temporary text
];
benchmarkHaskellDepends = [
aeson base containers criterion doclayout filepath mtl text
@@ -72498,8 +73035,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "doctest-driver-gen";
- version = "0.3.0.1";
- sha256 = "1sa47c1wml8k00h4h1gzbckfzbr3w7k3j0lvr1x5z6fh05s5xbsn";
+ version = "0.3.0.2";
+ sha256 = "1xkq9fpdm8ayjwf2lypkfnh1w08zimvhf27ffn71hfckd5nw4h2q";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -72859,8 +73396,8 @@ self: {
}:
mkDerivation {
pname = "dotenv";
- version = "0.8.0.2";
- sha256 = "0an7spi0cgvzr64nyy7p8pdslyf0jlh9l2ww52jbh1habsxjn6fp";
+ version = "0.8.0.4";
+ sha256 = "05dqa91zmxkzkz1dcpx2jxkzhdr4f51gw0qql47da9bllavl0jj4";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -72878,8 +73415,6 @@ self: {
];
description = "Loads environment variables from dotenv files";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"dotfs" = callPackage
@@ -73098,6 +73633,22 @@ self: {
broken = true;
}) {};
+ "downloader" = callPackage
+ ({ mkDerivation, base, directory, filepath, network-uri, process
+ , safe
+ }:
+ mkDerivation {
+ pname = "downloader";
+ version = "0.1.0.1";
+ sha256 = "1mjsdnghlbi1c0pzhrng1dcvs1syisxrv7ygg5267f9hmcwk5zgn";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base directory filepath network-uri process safe
+ ];
+ description = "A small, low-dependency library that provides turn-key file download over HTTP and HTTPS";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"dozenal" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -73968,6 +74519,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "duet" = callPackage
+ ({ mkDerivation, aeson, base, containers, deepseq, edit-distance
+ , exceptions, hspec, monad-logger, mtl, optparse-simple, parsec
+ , syb, text
+ }:
+ mkDerivation {
+ pname = "duet";
+ version = "0.0.2";
+ sha256 = "16hjhyn254d307ibg5541y00x0l6n5rwk06r5cdkj5x07jmgcafm";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base containers deepseq edit-distance exceptions monad-logger
+ mtl parsec syb text
+ ];
+ executableHaskellDepends = [
+ aeson base containers deepseq exceptions monad-logger mtl
+ optparse-simple syb text
+ ];
+ testHaskellDepends = [
+ aeson base containers deepseq edit-distance exceptions hspec
+ monad-logger mtl parsec syb text
+ ];
+ description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers to teach Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"dumb-cas" = callPackage
({ mkDerivation, base, containers, decimal-literals, hashable
, tasty, tasty-hunit, template-haskell, unordered-containers
@@ -75369,6 +75949,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "edit-distance-linear" = callPackage
+ ({ mkDerivation, array, base, bytestring, criterion, edit-distance
+ , hspec, QuickCheck, text, text-metrics
+ }:
+ mkDerivation {
+ pname = "edit-distance-linear";
+ version = "0.2.0.2";
+ sha256 = "0l95jjhjn39slyaixis2z6w0mly1vk1c2ia3nykhkvwp2adyn5nf";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ array base bytestring ];
+ testHaskellDepends = [
+ array base bytestring edit-distance hspec QuickCheck
+ ];
+ benchmarkHaskellDepends = [
+ array base bytestring criterion text text-metrics
+ ];
+ description = "Efficient implementation of the Levenshtein edit distance in linear memory";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"edit-distance-vector" = callPackage
({ mkDerivation, base, QuickCheck, quickcheck-instances, vector }:
mkDerivation {
@@ -75598,29 +76199,29 @@ self: {
}) {};
"egison" = callPackage
- ({ mkDerivation, alex, array, base, containers, criterion, deepseq
- , directory, filepath, ghc, ghc-paths, Glob, happy, hashable
- , haskeline, HUnit, mtl, optparse-applicative, parallel, parsec
- , process, random, regex-tdfa, split, test-framework
- , test-framework-hunit, text, transformers, unordered-containers
- , vector
+ ({ mkDerivation, array, base, containers, criterion, deepseq
+ , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline
+ , HUnit, megaparsec, mtl, optparse-applicative, parsec
+ , parser-combinators, prettyprinter, process, random, regex-tdfa
+ , split, test-framework, test-framework-hunit, text, transformers
+ , unordered-containers, vector
}:
mkDerivation {
pname = "egison";
- version = "3.9.1";
- sha256 = "1q4hyvr52zv2p827cvkmi4rl1d1dvrdg9bly6wykbhdv6ycbihn5";
+ version = "3.10.1";
+ sha256 = "047l2knxhzlrmc4n6xaannnwa1zhq7lxr3iswwrji5xcqbbag5xp";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base containers directory ghc ghc-paths hashable haskeline
- mtl parallel parsec process random regex-tdfa split text
- transformers unordered-containers vector
+ megaparsec mtl optparse-applicative parsec parser-combinators
+ prettyprinter process random regex-tdfa split text transformers
+ unordered-containers vector
];
- libraryToolDepends = [ alex happy ];
executableHaskellDepends = [
array base containers directory filepath ghc ghc-paths haskeline
- mtl optparse-applicative parsec process regex-tdfa text
+ mtl optparse-applicative parsec prettyprinter process split text
transformers unordered-containers vector
];
testHaskellDepends = [
@@ -75658,8 +76259,8 @@ self: {
}:
mkDerivation {
pname = "egison-tutorial";
- version = "3.7.14";
- sha256 = "1ar5yg00arqd09wva0q1y4d8lfpd0vjw9sgk47jsyqs7ydm59hnb";
+ version = "3.10.0";
+ sha256 = "109j17iskxs7gwgvxyyvmipf3xsbnysjxj20z6hhjzz1sb3sw5x5";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -76666,31 +77267,6 @@ self: {
}) {};
"elm2nix" = callPackage
- ({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary
- , bytestring, containers, data-default, directory, filepath, here
- , mtl, optparse-applicative, process, req, text, transformers
- , unordered-containers
- }:
- mkDerivation {
- pname = "elm2nix";
- version = "0.1.1";
- sha256 = "16b7vv7ndn8mpkg05rhljpmld2dazsgl9yqg8j3mza1f5x4f6jwp";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson async base binary bytestring containers data-default
- directory filepath here mtl process req text transformers
- unordered-containers
- ];
- executableHaskellDepends = [
- ansi-wl-pprint base directory here optparse-applicative
- ];
- testHaskellDepends = [ base ];
- description = "Turn your Elm project into buildable Nix project";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "elm2nix_0_1_2" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary
, bytestring, containers, data-default, directory, filepath, here
, mtl, optparse-applicative, process, req, text, transformers
@@ -76713,7 +77289,6 @@ self: {
testHaskellDepends = [ base ];
description = "Turn your Elm project into buildable Nix project";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"elminator" = callPackage
@@ -77015,6 +77590,8 @@ self: {
];
description = "Perform basic syntax and deliverability checks on email addresses";
license = stdenv.lib.licenses.agpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"emailaddress" = callPackage
@@ -77211,6 +77788,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "emojis" = callPackage
+ ({ mkDerivation, base, containers, HUnit, text }:
+ mkDerivation {
+ pname = "emojis";
+ version = "0.1";
+ sha256 = "1c6zkj9gmk1y90gbdrn50hyp7mw1mggzhnr2khqd728ryipw60ss";
+ libraryHaskellDepends = [ base containers text ];
+ testHaskellDepends = [ base HUnit text ];
+ description = "Conversion between emoji characters and their names";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"empty" = callPackage
({ mkDerivation }:
mkDerivation {
@@ -78746,7 +79335,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "esqueleto_3_2_2" = callPackage
+ "esqueleto_3_3_0" = callPackage
({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
, conduit, containers, exceptions, hspec, monad-logger, mtl, mysql
, mysql-simple, persistent, persistent-mysql, persistent-postgresql
@@ -78756,8 +79345,8 @@ self: {
}:
mkDerivation {
pname = "esqueleto";
- version = "3.2.2";
- sha256 = "1pnhnnsxx21jah4rnv8qy7jb4n7f6vbrxjh9cs2rygvrwqkg3n9c";
+ version = "3.3.0";
+ sha256 = "0qscm9b4zqb0w78xpf1yhmjlbapvghmvsqxqwx2x0grb4yvv7cwq";
libraryHaskellDepends = [
aeson attoparsec base blaze-html bytestring conduit containers
monad-logger persistent resourcet tagged text time transformers
@@ -79343,15 +79932,15 @@ self: {
"evdev" = callPackage
({ mkDerivation, base, bytestring, c2hs, composition, containers
, either, evdev, extra, hinotify, posix-paths, process, rawfilepath
- , streamly, time, unix
+ , safe, streamly, time, unix
}:
mkDerivation {
pname = "evdev";
- version = "0.1.0.1";
- sha256 = "17y1rg6p8inzf3zdakfxwp4f3yrak83lqfdjiwg786x4f0ab3jaq";
+ version = "0.2.0.1";
+ sha256 = "0b005anc3bxs8ys5zmzzs81n4wmjabvv7fbcj5w62ddsjfq38p62";
libraryHaskellDepends = [
base bytestring composition containers either extra hinotify
- posix-paths process rawfilepath streamly time unix
+ posix-paths process rawfilepath safe streamly time unix
];
librarySystemDepends = [ evdev ];
libraryToolDepends = [ c2hs ];
@@ -80394,6 +80983,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "exist" = callPackage
+ ({ mkDerivation, base, base-unicode-symbols, util }:
+ mkDerivation {
+ pname = "exist";
+ version = "0.2.0.0";
+ sha256 = "0w2ip29f99qzi3wxicydkv991ws0lhnar3w0qka54r2mjb3xzrk9";
+ libraryHaskellDepends = [ base base-unicode-symbols util ];
+ description = "Dependent sum type";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "exist-instances" = callPackage
+ ({ mkDerivation, base, base-unicode-symbols, constraint, exist
+ , util
+ }:
+ mkDerivation {
+ pname = "exist-instances";
+ version = "0.1.0.0";
+ sha256 = "09714dl2gwpr44fhkq5w9fswn4fk0zhddg21mgcw2nb5l7930d7x";
+ libraryHaskellDepends = [
+ base base-unicode-symbols constraint exist util
+ ];
+ description = "Instances for \"exist\" package (requires more language extensions and dependencies)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"existential" = callPackage
({ mkDerivation, base, cereal, constraints, control-invariants
, lens, portable-template-haskell-lens, QuickCheck
@@ -80837,8 +81454,8 @@ self: {
}:
mkDerivation {
pname = "expresso";
- version = "0.1.2.0";
- sha256 = "15s4gpf7pv6wv13q5i1cff7s93nx5vb8gyjfm4ifz76ki3xafgcn";
+ version = "0.1.2.2";
+ sha256 = "1fa37bqyw8zlva3z6sj10sp4r7sslh4xakrmr7d5diqynyrgdjax";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -81301,6 +81918,8 @@ self: {
];
description = "Rational arithmetic in an irrational world";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"facts" = callPackage
@@ -81550,7 +82169,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "fakedata_0_3_1" = callPackage
+ "fakedata_0_4_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, exceptions, filepath, gauge, hashable, hspec, hspec-discover
, random, template-haskell, text, time, unordered-containers
@@ -81558,8 +82177,8 @@ self: {
}:
mkDerivation {
pname = "fakedata";
- version = "0.3.1";
- sha256 = "0y5gnqjgn3n2px80xbpqx0kaxrdkaqhw8n9ah4ry310j80m9z8ma";
+ version = "0.4.0";
+ sha256 = "0q90aa92wraqjnj256bpv34mhsl42wyp31y2g4nv2sgzj7mi9jjg";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers directory exceptions filepath hashable
@@ -81789,15 +82408,15 @@ self: {
}) {};
"fast-downward" = callPackage
- ({ mkDerivation, base, containers, list-t, mtl, process, temporary
- , text, transformers
+ ({ mkDerivation, base, containers, mtl, process, temporary, text
+ , transformers
}:
mkDerivation {
pname = "fast-downward";
- version = "0.1.1.0";
- sha256 = "1c4qsihjf6wjmmh4nm088pxaj7xc1mm9di8jq124zgllf85j1lfl";
+ version = "0.2.0.0";
+ sha256 = "0a2ax0z326mf02p5wyp1d8knxj6afn92n9bqxav2qhkc2v5kijhw";
libraryHaskellDepends = [
- base containers list-t mtl process temporary text transformers
+ base containers mtl process temporary text transformers
];
description = "Solve classical planning problems (STRIPS/SAS+) using Haskell & Fast Downward";
license = stdenv.lib.licenses.bsd3;
@@ -82083,10 +82702,8 @@ self: {
}:
mkDerivation {
pname = "fastsum";
- version = "0.1.1.0";
- sha256 = "0fa3wjdsjl8wwlw194g1b7j8rvwix2b1hgwm1s10fq91a10mca6n";
- revision = "1";
- editedCabalFile = "0cjzy6q0srff2ygwrffgf4a6clpva4fd7jx5z3pv7ym64w5f4l97";
+ version = "0.1.1.1";
+ sha256 = "0j9jd068xgk7nn2ilgdkv1pxngflqqgxz1pnhdssgiih04v8zw5l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -82774,6 +83391,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "feed_1_3_0_0" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, HUnit
+ , markdown-unlit, old-locale, old-time, safe, syb, test-framework
+ , test-framework-hunit, text, time, time-locale-compat, utf8-string
+ , xml-conduit, xml-types
+ }:
+ mkDerivation {
+ pname = "feed";
+ version = "1.3.0.0";
+ sha256 = "19xqkx8ars0sjana18m34d7qg9l0qbg1i3v14a5rqabdppzcfrp2";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base base-compat bytestring old-locale old-time safe text time
+ time-locale-compat utf8-string xml-conduit xml-types
+ ];
+ testHaskellDepends = [
+ base base-compat HUnit old-time syb test-framework
+ test-framework-hunit text time xml-conduit xml-types
+ ];
+ testToolDepends = [ markdown-unlit ];
+ description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"feed-cli" = callPackage
({ mkDerivation, base, directory, feed, old-locale, old-time, time
, xml
@@ -83778,8 +84420,8 @@ self: {
({ mkDerivation, async, base, process, unix }:
mkDerivation {
pname = "filelock";
- version = "0.1.1.3";
- sha256 = "04qimhz78jjndk686dblkx06l9jscq2q9gyr014a4pbfj4iljgi5";
+ version = "0.1.1.4";
+ sha256 = "189n4pvq7f4d235smg2iqs2m5rqmnjdxflifq0mnb2qdbc4jjznr";
libraryHaskellDepends = [ base unix ];
testHaskellDepends = [ async base process ];
description = "Portable interface to file locking (flock / LockFileEx)";
@@ -83829,6 +84471,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "filepath-bytestring" = callPackage
+ ({ mkDerivation, base, bytestring, filepath, QuickCheck, unix }:
+ mkDerivation {
+ pname = "filepath-bytestring";
+ version = "1.4.2.1.0";
+ sha256 = "1q2d02p87yfvqbqhgry6lzqkjhscqfacpcxgnc6xz9b1rvg1mwvj";
+ libraryHaskellDepends = [ base bytestring unix ];
+ testHaskellDepends = [ base bytestring filepath QuickCheck ];
+ description = "Library for manipulating RawFilePaths in a cross platform way";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"filepath-crypto" = callPackage
({ mkDerivation, base, binary, bytestring, case-insensitive
, cryptoids, cryptoids-class, cryptoids-types, exceptions, filepath
@@ -83914,8 +84568,8 @@ self: {
}:
mkDerivation {
pname = "filestore";
- version = "0.6.3.4";
- sha256 = "0q1ynqjslcxx5r93l6w2hsmd1khlq38c5g5mwrifrv12qnh28sx0";
+ version = "0.6.4";
+ sha256 = "1z967kviqsy3ma8xdfffx864f7ji6nsrbd5riis0nasm1bbwm8rr";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers Diff directory filepath old-locale
@@ -83926,6 +84580,8 @@ self: {
];
description = "Interface for versioning file stores";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"filesystem-abstractions" = callPackage
@@ -84067,6 +84723,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fin_0_1_1" = callPackage
+ ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing
+ , QuickCheck, tagged
+ }:
+ mkDerivation {
+ pname = "fin";
+ version = "0.1.1";
+ sha256 = "0zwc8x2ilbk1bhsk85brf6g300cx4w2j3602gjh6rv900961gqri";
+ libraryHaskellDepends = [ base dec deepseq hashable QuickCheck ];
+ testHaskellDepends = [ base inspection-testing tagged ];
+ description = "Nat and Fin: peano naturals and finite numbers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"final" = callPackage
({ mkDerivation, base, stm, transformers }:
mkDerivation {
@@ -84259,24 +84930,25 @@ self: {
}) {};
"finitary-derive" = callPackage
- ({ mkDerivation, base, binary, coercible-utils, deepseq, finitary
- , finite-typelits, ghc-typelits-extra, ghc-typelits-knownnat
- , hashable, hedgehog, hedgehog-classes, monad-loops, mtl, vector
- , vector-sized
+ ({ mkDerivation, base, binary, bitvec, coercible-utils, deepseq
+ , finitary, finite-typelits, ghc-typelits-extra
+ , ghc-typelits-knownnat, hashable, hedgehog, hedgehog-classes
+ , transformers, vector, vector-binary-instances, vector-instances
}:
mkDerivation {
pname = "finitary-derive";
- version = "1.0.0.1";
- sha256 = "1wv9jjvv1jd5y39pybfawb19pxzwb6r3p69ajyh2f7m8nn81kcim";
+ version = "2.2.0.0";
+ sha256 = "11nkryzbhkbz4v2i4kwaggw67nlhs5jljqczmvliyz1df75f5kh3";
libraryHaskellDepends = [
- base binary coercible-utils deepseq finitary finite-typelits
- ghc-typelits-extra ghc-typelits-knownnat hashable mtl vector
- vector-sized
+ base binary bitvec coercible-utils deepseq finitary finite-typelits
+ ghc-typelits-extra ghc-typelits-knownnat hashable transformers
+ vector vector-binary-instances vector-instances
];
testHaskellDepends = [
- base finitary finite-typelits hedgehog hedgehog-classes monad-loops
+ base binary deepseq finitary finite-typelits hashable hedgehog
+ hedgehog-classes
];
- description = "Easy and efficient Unbox, Storable, Binary and Hashable instances for Finitary types";
+ description = "Flexible and easy deriving of type classes for finitary types";
license = stdenv.lib.licenses.gpl3Plus;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -84468,6 +85140,8 @@ self: {
];
description = "Calculates file-size frequency-distribution";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"fit" = callPackage
@@ -84938,10 +85612,8 @@ self: {
}:
mkDerivation {
pname = "fixplate";
- version = "0.1.7";
- sha256 = "0brll5vkb3341l5iblrc1r50jzg8q6ycvbqvrc9jnj2nc86mslay";
- revision = "1";
- editedCabalFile = "0ynmm06iblqsyzfc068sdvmlpll8zwyccwkdlji3nf535biv56hb";
+ version = "0.1.8";
+ sha256 = "0m0g7gbdhigfc0k0sbvxhcl3gilv1wfmffwl14wr6jqbmpqy0as5";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [
base containers QuickCheck tasty tasty-quickcheck
@@ -85086,8 +85758,8 @@ self: {
}:
mkDerivation {
pname = "flags-applicative";
- version = "0.1.0.1";
- sha256 = "1pamcfv5g6d42ksq10af0l2a6k8y997zx3y4pvf5gcy5hlxr2gwv";
+ version = "0.1.0.2";
+ sha256 = "192yghdmylynn57l22ahb6dhrbl590dxmv2cdn755r22v7dbhsgf";
libraryHaskellDepends = [
base casing containers mtl network text
];
@@ -85246,23 +85918,6 @@ self: {
}) {};
"flexible-defaults" = callPackage
- ({ mkDerivation, base, containers, template-haskell, th-extras
- , transformers
- }:
- mkDerivation {
- pname = "flexible-defaults";
- version = "0.0.2";
- sha256 = "0r4aq6n5h9xnal535hds111vq8whzsvyc3yibmcbp7fndldd9mgk";
- revision = "1";
- editedCabalFile = "1bmqmxv5nijb837xwxnb46w3bglmakfj1qs3xwkcnfh5ab0zazwr";
- libraryHaskellDepends = [
- base containers template-haskell th-extras transformers
- ];
- description = "Generate default function implementations for complex type classes";
- license = stdenv.lib.licenses.publicDomain;
- }) {};
-
- "flexible-defaults_0_0_3" = callPackage
({ mkDerivation, base, containers, template-haskell, th-extras
, transformers
}:
@@ -85275,7 +85930,6 @@ self: {
];
description = "Generate default function implementations for complex type classes";
license = stdenv.lib.licenses.publicDomain;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"flexible-time" = callPackage
@@ -85536,8 +86190,8 @@ self: {
}:
mkDerivation {
pname = "floskell";
- version = "0.10.1";
- sha256 = "1y79f6a6frcmhs70z34rdcpm5bqpgqf46bx29jnixgs313lwz229";
+ version = "0.10.2";
+ sha256 = "1id1bwvzl5x4wq6i2ailvmvy2gcdzfgs8q59pg7s2j5cv35gf80h";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -85752,7 +86406,7 @@ self: {
"fltkhs" = callPackage
({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
- , fltk14, libGLU_combined, mtl, OpenGLRaw, parsec, pkgconfig, text
+ , fltk14, libGL, libGLU, mtl, OpenGLRaw, parsec, pkg-config, text
, vector
}:
mkDerivation {
@@ -85765,15 +86419,15 @@ self: {
setupHaskellDepends = [ base Cabal directory filepath ];
libraryHaskellDepends = [ base bytestring text vector ];
librarySystemDepends = [ fltk14 ];
- libraryPkgconfigDepends = [ libGLU_combined ];
- libraryToolDepends = [ c2hs pkgconfig ];
+ libraryPkgconfigDepends = [ libGL libGLU ];
+ libraryToolDepends = [ c2hs pkg-config ];
executableHaskellDepends = [
base directory filepath mtl OpenGLRaw parsec text
];
description = "FLTK bindings";
license = stdenv.lib.licenses.mit;
- }) {inherit (pkgs) fltk14; inherit (pkgs) libGLU_combined;
- pkgconfig = null;};
+ }) {inherit (pkgs) fltk14; inherit (pkgs) libGL;
+ inherit (pkgs) libGLU; inherit (pkgs) pkg-config;};
"fltkhs-demos" = callPackage
({ mkDerivation, base, bytestring, directory, fltkhs, process, stm
@@ -86764,14 +87418,16 @@ self: {
}:
mkDerivation {
pname = "forma";
- version = "1.1.2";
- sha256 = "1ppgqwqm157ygj992r0cbarfii127g7nm63wbnrqvr9k1wmnlxx0";
+ version = "1.1.3";
+ sha256 = "0pd2qzibffbkw2c4mk687yg109pl0nfjq0kpwi2cl0l8d0qlyv0c";
libraryHaskellDepends = [
aeson base containers mtl text unordered-containers
];
testHaskellDepends = [ aeson base containers hspec mtl text ];
description = "Parse and validate forms in JSON format";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"formal" = callPackage
@@ -87257,6 +87913,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fplll" = callPackage
+ ({ mkDerivation, base, fplll, hgmp, lattices, semibounded-lattices
+ }:
+ mkDerivation {
+ pname = "fplll";
+ version = "0.1.0.0";
+ sha256 = "1q9njmsgxx4cpziw2llnbpg5ic6sag7qdhial00rak3iq29rzlhh";
+ libraryHaskellDepends = [
+ base hgmp lattices semibounded-lattices
+ ];
+ libraryPkgconfigDepends = [ fplll ];
+ testHaskellDepends = [ base ];
+ description = "Haskell bindings to ";
+ license = stdenv.lib.licenses.lgpl21Plus;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {inherit (pkgs) fplll;};
+
"fpnla" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -87511,8 +88185,8 @@ self: {
}:
mkDerivation {
pname = "free";
- version = "5.1.2";
- sha256 = "0vlf3f2ckl3cr7z2zl8c9c8qkdlfgvmh04gxkp2fg0z9dz80nlyb";
+ version = "5.1.3";
+ sha256 = "0b9f9jrfgkq13333px6p1faxpcypqvzi0m9dnbj2rm8s79pdcw1c";
libraryHaskellDepends = [
base comonad containers distributive exceptions mtl profunctors
semigroupoids template-haskell transformers transformers-base
@@ -87527,8 +88201,8 @@ self: {
}:
mkDerivation {
pname = "free-algebras";
- version = "0.0.8.0";
- sha256 = "0hwvjvly1ab7bnb4knqxz0gpxkw8pn1x5xbqf3g0k98cqr0zpsj7";
+ version = "0.0.8.1";
+ sha256 = "07p1nmg88b6nvqi33q80vb2aj6svx9r33ax85ry6d7adkg83s4jz";
libraryHaskellDepends = [
base containers data-fix dlist free groups kan-extensions mtl
transformers
@@ -87537,7 +88211,7 @@ self: {
base containers data-fix dlist free groups hedgehog kan-extensions
mtl transformers
];
- description = "Free algebras in Haskell";
+ description = "Free algebras";
license = stdenv.lib.licenses.mpl20;
}) {};
@@ -87553,13 +88227,19 @@ self: {
}) {};
"free-category" = callPackage
- ({ mkDerivation, base, free-algebras }:
+ ({ mkDerivation, base, criterion, free-algebras, QuickCheck, tasty
+ , tasty-quickcheck
+ }:
mkDerivation {
pname = "free-category";
- version = "0.0.2.0";
- sha256 = "16gs7n3gl5whda376j87qm9jfdx6zhmnyp43fjfaj6s5y2s0z53z";
+ version = "0.0.4.1";
+ sha256 = "1d7r9mcq4163g665bgzwxhvrk2iiypgss8s3j2lmqccb461s7a4j";
libraryHaskellDepends = [ base free-algebras ];
- description = "Free category";
+ testHaskellDepends = [
+ base free-algebras QuickCheck tasty tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ description = "efficient data types for free categories and arrows";
license = stdenv.lib.licenses.mpl20;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -89214,6 +89894,33 @@ self: {
broken = true;
}) {};
+ "functor-combinators_0_2_0_0" = callPackage
+ ({ mkDerivation, base, bifunctors, comonad, constraints, containers
+ , dependent-sum, deriving-compat, free, hedgehog, kan-extensions
+ , mmorph, mtl, natural-transformation, nonempty-containers, pointed
+ , profunctors, semigroupoids, tagged, tasty, tasty-hedgehog, these
+ , transformers, trivial-constraint, vinyl
+ }:
+ mkDerivation {
+ pname = "functor-combinators";
+ version = "0.2.0.0";
+ sha256 = "0z8r9z08cayyv2ag748aa8550sd2mnj2zagdkf5i5yn3lvhd0k6j";
+ libraryHaskellDepends = [
+ base bifunctors comonad constraints containers deriving-compat free
+ kan-extensions mmorph mtl natural-transformation
+ nonempty-containers pointed profunctors semigroupoids tagged these
+ transformers trivial-constraint vinyl
+ ];
+ testHaskellDepends = [
+ base bifunctors dependent-sum free hedgehog nonempty-containers
+ semigroupoids tasty tasty-hedgehog transformers
+ ];
+ description = "Tools for functor combinator-based program design";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"functor-combo" = callPackage
({ mkDerivation, base, base-orphans, containers, data-inttrie, lub
, type-unary, TypeCompose
@@ -89496,31 +90203,90 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "fused-effects_1_0_0_0" = callPackage
+ ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn
+ , inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog
+ , tasty-hunit, transformers
+ }:
+ mkDerivation {
+ pname = "fused-effects";
+ version = "1.0.0.0";
+ sha256 = "120jvgh35wl5vb2qad8c1dhpr1ddlbhm5b03dy9kcb7d8s89qfs6";
+ libraryHaskellDepends = [ base transformers ];
+ testHaskellDepends = [
+ base containers hedgehog hedgehog-fn inspection-testing mtl tasty
+ tasty-hedgehog tasty-hunit transformers
+ ];
+ testToolDepends = [ markdown-unlit ];
+ benchmarkHaskellDepends = [ base gauge ];
+ description = "A fast, flexible, fused effect system";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"fused-effects-exceptions" = callPackage
- ({ mkDerivation, base, fused-effects, safe-exceptions
- , unliftio-core
+ ({ mkDerivation, base, fused-effects, markdown-unlit, tasty
+ , tasty-hunit, transformers
}:
mkDerivation {
pname = "fused-effects-exceptions";
- version = "0.2.0.0";
- sha256 = "1hgvl48vdrgcb45izmwad40x5jgxiaf3rdhhm5x0gjd9848drmbb";
- libraryHaskellDepends = [
- base fused-effects safe-exceptions unliftio-core
+ version = "1.0.0.0";
+ sha256 = "13ki1fzjsqd762bbc5ia9k4agsa634lflidnzs6lahxmar1sqmid";
+ libraryHaskellDepends = [ base fused-effects transformers ];
+ testHaskellDepends = [
+ base fused-effects tasty tasty-hunit transformers
];
+ testToolDepends = [ markdown-unlit ];
description = "Handle exceptions thrown in IO with fused-effects";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"fused-effects-lens" = callPackage
- ({ mkDerivation, base, fused-effects, hspec, lens, microlens }:
+ ({ mkDerivation, base, fused-effects, hspec, microlens }:
mkDerivation {
pname = "fused-effects-lens";
- version = "0.2.0.0";
- sha256 = "199afrkhb1dhah3jy3xyq5k71cqbzf9m8ninyh95qmam600r8q0m";
+ version = "1.0.0.0";
+ sha256 = "0qix94bw9rzv7frwxn4d9l8bz133fbmazzsvmilfz6bm6k8ci6nx";
libraryHaskellDepends = [ base fused-effects microlens ];
- testHaskellDepends = [ base fused-effects hspec lens ];
+ testHaskellDepends = [ base fused-effects hspec microlens ];
description = "Monadic lens combinators for fused-effects";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "fused-effects-random" = callPackage
+ ({ mkDerivation, base, fused-effects, MonadRandom, random
+ , transformers
+ }:
+ mkDerivation {
+ pname = "fused-effects-random";
+ version = "1.0.0.0";
+ sha256 = "14s65ndb5ik47wasn62pd0m5ls02a0v2vinv69jz9z630q9y7ay4";
+ libraryHaskellDepends = [
+ base fused-effects MonadRandom random transformers
+ ];
+ description = "Random number generation for fused-effects";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "fused-effects-resumable" = callPackage
+ ({ mkDerivation, base, deepseq, fused-effects, transformers }:
+ mkDerivation {
+ pname = "fused-effects-resumable";
+ version = "0.1.0.0";
+ sha256 = "0w0ih8sspb7ffpvbf9bcqsiv7683g3ccfpgd48hq0h819zpa58m9";
+ libraryHaskellDepends = [
+ base deepseq fused-effects transformers
+ ];
+ description = "Resumable exceptions for the fused-effects ecosystem";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"fusion" = callPackage
@@ -89554,8 +90320,8 @@ self: {
}:
mkDerivation {
pname = "futhark";
- version = "0.12.2";
- sha256 = "1q9k725wwf94gamjsi7rjazjgwdmh42h3fchlf25qm0w27llcrkc";
+ version = "0.13.1";
+ sha256 = "0h92q21hg3850f7hv5n497mn90dv3hxp8fa3cl29gwkn0pkaz33b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -89922,6 +90688,34 @@ self: {
broken = true;
}) {};
+ "galois-fft" = callPackage
+ ({ mkDerivation, base, criterion, elliptic-curve, galois-field
+ , pairing, poly, protolude, QuickCheck, quickcheck-instances, tasty
+ , tasty-discover, tasty-hunit, tasty-quickcheck, vector
+ }:
+ mkDerivation {
+ pname = "galois-fft";
+ version = "0.1.0";
+ sha256 = "1qyhx0b0p3avag82g1fdwbiwxdr0npw39k4f2nv0x772rr4h9rz1";
+ libraryHaskellDepends = [
+ base elliptic-curve galois-field poly protolude vector
+ ];
+ testHaskellDepends = [
+ base elliptic-curve galois-field pairing poly protolude QuickCheck
+ quickcheck-instances tasty tasty-discover tasty-hunit
+ tasty-quickcheck vector
+ ];
+ testToolDepends = [ tasty-discover ];
+ benchmarkHaskellDepends = [
+ base criterion elliptic-curve galois-field pairing poly protolude
+ vector
+ ];
+ description = "FFTs over finite fields";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"galois-field" = callPackage
({ mkDerivation, base, criterion, integer-gmp, MonadRandom
, protolude, tasty, tasty-quickcheck, wl-pprint-text
@@ -90193,12 +90987,12 @@ self: {
}) {};
"gasp" = callPackage
- ({ mkDerivation, base, binary, containers }:
+ ({ mkDerivation, base, binary, containers, mtl }:
mkDerivation {
pname = "gasp";
- version = "1.1.0.0";
- sha256 = "1zv7jq60nw2nd0np7xkz83y7jnvnshccz63j0i9bl0d9x1grhzbq";
- libraryHaskellDepends = [ base binary containers ];
+ version = "1.2.0.0";
+ sha256 = "0dq867kgil7xp7wqk8ylmx9ninxrqwc375g5l13iskvyz1li7474";
+ libraryHaskellDepends = [ base binary containers mtl ];
description = "A framework of algebraic classes";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -90439,8 +91233,8 @@ self: {
({ mkDerivation, base, lawful }:
mkDerivation {
pname = "gdp";
- version = "0.0.0.2";
- sha256 = "1gqs19wjyng0nacwvi7sjxnhnxjy2az0jwjyy6w2r5g4w9dgykr1";
+ version = "0.0.3.0";
+ sha256 = "0pkx6j557p9rm39pr6pw8p2j3nz8s4q839n6y9p6c31dnlz0zxx0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base lawful ];
@@ -91006,14 +91800,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "generic-deriving_1_13" = callPackage
+ "generic-deriving_1_13_1" = callPackage
({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
, template-haskell, th-abstraction
}:
mkDerivation {
pname = "generic-deriving";
- version = "1.13";
- sha256 = "0k4av4jamgpavn82q54g345la5i2ckfbq2w9nnf2a6vhvk1lnw8g";
+ version = "1.13.1";
+ sha256 = "1glsl15dc40wn1r851bray6i450g82xa2n0q53p1i3p5x903mdg9";
libraryHaskellDepends = [
base containers ghc-prim template-haskell th-abstraction
];
@@ -91276,19 +92070,15 @@ self: {
}) {};
"generic-xmlpickler" = callPackage
- ({ mkDerivation, base, generic-deriving, hxt, hxt-pickle-utils
- , tasty, tasty-hunit, tasty-th, text
+ ({ mkDerivation, base, generic-deriving, hxt, tasty, tasty-hunit
+ , tasty-th, text
}:
mkDerivation {
pname = "generic-xmlpickler";
- version = "0.1.0.5";
- sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym";
- revision = "8";
- editedCabalFile = "1hpcglml4b5yv192syxazminr5v7qjrgqwb2wk0cf7f0sjpm5d0q";
+ version = "0.1.0.6";
+ sha256 = "0cbigrfiilwr2dfcnd2mskj1pjgwrjj72anfpa1yii7q9rs0gdh3";
libraryHaskellDepends = [ base generic-deriving hxt text ];
- testHaskellDepends = [
- base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
- ];
+ testHaskellDepends = [ base hxt tasty tasty-hunit tasty-th ];
description = "Generic generation of HXT XmlPickler instances using GHC Generics";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -91660,12 +92450,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "genvalidity_0_9_0_1" = callPackage
+ "genvalidity_0_9_1_0" = callPackage
({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
mkDerivation {
pname = "genvalidity";
- version = "0.9.0.1";
- sha256 = "1f0jhahgh0kyyk74g2vmjb3vcv4qvg2xhib1n92r8yyggxih3msl";
+ version = "0.9.1.0";
+ sha256 = "0pkc0ys8g6g0d22s83xwk1vkx476qhassdqn4d7m6z0zcsq0shkg";
libraryHaskellDepends = [ base QuickCheck validity ];
testHaskellDepends = [ base hspec hspec-core QuickCheck ];
description = "Testing utilities for the validity library";
@@ -91733,15 +92523,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "genvalidity-containers_0_8_0_0" = callPackage
+ "genvalidity-containers_0_8_0_1" = callPackage
({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
, genvalidity-property, hspec, QuickCheck, validity
, validity-containers
}:
mkDerivation {
pname = "genvalidity-containers";
- version = "0.8.0.0";
- sha256 = "1397i50dzd7jhq2ymzs2msgbgkih9dfn74bhl2va2rrgjhnypnw6";
+ version = "0.8.0.1";
+ sha256 = "1iamvqrrvqa07hkpfcsmmrg3zppm2gk5gn97qpgmwn0h1pq9fmjp";
libraryHaskellDepends = [
base containers genvalidity QuickCheck validity validity-containers
];
@@ -92029,6 +92819,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "genvalidity-text_0_7_0_1" = callPackage
+ ({ mkDerivation, array, base, criterion, genvalidity
+ , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck
+ , random, text, validity, validity-text
+ }:
+ mkDerivation {
+ pname = "genvalidity-text";
+ version = "0.7.0.1";
+ sha256 = "13lpvjid379acapk8if3355zrgaaw2dg8fw52vzby9hqj4ki4gxs";
+ libraryHaskellDepends = [
+ array base genvalidity QuickCheck random text validity
+ validity-text
+ ];
+ testHaskellDepends = [
+ base genvalidity genvalidity-hspec hspec QuickCheck text
+ ];
+ benchmarkHaskellDepends = [
+ base criterion genvalidity genvalidity-criterion QuickCheck text
+ ];
+ description = "GenValidity support for Text";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {genvalidity-criterion = null;};
+
"genvalidity-time" = callPackage
({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
, QuickCheck, time, validity-time
@@ -92255,8 +93070,8 @@ self: {
}:
mkDerivation {
pname = "geoip2";
- version = "0.4.0.0";
- sha256 = "1a2wxblnv611asfwkgm2ndam1jvm2xqajj3rk0ii9qi7j9s5w8v0";
+ version = "0.4.0.1";
+ sha256 = "0q0clfmq7spfplxr6dxhq0d39f5l95yfr87ixnv2cn0ahcx7fpi7";
libraryHaskellDepends = [
base bytestring cereal containers iproute lens mmap
reinterpret-cast text
@@ -92484,6 +93299,8 @@ self: {
];
description = "Github Standard Labeler";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"gh-pocket-knife" = callPackage
@@ -92723,8 +93540,8 @@ self: {
}:
mkDerivation {
pname = "ghc-events";
- version = "0.11.0";
- sha256 = "0ssm19fp6phpj7b0xgylz29fcbzq8chgfz62kax3wc1acd40vmp0";
+ version = "0.12.0";
+ sha256 = "08lrpi6dn32m9ih2w6s7s7fq95k5k015jxkj73z1kss092l3pwi6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -92988,27 +93805,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc-lib_8_8_1" = callPackage
+ "ghc-lib_8_8_1_20191204" = callPackage
({ mkDerivation, alex, array, base, binary, bytestring, containers
, deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy
- , haskeline, hpc, pretty, process, time, transformers, unix
+ , hpc, pretty, process, time, transformers, unix
}:
mkDerivation {
pname = "ghc-lib";
- version = "8.8.1";
- sha256 = "0lilr12pamss6x2vkqb700zy7yd15vd4y8f0h4q8fdp068bxn177";
- isLibrary = true;
- isExecutable = true;
+ version = "8.8.1.20191204";
+ sha256 = "1xj2l9w4jmwxavs5s6p50wciracqlvkx9mg015m8gv1s8sxn6sqh";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
ghc-lib-parser ghc-prim hpc pretty process time transformers unix
];
libraryToolDepends = [ alex happy ];
- executableHaskellDepends = [
- array base bytestring containers deepseq directory filepath
- ghc-prim haskeline process time transformers unix
- ];
description = "The GHC API, decoupled from GHC versions";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -93033,15 +93844,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc-lib-parser_8_8_1" = callPackage
+ "ghc-lib-parser_8_8_1_20191204" = callPackage
({ mkDerivation, alex, array, base, binary, bytestring, containers
, deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
, process, time, transformers, unix
}:
mkDerivation {
pname = "ghc-lib-parser";
- version = "8.8.1";
- sha256 = "12aicsvc45ld2hv2qq0wdky4qa2mg8s6hhamilavcbp0da2s6wnh";
+ version = "8.8.1.20191204";
+ sha256 = "0acfq70mhhb76v0fhgqnijb4yp4njzxwc3c6d53r594cix3grvdp";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
@@ -93467,6 +94278,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghc-syntax-highlighter_0_0_5_0" = callPackage
+ ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text
+ }:
+ mkDerivation {
+ pname = "ghc-syntax-highlighter";
+ version = "0.0.5.0";
+ sha256 = "09h911wqja56b9j9dwjqv7dlim9rm50vra1bkp8zhnlw9fa2s127";
+ revision = "1";
+ editedCabalFile = "15ykgzk8f1kslvwl645saz7q1d6iv3fk5xyri65v2gaiaih0r640";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [ base ghc-lib-parser text ];
+ testHaskellDepends = [ base hspec text ];
+ testToolDepends = [ hspec-discover ];
+ description = "Syntax highlighter for Haskell using lexer of GHC itself";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghc-tcplugins-extra" = callPackage
({ mkDerivation, base, ghc }:
mkDerivation {
@@ -93516,11 +94345,11 @@ self: {
({ mkDerivation, base, bytestring, criterion, text }:
mkDerivation {
pname = "ghc-trace-events";
- version = "0.0.0.1";
- sha256 = "0b9s07wy26f9xswg6ysylpjaa9gv9iqw50n3zqpkj3jr8ah8y3kl";
+ version = "0.1.0";
+ sha256 = "0i68zk3k02f3hp6yvkgmdvdjfm8kgh3pwhr3qff4bc9isfh6qks2";
libraryHaskellDepends = [ base bytestring text ];
benchmarkHaskellDepends = [ base bytestring criterion ];
- description = "Faster replacements for traceEvent and traceMarker";
+ description = "Faster traceEvent and traceMarker, and binary object logging for eventlog";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -93684,8 +94513,8 @@ self: {
({ mkDerivation, base, directory, ghc, time }:
mkDerivation {
pname = "ghcflags";
- version = "1.0.1";
- sha256 = "1s7xx13ka5jc8c5ga2yzzx3m6l9kn8fjgrfq6g7y6z8kw38590vb";
+ version = "1.0.2";
+ sha256 = "17j7bkx7ki5vqr0a3vl0f0v4l9cz2q7lm9xpkj3144y9sqmiqzy3";
libraryHaskellDepends = [ base directory ghc time ];
description = "Dump the ghc flags during compilation";
license = stdenv.lib.licenses.bsd2;
@@ -93860,8 +94689,8 @@ self: {
}:
mkDerivation {
pname = "ghcid";
- version = "0.7.6";
- sha256 = "0ic4v2l2mlcbgshd2p3834mdzagprc2bqjhnm9z38yvwj4bjgp5r";
+ version = "0.7.7";
+ sha256 = "1qrj6is1f6jnx9m2g7cp2009dik7inzf5yqlvqv4pwzzxp0nhl3a";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -93879,21 +94708,48 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ghcid_0_8" = callPackage
+ ({ mkDerivation, ansi-terminal, base, cmdargs, containers
+ , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
+ , terminal-size, time, unix
+ }:
+ mkDerivation {
+ pname = "ghcid";
+ version = "0.8";
+ sha256 = "1vyjsxxp0jqqfkxp9r8by9qg794g0nj3k5zg7vlvh5v8xzigv8qg";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ ansi-terminal base cmdargs directory extra filepath process time
+ ];
+ executableHaskellDepends = [
+ ansi-terminal base cmdargs containers directory extra filepath
+ fsnotify process terminal-size time unix
+ ];
+ testHaskellDepends = [
+ ansi-terminal base cmdargs containers directory extra filepath
+ fsnotify process tasty tasty-hunit terminal-size time unix
+ ];
+ description = "GHCi based bare bones IDE";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ghcide" = callPackage
({ mkDerivation, aeson, async, base, binary, bytestring, containers
, data-default, deepseq, directory, extra, filepath, ghc, ghc-boot
- , ghc-boot-th, ghc-paths, hashable, haskell-lsp, haskell-lsp-types
- , hie-bios, hslogger, lens, lsp-test, mtl, network-uri
- , optparse-applicative, parser-combinators, prettyprinter
- , prettyprinter-ansi-terminal, rope-utf16-splay, safe-exceptions
- , shake, sorted-list, stm, syb, tasty, tasty-expected-failure
- , tasty-hunit, text, time, transformers, unix, unordered-containers
- , utf8-string
+ , ghc-boot-th, ghc-paths, ghc-typelits-knownnat, hashable
+ , haskell-lsp, haskell-lsp-types, hie-bios, hslogger, lens
+ , lsp-test, mtl, network-uri, optparse-applicative
+ , parser-combinators, prettyprinter, prettyprinter-ansi-terminal
+ , rope-utf16-splay, safe-exceptions, shake, sorted-list, stm, syb
+ , tasty, tasty-expected-failure, tasty-hunit, text, time
+ , transformers, unix, unordered-containers, utf8-string
}:
mkDerivation {
pname = "ghcide";
- version = "0.0.4";
- sha256 = "19iasnsqz9a07gw1f3cxraij1hykwxsidx1c26ws8l13nhnh6mpr";
+ version = "0.0.5";
+ sha256 = "014l2gg7ln2q9c7qpga45iicxi5mcyjzllvyiwb4vd8rmbkvr1bm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -93909,14 +94765,12 @@ self: {
haskell-lsp hie-bios hslogger optparse-applicative shake text
];
testHaskellDepends = [
- base containers directory extra filepath ghc haskell-lsp-types lens
- lsp-test parser-combinators tasty tasty-expected-failure
- tasty-hunit text
+ base bytestring containers directory extra filepath ghc
+ ghc-typelits-knownnat haskell-lsp-types lens lsp-test
+ parser-combinators tasty tasty-expected-failure tasty-hunit text
];
description = "The core of an IDE";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"ghcjs-ajax" = callPackage
@@ -95546,8 +96400,8 @@ self: {
}:
mkDerivation {
pname = "git-annex";
- version = "7.20191024";
- sha256 = "11n0wvw7i1rgrsmm2wkv01rfa0azgaw1ib7jbmy4fyg9pw0s27y1";
+ version = "7.20191114";
+ sha256 = "1afrn5g3b80f3n6ncfph6pmf9jdpc7a6ay55k2pmkn96pyv4hfmm";
configureFlags = [
"-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
"-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -95646,8 +96500,8 @@ self: {
}:
mkDerivation {
pname = "git-config";
- version = "0.1.1";
- sha256 = "0vspjqscw02x3hr6n0d0d4kyjfh5lij4wy58fp4z301vmyv77vgl";
+ version = "0.1.2";
+ sha256 = "1kp5yqn7pz5haq41m2za2f3bw0ygf1zlnn3n0b76zh0jbrndgknh";
libraryHaskellDepends = [
base megaparsec text unordered-containers
];
@@ -96056,8 +96910,8 @@ self: {
}:
mkDerivation {
pname = "github";
- version = "0.23";
- sha256 = "1d08m0kajl6zaralz1rbm4miv2a5zrbm6asjyrl75n915l56m9mb";
+ version = "0.24";
+ sha256 = "0jbk34aibm5bqbax8f2sif840f31g81yipnkav96lr4pfdv5b4mr";
libraryHaskellDepends = [
aeson base base-compat base16-bytestring binary binary-instances
bytestring containers cryptohash-sha1 deepseq deepseq-generics
@@ -96152,8 +97006,8 @@ self: {
}:
mkDerivation {
pname = "github-release";
- version = "1.2.4";
- sha256 = "1s4vmqrzq7w35kfij9pyxm9b672khhx03whi4adz6l51xij6a3yb";
+ version = "1.2.5";
+ sha256 = "1ilmq8sjxidyna41gm97ygskjzkbf3rggb2m6lqpxpjcycay7jfr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -96168,6 +97022,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "github-rest" = callPackage
+ ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client
+ , http-client-tls, http-types, jwt, mtl, scientific, tasty
+ , tasty-golden, tasty-hunit, tasty-quickcheck, text, time
+ , transformers, unliftio, unliftio-core
+ }:
+ mkDerivation {
+ pname = "github-rest";
+ version = "1.0.1";
+ sha256 = "0dv959xmfpwbkjnjkisgxldkb89ln0wypz4cb65biijqfw0i4399";
+ libraryHaskellDepends = [
+ aeson base bytestring http-client http-client-tls http-types jwt
+ mtl scientific text time transformers unliftio unliftio-core
+ ];
+ testHaskellDepends = [
+ aeson aeson-qq base bytestring http-client http-client-tls
+ http-types jwt mtl scientific tasty tasty-golden tasty-hunit
+ tasty-quickcheck text time transformers unliftio unliftio-core
+ ];
+ description = "Query the GitHub REST API programmatically";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"github-tools" = callPackage
({ mkDerivation, base, bytestring, containers, exceptions, github
, groom, html, http-client, http-client-tls, monad-parallel
@@ -96399,22 +97276,16 @@ self: {
"gitlab-haskell" = callPackage
({ mkDerivation, aeson, base, bytestring, connection, http-conduit
- , http-types, optparse-applicative, text, transformers, unliftio
- , unliftio-core
+ , http-types, text, time, transformers, unliftio, unliftio-core
}:
mkDerivation {
pname = "gitlab-haskell";
- version = "0.1.2";
- sha256 = "0m5gxf7799ds3ff46bz7j3rxycwnbaaik7lffyh22ipp3wlxjxpn";
- isLibrary = true;
- isExecutable = true;
+ version = "0.1.4";
+ sha256 = "09va5xbb2qya149gzrm3d3q9g6s4axxx6qkv4z764dryqq7fm7ly";
libraryHaskellDepends = [
- aeson base bytestring connection http-conduit http-types text
+ aeson base bytestring connection http-conduit http-types text time
transformers unliftio unliftio-core
];
- executableHaskellDepends = [
- base http-types optparse-applicative text
- ];
description = "A Haskell library for the GitLab web API";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -97423,10 +98294,15 @@ self: {
}:
mkDerivation {
pname = "glpk-hs";
- version = "0.5";
- sha256 = "1scr5iyxn83172g3d7wjww3frcrgk8kh3hzni11qchskllkx0vm3";
+ version = "0.7";
+ sha256 = "0cbdlidq14hmhndlgxid4gdzyg0jlm5habp5389xl3zkbmm2hni9";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [ array base containers deepseq gasp mtl ];
librarySystemDepends = [ glpk ];
+ executableHaskellDepends = [
+ array base containers deepseq gasp mtl
+ ];
description = "Comprehensive GLPK linear programming bindings";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -101702,21 +102578,22 @@ self: {
}) {};
"graphql" = callPackage
- ({ mkDerivation, aeson, base, hspec, hspec-expectations
+ ({ mkDerivation, aeson, base, containers, hspec, hspec-expectations
, hspec-megaparsec, megaparsec, raw-strings-qq, text, transformers
, unordered-containers
}:
mkDerivation {
pname = "graphql";
- version = "0.5.1.0";
- sha256 = "0wnn4nhszcciv06h17qkaxn649w48fw876v85934mfbn56fczzdd";
+ version = "0.6.0.0";
+ sha256 = "0gippn2y1ngykfz33825r4r4m5km7m8qch7ijics1q9d1jnszs5a";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson base megaparsec text transformers unordered-containers
+ aeson base containers megaparsec text transformers
+ unordered-containers
];
testHaskellDepends = [
- aeson base hspec hspec-expectations hspec-megaparsec megaparsec
- raw-strings-qq text transformers unordered-containers
+ aeson base containers hspec hspec-expectations hspec-megaparsec
+ megaparsec raw-strings-qq text transformers unordered-containers
];
description = "Haskell GraphQL implementation";
license = stdenv.lib.licenses.bsd3;
@@ -101759,8 +102636,8 @@ self: {
({ mkDerivation, base, containers, json, text }:
mkDerivation {
pname = "graphql-w-persistent";
- version = "0.6.0.0";
- sha256 = "03m247xmj8gvvjs4bgsc06daz9avklza7ngs575psaqmkpxd8ga3";
+ version = "0.7.0.0";
+ sha256 = "02qbwkbr8hckr6z9ivszdnwlilz7mkh6zinb33s7gas7iwzkf9jc";
libraryHaskellDepends = [ base containers json text ];
description = "GraphQL interface middleware for (SQL) databases";
license = stdenv.lib.licenses.isc;
@@ -102676,8 +103553,8 @@ self: {
}:
mkDerivation {
pname = "grpc-haskell";
- version = "0.0.0.0";
- sha256 = "1d1njhrg6sfwy9f6xaxj0p8bbp2g6qjsa4cq7zq43h3vc1lkb0ii";
+ version = "0.0.1.0";
+ sha256 = "1cl12g88wvml3s5jazcb4gi4zwf6fp28hc9jp1fj25qpbr14il5c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -102696,7 +103573,34 @@ self: {
license = stdenv.lib.licenses.asl20;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {grpc-haskell-core = null;};
+ }) {};
+
+ "grpc-haskell-core" = callPackage
+ ({ mkDerivation, async, base, bytestring, c2hs, clock, containers
+ , gpr, grpc, managed, pipes, proto3-suite, QuickCheck, safe
+ , sorted-list, stm, tasty, tasty-hunit, tasty-quickcheck, text
+ , time, transformers, turtle, unix
+ }:
+ mkDerivation {
+ pname = "grpc-haskell-core";
+ version = "0.0.0.0";
+ sha256 = "1pvcdr1jrn94nwhni5992l8mv401150wl8yi519hncs173n2fx88";
+ libraryHaskellDepends = [
+ base bytestring clock containers managed sorted-list stm
+ transformers
+ ];
+ librarySystemDepends = [ gpr grpc ];
+ libraryToolDepends = [ c2hs ];
+ testHaskellDepends = [
+ async base bytestring clock containers managed pipes proto3-suite
+ QuickCheck safe tasty tasty-hunit tasty-quickcheck text time
+ transformers turtle unix
+ ];
+ description = "Haskell implementation of gRPC layered on shared C library";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {gpr = null; inherit (pkgs) grpc;};
"gruff" = callPackage
({ mkDerivation, base, bytestring, containers, directory, filepath
@@ -103881,29 +104785,28 @@ self: {
"hOpenPGP" = callPackage
({ mkDerivation, aeson, asn1-encoding, attoparsec, base
- , base16-bytestring, base64-bytestring, bifunctors, binary
- , binary-conduit, bytestring, bzlib, conduit, conduit-extra
- , containers, criterion, crypto-cipher-types, cryptonite, errors
- , hashable, incremental-parser, ixset-typed, lens, memory
- , monad-loops, nettle, network, network-uri, newtype
- , openpgp-asciiarmor, prettyprinter, QuickCheck
- , quickcheck-instances, resourcet, semigroups, split, tasty
- , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
- , transformers, unliftio-core, unordered-containers, zlib
+ , base16-bytestring, bifunctors, binary, binary-conduit, bytestring
+ , bzlib, conduit, conduit-extra, containers, criterion
+ , crypto-cipher-types, cryptonite, errors, hashable
+ , incremental-parser, ixset-typed, lens, memory, monad-loops
+ , nettle, network, network-uri, newtype, openpgp-asciiarmor
+ , prettyprinter, QuickCheck, quickcheck-instances, resourcet
+ , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
+ , time, time-locale-compat, transformers, unliftio-core
+ , unordered-containers, zlib
}:
mkDerivation {
pname = "hOpenPGP";
- version = "2.8";
- sha256 = "1n6cpwgg934ii3b4ap2gp347q3k4b64dc9x37d4bj51hs6910pmw";
+ version = "2.8.5";
+ sha256 = "1d5cmgj3rg8snc2b5jn9h7hb83j2hhf0c9shiiyrpr8rrl4hx2mj";
libraryHaskellDepends = [
- aeson asn1-encoding attoparsec base base16-bytestring
- base64-bytestring bifunctors binary binary-conduit bytestring bzlib
- conduit conduit-extra containers crypto-cipher-types cryptonite
- errors hashable incremental-parser ixset-typed lens memory
- monad-loops nettle network-uri newtype openpgp-asciiarmor
- prettyprinter resourcet semigroups split text time
- time-locale-compat transformers unliftio-core unordered-containers
- zlib
+ aeson asn1-encoding attoparsec base base16-bytestring bifunctors
+ binary binary-conduit bytestring bzlib conduit conduit-extra
+ containers crypto-cipher-types cryptonite errors hashable
+ incremental-parser ixset-typed lens memory monad-loops nettle
+ network-uri newtype openpgp-asciiarmor prettyprinter resourcet
+ semigroups split text time time-locale-compat transformers
+ unliftio-core unordered-containers zlib
];
testHaskellDepends = [
aeson asn1-encoding attoparsec base base16-bytestring bifunctors
@@ -103916,16 +104819,68 @@ self: {
unliftio-core unordered-containers zlib
];
benchmarkHaskellDepends = [
- aeson base base16-bytestring base64-bytestring bifunctors binary
- binary-conduit bytestring bzlib conduit conduit-extra containers
- criterion crypto-cipher-types cryptonite errors hashable
- incremental-parser ixset-typed lens memory monad-loops nettle
- network network-uri newtype openpgp-asciiarmor prettyprinter
- resourcet semigroups split text time time-locale-compat
- transformers unliftio-core unordered-containers zlib
+ aeson base base16-bytestring bifunctors binary binary-conduit
+ bytestring bzlib conduit conduit-extra containers criterion
+ crypto-cipher-types cryptonite errors hashable incremental-parser
+ ixset-typed lens memory monad-loops nettle network network-uri
+ newtype openpgp-asciiarmor prettyprinter resourcet semigroups split
+ text time time-locale-compat transformers unliftio-core
+ unordered-containers zlib
];
description = "native Haskell implementation of OpenPGP (RFC4880)";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "hOpenPGP_2_9" = callPackage
+ ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
+ , base16-bytestring, bifunctors, binary, binary-conduit, bytestring
+ , bzlib, conduit, conduit-extra, containers, criterion
+ , crypto-cipher-types, cryptonite, errors, hashable
+ , incremental-parser, ixset-typed, lens, memory, monad-loops
+ , nettle, network, network-uri, newtype, openpgp-asciiarmor
+ , prettyprinter, QuickCheck, quickcheck-instances, resourcet
+ , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
+ , time, time-locale-compat, transformers, unliftio-core
+ , unordered-containers, zlib
+ }:
+ mkDerivation {
+ pname = "hOpenPGP";
+ version = "2.9";
+ sha256 = "0xdb1ggd7pw0faan8cs3hs29sqb3bgjfhxqs5x43hh1k64k3vdjk";
+ libraryHaskellDepends = [
+ aeson asn1-encoding attoparsec base base16-bytestring bifunctors
+ binary binary-conduit bytestring bzlib conduit conduit-extra
+ containers crypto-cipher-types cryptonite errors hashable
+ incremental-parser ixset-typed lens memory monad-loops nettle
+ network-uri newtype openpgp-asciiarmor prettyprinter resourcet
+ semigroups split text time time-locale-compat transformers
+ unliftio-core unordered-containers zlib
+ ];
+ testHaskellDepends = [
+ aeson asn1-encoding attoparsec base base16-bytestring bifunctors
+ binary binary-conduit bytestring bzlib conduit conduit-extra
+ containers crypto-cipher-types cryptonite errors hashable
+ incremental-parser ixset-typed lens memory monad-loops nettle
+ network network-uri newtype prettyprinter QuickCheck
+ quickcheck-instances resourcet semigroups split tasty tasty-hunit
+ tasty-quickcheck text time time-locale-compat transformers
+ unliftio-core unordered-containers zlib
+ ];
+ benchmarkHaskellDepends = [
+ aeson base base16-bytestring bifunctors binary binary-conduit
+ bytestring bzlib conduit conduit-extra containers criterion
+ crypto-cipher-types cryptonite errors hashable incremental-parser
+ ixset-typed lens memory monad-loops nettle network network-uri
+ newtype openpgp-asciiarmor prettyprinter resourcet semigroups split
+ text time time-locale-compat transformers unliftio-core
+ unordered-containers zlib
+ ];
+ description = "native Haskell implementation of OpenPGP (RFC4880)";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"hPDB" = callPackage
@@ -104816,22 +105771,23 @@ self: {
"hackage-repo-tool" = callPackage
({ mkDerivation, base, bytestring, Cabal, directory, filepath
- , hackage-security, network, network-uri, old-time
+ , hackage-security, microlens, network, network-uri, old-time
, optparse-applicative, tar, time, unix, zlib
}:
mkDerivation {
pname = "hackage-repo-tool";
- version = "0.1.1.1";
- sha256 = "05r4i7zhwbsv9ci4yid57fnb5lkx254pch9arq5a11dvwsvdzvzw";
- revision = "2";
- editedCabalFile = "04ghg9chkqj3s4g24jszcpb4m8fi9qbgs04bbb1kny3c6ihin93x";
+ version = "0.1.1.2";
+ sha256 = "1zgsmibi24w2wsd828hnls1yv9lrl9xwsi2aay3d603j8mg8vd0r";
+ revision = "1";
+ editedCabalFile = "1x8cqmfyc168jrmvg2c8as1gj4qys10hyr71nmcyskvqrk5bsxf8";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base bytestring Cabal directory filepath hackage-security network
- network-uri old-time optparse-applicative tar time unix zlib
+ base bytestring Cabal directory filepath hackage-security microlens
+ network network-uri old-time optparse-applicative tar time unix
+ zlib
];
- description = "Utility to manage secure file-based package repositories";
+ description = "Manage secure file-based package repositories";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -104864,6 +105820,36 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hackage-security_0_6_0_0" = callPackage
+ ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
+ , bytestring, Cabal, containers, cryptohash-sha256, directory
+ , ed25519, filepath, ghc-prim, lukko, mtl, network, network-uri
+ , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, temporary, time, transformers
+ , unordered-containers, vector, zlib
+ }:
+ mkDerivation {
+ pname = "hackage-security";
+ version = "0.6.0.0";
+ sha256 = "1y9vs30y474ri8b9jqkbwfkcfh7p7jaafzwxina9z0xl32d0bn1c";
+ revision = "1";
+ editedCabalFile = "0iw1vy9xapwrwsg38pb6lr26yprwhz1j2w2kzkqfapxmwx37v639";
+ libraryHaskellDepends = [
+ base base16-bytestring base64-bytestring bytestring Cabal
+ containers cryptohash-sha256 directory ed25519 filepath ghc-prim
+ lukko mtl network network-uri parsec pretty tar template-haskell
+ time transformers zlib
+ ];
+ testHaskellDepends = [
+ aeson base bytestring Cabal containers network-uri QuickCheck tar
+ tasty tasty-hunit tasty-quickcheck temporary time
+ unordered-containers vector zlib
+ ];
+ description = "Hackage security library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hackage-security-HTTP" = callPackage
({ mkDerivation, base, bytestring, hackage-security, HTTP, mtl
, network, network-uri, zlib
@@ -105278,6 +106264,8 @@ self: {
pname = "haddock-library";
version = "1.8.0";
sha256 = "15xpv29yh3kb9qq9gmws2l8m64i7phvf47y08vxc2j55101sg4vh";
+ revision = "1";
+ editedCabalFile = "09v6lq3ncf3ax7b6n36vhsflm488x0qc8sgc3w17m09x1jl48d99";
libraryHaskellDepends = [
base bytestring containers parsec text transformers
];
@@ -105340,8 +106328,8 @@ self: {
}:
mkDerivation {
pname = "hadolint";
- version = "1.17.2";
- sha256 = "0s9q0016j3y56sblkq12mai1j58h8w8cy8k2x1bzvhb95zpg1va9";
+ version = "1.17.3";
+ sha256 = "00lyf2m6q866383q79b705xhn987504wz3fp3zh7m8580v8phy5p";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -105553,8 +106541,6 @@ self: {
];
description = "A service for pull-based continuous deployment based on hydra";
license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hailgun" = callPackage
@@ -106097,8 +107083,6 @@ self: {
];
description = "Hakyll utilities to work with images";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"hakyll-ogmarkup" = callPackage
@@ -106894,37 +107878,6 @@ self: {
}) {};
"hapistrano" = callPackage
- ({ mkDerivation, aeson, async, base, directory, filepath
- , formatting, gitrev, hspec, mtl, optparse-applicative, path
- , path-io, process, QuickCheck, silently, stm, temporary, time
- , transformers, typed-process, yaml
- }:
- mkDerivation {
- pname = "hapistrano";
- version = "0.3.9.3";
- sha256 = "1kp2gdr0xjzr0qi584lqiqh7hjk8vymz04af2zcgdhbw68brj2cx";
- isLibrary = true;
- isExecutable = true;
- enableSeparateDataOutput = true;
- libraryHaskellDepends = [
- aeson base filepath formatting gitrev mtl path process stm time
- transformers typed-process
- ];
- executableHaskellDepends = [
- aeson async base formatting gitrev optparse-applicative path
- path-io stm yaml
- ];
- testHaskellDepends = [
- base directory filepath hspec mtl path path-io process QuickCheck
- silently temporary
- ];
- description = "A deployment library for Haskell applications";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {};
-
- "hapistrano_0_3_10_0" = callPackage
({ mkDerivation, aeson, ansi-terminal, async, base, directory
, filepath, formatting, gitrev, hspec, hspec-discover, mtl
, optparse-applicative, path, path-io, process, QuickCheck
@@ -106952,8 +107905,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "A deployment library for Haskell applications";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"happindicator" = callPackage
@@ -107157,8 +108108,8 @@ self: {
}:
mkDerivation {
pname = "happstack-authenticate";
- version = "2.4.0";
- sha256 = "1q4k8x6mwh9g7y5njcjd1xyn79yjnjv01nk4xa5q9yspmsa4685m";
+ version = "2.4.0.2";
+ sha256 = "16f4rs4h3lznkci5axibliiwfr3vrm03arxcjfjiv6mypkcpnp2r";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
acid-state aeson authenticate base base64-bytestring boomerang
@@ -107417,8 +108368,8 @@ self: {
}:
mkDerivation {
pname = "happstack-hsp";
- version = "7.3.7.3";
- sha256 = "0m7psd6dg33xijshs3dxz2xrqghmpbs402h67b52pkqsk5nmy633";
+ version = "7.3.7.4";
+ sha256 = "188fqqpq7m921qkfv2b64pikcx8zzsy376l4py4wxlkabl7fkydr";
libraryHaskellDepends = [
base bytestring happstack-server harp hsp hsx2hs mtl syb text
utf8-string
@@ -107473,8 +108424,8 @@ self: {
}:
mkDerivation {
pname = "happstack-jmacro";
- version = "7.0.12.1";
- sha256 = "0bx2wa0pdj73f11xhkk0qq3k8zwh6ccc3kqli9q59617s05wq6zz";
+ version = "7.0.12.2";
+ sha256 = "0zgmh75z59g6hs8n924sbnhswjdd6b947ywiird2a3y6d2zwqj3v";
libraryHaskellDepends = [
base base64-bytestring bytestring cereal digest happstack-server
jmacro text utf8-string wl-pprint-text
@@ -107538,22 +108489,22 @@ self: {
({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
, containers, directory, exceptions, extensible-exceptions
, filepath, hslogger, html, HUnit, monad-control, mtl, network
- , network-uri, old-locale, parsec, process, semigroups, sendfile
- , syb, system-filepath, template-haskell, text, threads, time
- , transformers, transformers-base, transformers-compat, unix
+ , network-bsd, network-uri, old-locale, parsec, process, semigroups
+ , sendfile, syb, system-filepath, template-haskell, text, threads
+ , time, transformers, transformers-base, transformers-compat, unix
, utf8-string, xhtml, zlib
}:
mkDerivation {
pname = "happstack-server";
- version = "7.5.4";
- sha256 = "0i7csvmwv7n68gkwqzi985p2mjdgzipjnlj873sdiknhx9pfmq70";
+ version = "7.6.0";
+ sha256 = "0dixzrqr6y96ldx7ls2n19ilfph798jkflgcpzbj6gaw3y20w2b7";
libraryHaskellDepends = [
base base64-bytestring blaze-html bytestring containers directory
exceptions extensible-exceptions filepath hslogger html
- monad-control mtl network network-uri old-locale parsec process
- semigroups sendfile syb system-filepath template-haskell text
- threads time transformers transformers-base transformers-compat
- unix utf8-string xhtml zlib
+ monad-control mtl network network-bsd network-uri old-locale parsec
+ process semigroups sendfile syb system-filepath template-haskell
+ text threads time transformers transformers-base
+ transformers-compat unix utf8-string xhtml zlib
];
testHaskellDepends = [
base bytestring containers HUnit parsec zlib
@@ -107571,8 +108522,8 @@ self: {
}:
mkDerivation {
pname = "happstack-server-tls";
- version = "7.1.6.7";
- sha256 = "18jvim1hm1d4ia8ka2kxwzzzpdvs6wy0v2k5qz6bg9lsv4wi9xil";
+ version = "7.2.1";
+ sha256 = "1cihzjxl1v5sgmaxn8qny8b9yzm7p1gccgy1iaa3dk2jpl07a2dp";
libraryHaskellDepends = [
base bytestring extensible-exceptions happstack-server hslogger
HsOpenSSL network sendfile time unix
@@ -107710,6 +108661,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "happy_1_19_9" = callPackage
+ ({ mkDerivation, array, base, Cabal, containers, directory
+ , filepath, mtl, process
+ }:
+ mkDerivation {
+ pname = "happy";
+ version = "1.19.9";
+ sha256 = "138xpxdb7x62lpmgmb6b3v3vgdqqvqn4273jaap3mjmc2gla709y";
+ revision = "3";
+ editedCabalFile = "0kwlh964nyqvfbm02np8vpc28gbhsby0r65jhz1918rm0wip9izq";
+ isLibrary = false;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal directory filepath ];
+ executableHaskellDepends = [ array base containers mtl ];
+ testHaskellDepends = [ base process ];
+ description = "Happy is a parser generator for Haskell";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"happy" = callPackage
({ mkDerivation, array, base, containers, mtl, process }:
mkDerivation {
@@ -108034,8 +109005,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "harp";
- version = "0.4.3.2";
- sha256 = "1abyfsr0ya7j0s6znixhfhsr9mlmcg16rg5d9909b0xr896bkbn6";
+ version = "0.4.3.3";
+ sha256 = "16bmv3ymiiyvy65vf4s5h4fhp6q5hrw40xfdba4yarwgpbm0frm2";
libraryHaskellDepends = [ base ];
description = "HaRP allows pattern-matching with regular expressions";
license = stdenv.lib.licenses.bsd3;
@@ -108114,8 +109085,8 @@ self: {
}:
mkDerivation {
pname = "hasbolt";
- version = "0.1.3.5";
- sha256 = "0qd5rh0jdwhkjcz5kg1bqwd5hpz5w9ph9k0vxaam1lnjjniw7zbj";
+ version = "0.1.3.6";
+ sha256 = "0sgxvgvxqykslbjslrb5mzmaaar4nbc59p94qhk7rzbjsas01vp2";
libraryHaskellDepends = [
base binary bytestring connection containers data-binary-ieee754
data-default mtl network text
@@ -108129,14 +109100,14 @@ self: {
"hasbolt-extras" = callPackage
({ mkDerivation, aeson, aeson-casing, base, bytestring, containers
- , data-default, free, hasbolt, lens, mtl, neat-interpolation
- , scientific, template-haskell, text, th-lift-instances
- , unordered-containers, vector
+ , data-default, doctest, free, hasbolt, lens, mtl
+ , neat-interpolation, scientific, template-haskell, text
+ , th-lift-instances, unordered-containers, vector
}:
mkDerivation {
pname = "hasbolt-extras";
- version = "0.0.0.22";
- sha256 = "06bad2hbzmrrav1f7fsszrspxghziy6jpmgr39nbs375fbqib4kp";
+ version = "0.0.0.25";
+ sha256 = "0cd0c6vcyfzrg3bzs1mv2c7alr7ncz5gkj6r70n2fb41mxnz9i2l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -108147,6 +109118,7 @@ self: {
executableHaskellDepends = [
aeson base bytestring containers data-default hasbolt mtl text
];
+ testHaskellDepends = [ base doctest ];
description = "Extras for hasbolt library";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -109110,23 +110082,24 @@ self: {
"haskell-ci" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, base-compat
- , bytestring, Cabal, containers, deepseq, Diff, directory
- , exceptions, filepath, generic-lens, HsYAML, lattices, microlens
- , mtl, network-uri, optparse-applicative, parsec, pretty, process
- , ShellCheck, tasty, tasty-golden, temporary, text, transformers
- , unordered-containers
+ , bytestring, Cabal, cabal-install-parsers, containers, deepseq
+ , Diff, directory, exceptions, filepath, generic-lens, HsYAML
+ , lattices, microlens, mtl, network-uri, optparse-applicative
+ , parsec, pretty, process, ShellCheck, tasty, tasty-golden
+ , temporary, text, transformers, unordered-containers
}:
mkDerivation {
pname = "haskell-ci";
- version = "0.6";
- sha256 = "1g9zfdw4z00sbh3mkaz2hzn09hjlawkb7h67mqn4qsdjw6dbwaab";
+ version = "0.8";
+ sha256 = "1wm5fs8fdy85lvjyy9n0yh66ax6bs0ll4gq7d8ba0ibsp69g6pm3";
isLibrary = false;
isExecutable = true;
libraryHaskellDepends = [
- aeson base base-compat bytestring Cabal containers deepseq
- directory exceptions filepath generic-lens HsYAML lattices
- microlens mtl network-uri optparse-applicative parsec pretty
- process ShellCheck temporary text transformers unordered-containers
+ aeson base base-compat bytestring Cabal cabal-install-parsers
+ containers deepseq directory exceptions filepath generic-lens
+ HsYAML lattices microlens mtl network-uri optparse-applicative
+ parsec pretty process ShellCheck temporary text transformers
+ unordered-containers
];
executableHaskellDepends = [ base ];
testHaskellDepends = [
@@ -109136,7 +110109,8 @@ self: {
doHaddock = false;
description = "Cabal package script generator for Travis-CI";
license = stdenv.lib.licenses.gpl3Plus;
- maintainers = with stdenv.lib.maintainers; [ peti ];
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"haskell-cnc" = callPackage
@@ -109676,7 +110650,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp_0_17_0_0" = callPackage
+ "haskell-lsp_0_18_0_0" = callPackage
({ mkDerivation, aeson, async, attoparsec, base, bytestring
, containers, data-default, directory, filepath, hashable
, haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl
@@ -109685,8 +110659,8 @@ self: {
}:
mkDerivation {
pname = "haskell-lsp";
- version = "0.17.0.0";
- sha256 = "17c95ndm6jadab04q707pmv6x9cwshk463c8gc9ai0m7763win7x";
+ version = "0.18.0.0";
+ sha256 = "0q9xpjgr3n7svhd9f7mmkw113avswvfm08fnbijdr1sblipd12sl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -109745,15 +110719,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp-types_0_17_0_0" = callPackage
+ "haskell-lsp-types_0_18_0_0" = callPackage
({ mkDerivation, aeson, base, bytestring, data-default, deepseq
, filepath, hashable, lens, network-uri, scientific, text
, unordered-containers
}:
mkDerivation {
pname = "haskell-lsp-types";
- version = "0.17.0.0";
- sha256 = "03i3s7f82imv4ysclhjv07mcs0dl3m5nmjxmfa5wafircai4yi3p";
+ version = "0.18.0.0";
+ sha256 = "1ypa3gxxcg7dl905d4nprcqzw2fcl7z7xy1hpg5har1dw3w9fyiq";
libraryHaskellDepends = [
aeson base bytestring data-default deepseq filepath hashable lens
network-uri scientific text unordered-containers
@@ -109847,8 +110821,8 @@ self: {
}:
mkDerivation {
pname = "haskell-names";
- version = "0.9.6";
- sha256 = "06g1h1dvsh31hm18v3hkx2s4bcrv2h49kgc2x9k1xk6532a9503w";
+ version = "0.9.7";
+ sha256 = "1ad0kdp4a9gq10g9flmmjn0ibfaipq2qnrz5a13r1mgyb6skzc5j";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring containers data-lens-light filepath
@@ -110211,6 +111185,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "haskell-src_1_0_3_1" = callPackage
+ ({ mkDerivation, array, base, happy, pretty, syb }:
+ mkDerivation {
+ pname = "haskell-src";
+ version = "1.0.3.1";
+ sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746";
+ libraryHaskellDepends = [ array base pretty syb ];
+ libraryToolDepends = [ happy ];
+ description = "Support for manipulating Haskell source code";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haskell-src-exts_1_19_1" = callPackage
({ mkDerivation, array, base, containers, cpphs, directory
, filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
@@ -110342,10 +111329,8 @@ self: {
({ mkDerivation, base, haskell-src-exts }:
mkDerivation {
pname = "haskell-src-exts-simple";
- version = "1.21.1.0";
- sha256 = "1zw95fdbqgn9653fgbcpdc364ps07v0zgvwxng8yi2dhdnlhjqra";
- revision = "1";
- editedCabalFile = "0mc1n7bkwbykrw1wivj1mvm69a0j1089vbrg8vc1cfkmcdib3xdj";
+ version = "1.22.0.0";
+ sha256 = "1zfb12r7fpq5nnfgn27m8grql2bx50w7g2jbgy9404rjcr1gk59c";
libraryHaskellDepends = [ base haskell-src-exts ];
description = "A simplified view on the haskell-src-exts AST";
license = stdenv.lib.licenses.mit;
@@ -110386,6 +111371,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "haskell-src-meta_0_8_5" = callPackage
+ ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty
+ , syb, tasty, tasty-hunit, template-haskell, th-orphans
+ }:
+ mkDerivation {
+ pname = "haskell-src-meta";
+ version = "0.8.5";
+ sha256 = "1csqp3n7330rhia9msyw34z7qwwj64gdy5qlv8w4jbm49dap24ik";
+ libraryHaskellDepends = [
+ base haskell-src-exts pretty syb template-haskell th-orphans
+ ];
+ testHaskellDepends = [
+ base containers haskell-src-exts HUnit pretty syb tasty tasty-hunit
+ template-haskell
+ ];
+ description = "Parse source to template-haskell abstract syntax";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"haskell-src-meta-mwotton" = callPackage
({ mkDerivation, base, containers, ghc-prim, haskell-src-exts
, pretty, syb, template-haskell
@@ -111362,6 +112367,17 @@ self: {
broken = true;
}) {};
+ "haskellish" = callPackage
+ ({ mkDerivation, base, haskell-src-exts }:
+ mkDerivation {
+ pname = "haskellish";
+ version = "0.1.1";
+ sha256 = "1smgr42m4dz6yd8w34dmc3w2l06jllli831bq66l3mdbrfb3964h";
+ libraryHaskellDepends = [ base haskell-src-exts ];
+ description = "For parsing Haskell-ish languages";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"haskellscrabble" = callPackage
({ mkDerivation, array, arrows, base, containers, directory, errors
, filepath, HUnit, listsafe, mtl, parsec, QuickCheck, random, safe
@@ -111472,20 +112488,20 @@ self: {
"haskey" = callPackage
({ mkDerivation, async, base, binary, bytestring, containers
- , directory, exceptions, filepath, focus, haskey-btree, HUnit
- , list-t, lz4, mtl, QuickCheck, random, semigroups, stm
+ , directory, exceptions, filepath, focus, hashable, haskey-btree
+ , HUnit, list-t, lz4, mtl, QuickCheck, random, semigroups, stm
, stm-containers, temporary, test-framework, test-framework-hunit
, test-framework-quickcheck2, text, transformers, unix, vector
, xxhash-ffi
}:
mkDerivation {
pname = "haskey";
- version = "0.3.0.2";
- sha256 = "1s24k6mwb1231j3ryd4iizday4l966vs9rcghr53k3jx2nl0h74h";
+ version = "0.3.1.0";
+ sha256 = "06q5gwjpgrgjq07iz7368yfghsfc2im1gbwqqixb1lqbiz7q6dbs";
libraryHaskellDepends = [
base binary bytestring containers directory exceptions filepath
- focus haskey-btree list-t lz4 mtl semigroups stm stm-containers
- transformers unix xxhash-ffi
+ focus hashable haskey-btree list-t lz4 mtl semigroups stm
+ stm-containers transformers unix xxhash-ffi
];
testHaskellDepends = [
async base binary bytestring containers directory exceptions
@@ -111687,39 +112703,14 @@ self: {
}:
mkDerivation {
pname = "haskoin-core";
- version = "0.9.5";
- sha256 = "1q7v7cyabka4yy9di0z88li131sxf1pgc330aiw9gazxchz05jx9";
+ version = "0.9.7";
+ sha256 = "04bh21sdkqzp7rlvs49wqq9lj8cyf2mm8cdjyg3zr4kqsfbw2z73";
libraryHaskellDepends = [
aeson array base base16-bytestring bytestring cereal conduit
- containers cryptonite entropy hashable memory mtl murmur3 network
- QuickCheck scientific secp256k1-haskell split string-conversions
- text time transformers unordered-containers vector
- ];
- testHaskellDepends = [
- aeson base bytestring cereal containers hspec HUnit mtl QuickCheck
- safe split string-conversions text unordered-containers vector
- ];
- testToolDepends = [ hspec-discover ];
- description = "Bitcoin & Bitcoin Cash library for Haskell";
- license = stdenv.lib.licenses.publicDomain;
- }) {};
-
- "haskoin-core_0_9_6" = callPackage
- ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
- , cereal, conduit, containers, cryptonite, entropy, hashable, hspec
- , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck
- , safe, scientific, secp256k1-haskell, split, string-conversions
- , text, time, transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "haskoin-core";
- version = "0.9.6";
- sha256 = "1sj54ajnqdkf3fnsz5i41p0mglixabyh5csnpzlvhh0wmaca0g52";
- libraryHaskellDepends = [
- aeson array base base16-bytestring bytestring cereal conduit
- containers cryptonite entropy hashable memory mtl murmur3 network
- QuickCheck scientific secp256k1-haskell split string-conversions
- text time transformers unordered-containers vector
+ containers cryptonite entropy hashable hspec HUnit memory mtl
+ murmur3 network QuickCheck safe scientific secp256k1-haskell split
+ string-conversions text time transformers unordered-containers
+ vector
];
testHaskellDepends = [
aeson base bytestring cereal containers hspec HUnit mtl QuickCheck
@@ -111729,6 +112720,7 @@ self: {
description = "Bitcoin & Bitcoin Cash library for Haskell";
license = stdenv.lib.licenses.publicDomain;
hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"haskoin-crypto" = callPackage
@@ -111765,8 +112757,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-node";
- version = "0.9.13";
- sha256 = "15z6qnaj5lk6kd151nl6ddjza0ngpgx8j29ayd5pcwr59r40hl95";
+ version = "0.9.14";
+ sha256 = "17nd6spm2bskgnxp2v7jfb66ds2qgxzhzlvd4yhgbf63kqfhlkjl";
libraryHaskellDepends = [
base bytestring cereal conduit conduit-extra containers
data-default hashable haskoin-core monad-logger mtl network nqe
@@ -111844,8 +112836,8 @@ self: {
}:
mkDerivation {
pname = "haskoin-store";
- version = "0.18.6";
- sha256 = "0hgjawlvlvz2wz711dgfbg8wvinzl4faisw8fpi7v00v6agwz2gx";
+ version = "0.18.9";
+ sha256 = "0gfvlah265mdc52nxkb2mlq1qblli0fm7lrxhwbggjjssj0jbp05";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -112711,8 +113703,8 @@ self: {
}:
mkDerivation {
pname = "hasql";
- version = "1.4";
- sha256 = "0j2arb96i1dinpz1yxl2cjl4qhbljk9yph52cj9az50mvl8vx3w4";
+ version = "1.4.0.1";
+ sha256 = "04112217385hh7bqzs4sr0263yy3pzny10ym4j5vmy9kwrbygk2d";
libraryHaskellDepends = [
attoparsec base base-prelude bytestring bytestring-strict-builder
contravariant contravariant-extras dlist hashable hashtables
@@ -112996,14 +113988,27 @@ self: {
}) {};
"hasql-th" = callPackage
- ({ mkDerivation, base-prelude, bytestring, template-haskell, text
+ ({ mkDerivation, base, bytestring, case-insensitive, containers
+ , contravariant, fast-builder, foldl, hashable, hasql
+ , headed-megaparsec, hedgehog, megaparsec, parser-combinators
+ , selective, template-haskell, text, text-builder, tuple-th
+ , unordered-containers, uuid, vector
}:
mkDerivation {
pname = "hasql-th";
- version = "0.2.1";
- sha256 = "0lfnmlpxxzm06cr3p6b2x0wzf11913w6ps6hlv290mdd0l3wk1mg";
+ version = "0.3.0.1";
+ sha256 = "03wfzwf3rr83j158757llq23zi17pkpmpracwisbz4acvk0vb3s0";
libraryHaskellDepends = [
- base-prelude bytestring template-haskell text
+ base bytestring case-insensitive containers contravariant
+ fast-builder foldl hashable hasql headed-megaparsec megaparsec
+ parser-combinators selective template-haskell text text-builder
+ tuple-th unordered-containers uuid vector
+ ];
+ testHaskellDepends = [
+ base bytestring case-insensitive containers contravariant
+ fast-builder foldl hashable hasql headed-megaparsec hedgehog
+ megaparsec parser-combinators selective template-haskell text
+ text-builder tuple-th unordered-containers uuid vector
];
description = "Template Haskell utilities for Hasql";
license = stdenv.lib.licenses.mit;
@@ -113027,21 +114032,21 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hasql-transaction_1" = callPackage
+ "hasql-transaction_1_0_0_1" = callPackage
({ mkDerivation, async, base, bytestring, bytestring-tree-builder
, contravariant, contravariant-extras, hasql, mtl, rebase
, transformers
}:
mkDerivation {
pname = "hasql-transaction";
- version = "1";
- sha256 = "1k82b0bx4j2g7lhr2p4z4a365kx1i23dr6zikwg1yyhpvhl3xbcj";
+ version = "1.0.0.1";
+ sha256 = "0jfvabsjpj56piny41hzbblhprjsk5xkpk35x502q2isl2mkk5ql";
libraryHaskellDepends = [
base bytestring bytestring-tree-builder contravariant
contravariant-extras hasql mtl transformers
];
testHaskellDepends = [ async hasql rebase ];
- description = "A composable abstraction over the retryable transactions for Hasql";
+ description = "Composable abstraction over retryable transactions for Hasql";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -114235,8 +115240,8 @@ self: {
}:
mkDerivation {
pname = "hdaemonize";
- version = "0.5.5";
- sha256 = "17q2zr9bv6xwnldgbsh1idwfgybp8q4xzq79p2lmmi3f0q6cnl6j";
+ version = "0.5.6";
+ sha256 = "097fgjgskigy3grnd3ijzyhdq34vjmd9bjk2rscixi59j8j30vxd";
libraryHaskellDepends = [
base bytestring extensible-exceptions filepath hsyslog mtl unix
];
@@ -114714,6 +115719,21 @@ self: {
broken = true;
}) {};
+ "headed-megaparsec" = callPackage
+ ({ mkDerivation, base, case-insensitive, megaparsec
+ , parser-combinators, selective
+ }:
+ mkDerivation {
+ pname = "headed-megaparsec";
+ version = "0.1.0.2";
+ sha256 = "0npkkphm4gv7cgm08asr5qxjyk6jdbm4h4w0jwsvxzpxh3nfxgbr";
+ libraryHaskellDepends = [
+ base case-insensitive megaparsec parser-combinators selective
+ ];
+ description = "More informative parser";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"headergen" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
, filepath, haskeline, time
@@ -114775,8 +115795,8 @@ self: {
({ mkDerivation, async, base, io-streams, time }:
mkDerivation {
pname = "heartbeat-streams";
- version = "0.1.0.1";
- sha256 = "0arfwp0qkk5p6wh2lwh05r17mwkpn3dcmy382n1rgxr8k03fzv57";
+ version = "0.1.0.2";
+ sha256 = "059dx7paaniwmxgyzapv0542jf8yb4vzbg8501d2j779ixvzm80d";
libraryHaskellDepends = [ async base io-streams time ];
description = "Heartbeats for io-streams";
license = stdenv.lib.licenses.bsd3;
@@ -114955,6 +115975,18 @@ self: {
broken = true;
}) {};
+ "heckin" = callPackage
+ ({ mkDerivation, base, hspec }:
+ mkDerivation {
+ pname = "heckin";
+ version = "0.0.1.0";
+ sha256 = "0nvcjkpsk4n96hjah4m85issr47abz3g0csv34sdwk59dx201zbi";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec ];
+ description = "Oh heck, it's a heckin' case conversion library";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"heckle" = callPackage
({ mkDerivation, base, blaze-html, directory, pandoc, pandoc-types
, process, split, tagsoup, time
@@ -115120,6 +116152,25 @@ self: {
broken = true;
}) {};
+ "hedgehog-golden" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+ , Diff, directory, extra, hedgehog, text
+ }:
+ mkDerivation {
+ pname = "hedgehog-golden";
+ version = "1.0.0";
+ sha256 = "17ja3ch042kvk0fpd1gd9nnj9x5jbl37vxn579hr9rimwgf99az7";
+ libraryHaskellDepends = [
+ aeson aeson-pretty base bytestring containers Diff directory extra
+ hedgehog text
+ ];
+ testHaskellDepends = [ base hedgehog ];
+ description = "Golden testing capabilities for hedgehog using Aeson";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hedgehog-quickcheck" = callPackage
({ mkDerivation, base, hedgehog, QuickCheck, transformers }:
mkDerivation {
@@ -115131,6 +116182,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hedgehog-servant" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, case-insensitive
+ , hedgehog, http-client, http-media, http-types, servant
+ , servant-client, servant-server, string-conversions, text
+ }:
+ mkDerivation {
+ pname = "hedgehog-servant";
+ version = "0.0.0.1";
+ sha256 = "04plk39ni5m9arcphb4464bpl12r6aw2zfnzlzhpa1i49qlpivc3";
+ libraryHaskellDepends = [
+ base bytestring case-insensitive hedgehog http-client http-media
+ http-types servant servant-client servant-server string-conversions
+ text
+ ];
+ testHaskellDepends = [
+ aeson base bytestring case-insensitive hedgehog http-client
+ http-media http-types servant servant-client servant-server
+ string-conversions text
+ ];
+ description = "Hedgehog property testing for Servant APIs";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hedis" = callPackage
({ mkDerivation, async, base, bytestring, bytestring-lexing
, deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
@@ -115139,8 +116213,8 @@ self: {
}:
mkDerivation {
pname = "hedis";
- version = "0.12.8";
- sha256 = "119j0g6b2ci04bax6xl2biwwf7cfk2vybypx3089fm69xgm8spcz";
+ version = "0.12.10";
+ sha256 = "0n9rm73h9lgrqavzjlakb95jvpg0lfjhj6grb5rgwpi4rhvqiygb";
libraryHaskellDepends = [
async base bytestring bytestring-lexing deepseq errors HTTP mtl
network network-uri resource-pool scanner stm text time tls
@@ -117307,8 +118381,8 @@ self: {
}:
mkDerivation {
pname = "hgrev";
- version = "0.2.3";
- sha256 = "0cf0pwl4218wvp6il8h82qnkjd1c9vh6bc8g7dxns0hw4vda3ly8";
+ version = "0.2.4";
+ sha256 = "1mmnz6vipl42p2raxn26hjlcrjhrk3xfbvzyxhjl5ciybgi6dc3w";
libraryHaskellDepends = [
aeson base bytestring directory filepath process template-haskell
];
@@ -118402,8 +119476,8 @@ self: {
}:
mkDerivation {
pname = "hinterface";
- version = "0.11.0";
- sha256 = "1p878194kl4dma6xmp73j4m87yjs7lprjqm3pb81li222fcylz88";
+ version = "1.0.0";
+ sha256 = "18vhpmhpfam1nbh5fgbcfjnmsnsbkzq9qmr64alldlvwf6brs0kp";
libraryHaskellDepends = [
array async base binary bytestring containers cryptonite deepseq
exceptions lifted-async lifted-base memory monad-control
@@ -118450,20 +119524,22 @@ self: {
}) {};
"hip" = callPackage
- ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
- , criterion, deepseq, directory, filepath, hspec, JuicyPixels
- , netpbm, primitive, process, QuickCheck, repa, repa-algorithms
- , temporary, vector
+ ({ mkDerivation, array, base, bytestring, Chart, Chart-diagrams
+ , colour, criterion, deepseq, directory, filepath, hspec
+ , hspec-discover, JuicyPixels, netpbm, primitive, process
+ , QuickCheck, random, repa, repa-algorithms, temporary, vector
}:
mkDerivation {
pname = "hip";
- version = "1.5.3.0";
- sha256 = "07jgqz5dz8qk96xz0q92hpn172jaqivfmn0mrynhicmvkx7a7izr";
+ version = "1.5.4.0";
+ sha256 = "09vv9zshgy6g9333pyny5lcja8662rxnldg1m0vvfiywcjafbn14";
libraryHaskellDepends = [
- base bytestring Chart Chart-diagrams colour deepseq directory
- filepath JuicyPixels netpbm primitive process repa temporary vector
+ array base bytestring Chart Chart-diagrams colour deepseq directory
+ filepath JuicyPixels netpbm primitive process random repa temporary
+ vector
];
testHaskellDepends = [ base bytestring hspec QuickCheck ];
+ testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
base criterion deepseq repa repa-algorithms vector
];
@@ -119015,8 +120091,8 @@ self: {
}:
mkDerivation {
pname = "hjugement-cli";
- version = "0.0.0.20191031";
- sha256 = "1rsm0byqg2dgqn3pcs7c89q98zcnblsj0qjb129xkdf3r6i0p26w";
+ version = "0.0.0.20191104";
+ sha256 = "17bz2cb9i7iv1s1s5g17797x07h80p3h682zkq9i4s5cbqjga44g";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -119041,8 +120117,8 @@ self: {
}:
mkDerivation {
pname = "hjugement-protocol";
- version = "0.0.9.20191031";
- sha256 = "1dh77mrrl1a5qazdqrymcllygwjl54n12vi6rx7jyp01c62k35bk";
+ version = "0.0.10.20191104";
+ sha256 = "1zra21x92bvgnqj4if2lhhzbf4kwj9xn1lp8glzngvby0914na7x";
libraryHaskellDepends = [
aeson base base64-bytestring binary bytestring containers
cryptonite deepseq memory random reflection text transformers
@@ -119060,6 +120136,18 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "hkd" = callPackage
+ ({ mkDerivation, base, some }:
+ mkDerivation {
+ pname = "hkd";
+ version = "0.1";
+ sha256 = "1xz0i8lkh0rp55b0s7npkzqgyz9pf1bwq9b66cwbg073r9sz41wa";
+ libraryHaskellDepends = [ base some ];
+ testHaskellDepends = [ base some ];
+ description = "\"higher-kinded data\"";
+ license = "(BSD-2-Clause OR Apache-2.0)";
+ }) {};
+
"hkd-delta" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -119214,55 +120302,44 @@ self: {
"hledger" = callPackage
({ mkDerivation, ansi-terminal, base, base-compat-batteries
- , bytestring, cmdargs, containers, criterion, data-default, Decimal
- , Diff, directory, easytest, extra, filepath, hashable, haskeline
- , hledger-lib, html, lucid, math-functions, 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
+ , bytestring, cmdargs, containers, data-default, Decimal, Diff
+ , directory, extra, filepath, hashable, haskeline, hledger-lib
+ , lucid, math-functions, megaparsec, mtl, old-time, parsec
+ , pretty-show, process, regex-tdfa, safe, shakespeare, split
+ , tabular, tasty, temporary, terminfo, text, time, timeit
, transformers, unordered-containers, utf8-string, utility-ht
, wizards
}:
mkDerivation {
pname = "hledger";
- version = "1.15.2";
- sha256 = "16mpj58519p4ksd0iwwkd63xxcr21k99h015l4kgi6zd934v2qix";
+ version = "1.16.1";
+ sha256 = "1dw04sjgji6iprs0hqxr0nynkg5qsqh20l0d48vqjkgaral4sxma";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers data-default Decimal Diff directory easytest extra
- filepath hashable haskeline hledger-lib lucid math-functions
- 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
+ containers data-default Decimal Diff directory extra filepath
+ hashable haskeline hledger-lib lucid math-functions megaparsec mtl
+ old-time parsec pretty-show process regex-tdfa safe shakespeare
+ split tabular tasty temporary terminfo text time timeit
+ transformers unordered-containers utf8-string utility-ht wizards
];
executableHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers data-default Decimal directory easytest extra filepath
- haskeline hledger-lib math-functions megaparsec mtl mtl-compat
- old-time parsec pretty-show process regex-tdfa safe shakespeare
- split tabular temporary terminfo text time timeit transformers
+ containers data-default Decimal directory extra filepath haskeline
+ hledger-lib math-functions megaparsec mtl old-time parsec
+ pretty-show process regex-tdfa safe shakespeare split tabular tasty
+ temporary terminfo text time timeit transformers
unordered-containers utf8-string utility-ht wizards
];
testHaskellDepends = [
ansi-terminal base base-compat-batteries bytestring cmdargs
- containers data-default Decimal directory easytest extra filepath
- haskeline hledger-lib math-functions 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
+ containers data-default Decimal directory extra filepath haskeline
+ hledger-lib math-functions megaparsec mtl old-time parsec
+ pretty-show process regex-tdfa safe shakespeare split tabular tasty
+ temporary terminfo text time timeit transformers
unordered-containers utf8-string utility-ht wizards
];
- benchmarkHaskellDepends = [
- ansi-terminal base base-compat-batteries bytestring cmdargs
- containers criterion data-default Decimal directory easytest extra
- filepath haskeline hledger-lib html math-functions 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
- ];
description = "Command-line interface for the hledger accounting tool";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -119363,8 +120440,8 @@ self: {
pname = "hledger-iadd";
version = "1.3.9";
sha256 = "07g48w4099m4vm7z5hrg9zzd2v2yhy7kcv40902njz6v8cklgdgq";
- revision = "1";
- editedCabalFile = "18qjkl79gwmdgk6vl8cg3m94wm0qw30kxn4lvlnj9n6gnv2p0b3k";
+ revision = "3";
+ editedCabalFile = "1c06v50lhhzsa4872j9khqvga7pvfrvns8sp3srn9vfwxbiw5x7z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -119430,33 +120507,33 @@ self: {
({ mkDerivation, ansi-terminal, array, base, base-compat-batteries
, blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec
, cmdargs, containers, data-default, Decimal, deepseq, directory
- , doctest, easytest, extra, fgl, file-embed, filepath, Glob
- , hashtables, megaparsec, mtl, mtl-compat, old-time, parsec
- , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular
+ , extra, fgl, file-embed, filepath, Glob, hashtables, megaparsec
+ , mtl, old-time, parsec, parser-combinators, pretty-show
+ , regex-tdfa, safe, split, tabular, tasty, tasty-hunit
, template-haskell, text, time, timeit, transformers, uglymemo
, utf8-string
}:
mkDerivation {
pname = "hledger-lib";
- version = "1.15.2";
- sha256 = "0q6ppizyadilxma3l8bwlswa6syyzkdri0yq0bqfmdzxvh9s3bcm";
+ version = "1.16.1";
+ sha256 = "14rwigcmal1dy286qnw93nnn4rl42hgcnz882wmjmhpyjrs4l5ig";
libraryHaskellDepends = [
ansi-terminal array base base-compat-batteries blaze-markup
bytestring call-stack cassava cassava-megaparsec cmdargs containers
- data-default Decimal deepseq directory easytest extra fgl
- file-embed filepath Glob hashtables megaparsec mtl mtl-compat
- old-time parsec parser-combinators pretty-show regex-tdfa safe
- split tabular template-haskell text time timeit transformers
- uglymemo utf8-string
+ data-default Decimal deepseq directory extra fgl file-embed
+ filepath Glob hashtables megaparsec mtl old-time parsec
+ parser-combinators pretty-show regex-tdfa safe split tabular tasty
+ tasty-hunit template-haskell text time timeit transformers uglymemo
+ utf8-string
];
testHaskellDepends = [
ansi-terminal array base base-compat-batteries blaze-markup
bytestring call-stack cassava cassava-megaparsec cmdargs containers
- data-default Decimal deepseq directory doctest easytest extra fgl
- file-embed filepath Glob hashtables megaparsec mtl mtl-compat
- old-time parsec parser-combinators pretty-show regex-tdfa safe
- split tabular template-haskell text time timeit transformers
- uglymemo utf8-string
+ data-default Decimal deepseq directory extra fgl file-embed
+ filepath Glob hashtables megaparsec mtl old-time parsec
+ parser-combinators pretty-show regex-tdfa safe split tabular tasty
+ tasty-hunit template-haskell text time timeit transformers uglymemo
+ utf8-string
];
description = "Core data types, parsers and functionality for the hledger accounting tools";
license = stdenv.lib.licenses.gpl3;
@@ -119492,8 +120569,8 @@ self: {
}:
mkDerivation {
pname = "hledger-ui";
- version = "1.15";
- sha256 = "047ssmix7pxq61hknd40z983aw8110zxzh6z2ick8xkhdsnw3s1q";
+ version = "1.16.1";
+ sha256 = "0cn1pwr87lvi65m619v845vj17v27hp3h6fcgy1cpb4gjsdvq861";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -119503,7 +120580,7 @@ self: {
process safe split text text-zipper time transformers unix vector
vty
];
- description = "Curses-style user interface for the hledger accounting tool";
+ description = "Terminal user interface for the hledger accounting tool";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
@@ -119531,24 +120608,25 @@ self: {
({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
, case-insensitive, clientsession, cmdargs, conduit, conduit-extra
, containers, data-default, Decimal, directory, filepath, hjsmin
- , hledger, hledger-lib, http-client, http-conduit, http-types, json
+ , hledger, hledger-lib, http-client, http-conduit, http-types
, megaparsec, mtl, semigroups, shakespeare, template-haskell, text
- , time, transformers, wai, wai-extra, wai-handler-launch, warp
- , yaml, yesod, yesod-core, yesod-form, yesod-static
+ , time, transformers, utf8-string, wai, wai-cors, wai-extra
+ , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form
+ , yesod-static
}:
mkDerivation {
pname = "hledger-web";
- version = "1.15";
- sha256 = "1m54m8v1fzlazrh9hhv4ff7jrg95d03i8wx360l1y731gry54zw3";
+ version = "1.16.1";
+ sha256 = "1mn3mk4v6akbzl2hc8k89q4njffxpj832h5pywy9rj2mc7fbw5s5";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base blaze-html blaze-markup bytestring case-insensitive
clientsession cmdargs conduit conduit-extra containers data-default
Decimal directory filepath hjsmin hledger hledger-lib http-client
- http-conduit http-types json megaparsec mtl semigroups shakespeare
- template-haskell text time transformers wai wai-extra
- wai-handler-launch warp yaml yesod yesod-core yesod-form
+ http-conduit http-types megaparsec mtl semigroups shakespeare
+ template-haskell text time transformers utf8-string wai wai-cors
+ wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form
yesod-static
];
executableHaskellDepends = [ base ];
@@ -119621,7 +120699,7 @@ self: {
pname = "hlibsass";
version = "0.1.8.0";
sha256 = "1ssgvr0jvl79k1vckp5nq2zw6mx8l4xasydymzjwmhg0fl99mpi6";
- configureFlags = [ "-fexternalLibsass" ];
+ configureFlags = [ "-fexternallibsass" ];
setupHaskellDepends = [ base Cabal directory ];
libraryHaskellDepends = [ base ];
librarySystemDepends = [ libsass ];
@@ -119633,20 +120711,20 @@ self: {
"hlint" = callPackage
({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
, containers, cpphs, data-default, directory, extra, filepath
- , ghc-lib-parser, haskell-src-exts, haskell-src-exts-util, hscolour
- , mtl, process, refact, syb, text, transformers, uniplate
- , unordered-containers, vector, yaml
+ , filepattern, ghc-lib-parser, haskell-src-exts
+ , haskell-src-exts-util, hscolour, mtl, process, refact, syb, text
+ , transformers, uniplate, unordered-containers, vector, yaml
}:
mkDerivation {
pname = "hlint";
- version = "2.2.3";
- sha256 = "0amkk315mpqc1b2pf5mngfzmzfx4bad4pzcg4h0120825909zpz6";
+ version = "2.2.5";
+ sha256 = "1ygyk1rg07j5x1qa6af3a76ps1cqicz4cv9i986kcfpzhzlf7iqd";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson ansi-terminal base bytestring cmdargs containers cpphs
- data-default directory extra filepath ghc-lib-parser
+ data-default directory extra filepath filepattern ghc-lib-parser
haskell-src-exts haskell-src-exts-util hscolour mtl process refact
syb text transformers uniplate unordered-containers vector yaml
];
@@ -119741,6 +120819,8 @@ self: {
pname = "hlrdb";
version = "0.3.0.0";
sha256 = "0pc3hqi6v9b78fijisnarfs59w6mw8jgyww25r1wmblgwyakl5ab";
+ revision = "1";
+ editedCabalFile = "1ycglx3b5n1l97pq0rd50wd313gwz1is10snf8s0c9bjlrzspbn5";
libraryHaskellDepends = [
base base64-bytestring bytestring cryptonite hashable hedis
hlrdb-core memory random store time unordered-containers
@@ -119755,8 +120835,8 @@ self: {
}:
mkDerivation {
pname = "hlrdb-core";
- version = "0.1.4.0";
- sha256 = "1sn23347mm9r4j45ba2jz4vw7swh6jgn5fds9xnwgr8rch9b0ljc";
+ version = "0.1.5.0";
+ sha256 = "0aznzrwv021nppb5cxbpnr7hiajny4s40diz6kcmddsbml56xmk9";
libraryHaskellDepends = [
base bytestring hashable hedis lens mtl profunctors random time
unordered-containers
@@ -120395,8 +121475,8 @@ self: {
}:
mkDerivation {
pname = "hmp3-ng";
- version = "2.7.1";
- sha256 = "1flwj8dp18w1vn34lzd44i5wy13m8qmcykmaziwbhz9npv097pnc";
+ version = "2.7.3.1";
+ sha256 = "1g4r9kkd0cqcarg220bj481b2j1gid68l0dfycy47hl8glqhv2w9";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -121649,8 +122729,8 @@ self: {
}:
mkDerivation {
pname = "hoogle";
- version = "5.0.17.11";
- sha256 = "1svp8z9pad8z2j386pr0dda0ds8ddxab0salnz4gm51q877w93p1";
+ version = "5.0.17.13";
+ sha256 = "1lbn4ji8l20pvyn5r2cdys0cnxhhac1559q54c6kb4vz4fr0a82p";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -121838,6 +122918,40 @@ self: {
broken = true;
}) {};
+ "hopenpgp-tools_0_23" = callPackage
+ ({ mkDerivation, aeson, alex, array, attoparsec, base
+ , base16-bytestring, binary, binary-conduit, bytestring, conduit
+ , conduit-extra, containers, crypto-pubkey, cryptohash, cryptonite
+ , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client
+ , http-client-tls, http-types, ixset-typed, lens, monad-loops, mtl
+ , openpgp-asciiarmor, optparse-applicative, prettyprinter
+ , prettyprinter-ansi-terminal, prettyprinter-convert-ansi-wl-pprint
+ , resourcet, text, time, time-locale-compat, transformers
+ , unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "hopenpgp-tools";
+ version = "0.23";
+ sha256 = "1sgqx8b1sq89hpjzbdmkjsmrfagh5v0jfxyqphzkh1bq2zydj0jl";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson array attoparsec base base16-bytestring binary binary-conduit
+ bytestring conduit conduit-extra containers crypto-pubkey
+ cryptohash cryptonite directory errors fgl graphviz hOpenPGP
+ http-client http-client-tls http-types ixset-typed lens monad-loops
+ mtl openpgp-asciiarmor optparse-applicative prettyprinter
+ prettyprinter-ansi-terminal prettyprinter-convert-ansi-wl-pprint
+ resourcet text time time-locale-compat transformers
+ unordered-containers vector yaml
+ ];
+ executableToolDepends = [ alex happy ];
+ description = "hOpenPGP-based command-line tools";
+ license = stdenv.lib.licenses.agpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hopenssl" = callPackage
({ mkDerivation, base, bytestring, HUnit, openssl }:
mkDerivation {
@@ -122955,12 +124069,12 @@ self: {
({ mkDerivation, base, base16-bytestring, bytestring, containers
, cryptohash, exceptions, fields-json, hpqtypes, lifted-base
, log-base, monad-control, mtl, safe, semigroups, tasty
- , tasty-hunit, text, text-show, transformers
+ , tasty-hunit, text, text-show, transformers, uuid-types
}:
mkDerivation {
pname = "hpqtypes-extras";
- version = "1.9.0.1";
- sha256 = "04qlcs5vdzyxfdmamz65lhw1bjbm8rl9h5qf4xback6lcxr2h5q7";
+ version = "1.10.0.0";
+ sha256 = "0gh8gg3hl64i851q3zaigg8i5axrgxw169m1xzzgximhzhzbl7m8";
libraryHaskellDepends = [
base base16-bytestring bytestring containers cryptohash exceptions
fields-json hpqtypes lifted-base log-base monad-control mtl safe
@@ -122968,7 +124082,7 @@ self: {
];
testHaskellDepends = [
base exceptions hpqtypes lifted-base log-base monad-control tasty
- tasty-hunit text transformers
+ tasty-hunit text transformers uuid-types
];
description = "Extra utilities for hpqtypes library";
license = stdenv.lib.licenses.bsd3;
@@ -122983,8 +124097,8 @@ self: {
}:
mkDerivation {
pname = "hprotoc";
- version = "2.4.12";
- sha256 = "0xj000ikh3y8dg5sbrl7ycb471qgra4khmk4kq079biasjvhf58a";
+ version = "2.4.13";
+ sha256 = "0z88kiirwpnzw6hxg99kg42j2hkf002vcsmbcm7nqdfqajrggiy0";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -123306,6 +124420,84 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "hreq-client" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, bytestring, Cabal
+ , cabal-doctest, containers, doctest, exceptions, hreq-core, hspec
+ , hspec-discover, http-client, http-client-tls, http-media
+ , http-types, mtl, retry, stm, string-conversions, text, time
+ , unliftio-core
+ }:
+ mkDerivation {
+ pname = "hreq-client";
+ version = "0.1.1.0";
+ sha256 = "0bx4vhvwh4arkp5ly6clj55dmai3npl2p87l64radhyqr9z0il24";
+ isLibrary = true;
+ isExecutable = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base base-compat bytestring containers exceptions hreq-core
+ http-client http-client-tls http-media http-types mtl retry stm
+ string-conversions text time unliftio-core
+ ];
+ executableHaskellDepends = [ aeson base text ];
+ testHaskellDepends = [
+ aeson base containers doctest hreq-core hspec http-types
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "A Type dependent Highlevel HTTP client library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "hreq-conduit" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-doctest
+ , conduit, doctest, exceptions, hreq-client, hreq-core, hspec
+ , hspec-discover, http-client, http-types, markdown-unlit, mtl
+ , retry, string-conversions, text, unliftio-core
+ }:
+ mkDerivation {
+ pname = "hreq-conduit";
+ version = "0.1.0.0";
+ sha256 = "0rdi3nxmq3g7gzlc3w1vc27djwd2pbsifm6mvi6d9nk3ynnrc2vv";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base bytestring conduit exceptions hreq-client hreq-core
+ http-client http-types mtl retry unliftio-core
+ ];
+ testHaskellDepends = [
+ aeson base bytestring conduit doctest hspec http-types
+ string-conversions text
+ ];
+ testToolDepends = [ hspec-discover markdown-unlit ];
+ description = "Conduit streaming support for Hreq";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "hreq-core" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+ , Cabal, cabal-doctest, containers, doctest, exceptions
+ , http-api-data, http-media, http-types, mtl, string-conversions
+ , text
+ }:
+ mkDerivation {
+ pname = "hreq-core";
+ version = "0.1.1.0";
+ sha256 = "0lc1bc3kr3j6rkrz9w0s5aqb5bb60xhafg1v02n7vcyishdh2iwl";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson attoparsec base base-compat bytestring containers exceptions
+ http-api-data http-media http-types mtl string-conversions text
+ ];
+ testHaskellDepends = [ base doctest ];
+ description = "Core functionality for Hreq Http client library";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hrfsize" = callPackage
({ mkDerivation, base, process, tasty, tasty-hunit }:
mkDerivation {
@@ -124064,8 +125256,8 @@ self: {
({ mkDerivation, aeson, base, extra, ghc-events, text, vector }:
mkDerivation {
pname = "hs-speedscope";
- version = "0.1.0.0";
- sha256 = "1q6rqf07akrcwvp84sw9l0niy8vjmllwlfqx8v8nzj67zw5jcj3q";
+ version = "0.1.1.0";
+ sha256 = "0dldhndlags3ig991yvddfaw472cjwfy9dz3i12hq5ny6s9qz8qa";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -125710,8 +126902,8 @@ self: {
}:
mkDerivation {
pname = "hsinspect";
- version = "0.0.7";
- sha256 = "0vwhxlycvmyczd412llpsjfl63f58bz4ad4fbhiiqw754d7qwaka";
+ version = "0.0.8";
+ sha256 = "1lqczihv7qjh1yy51qds4sg95riwaq1i0fd9mgn3kvhgbyx1r9nn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -126373,6 +127565,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hspec-bracket" = callPackage
+ ({ mkDerivation, base, hspec }:
+ mkDerivation {
+ pname = "hspec-bracket";
+ version = "0.0.1.0";
+ sha256 = "1d6262frfaghmq77nqsvcalm6w4jl7bn995bkphx461skhm8n300";
+ libraryHaskellDepends = [ base hspec ];
+ description = "The bracket definitions for Hspec";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hspec-checkers" = callPackage
({ mkDerivation, base, checkers, hspec }:
mkDerivation {
@@ -126691,6 +127894,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hspec-megaparsec_2_1_0" = callPackage
+ ({ mkDerivation, base, containers, hspec, hspec-expectations
+ , megaparsec
+ }:
+ mkDerivation {
+ pname = "hspec-megaparsec";
+ version = "2.1.0";
+ sha256 = "1x8qbih5ci9flc3b5c1g4cc8xgq504bw5q26cpkcnlaanrp01p5x";
+ libraryHaskellDepends = [
+ base containers hspec-expectations megaparsec
+ ];
+ testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
+ description = "Utility functions for testing Megaparsec parsers with Hspec";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hspec-meta" = callPackage
({ mkDerivation, ansi-terminal, array, base, call-stack, clock
, deepseq, directory, filepath, hspec-expectations, HUnit
@@ -127905,8 +129125,8 @@ self: {
}:
mkDerivation {
pname = "hsx2hs";
- version = "0.14.1.5";
- sha256 = "0cw66j3firzgg5c7689y0kffgfq36yn4y17yprbbgv6kw4g7wid4";
+ version = "0.14.1.6";
+ sha256 = "09qynnmy5pq7yl8zic91wysrvjb1a1ibcjc9ry458wgbz236br4n";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -128517,8 +129737,8 @@ self: {
pname = "htoml-megaparsec";
version = "2.1.0.3";
sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x";
- revision = "1";
- editedCabalFile = "07zw749vwqdr2lznxivfa22smq7k3h0innanl5wwyf29dq4gk464";
+ revision = "2";
+ editedCabalFile = "0vlyr965g1x5hk2mxlp8w4vv9ijq1gbm3i76slkl2aa38bf2i4ki";
libraryHaskellDepends = [
base composition-prelude containers deepseq megaparsec mtl text
time unordered-containers vector
@@ -128654,27 +129874,23 @@ self: {
"http-api-data" = callPackage
({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat
- , bytestring, Cabal, cabal-doctest, containers, cookie, directory
- , doctest, filepath, hashable, hspec, hspec-discover, http-types
- , HUnit, nats, QuickCheck, quickcheck-instances, tagged, text
- , time-compat, unordered-containers, uuid-types
+ , bytestring, containers, cookie, hashable, hspec, hspec-discover
+ , http-types, HUnit, nats, QuickCheck, quickcheck-instances, tagged
+ , text, time-compat, unordered-containers, uuid-types
}:
mkDerivation {
pname = "http-api-data";
- version = "0.4.1";
- sha256 = "1ps4bvln43gz72dr9mc3c9n1rn38c4rz6m49vxzz9nz6jz1978rv";
- revision = "2";
- editedCabalFile = "14gvcqdxxs9s74r73i5f5g2819dfyp05m0p4s729ynwm7c20fzfs";
- setupHaskellDepends = [ base Cabal cabal-doctest ];
+ version = "0.4.1.1";
+ sha256 = "1s93m2vh4c1p073xasvknnj3czbf8xsyg48kyznr4jwfhzi17anh";
libraryHaskellDepends = [
attoparsec attoparsec-iso8601 base base-compat bytestring
containers cookie hashable http-types tagged text time-compat
unordered-containers uuid-types
];
testHaskellDepends = [
- base base-compat bytestring cookie directory doctest filepath hspec
- HUnit nats QuickCheck quickcheck-instances text time-compat
- unordered-containers uuid-types
+ base base-compat bytestring cookie hspec HUnit nats QuickCheck
+ quickcheck-instances text time-compat unordered-containers
+ uuid-types
];
testToolDepends = [ hspec-discover ];
description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
@@ -129204,23 +130420,24 @@ self: {
"http-io-streams" = callPackage
({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
- , bytestring, case-insensitive, containers, directory, HsOpenSSL
- , io-streams, mtl, network, network-uri, openssl-streams, text
- , transformers
+ , brotli-streams, bytestring, case-insensitive, containers
+ , directory, HsOpenSSL, io-streams, mtl, network, network-uri
+ , openssl-streams, text, transformers
}:
mkDerivation {
pname = "http-io-streams";
- version = "0.1.0.0";
- sha256 = "0fxz7p5n7gd99xjq9rwm6x74qzpfp4wdmhj1hm08c7hkinizdvgv";
- revision = "2";
- editedCabalFile = "0l6afs6bhf5q73nmlmc37qi0anr1dlrz1x10m9ipfssnkb5hp25k";
+ version = "0.1.2.0";
+ sha256 = "1xn3lbpxsbl79qgaq9qmhlr78g44h0qpx0jyyb3z8q28z5p39wcy";
libraryHaskellDepends = [
- attoparsec base base64-bytestring blaze-builder bytestring
- case-insensitive containers directory HsOpenSSL io-streams mtl
- network network-uri openssl-streams text transformers
+ attoparsec base base64-bytestring blaze-builder brotli-streams
+ bytestring case-insensitive containers directory HsOpenSSL
+ io-streams mtl network network-uri openssl-streams text
+ transformers
];
description = "HTTP client based on io-streams";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"http-kinder" = callPackage
@@ -129770,17 +130987,17 @@ self: {
"http2-client-grpc" = callPackage
({ mkDerivation, async, base, binary, bytestring, case-insensitive
- , data-default-class, http2, http2-client, http2-grpc-types, lens
- , lifted-async, lifted-base, proto-lens, text, tls
+ , data-default-class, http2, http2-client, http2-grpc-types
+ , lifted-async, lifted-base, text, tls
}:
mkDerivation {
pname = "http2-client-grpc";
- version = "0.7.0.0";
- sha256 = "1iy825wrn2ai2qpbkq4p9k2amc5rarr57b9sa2vm8vqdrclcvzn1";
+ version = "0.8.0.0";
+ sha256 = "1dprkdcylyvmvnhn94wzkxzgm6rx3bs4iv82xyg9y317d348pn12";
libraryHaskellDepends = [
async base binary bytestring case-insensitive data-default-class
- http2 http2-client http2-grpc-types lens lifted-async lifted-base
- proto-lens text tls
+ http2 http2-client http2-grpc-types lifted-async lifted-base text
+ tls
];
testHaskellDepends = [ base ];
description = "Implement gRPC-over-HTTP2 clients";
@@ -129789,16 +131006,49 @@ self: {
broken = true;
}) {};
- "http2-grpc-types" = callPackage
+ "http2-grpc-proto-lens" = callPackage
({ mkDerivation, base, binary, bytestring, case-insensitive
- , proto-lens, zlib
+ , http2-grpc-types, proto-lens, zlib
+ }:
+ mkDerivation {
+ pname = "http2-grpc-proto-lens";
+ version = "0.1.0.0";
+ sha256 = "0nhygkv1z7qrhnrgms3kzzay5h5qqrdi4081v896prwjl2xd2p4f";
+ libraryHaskellDepends = [
+ base binary bytestring case-insensitive http2-grpc-types proto-lens
+ zlib
+ ];
+ description = "Encoders based on `proto-lens` for gRPC over HTTP2";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "http2-grpc-proto3-wire" = callPackage
+ ({ mkDerivation, base, binary, bytestring, case-insensitive
+ , http2-grpc-types, proto3-wire, zlib
+ }:
+ mkDerivation {
+ pname = "http2-grpc-proto3-wire";
+ version = "0.1.0.0";
+ sha256 = "00k7sm7z0q8k1zr3lcsyaciylk03c18cpdciqq33rfj6p7jwyphv";
+ libraryHaskellDepends = [
+ base binary bytestring case-insensitive http2-grpc-types
+ proto3-wire zlib
+ ];
+ description = "Encoders based on `proto3-wire` for gRPC over HTTP2";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "http2-grpc-types" = callPackage
+ ({ mkDerivation, base, binary, bytestring, case-insensitive, zlib
}:
mkDerivation {
pname = "http2-grpc-types";
- version = "0.4.0.0";
- sha256 = "1h15smbncifn0c9n0dmwzpwr0fnb3jby9zch71rmsnsirclycsb5";
+ version = "0.5.0.0";
+ sha256 = "0p479rj60lpd9vc4hb0jybjb0f8gw42dpfc7h2nxapcihafr4knb";
libraryHaskellDepends = [
- base binary bytestring case-insensitive proto-lens zlib
+ base binary bytestring case-insensitive zlib
];
description = "Types for gRPC over HTTP2 common for client and servers";
license = stdenv.lib.licenses.bsd3;
@@ -130615,6 +131865,35 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hw-all" = callPackage
+ ({ mkDerivation, base, bits-extra, hw-aeson, hw-balancedparens
+ , hw-bits, hw-conduit, hw-diagnostics, hw-dsv, hw-dump
+ , hw-eliasfano, hw-excess, hw-fingertree, hw-fingertree-strict
+ , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-ip, hw-json
+ , hw-json-lens, hw-json-simd, hw-json-simple-cursor
+ , hw-json-standard-cursor, hw-mquery, hw-packed-vector, hw-parser
+ , hw-prim, hw-rankselect, hw-rankselect-base, hw-simd, hw-streams
+ , hw-string-parse, hw-succinct, hw-uri, hw-xml
+ }:
+ mkDerivation {
+ pname = "hw-all";
+ version = "0.0.0.1";
+ sha256 = "09yp4aq5jd6jkabk9hqmvq7hjigabwa5s8wfjl6pswgpadvqpsmm";
+ libraryHaskellDepends = [
+ base bits-extra hw-aeson hw-balancedparens hw-bits hw-conduit
+ hw-diagnostics hw-dsv hw-dump hw-eliasfano hw-excess hw-fingertree
+ hw-fingertree-strict hw-hedgehog hw-hspec-hedgehog hw-int hw-ip
+ hw-json hw-json-lens hw-json-simd hw-json-simple-cursor
+ hw-json-standard-cursor hw-mquery hw-packed-vector hw-parser
+ hw-prim hw-rankselect hw-rankselect-base hw-simd hw-streams
+ hw-string-parse hw-succinct hw-uri hw-xml
+ ];
+ description = "Demo library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-balancedparens" = callPackage
({ mkDerivation, base, criterion, deepseq, hspec, hspec-discover
, hw-bits, hw-excess, hw-prim, hw-rankselect-base, QuickCheck
@@ -130670,19 +131949,21 @@ self: {
}) {};
"hw-bits" = callPackage
- ({ mkDerivation, base, bytestring, criterion, hedgehog, hspec
- , hspec-discover, hw-hspec-hedgehog, hw-int, hw-prim
- , hw-string-parse, vector
+ ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq
+ , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog, hw-int
+ , hw-prim, hw-string-parse, vector
}:
mkDerivation {
pname = "hw-bits";
- version = "0.7.0.8";
- sha256 = "1yrck20adphrqai9nq8qxyi3l5y7gx9gjvr4vgdzg39mnl6057s4";
+ version = "0.7.1.0";
+ sha256 = "0r4jinz2h5zkjap6f6qrjgfq6xhaz3j34fjwawv8qvgc4qgq7bil";
libraryHaskellDepends = [
- base bytestring hw-int hw-prim hw-string-parse vector
+ base bitvec bytestring deepseq hw-int hw-prim hw-string-parse
+ vector
];
testHaskellDepends = [
- base bytestring hedgehog hspec hw-hspec-hedgehog hw-prim vector
+ base bitvec bytestring hedgehog hspec hw-hspec-hedgehog hw-prim
+ vector
];
testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [ base criterion vector ];
@@ -130928,6 +132209,8 @@ self: {
pname = "hw-eliasfano";
version = "0.1.1.1";
sha256 = "0fmbcddw13m49xvw8gnpjh246mw4k9h3hr94k956bi1vdvywyqv7";
+ revision = "1";
+ editedCabalFile = "1i5in5h9jnx4p873qv80jmdd1ak6yyyf70002j3lhxyaxx9byy7k";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -131091,6 +132374,36 @@ self: {
broken = true;
}) {};
+ "hw-ip_2_4_0_1" = callPackage
+ ({ mkDerivation, appar, base, binary, bytestring, containers
+ , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
+ , hw-hspec-hedgehog, iproute, lens, optparse-applicative, text
+ }:
+ mkDerivation {
+ pname = "hw-ip";
+ version = "2.4.0.1";
+ sha256 = "0ypz0m5vnwirxap17ws44a0q6vfbg48dk6n8gb9aii2hfcdapds0";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ appar base containers generic-lens hedgehog hw-bits iproute text
+ ];
+ executableHaskellDepends = [
+ appar base binary bytestring generic-lens lens optparse-applicative
+ text
+ ];
+ testHaskellDepends = [
+ appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog
+ text
+ ];
+ testToolDepends = [ hspec-discover ];
+ doHaddock = false;
+ description = "Library for manipulating IP addresses and CIDR blocks";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"hw-json" = callPackage
({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
, bits-extra, bytestring, criterion, directory, dlist, generic-lens
@@ -131177,16 +132490,24 @@ self: {
}) {};
"hw-json-lens" = callPackage
- ({ mkDerivation, base, bytestring, containers, criterion, hw-json
- , lens, scientific, word8
+ ({ mkDerivation, base, bytestring, containers, criterion, hedgehog
+ , hspec, hspec-discover, hw-balancedparens, hw-bits
+ , hw-hspec-hedgehog, hw-json, hw-json-standard-cursor, hw-prim
+ , lens, scientific, text, vector, word8
}:
mkDerivation {
pname = "hw-json-lens";
- version = "0.1.0.0";
- sha256 = "1dbgxdbm8xp83hmdygi0y4h5lysacvdhms5g6i7p5i2w6prwqvid";
+ version = "0.2.0.0";
+ sha256 = "0byl0hqizqgpbajcgid0xca6jiqzm6syiz48jlywzg27niv3xdpd";
libraryHaskellDepends = [
- base bytestring containers hw-json lens scientific word8
+ base bytestring containers hw-json lens scientific text word8
];
+ testHaskellDepends = [
+ base bytestring hedgehog hspec hw-balancedparens hw-bits
+ hw-hspec-hedgehog hw-json hw-json-standard-cursor hw-prim lens
+ vector
+ ];
+ testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
base bytestring criterion hw-json lens
];
@@ -131461,31 +132782,6 @@ self: {
}) {};
"hw-prim" = callPackage
- ({ mkDerivation, base, bytestring, criterion, directory, exceptions
- , ghc-prim, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
- , mmap, QuickCheck, semigroups, transformers, unliftio-core, vector
- }:
- mkDerivation {
- pname = "hw-prim";
- version = "0.6.2.36";
- sha256 = "0anbwaz0hlskrlhp7nmzxzv7mgrs063d7qxhcv4iq9d46j90p031";
- libraryHaskellDepends = [
- base bytestring ghc-prim mmap semigroups transformers unliftio-core
- vector
- ];
- testHaskellDepends = [
- base bytestring directory exceptions hedgehog hspec
- hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
- ];
- testToolDepends = [ hspec-discover ];
- benchmarkHaskellDepends = [
- base bytestring criterion mmap semigroups transformers vector
- ];
- description = "Primitive functions and data types";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hw-prim_0_6_2_38" = callPackage
({ mkDerivation, base, bytestring, criterion, deepseq, directory
, exceptions, ghc-prim, hedgehog, hspec, hspec-discover
, hw-hspec-hedgehog, mmap, QuickCheck, semigroups, transformers
@@ -131493,8 +132789,8 @@ self: {
}:
mkDerivation {
pname = "hw-prim";
- version = "0.6.2.38";
- sha256 = "0669dkpwax4nh66c2ll4lb0fvzqhvpvirwnbzzskvykqkq1sj3kr";
+ version = "0.6.2.39";
+ sha256 = "06f4ygwmfb3ambzw972cninj9v0i7pir97qq0832a1mb19h4222g";
libraryHaskellDepends = [
base bytestring deepseq ghc-prim mmap semigroups transformers
unliftio-core vector
@@ -131509,7 +132805,6 @@ self: {
];
description = "Primitive functions and data types";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hw-prim-bits" = callPackage
@@ -131610,19 +132905,20 @@ self: {
}) {};
"hw-rankselect-base" = callPackage
- ({ mkDerivation, base, bits-extra, criterion, hedgehog, hspec
- , hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int
- , hw-prim, hw-string-parse, QuickCheck, vector
+ ({ mkDerivation, base, bits-extra, bitvec, criterion, hedgehog
+ , hspec, hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog
+ , hw-int, hw-prim, hw-string-parse, QuickCheck, vector
}:
mkDerivation {
pname = "hw-rankselect-base";
- version = "0.3.2.3";
- sha256 = "1gkgbrpklzzfxs5b2w98l5zr48pvdc1l4zll77s2ya7lw0hc69m5";
+ version = "0.3.3.0";
+ sha256 = "17h4kmi9zcgm4sdpbmqh6rzygz7w0v95lfc6rmhc9a8bmmg30i5b";
libraryHaskellDepends = [
- base bits-extra hw-bits hw-int hw-prim hw-string-parse vector
+ base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse
+ vector
];
testHaskellDepends = [
- base bits-extra hedgehog hspec hw-bits hw-hedgehog
+ base bits-extra bitvec hedgehog hspec hw-bits hw-hedgehog
hw-hspec-hedgehog hw-prim QuickCheck vector
];
testToolDepends = [ hspec-discover ];
@@ -131788,25 +133084,26 @@ self: {
}:
mkDerivation {
pname = "hw-xml";
- version = "0.4.0.2";
- sha256 = "122viqivv2csgrv144xc88xhafiq5vcsy545jpmg052d3kg1x4g2";
+ version = "0.5.0.0";
+ sha256 = "0cqrs19bd9yh67yczhhb1yf5dhcx2v6xikybd88vqwxdh51pxyyn";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
ansi-wl-pprint array attoparsec base bytestring cereal containers
deepseq ghc-prim hw-balancedparens hw-bits hw-parser hw-prim
- hw-rankselect hw-rankselect-base lens mmap mtl resourcet
+ hw-rankselect hw-rankselect-base lens mmap mtl resourcet text
transformers vector word8
];
executableHaskellDepends = [
- attoparsec base bytestring generic-lens hw-balancedparens hw-bits
- hw-prim hw-rankselect lens mmap mtl optparse-applicative resourcet
- text vector
+ attoparsec base bytestring deepseq generic-lens hw-balancedparens
+ hw-bits hw-prim hw-rankselect lens mmap mtl optparse-applicative
+ resourcet text vector
];
testHaskellDepends = [
attoparsec base bytestring hedgehog hspec hw-balancedparens hw-bits
- hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base vector
+ hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text
+ vector
];
testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
@@ -135561,8 +136858,8 @@ self: {
}:
mkDerivation {
pname = "inflections";
- version = "0.4.0.4";
- sha256 = "0lspb0xpfj4q6wrzgss7pfjmr6xb5clj7y686vsairbkpcj3cfcl";
+ version = "0.4.0.5";
+ sha256 = "0fdq3iwa2vgb5k19ck6jxzh7f1xsf1kpwx4p3agpdpsrylrcanvb";
libraryHaskellDepends = [
base exceptions megaparsec text unordered-containers
];
@@ -135815,16 +137112,16 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "inline-c_0_8_0_1" = callPackage
+ "inline-c_0_9_0_0" = callPackage
({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
, hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
- , regex-posix, template-haskell, transformers, unordered-containers
- , vector
+ , regex-posix, split, template-haskell, transformers
+ , unordered-containers, vector
}:
mkDerivation {
pname = "inline-c";
- version = "0.8.0.1";
- sha256 = "1w8njc8k1g8kmpk8c8q5p7m8adgpv5v4k4643hsi5422jdaq0g3i";
+ version = "0.9.0.0";
+ sha256 = "086kqca1vcxhi7wdzmdv3rjwh9k50k3wj4rzig1yjz3x12d0h6q6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -135833,7 +137130,7 @@ self: {
];
testHaskellDepends = [
ansi-wl-pprint base containers hashable hspec parsers QuickCheck
- raw-strings-qq regex-posix template-haskell transformers
+ raw-strings-qq regex-posix split template-haskell transformers
unordered-containers vector
];
description = "Write Haskell source files including C code inline. No FFI required.";
@@ -135870,6 +137167,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "inline-c-cpp_0_4_0_1" = callPackage
+ ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions
+ , template-haskell
+ }:
+ mkDerivation {
+ pname = "inline-c-cpp";
+ version = "0.4.0.1";
+ sha256 = "1bsmm6sqxjzlk6mdq5a8vwsc1cy0ag0lvajdpsbqq7vradj54yqq";
+ libraryHaskellDepends = [
+ base containers inline-c safe-exceptions template-haskell
+ ];
+ testHaskellDepends = [
+ base containers hspec inline-c safe-exceptions
+ ];
+ description = "Lets you embed C++ code into Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"inline-c-win32" = callPackage
({ mkDerivation, base, containers, inline-c, template-haskell
, Win32
@@ -135975,6 +137291,30 @@ self: {
}) {aether = null;};
"insert-ordered-containers" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, hashable, lens
+ , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck
+ , text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "insert-ordered-containers";
+ version = "0.2.2";
+ sha256 = "1ikjhg0pdfpnx1d645r92k2dwlk7y935j1w5lcsk23nzpwhbkxja";
+ revision = "1";
+ editedCabalFile = "1hlinc8nnjlzc6ds3wf8jvkihpcbhz2dk0rqxq1ns0c5zbbhnylq";
+ libraryHaskellDepends = [
+ aeson base base-compat hashable lens semigroupoids semigroups text
+ transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ aeson base base-compat hashable lens QuickCheck semigroupoids
+ semigroups tasty tasty-quickcheck text transformers
+ unordered-containers
+ ];
+ description = "Associative containers retaining insertion order for traversals";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "insert-ordered-containers_0_2_3" = callPackage
({ mkDerivation, aeson, base, base-compat, hashable, lens
, optics-core, optics-extra, QuickCheck, semigroupoids, semigroups
, tasty, tasty-quickcheck, text, transformers, unordered-containers
@@ -135994,6 +137334,7 @@ self: {
];
description = "Associative containers retaining insertion order for traversals";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"inserts" = callPackage
@@ -136934,6 +138275,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "intro_0_6_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, dlist
+ , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers
+ , unordered-containers, writer-cps-mtl
+ }:
+ mkDerivation {
+ pname = "intro";
+ version = "0.6.0.1";
+ sha256 = "1kka6dnlyqppjx9ykk3zixfyslr8cf4ja6sa2hgq6h69mmsicp67";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq dlist extra hashable mtl safe
+ text transformers unordered-containers writer-cps-mtl
+ ];
+ testHaskellDepends = [
+ base bytestring containers deepseq dlist extra hashable lens mtl
+ QuickCheck safe text transformers unordered-containers
+ writer-cps-mtl
+ ];
+ description = "Safe and minimal prelude";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"intro-prelude" = callPackage
({ mkDerivation, intro }:
mkDerivation {
@@ -137037,6 +138401,8 @@ self: {
pname = "invariant";
version = "0.5.3";
sha256 = "03245nhcqxx6b0yw81fzqaqd7cgllmx8awzhvs2xv7ys73pmsgnp";
+ revision = "1";
+ editedCabalFile = "0sjy375npw6lqcckhyicizzv91v8jh3ca5yjkygiaj22bw5k8c74";
libraryHaskellDepends = [
array base bifunctors comonad containers contravariant ghc-prim
profunctors StateVar stm tagged template-haskell th-abstraction
@@ -137250,7 +138616,7 @@ self: {
sha256 = "1c7byr943x41nxpc3bnz152fvfbmakafq2958wyf9qiyp2pz18la";
revision = "1";
editedCabalFile = "0n0qs5lgryh3zxy73j3qbpnxand43yd2bj6pclvyii8apqqp901a";
- configureFlags = [ "-fNoInteractiveTests" ];
+ configureFlags = [ "-fnointeractivetests" ];
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder network primitive
process text time transformers vector zlib-bindings
@@ -137273,8 +138639,8 @@ self: {
pname = "io-streams-haproxy";
version = "1.0.1.0";
sha256 = "1dcn5hd4fiwyq7m01r6fi93vfvygca5s6mz87c78m0zyj29clkmp";
- revision = "1";
- editedCabalFile = "00zbqcxfkrxidrli5qd8jvdw0jkyvcb3bwv29w8nbk9cr8vmmfl3";
+ revision = "2";
+ editedCabalFile = "1pvw39f0vrzb5hdx6nqpdg4ccsxa59vwjspfjkh6vvw1zwmidgja";
libraryHaskellDepends = [
attoparsec base bytestring io-streams network transformers
];
@@ -137444,7 +138810,7 @@ self: {
broken = true;
}) {};
- "ip_1_6_0" = callPackage
+ "ip_1_7_0" = callPackage
({ mkDerivation, aeson, attoparsec, base, byteslice, bytesmith
, bytestring, criterion, deepseq, doctest, hashable, hspec
, hspec-discover, HUnit, natural-arithmetic, primitive, QuickCheck
@@ -137453,8 +138819,10 @@ self: {
}:
mkDerivation {
pname = "ip";
- version = "1.6.0";
- sha256 = "19qs04lcjpzcdl9b1yi6clc72w25i0qc04nm877bgy3sqp7qj2zm";
+ version = "1.7.0";
+ sha256 = "18m8586ns6kijvk8wwflkhr9apki1h0gd7rkxd4w6qq66x034hk2";
+ revision = "1";
+ editedCabalFile = "1yjz4822vq22zh8mb96ccplqmm6rxrvy334n34gwyq0cfddsilr0";
libraryHaskellDepends = [
aeson attoparsec base byteslice bytesmith bytestring deepseq
hashable natural-arithmetic primitive small-bytearray-builder text
@@ -137463,7 +138831,7 @@ self: {
testHaskellDepends = [
attoparsec base byteslice bytestring doctest hspec HUnit QuickCheck
quickcheck-classes tasty tasty-hunit tasty-quickcheck text
- text-short wide-word
+ text-short vector wide-word
];
testToolDepends = [ hspec-discover ];
benchmarkHaskellDepends = [
@@ -137493,8 +138861,8 @@ self: {
({ mkDerivation, base, binary, bytestring, iproute }:
mkDerivation {
pname = "ip2location";
- version = "8.1.0";
- sha256 = "07n5xnspl318hrmff4gr274zpgszgviilwhjd7vdrhm1sq9sdir8";
+ version = "8.2.0";
+ sha256 = "01ia5647y608xr5kqkxaamhaxs39k3x81wpj8aqzf24mirkalf23";
libraryHaskellDepends = [ base binary bytestring iproute ];
description = "IP2Location Haskell package for IP geolocation";
license = stdenv.lib.licenses.mit;
@@ -137506,8 +138874,8 @@ self: {
({ mkDerivation, base, binary, bytestring, iproute }:
mkDerivation {
pname = "ip2proxy";
- version = "2.1.0";
- sha256 = "0qcmqy8p13hg9aih8m9w7qpbr6zcbvgc9y6bzh2cqm2sbx7ksvqm";
+ version = "2.2.0";
+ sha256 = "12j8jd0ir24xgghvmac2npf9zqfbfq7fwj1ni2xdi8p673k3d0kd";
libraryHaskellDepends = [ base binary bytestring iproute ];
description = "IP2Proxy Haskell package for proxy detection";
license = stdenv.lib.licenses.mit;
@@ -137661,8 +139029,8 @@ self: {
}:
mkDerivation {
pname = "iproute";
- version = "1.7.7";
- sha256 = "0gab5930nvzrpvisx3x43ydnp2rd4fbmy9cq1zpgqy1adx5gx8z6";
+ version = "1.7.8";
+ sha256 = "0k2qzdw36qp9qs2j0bxsn95ymk3wpjvw6s5c1535aw677gw19bad";
libraryHaskellDepends = [
appar base byteorder containers network
];
@@ -139025,8 +140393,8 @@ self: {
}:
mkDerivation {
pname = "ixset";
- version = "1.1.1";
- sha256 = "1wjv6jfkv5z5j3af6dg7zlbir780mshq01x2wzlyav5dwr40di3m";
+ version = "1.1.1.1";
+ sha256 = "1d3h53sq8i8azzr71yi4h5zma2bb2f623gpfw25x2kd4slhpkrgf";
libraryHaskellDepends = [
base containers safecopy syb syb-with-class template-haskell
];
@@ -139763,6 +141131,21 @@ self: {
broken = true;
}) {};
+ "jira-wiki-markup" = callPackage
+ ({ mkDerivation, base, parsec, tasty, tasty-hunit, text }:
+ mkDerivation {
+ pname = "jira-wiki-markup";
+ version = "0.1.1";
+ sha256 = "1a6vk4aryppay87fyirxprwklqvpjh6nj9x2k9s3ybrwhapf1wdx";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base parsec text ];
+ executableHaskellDepends = [ base text ];
+ testHaskellDepends = [ base parsec tasty tasty-hunit text ];
+ description = "Handle Jira wiki markup";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"jmacro" = callPackage
({ mkDerivation, aeson, base, bytestring, containers
, haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec
@@ -139771,10 +141154,8 @@ self: {
}:
mkDerivation {
pname = "jmacro";
- version = "0.6.16";
- sha256 = "1kyrvxg5fwwrwv72aby694ar071yl2xmnfkjyrwi5wbc7hsb8rda";
- revision = "1";
- editedCabalFile = "0g7fn738ljrhh6ydmvkigj9znhh2szdvp79kqxw62m4ryqan23qq";
+ version = "0.6.17";
+ sha256 = "14vmnaqr3lhcj7y5rj4jgm2w89kkznfksy53pinmc1xq1bd8b7px";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -140039,8 +141420,8 @@ self: {
}:
mkDerivation {
pname = "jose";
- version = "0.8.1.0";
- sha256 = "02xg8axy6whbkn0mzg1gjy6b1mhxlmsh1x7vjk1fiawvg9nwzrkl";
+ version = "0.8.2.0";
+ sha256 = "0kv2kmws9kwymx8pm6j8nnlk1d8pwv22hw2ka2kwlipjvmb7mld4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -140660,8 +142041,8 @@ self: {
}:
mkDerivation {
pname = "json-feed";
- version = "1.0.6";
- sha256 = "1j5x5ibax81348m4m1fv8pz0044gbvlskgh9gpn5dn8d0cpd7vf7";
+ version = "1.0.7";
+ sha256 = "0rjszis4l0sb15v2gjiwnq6avl4bkqp186v449ms4qwbbqz11sc7";
libraryHaskellDepends = [
aeson base bytestring mime-types network-uri tagsoup text time
];
@@ -140928,8 +142309,8 @@ self: {
pname = "json-rpc-server";
version = "0.2.6.0";
sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn";
- revision = "6";
- editedCabalFile = "1rfabr679pk605v141gm0ynbp3l6x87s3ip3wa49lwnpab495mxs";
+ revision = "7";
+ editedCabalFile = "1fjkl0p5glkk01jny6ar62356pmp2a2vf9v1jq67ly3y14dcvywq";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -141229,10 +142610,8 @@ self: {
}:
mkDerivation {
pname = "jsonpath";
- version = "0.1.0.1";
- sha256 = "0wp5516g33spb9ilphjkzamr88xl64fb6y9zjfci1kac5vkl4qqk";
- revision = "3";
- editedCabalFile = "01x3mx3l00cwjkf9am6aaivmccpyzj85cjww7djy3dzh63m3ak3d";
+ version = "0.1.0.2";
+ sha256 = "1b889p98z2sq93n996p0r892dsvy4is2c10xwpag1vbr8dlr614c";
libraryHaskellDepends = [
aeson attoparsec base text unordered-containers vector
];
@@ -141325,6 +142704,8 @@ self: {
pname = "jsonschema-gen";
version = "0.4.1.0";
sha256 = "1ssgci0nnpdj5sgw7wghnca8ndx20azb5z7svbxk6a1gmh9pfndj";
+ revision = "1";
+ editedCabalFile = "0fiwjdyp4fmw662x7bcdp1wglxxm39l6ivshkb65zmczc3szac5d";
libraryHaskellDepends = [
aeson base bytestring containers scientific tagged text time
unordered-containers vector
@@ -141753,8 +143134,8 @@ self: {
pname = "jwt";
version = "0.10.0";
sha256 = "1a1fqmqfm2ajq75mq2x6la8jb2g5hzl4dk8cgx9xsrikp8c7n75w";
- revision = "1";
- editedCabalFile = "0agwck6lidcxlixk5jgw0pw162xrsnlsgj8y8jwlyhjpqfq52ifi";
+ revision = "2";
+ editedCabalFile = "1ld5dh4x3sb28416bk3k39k46vmx1s7agk17v7cb5cxam4hj3c1c";
libraryHaskellDepends = [
aeson base bytestring containers cryptonite http-types memory
network-uri scientific semigroups text time unordered-containers
@@ -141825,6 +143206,22 @@ self: {
broken = true;
}) {};
+ "kafka-client-sync" = callPackage
+ ({ mkDerivation, base, containers, hw-kafka-client, monad-parallel
+ , text
+ }:
+ mkDerivation {
+ pname = "kafka-client-sync";
+ version = "0.1.1.0";
+ sha256 = "0m8y3sinyl7f6srqk0q9yvj6f896y70zisrz4qa5qfnjik0c8ds1";
+ libraryHaskellDepends = [ base containers hw-kafka-client ];
+ testHaskellDepends = [ base hw-kafka-client monad-parallel text ];
+ description = "Synchronous Kafka Client";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"kafka-device" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, cereal, linear
, milena, mtl
@@ -143128,6 +144525,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "key-vault" = callPackage
+ ({ mkDerivation, base, base-unicode-symbols, containers, key, util
+ }:
+ mkDerivation {
+ pname = "key-vault";
+ version = "0.1.0.0";
+ sha256 = "1cgsrfckph7zc5iwxjpcglz8vjk5ligmmp2rhp4nrc14njm06v8x";
+ libraryHaskellDepends = [
+ base base-unicode-symbols containers key util
+ ];
+ description = "Store of values of arbitrary types";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"keycloak-hs" = callPackage
({ mkDerivation, aeson, aeson-casing, base, base64-bytestring
, bytestring, containers, exceptions, hslogger, http-api-data
@@ -143136,13 +144547,16 @@ self: {
}:
mkDerivation {
pname = "keycloak-hs";
- version = "0.2.0";
- sha256 = "1mavfrgvvc1jg8y9gbv9jdmnd0ml71adaib1g9appnarsiqd0gkp";
+ version = "1.1.1";
+ sha256 = "1ycr1q7sfr68zbx1jxnfv0c19w2nv2rxczi5aixd01ck8v1kx798";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
aeson aeson-casing base base64-bytestring bytestring containers
exceptions hslogger http-api-data http-client http-types jwt lens
mtl safe string-conversions text word8 wreq
];
+ executableHaskellDepends = [ base ];
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -143154,8 +144568,8 @@ self: {
pname = "keycode";
version = "0.2.2";
sha256 = "046k8d1h5wwadf5z4pppjkc3g7v2zxlzb06s1xgixc42y5y41yan";
- revision = "4";
- editedCabalFile = "081spzhywygv90i7jwhbcm7p1aqz6qqph02ddxvqncghar5kjc7n";
+ revision = "5";
+ editedCabalFile = "17fhzhlbqgd5pqp357n3z0k176q79c2jxvpwqryl3gbad3s8qsfw";
libraryHaskellDepends = [
base containers ghc-prim template-haskell
];
@@ -143619,15 +145033,17 @@ self: {
"knead" = callPackage
({ mkDerivation, base, bool8, comfort-array, llvm-extra, llvm-tf
- , storable-record, storable-tuple, tfp, transformers, utility-ht
+ , prelude-compat, storable-enum, storable-record, storable-tuple
+ , tagged, tfp, transformers, utility-ht
}:
mkDerivation {
pname = "knead";
- version = "0.4";
- sha256 = "1p1zfa2mihy2di5wjb189mdq6kygr47y19194ycxdx47sh8y6s6y";
+ version = "0.4.1";
+ sha256 = "07jjs6qx58whwh61n4avrbi6krpl3qawx3mp8wacbjyrjfskcyln";
libraryHaskellDepends = [
- base bool8 comfort-array llvm-extra llvm-tf storable-record
- storable-tuple tfp transformers utility-ht
+ base bool8 comfort-array llvm-extra llvm-tf prelude-compat
+ storable-enum storable-record storable-tuple tagged tfp
+ transformers utility-ht
];
description = "Repa-like array processing using LLVM JIT";
license = stdenv.lib.licenses.bsd3;
@@ -144290,8 +145706,8 @@ self: {
({ mkDerivation, base, hspec, servant, servant-foreign, text }:
mkDerivation {
pname = "lackey";
- version = "1.0.9";
- sha256 = "0prkaxa9f03m5a333zsl75jdv2hi48w9ghv1ff1r68gnqf4hbvlr";
+ version = "1.0.10";
+ sha256 = "13nvrsw29l25ysln0di0bd5lrwnwwp0mkwvymdgf2kc2jg7x46dj";
libraryHaskellDepends = [ base servant servant-foreign text ];
testHaskellDepends = [ base hspec servant servant-foreign text ];
description = "Generate Ruby clients from Servant APIs";
@@ -144461,12 +145877,12 @@ self: {
}:
mkDerivation {
pname = "lambda-options";
- version = "1.0.0.0";
- sha256 = "1cpd5s0m10d09mqbpy1qxnrpy8np21ci6fcd09d01xj7lx8p2yzx";
+ version = "1.1.0.0";
+ sha256 = "0ihbwml2l4jyd3h2kj5qz7fxzzkq47xk4fkybhp1rnfzxjlqfib3";
libraryHaskellDepends = [
base containers funspection mtl read-bounded
];
- description = "Declarative command-line parser using type-driven pattern matching";
+ description = "Declarative command-line parser with type-driven pattern matching";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -145398,8 +146814,8 @@ self: {
({ mkDerivation, base, pretty }:
mkDerivation {
pname = "language-c99";
- version = "0.1.1";
- sha256 = "1a6n9n3jzplwgm6136rvhm6zmkvnhxz0nw1bfplikg8kkfgbp5al";
+ version = "0.1.2";
+ sha256 = "0k4a1chca328sa3w7aghhi446kqfrbp6h5jaj2rddd8f8qjz5pag";
libraryHaskellDepends = [ base pretty ];
description = "An implementation of the C99 AST that strictly follows the standard";
license = stdenv.lib.licenses.mit;
@@ -146147,6 +147563,17 @@ self: {
broken = true;
}) {};
+ "language-protobuf" = callPackage
+ ({ mkDerivation, base, megaparsec, text }:
+ mkDerivation {
+ pname = "language-protobuf";
+ version = "1.0";
+ sha256 = "1qg9c862srf7klcan53sa92ylnfx6xz8b1jqgw6rmpznfsw4h2c8";
+ libraryHaskellDepends = [ base megaparsec text ];
+ description = "Language definition and parser for Protocol Buffers";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"language-puppet" = callPackage
({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
, base16-bytestring, bytestring, case-insensitive, containers
@@ -146664,6 +148091,8 @@ self: {
pname = "latex-formulae-hakyll";
version = "0.2.0.4";
sha256 = "0q16p3ccql38ri3rnbsx54vj6jn154j3m6vic64zi4nk54g0sc5f";
+ revision = "1";
+ editedCabalFile = "08502482n0szzg32bcrdyhs853hlmx3r14bpjww1fv2dijk5asrw";
libraryHaskellDepends = [
base hakyll latex-formulae-image latex-formulae-pandoc lrucache
pandoc-types
@@ -146682,6 +148111,8 @@ self: {
pname = "latex-formulae-image";
version = "0.1.1.4";
sha256 = "0s3r0qd235lgmw4g5j52r2d97zsr3nd0ikzffgpwigvcbzshddv0";
+ revision = "1";
+ editedCabalFile = "0m15dyrxala5dh5sh228bsrfa3nym9wd719byj19vfl4i2nabw9d";
libraryHaskellDepends = [
base directory errors filepath JuicyPixels process temporary
transformers
@@ -147240,8 +148671,8 @@ self: {
}:
mkDerivation {
pname = "ldap-client";
- version = "0.3.0";
- sha256 = "0fii1yi3mn1dqvzbsx63fqrb53v81a7d2gqn3xma8v9vsp9nxv7v";
+ version = "0.4.0";
+ sha256 = "1n15yab8mg12f80rq47ansdxmxj4n6symx11ihy2m4bjn7yq31mk";
libraryHaskellDepends = [
asn1-encoding asn1-types async base bytestring connection
containers fail network semigroups stm text
@@ -148150,22 +149581,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "lens-regex-pcre_1_0_0_1" = callPackage
- ({ mkDerivation, base, bytestring, gauge, hspec, lens, pcre-heavy
- , template-haskell, text
+ "lens-regex-pcre_1_1_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, gauge, hspec, lens
+ , pcre-heavy, pcre-light, template-haskell, text
}:
mkDerivation {
pname = "lens-regex-pcre";
- version = "1.0.0.1";
- sha256 = "0g103a415npasr9a8ay1bs1f7m24w8f53h9x3wrpvvbaf0v3z74i";
+ version = "1.1.0.0";
+ sha256 = "06540l3rylgpdhfdvd9nwkf6v8hyky4l3igs45zblrmhz4sdql5i";
libraryHaskellDepends = [
- base bytestring lens pcre-heavy template-haskell text
+ base bytestring containers lens pcre-heavy pcre-light
+ template-haskell text
];
testHaskellDepends = [
- base bytestring hspec lens pcre-heavy template-haskell text
+ base bytestring containers hspec lens pcre-heavy pcre-light
+ template-haskell text
];
benchmarkHaskellDepends = [
- base bytestring gauge lens pcre-heavy template-haskell text
+ base bytestring containers gauge lens pcre-heavy pcre-light
+ template-haskell text
];
description = "A lensy interface to regular expressions";
license = stdenv.lib.licenses.bsd3;
@@ -148405,8 +149839,8 @@ self: {
pname = "lenz-template";
version = "0.2.0.0";
sha256 = "0g073wfh8522hvmy80dp8an5jr6qjnkfj3119ms3sir7dkfzljqn";
- revision = "3";
- editedCabalFile = "1ydlnn3cppjr3c0ink0k0668dmxk057gild2k84j8f27hcyb0w2j";
+ revision = "5";
+ editedCabalFile = "0l75fkl778r9kgigyiijnkw2wn2kd4xkpjj7s3bkswg75dvnrbk0";
libraryHaskellDepends = [
base base-unicode-symbols containers lenz template-haskell
];
@@ -148714,23 +150148,26 @@ self: {
}) {};
"libarchive" = callPackage
- ({ mkDerivation, base, bytestring, c2hs, chs-cabal
- , composition-prelude, criterion, deepseq, directory, dlist
- , filepath, hspec, libarchive, mtl, tar, tar-conduit, temporary
- , unix-compat
+ ({ mkDerivation, base, bytestring, c2hs, Cabal, chs-cabal
+ , composition-prelude, criterion, deepseq, dir-traverse, directory
+ , dlist, filepath, hspec, libarchive, mtl, tar, tar-conduit
+ , temporary, unix-compat
}:
mkDerivation {
pname = "libarchive";
- version = "2.0.0.2";
- sha256 = "126cq8sg2siirxkg1718n86xhlqxa1a96339dm1mw9r68ckj2jd0";
- setupHaskellDepends = [ base chs-cabal ];
+ version = "2.1.2.0";
+ sha256 = "00j1xrfwcmfb2dhz04dy4p2aryp751mmp6hpdcbm2xdhzdxrgkjf";
+ setupHaskellDepends = [ base Cabal chs-cabal ];
libraryHaskellDepends = [
base bytestring composition-prelude deepseq dlist filepath mtl
unix-compat
];
libraryPkgconfigDepends = [ libarchive ];
libraryToolDepends = [ c2hs ];
- testHaskellDepends = [ base bytestring directory filepath hspec ];
+ testHaskellDepends = [
+ base bytestring composition-prelude dir-traverse directory filepath
+ hspec mtl temporary
+ ];
benchmarkHaskellDepends = [
base bytestring criterion tar tar-conduit temporary
];
@@ -149596,8 +151033,8 @@ self: {
({ mkDerivation, base, bytestring, conduit, resourcet }:
mkDerivation {
pname = "libyaml";
- version = "0.1.1.0";
- sha256 = "0psznm9c3yjsyj9aj8m2svvv9m2v0x90hnwarcx5sbswyi3l00va";
+ version = "0.1.1.1";
+ sha256 = "0qjq0w8gqzzg3lf53mg9avkdd6z609kaacyyzjz0rbjjks4gl1db";
libraryHaskellDepends = [ base bytestring conduit resourcet ];
description = "Low-level, streaming YAML interface";
license = stdenv.lib.licenses.bsd3;
@@ -149702,20 +151139,19 @@ self: {
"lift-generics" = callPackage
({ mkDerivation, base, base-compat, generic-deriving, ghc-prim
- , hspec, template-haskell
+ , hspec, hspec-discover, template-haskell
}:
mkDerivation {
pname = "lift-generics";
- version = "0.1.2";
- sha256 = "0kk05dp6n93jgxq4x1lrckjrca6lrwa7qklr3vpzc6iyrlbvv7qf";
- revision = "3";
- editedCabalFile = "0ackkmjfqxyxhy9w03zlqvmi68la9yv4jf0sc8qdhyr5y30ac68s";
+ version = "0.1.3";
+ sha256 = "0r2rbik5lh5x8psy5cblzd1ly1ybizdcyjdg8n79m7k3rqp2w6v7";
libraryHaskellDepends = [
base generic-deriving ghc-prim template-haskell
];
testHaskellDepends = [
base base-compat generic-deriving hspec template-haskell
];
+ testToolDepends = [ hspec-discover ];
description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -149928,22 +151364,24 @@ self: {
}) {};
"lightstep-haskell" = callPackage
- ({ mkDerivation, async, base, chronos, containers, http2-client
- , http2-client-grpc, lens, mtl, proto-lens, proto-lens-runtime
- , safe-exceptions, stm, text, transformers, unordered-containers
+ ({ mkDerivation, async, base, bytestring, chronos, containers
+ , http-types, http2-client, http2-client-grpc
+ , http2-grpc-proto-lens, lens, mtl, proto-lens
+ , proto-lens-protobuf-types, proto-lens-runtime, safe-exceptions
+ , stm, text, transformers, unordered-containers, wai
}:
mkDerivation {
pname = "lightstep-haskell";
- version = "0.2.0";
- sha256 = "1ayb6s4mx9h3vywl4vrldqsh62k9m9s8z0lj62ws8hy39djhdy4p";
+ version = "0.4.4";
+ sha256 = "0y1pvb4ic9q3ma9vjlsg0spw3wq6ll9za8nys88083bm08098wfd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- async base chronos containers http2-client http2-client-grpc lens
- mtl proto-lens proto-lens-runtime safe-exceptions stm text
- transformers unordered-containers
+ async base bytestring chronos containers http-types http2-client
+ http2-client-grpc http2-grpc-proto-lens lens mtl proto-lens
+ proto-lens-protobuf-types proto-lens-runtime safe-exceptions stm
+ text transformers unordered-containers wai
];
- executableHaskellDepends = [ async base http2-client text ];
description = "LightStep OpenTracing client library";
license = stdenv.lib.licenses.asl20;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -150180,13 +151618,13 @@ self: {
}) {};
"line-drawing" = callPackage
- ({ mkDerivation, base, hspec }:
+ ({ mkDerivation, base, hspec, QuickCheck }:
mkDerivation {
pname = "line-drawing";
- version = "0.1.0.0";
- sha256 = "19hdx810mraygd1li8bw9l3i18ygbzmyxsqkyvh6q90saayglr4f";
+ version = "0.4.0.0";
+ sha256 = "0f0dj3hr1b9vryrmd88ghhn0jrv3nn5yhl5kj1bwwl99z59ww7bp";
libraryHaskellDepends = [ base ];
- testHaskellDepends = [ base hspec ];
+ testHaskellDepends = [ base hspec QuickCheck ];
description = "raster line drawing";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -150789,8 +152227,8 @@ self: {
pname = "linux-evdev";
version = "0.3.2";
sha256 = "04ajbcvn8i2xa678f3sgbbrn00rxm1k86wrj9n6w2r8h2yda9s9r";
- revision = "1";
- editedCabalFile = "0s7yb9wwh5rp4v2phm5lih29f033rgffldhkm9i2mxsag2qbfg0k";
+ revision = "2";
+ editedCabalFile = "1gnjyc8q7xq60pm362hwibwh97jw8pv66xvqv88cm9nbh0ccf6q2";
libraryHaskellDepends = [ base bytestring time unix ];
description = "Bindings to Linux evdev input device interface";
license = stdenv.lib.licenses.bsd3;
@@ -151849,18 +153287,20 @@ self: {
}) {};
"llvm-extra" = callPackage
- ({ mkDerivation, base, bool8, containers, cpuid, llvm-tf, non-empty
- , prelude-compat, tfp, transformers, unsafe, utility-ht
+ ({ mkDerivation, base, bool8, containers, cpuid, enumset, llvm-tf
+ , non-empty, prelude-compat, storable-enum, tagged, tfp
+ , transformers, unsafe, utility-ht
}:
mkDerivation {
pname = "llvm-extra";
- version = "0.8.0.3";
- sha256 = "1cqxfrjhfgliwxjgbmjkbpcy4dlv0fwwqzdd9jd8fiq96njfqfvp";
+ version = "0.8.3";
+ sha256 = "08d1ywx1m82qdyrcg607mbi7szg7mg4vszbnz4i3rgj9snlqj8hr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base bool8 containers cpuid llvm-tf non-empty prelude-compat tfp
- transformers unsafe utility-ht
+ base bool8 containers cpuid enumset llvm-tf non-empty
+ prelude-compat storable-enum tagged tfp transformers unsafe
+ utility-ht
];
description = "Utility functions for the llvm interface";
license = stdenv.lib.licenses.bsd3;
@@ -151872,8 +153312,8 @@ self: {
({ mkDerivation, base, enumset, LLVM }:
mkDerivation {
pname = "llvm-ffi";
- version = "3.8.1.2";
- sha256 = "04k2ag8nh54f9hh3blgyn1xa88hfv6c6ps51i5b84g4jdvja7f5v";
+ version = "3.9.1";
+ sha256 = "0gyda3bh43iib5isp6fd0rsf1rxkgidnmxrdm31xwjc0qnz71yf2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base enumset ];
@@ -152177,8 +153617,8 @@ self: {
}:
mkDerivation {
pname = "llvm-tf";
- version = "3.1.1.1";
- sha256 = "1rqszg06r8md7cgw2zgf30yvri4isndj608r9l8grqfnyi4lfjay";
+ version = "3.9";
+ sha256 = "02x2pq4p9dgal6fri9w1r6dj37m0l8jh0gq6ry2xq0rmq2mz70w4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -152678,6 +154118,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "log-domain_0_13" = callPackage
+ ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
+ , comonad, deepseq, distributive, doctest, generic-deriving
+ , hashable, semigroupoids, semigroups, simple-reflect, vector
+ }:
+ mkDerivation {
+ pname = "log-domain";
+ version = "0.13";
+ sha256 = "0isl8rs0k5088sxapfh351sff3lh7r1qkgwz8lmai3gvqasb3avv";
+ revision = "1";
+ editedCabalFile = "0wcy54axpnym55f1skagnbmdpw6y2ys6zvn99x8i6qcfzw00i6l9";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ base binary bytes cereal comonad deepseq distributive hashable
+ semigroupoids semigroups vector
+ ];
+ testHaskellDepends = [
+ base doctest generic-deriving semigroups simple-reflect
+ ];
+ description = "Log-domain arithmetic";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"log-effect" = callPackage
({ mkDerivation, base, bytestring, extensible-effects
, monad-control, text, transformers-base
@@ -152747,6 +154211,8 @@ self: {
pname = "log-postgres";
version = "0.7.1.1";
sha256 = "1mx43qbv9rbzzkxz7qgwgp26aq00a97rwka7a823l5hm5hamx74k";
+ revision = "1";
+ editedCabalFile = "012vyqrw0ncwxdrlbcb97x9lcmaizxspfc9dd5jxq8dfmqw5xgq7";
libraryHaskellDepends = [
aeson aeson-pretty base base64-bytestring bytestring deepseq
hpqtypes http-client lifted-base log-base mtl semigroups split text
@@ -152956,8 +154422,8 @@ self: {
}:
mkDerivation {
pname = "logging-effect";
- version = "1.3.7";
- sha256 = "1m8f9s6v1xxfp3li1yjfwdhn2an29lk07ijqcrb1db8chrlx93vd";
+ version = "1.3.8";
+ sha256 = "0ksavyvcz0c9fadik9yksm4zskzh313srf3713migwrdza5ci5q3";
libraryHaskellDepends = [
async base exceptions free monad-control mtl prettyprinter
semigroups stm stm-delay text time transformers transformers-base
@@ -153794,8 +155260,8 @@ self: {
}:
mkDerivation {
pname = "lp-diagrams";
- version = "2.1.1";
- sha256 = "0dynm0kib4lgyz00gbg4gi0ds5cgpbdx40davk53cknwxv7icri0";
+ version = "2.1.2";
+ sha256 = "0q0qzij6j0nv01hhrd417swyyf5vhgi2m83bmk98dvrd0309l9xl";
libraryHaskellDepends = [
base containers gasp graphviz labeled-tree lens mtl parsek
polynomials-bernstein process reflection text typography-geometry
@@ -153923,7 +155389,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "lsp-test_0_8_0_0" = callPackage
+ "lsp-test_0_8_2_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
, bytestring, conduit, conduit-parse, containers, data-default
, Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
@@ -153932,8 +155398,8 @@ self: {
}:
mkDerivation {
pname = "lsp-test";
- version = "0.8.0.0";
- sha256 = "1w8ag6v8mdgxynz32nzxmvfaar68abmsh3fchdfbhz2ky07p6085";
+ version = "0.8.2.0";
+ sha256 = "1762avrs4fkkd9v8i76giaf6km5f3lds5laickn7la7zq7ysh8a3";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal async base bytestring conduit
conduit-parse containers data-default Diff directory filepath
@@ -154168,10 +155634,8 @@ self: {
}:
mkDerivation {
pname = "lucid";
- version = "2.9.11";
- sha256 = "13xz21hf9ywbyqwm33z8pfrjq03rzffhqswi30xsi13rrawj99cc";
- revision = "1";
- editedCabalFile = "10k3x9cn4a23kqk909xiv8phkfgagf7p16qlfpr9swn1dn4xasgf";
+ version = "2.9.12";
+ sha256 = "156wniydd1hlb7rygbm95zln8ky8lai8rn2apkkv0rax9cdw6jrh";
libraryHaskellDepends = [
base blaze-builder bytestring containers hashable mmorph mtl text
transformers unordered-containers
@@ -154324,6 +155788,23 @@ self: {
broken = true;
}) {objc = null;};
+ "lukko" = callPackage
+ ({ mkDerivation, async, base, bytestring, filepath, singleton-bool
+ , tasty, tasty-expected-failure, tasty-hunit, temporary
+ }:
+ mkDerivation {
+ pname = "lukko";
+ version = "0.1.1.1";
+ sha256 = "13wf2vgi3bq48h757qs0zi1sxa6ip9pk8fxfiq7qrrb9p5silcpj";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ async base bytestring filepath singleton-bool tasty
+ tasty-expected-failure tasty-hunit temporary
+ ];
+ description = "File locking";
+ license = "GPL-2.0-or-later AND BSD-3-Clause";
+ }) {};
+
"luminance" = callPackage
({ mkDerivation, base, containers, contravariant, dlist, gl, linear
, mtl, resourcet, semigroups, transformers, vector, void
@@ -154598,8 +156079,8 @@ self: {
}:
mkDerivation {
pname = "lzlib";
- version = "0.3.0.0";
- sha256 = "1gav8x226703k7jsjbw4g6y74xh2id5adlnqb7hpwv314d45v76a";
+ version = "0.3.0.1";
+ sha256 = "0rq7kafqnv16313ymcq6vcslgf4ls4zjw7n5i73vp7iwsh80pl5d";
libraryHaskellDepends = [ base bytestring ];
libraryToolDepends = [ c2hs ];
testHaskellDepends = [ base bytestring directory hspec ];
@@ -155101,6 +156582,28 @@ self: {
broken = true;
}) {};
+ "mad-props" = callPackage
+ ({ mkDerivation, base, containers, lens, logict, MonadRandom, mtl
+ , psqueues, random, random-shuffle, raw-strings-qq, transformers
+ }:
+ mkDerivation {
+ pname = "mad-props";
+ version = "0.2.1.0";
+ sha256 = "0cz01majj5m0a9wszdzlz4arzf3xzppi835k2xrkd3hpzl2fxpiv";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers lens logict MonadRandom mtl psqueues random
+ random-shuffle raw-strings-qq transformers
+ ];
+ executableHaskellDepends = [
+ base containers lens logict MonadRandom mtl psqueues random
+ random-shuffle raw-strings-qq transformers
+ ];
+ description = "Monadic DSL for building constraint solvers using basic propagators";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"madlang" = callPackage
({ mkDerivation, ansi-wl-pprint, base, binary, Cabal, cli-setup
, composition-prelude, containers, criterion, directory, file-embed
@@ -155111,8 +156614,8 @@ self: {
}:
mkDerivation {
pname = "madlang";
- version = "4.0.2.15";
- sha256 = "0fv2p6f6gj9jg72kmlf56nymvs3sf6hn98jh4q0ighn6k5dkhbf3";
+ version = "4.0.2.16";
+ sha256 = "0n4y2s5m854akdy482wmhh3m5s77mgq1q91619lc2lsfg21xr80w";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cli-setup ];
@@ -156047,8 +157550,8 @@ self: {
}:
mkDerivation {
pname = "mandrill";
- version = "0.5.3.6";
- sha256 = "1jvgxhc3x7867cryvsbpj7hks9syhpqbwyh4y0v6b0yp0xil8qrl";
+ version = "0.5.4.0";
+ sha256 = "0cp0xd4by5ml1526lybqvxr1g5ccgskmj9ibl3xnrcmkbi9a14y6";
libraryHaskellDepends = [
aeson base base64-bytestring blaze-html bytestring containers
email-validate http-client http-client-tls http-types microlens-th
@@ -156255,8 +157758,8 @@ self: {
pname = "map-syntax";
version = "0.3";
sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k";
- revision = "1";
- editedCabalFile = "1qfjficc7b6hbg44r3czk8iqgkjmgnp14wmzcdcz4ai93kx8dp44";
+ revision = "2";
+ editedCabalFile = "1cpiarychx4cmv7v71rbd5ccfsjac928isd52sf42mzs2nb492ya";
libraryHaskellDepends = [ base containers mtl ];
testHaskellDepends = [
base containers deepseq hspec HUnit mtl QuickCheck transformers
@@ -156753,8 +158256,8 @@ self: {
}:
mkDerivation {
pname = "marxup";
- version = "3.1.1.0";
- sha256 = "0b22mf14qajkpf7hlm6086d951g0wgihlyiw93m0nh4yl1kmgf5q";
+ version = "3.1.2.0";
+ sha256 = "0a6lfjh5brkjm66y4yizzskra4007shqnsb5bjljxwg0vwphp112";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -156795,6 +158298,23 @@ self: {
broken = true;
}) {};
+ "mason" = callPackage
+ ({ mkDerivation, base, bytestring, ghc-prim, integer-gmp, network
+ , text
+ }:
+ mkDerivation {
+ pname = "mason";
+ version = "0.1";
+ sha256 = "1h9ch2q84n9hbcr6nvb7vllxb05m81vjwlk1vkarp31qjbfcmh29";
+ libraryHaskellDepends = [
+ base bytestring ghc-prim integer-gmp network text
+ ];
+ description = "Fast and extensible bytestring builder";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"massiv" = callPackage
({ mkDerivation, base, bytestring, Cabal, cabal-doctest
, data-default-class, deepseq, doctest, exceptions
@@ -156803,8 +158323,8 @@ self: {
}:
mkDerivation {
pname = "massiv";
- version = "0.4.3.0";
- sha256 = "0sydba4dr9y0ap8d0sqr52x1pi2qq56ciznznjgdzz6f5gip667c";
+ version = "0.4.4.0";
+ sha256 = "13hwf1z9iqybrjsn21gkglqq3knin6x84rflv3wk6wplk7dfhd2n";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base bytestring data-default-class deepseq exceptions primitive
@@ -156816,6 +158336,8 @@ self: {
];
description = "Massiv (Массив) is an Array Library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"massiv-io" = callPackage
@@ -156824,14 +158346,16 @@ self: {
}:
mkDerivation {
pname = "massiv-io";
- version = "0.1.7.0";
- sha256 = "0w3yffkrsjkgfqdfmhq42am2hpmkblnfg0prifr2ja5pfwr02l5c";
+ version = "0.1.9.0";
+ sha256 = "0splwbavahv3g0p1pyhym9hwncaw7zd5f12girwxlwhcdwrsgz3r";
libraryHaskellDepends = [
base bytestring data-default-class deepseq directory filepath
JuicyPixels massiv netpbm process vector
];
description = "Import/export of Image files into massiv Arrays";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"massiv-scheduler" = callPackage
@@ -156873,6 +158397,8 @@ self: {
];
description = "Library that contains generators, properties and tests for Massiv Array Library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"master-plan" = callPackage
@@ -157000,15 +158526,16 @@ self: {
}) {};
"math-grads" = callPackage
- ({ mkDerivation, aeson, array, base, containers, hspec, linear
- , matrix, mtl, random, vector
+ ({ mkDerivation, aeson, array, base, bimap, containers, hspec
+ , ilist, lens, linear, matrix, mtl, random, vector
}:
mkDerivation {
pname = "math-grads";
- version = "0.1.5.1";
- sha256 = "0bq08gh1fv83glx4i2gs560cynl2dv1610kby7vlvjnhg0kkyjgl";
+ version = "0.1.6.2";
+ sha256 = "02flkabfqwgmgcsrlxcfk9zm8b94l65imr3xprdap1g9z26si66l";
libraryHaskellDepends = [
- aeson array base containers linear matrix mtl random vector
+ aeson array base bimap containers ilist lens linear matrix mtl
+ random vector
];
testHaskellDepends = [ array base containers hspec random ];
description = "Library containing graph data structures and graph algorithms";
@@ -157291,26 +158818,6 @@ self: {
}) {};
"matrix-static" = callPackage
- ({ mkDerivation, base, deepseq, ghc-typelits-knownnat
- , ghc-typelits-natnormalise, matrix, tasty, tasty-hunit, vector
- }:
- mkDerivation {
- pname = "matrix-static";
- version = "0.2";
- sha256 = "0g4vkzc6jw4sx2an86d20fv9b23jzly8dxsan7ygih1mp8rn5r07";
- libraryHaskellDepends = [
- base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix
- vector
- ];
- testHaskellDepends = [
- base deepseq ghc-typelits-knownnat ghc-typelits-natnormalise matrix
- tasty tasty-hunit vector
- ];
- description = "Type-safe matrix operations";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "matrix-static_0_2_1" = callPackage
({ mkDerivation, base, deepseq, ghc-typelits-natnormalise, matrix
, tasty, tasty-hunit, vector
}:
@@ -157327,7 +158834,6 @@ self: {
];
description = "Type-safe matrix operations";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"matsuri" = callPackage
@@ -158226,6 +159732,27 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "megaparsec_8_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, containers
+ , criterion, deepseq, mtl, parser-combinators, scientific, text
+ , transformers, weigh
+ }:
+ mkDerivation {
+ pname = "megaparsec";
+ version = "8.0.0";
+ sha256 = "0633rqzrxzhq43z6i7ancncd633fm2b8755683si4v818r3cdmxm";
+ libraryHaskellDepends = [
+ base bytestring case-insensitive containers deepseq mtl
+ parser-combinators scientific text transformers
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion deepseq text weigh
+ ];
+ description = "Monadic parser combinators";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"megaparsec-tests" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, hspec, hspec-discover, hspec-expectations, hspec-megaparsec
@@ -158252,6 +159779,31 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
+ "megaparsec-tests_8_0_0" = callPackage
+ ({ mkDerivation, base, bytestring, case-insensitive, containers
+ , hspec, hspec-discover, hspec-expectations, hspec-megaparsec
+ , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text
+ , transformers
+ }:
+ mkDerivation {
+ pname = "megaparsec-tests";
+ version = "8.0.0";
+ sha256 = "1l71s16fhl2054myj02fnnjr71pfypjvwxd0hxzf83zwmqnv558f";
+ libraryHaskellDepends = [
+ base bytestring containers hspec hspec-expectations
+ hspec-megaparsec megaparsec mtl QuickCheck text transformers
+ ];
+ testHaskellDepends = [
+ base bytestring case-insensitive containers hspec
+ hspec-expectations hspec-megaparsec megaparsec mtl
+ parser-combinators QuickCheck scientific text transformers
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Test utilities and the test suite of Megaparsec";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"meldable-heap" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -160292,8 +161844,8 @@ self: {
}:
mkDerivation {
pname = "mini-egison";
- version = "0.1.5";
- sha256 = "19g5743q2h0vr9r7m854pi60r6z7f8cqr3l3fqi4b308jb492ngq";
+ version = "0.1.6";
+ sha256 = "08348nw7xnni81iwcah43x5hi0hyqz286g3zpmkhja8if99l59lj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -160367,8 +161919,8 @@ self: {
}:
mkDerivation {
pname = "minilight";
- version = "0.4.0";
- sha256 = "1ishxvijigfjfvrqiibbds2l7bb5vp51lsy933q4nphapvqrhk2m";
+ version = "0.4.1";
+ sha256 = "0zx21dhnzc8p0x6v827178rl2s215gik705fggmg31hqhwkzfy4c";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -160434,43 +161986,6 @@ self: {
}) {};
"minio-hs" = callPackage
- ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
- , case-insensitive, conduit, conduit-extra, connection, cryptonite
- , cryptonite-conduit, digest, directory, exceptions, filepath
- , http-client, http-client-tls, http-conduit, http-types, ini
- , memory, protolude, QuickCheck, raw-strings-qq, resourcet, retry
- , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary
- , text, time, transformers, unliftio, unliftio-core
- , unordered-containers, xml-conduit
- }:
- mkDerivation {
- pname = "minio-hs";
- version = "1.5.0";
- sha256 = "0qp8zl7f055lpchg8abcc27jq4s0nn14qp474qrj4wdmynfi8bc8";
- libraryHaskellDepends = [
- aeson base base64-bytestring binary bytestring case-insensitive
- conduit conduit-extra connection cryptonite cryptonite-conduit
- digest directory exceptions filepath http-client http-client-tls
- http-conduit http-types ini memory protolude raw-strings-qq
- resourcet retry text time transformers unliftio unliftio-core
- unordered-containers xml-conduit
- ];
- testHaskellDepends = [
- aeson base base64-bytestring binary bytestring case-insensitive
- conduit conduit-extra connection cryptonite cryptonite-conduit
- digest directory exceptions filepath http-client http-client-tls
- http-conduit http-types ini memory protolude QuickCheck
- raw-strings-qq resourcet retry tasty tasty-hunit tasty-quickcheck
- tasty-smallcheck temporary text time transformers unliftio
- unliftio-core unordered-containers xml-conduit
- ];
- description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage";
- license = stdenv.lib.licenses.asl20;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
- }) {};
-
- "minio-hs_1_5_1" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
, case-insensitive, conduit, conduit-extra, connection, cryptonite
, cryptonite-conduit, digest, directory, exceptions, filepath
@@ -160885,15 +162400,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "miso_1_3_0_0" = callPackage
+ "miso_1_4_0_0" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, http-api-data
, http-types, lucid, network-uri, servant, servant-lucid, text
, transformers, vector
}:
mkDerivation {
pname = "miso";
- version = "1.3.0.0";
- sha256 = "1vz7k7ajngmrzczw4bl33g081hbmbk1bkixsm47y4x8jzxa0lk7x";
+ version = "1.4.0.0";
+ sha256 = "067z49ial3dwkbcza54aivdh8r4yx54zmpyxmd6mpyqlv96dv8gc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -161246,6 +162761,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "mmark_0_0_7_2" = callPackage
+ ({ mkDerivation, aeson, base, case-insensitive, containers
+ , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec
+ , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens
+ , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck
+ , text, text-metrics, unordered-containers, weigh, yaml
+ }:
+ mkDerivation {
+ pname = "mmark";
+ version = "0.0.7.2";
+ sha256 = "1wwszzba6fvg0r4q5z2dzashim0nkaxzx4rmjl216kdi08jkp7mm";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson base case-insensitive containers deepseq dlist email-validate
+ foldl hashable html-entity-map lucid megaparsec microlens
+ microlens-th modern-uri mtl parser-combinators text text-metrics
+ unordered-containers yaml
+ ];
+ testHaskellDepends = [
+ aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
+ QuickCheck text
+ ];
+ benchmarkHaskellDepends = [ base criterion text weigh ];
+ description = "Strict markdown processor for writers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mmark-cli" = callPackage
({ mkDerivation, aeson, base, bytestring, directory
, ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark
@@ -161256,8 +162799,8 @@ self: {
pname = "mmark-cli";
version = "0.0.5.0";
sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby";
- revision = "1";
- editedCabalFile = "11yrsr4hpl5vxrfav1nfg3gidcr1qy0rjv5mkh5hqsxdpxy6c7aj";
+ revision = "2";
+ editedCabalFile = "1kpxrf3gwcl0l8jqq3dic49705p338rcvach95vp1g1jjpwd8kbj";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -161321,8 +162864,8 @@ self: {
({ mkDerivation, base, directory }:
mkDerivation {
pname = "mmsyn3";
- version = "0.1.2.0";
- sha256 = "1cjjdiyb1n5y5bswpm1lckqnn97lvn4mx8nrkydzsi1lfmxjvhk3";
+ version = "0.1.3.0";
+ sha256 = "0asxxv2ykwn82lr744ihfip8lhck888l3rvn4qadjdapv1sn3zfx";
libraryHaskellDepends = [ base directory ];
description = "A small library to deal with executable endings";
license = stdenv.lib.licenses.mit;
@@ -161346,6 +162889,40 @@ self: {
broken = true;
}) {};
+ "mmsyn5" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "mmsyn5";
+ version = "0.4.2.2";
+ sha256 = "1y5f9fwc9k7hbmnk8fvm6m6h2lrdsfijr6jn0dfj6fhc17kmp46p";
+ libraryHaskellDepends = [ base ];
+ description = "Various additional operations on lists (some with intermediate Monads)";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
+ "mmsyn6ukr" = callPackage
+ ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3
+ , mmsyn5, process, vector
+ }:
+ mkDerivation {
+ pname = "mmsyn6ukr";
+ version = "0.5.1.0";
+ sha256 = "1jmbfs0yi7r9lmaxq3dfyrw1rrwhknb7v4xfhrz3w7s8jg3vqs2x";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base bytestring directory mmsyn2 mmsyn3 mmsyn5 process vector
+ ];
+ executableHaskellDepends = [
+ base bytestring directory mmsyn2 mmsyn3 mmsyn5 process vector
+ ];
+ description = "A musical instrument synthesizer or a tool for Ukrainian language listening";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"mmtf" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, data-msgpack, deepseq, hspec, http-conduit, QuickCheck, text
@@ -161463,6 +163040,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "mod" = callPackage
+ ({ mkDerivation, base, deepseq, integer-gmp, quickcheck-classes
+ , quickcheck-classes-base, semirings, tasty, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "mod";
+ version = "0.1.0.0";
+ sha256 = "10cvd4275jzd8h1f227nivbvf52kbk0hn00zwrb1hmrgif6a31gd";
+ libraryHaskellDepends = [ base deepseq integer-gmp semirings ];
+ testHaskellDepends = [
+ base quickcheck-classes quickcheck-classes-base semirings tasty
+ tasty-quickcheck
+ ];
+ description = "Fast type-safe modular arithmetic";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"modbus-tcp" = callPackage
({ mkDerivation, base, bytestring, cereal, mtl, transformers }:
mkDerivation {
@@ -161523,8 +163117,8 @@ self: {
pname = "modern-uri";
version = "0.3.1.0";
sha256 = "1pi7la2rrpfa9qszz7zm4dd7dihakm4kjrhjzvxpbp4n34ihl8h5";
- revision = "1";
- editedCabalFile = "09fwv2sx49kbabkllag01g1g85m92fmz60k5lf0w8qnr7hkxv3rd";
+ revision = "2";
+ editedCabalFile = "0slfswzl4khpn0z8g7frn63gx7hw9n7nc3yff659q18nq7c6vjxd";
libraryHaskellDepends = [
base bytestring containers contravariant deepseq exceptions
megaparsec mtl profunctors QuickCheck reflection tagged
@@ -161987,12 +163581,14 @@ self: {
}) {};
"monad-codec" = callPackage
- ({ mkDerivation, base, binary, containers, data-lens, mtl }:
+ ({ mkDerivation, base, binary, containers, data-lens-light, mtl }:
mkDerivation {
pname = "monad-codec";
- version = "0.2.0";
- sha256 = "0jim6hk891jby2gch6f1k4262jm8fl9jgl808dj204ylz8w1475l";
- libraryHaskellDepends = [ base binary containers data-lens mtl ];
+ version = "0.2.1";
+ sha256 = "0n9mjzx6p75nm4f7ndlha9jmyvwdxaknhnds9cm8p4sj9mpsmgid";
+ libraryHaskellDepends = [
+ base binary containers data-lens-light mtl
+ ];
description = "Monadic conversion between complex data structures and unique integers";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -162301,10 +163897,8 @@ self: {
}:
mkDerivation {
pname = "monad-logger";
- version = "0.3.30";
- sha256 = "102l0v75hbvkmrypiyg4ybb6rbc7nij5nxs1aihmqfdpg04rkkp7";
- revision = "1";
- editedCabalFile = "0gm3gqbxkj8447js4a672snz0ir78syk890nqdmjb18hsjqy5p6a";
+ version = "0.3.31";
+ sha256 = "0awr06bh5d51kci2w2xsj34qvh98sb6dm48a4k05k8awv8hrrpmd";
libraryHaskellDepends = [
base bytestring conduit conduit-extra exceptions fast-logger
lifted-base monad-control monad-loops mtl resourcet stm stm-chans
@@ -162354,8 +163948,8 @@ self: {
}:
mkDerivation {
pname = "monad-logger-syslog";
- version = "0.1.4.0";
- sha256 = "1jwwpjn35mvl7z05xcykpxdyhaa6mgiighgcr8qzprrmw89kwb05";
+ version = "0.1.6.0";
+ sha256 = "1n4r0fl043r18683ym3k03sdm3b9wlxfzjgmnxi804kwna639rj3";
libraryHaskellDepends = [
base bytestring fast-logger hsyslog monad-logger text transformers
];
@@ -162549,8 +164143,10 @@ self: {
}:
mkDerivation {
pname = "monad-par";
- version = "0.3.4.8";
- sha256 = "0ldrzqy24fsszvn2a2nr77m2ih7xm0h9bgkjyv1l274aj18xyk7q";
+ version = "0.3.5";
+ sha256 = "1a8m99g9x1ivch4vhksk7fdzygbil3d33w8gdqngxbmwdikdafl2";
+ revision = "1";
+ editedCabalFile = "17l7zjykf5iqjmw1pq4iwls7v9x9d3in94iikxabx43q5l2iccsm";
libraryHaskellDepends = [
abstract-deque abstract-par array base containers deepseq
monad-par-extras mtl mwc-random parallel
@@ -163697,16 +165293,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "monoidal-containers_0_6" = callPackage
+ "monoidal-containers_0_6_0_1" = callPackage
({ mkDerivation, aeson, base, containers, deepseq, hashable, lens
, newtype, semialign, semigroups, these, unordered-containers
}:
mkDerivation {
pname = "monoidal-containers";
- version = "0.6";
- sha256 = "1ii09s068g6bj2j10ig3g3ymv1ci6zg596pmmaw6als15j9bybc9";
- revision = "2";
- editedCabalFile = "17qv2kds7m4mi3r4rd89d2nhcjc06lzdfg93qsn6ldssnypq0rra";
+ version = "0.6.0.1";
+ sha256 = "1j5mfs0ysvwk3jsmq4hlj4l3kasfc28lk1b3xaymf9dw48ac5j82";
libraryHaskellDepends = [
aeson base containers deepseq hashable lens newtype semialign
semigroups these unordered-containers
@@ -163844,6 +165438,28 @@ self: {
broken = true;
}) {};
+ "months" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base-compat, cassava
+ , deepseq, hashable, http-api-data, intervals, lens, lucid
+ , QuickCheck, swagger2, text, time-compat
+ }:
+ mkDerivation {
+ pname = "months";
+ version = "0.1";
+ sha256 = "000fqmd5j3pxmfa5bpyk5fd0hbn9iq3g5v1slk4hrjdjm8k19wa0";
+ revision = "2";
+ editedCabalFile = "030d693d4acc3zlha2rjzalrqn8i5pyqkw0zdp3i1hjr0694hwaf";
+ libraryHaskellDepends = [
+ aeson attoparsec base base-compat cassava deepseq hashable
+ http-api-data intervals lens lucid QuickCheck swagger2 text
+ time-compat
+ ];
+ description = "Month, YearMonth, Quarter, YearQuarter types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"monus" = callPackage
({ mkDerivation, base, containers, smallcheck, tasty
, tasty-quickcheck, tasty-smallcheck
@@ -164073,37 +165689,28 @@ self: {
}) {};
"morpheus-graphql" = callPackage
- ({ mkDerivation, aeson, base, bytestring, containers, filepath
- , megaparsec, mtl, optparse-applicative, scientific, scotty, tasty
- , tasty-hunit, template-haskell, text, transformers
- , unordered-containers, uuid, vector, wai, wai-websockets, warp
- , websockets
+ ({ mkDerivation, aeson, base, bytestring, containers, megaparsec
+ , mtl, scientific, tasty, tasty-hunit, template-haskell, text
+ , th-lift-instances, transformers, unordered-containers, uuid
+ , vector, websockets
}:
mkDerivation {
pname = "morpheus-graphql";
- version = "0.5.0";
- sha256 = "0481kz9wr8d3fhnmcgxnzffq97qqirk5fznddn3nsb3zl7r7c3g9";
- isLibrary = true;
- isExecutable = true;
+ version = "0.7.1";
+ sha256 = "1yh49icsq68xbw9gmvqssy4piaqb97cy39jg4a20360j9sfr87dp";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring containers megaparsec mtl scientific
- template-haskell text transformers unordered-containers uuid vector
- websockets
- ];
- executableHaskellDepends = [
- aeson base bytestring containers filepath megaparsec mtl
- optparse-applicative scientific scotty template-haskell text
- transformers unordered-containers uuid vector wai wai-websockets
- warp websockets
+ template-haskell text th-lift-instances transformers
+ unordered-containers uuid vector websockets
];
testHaskellDepends = [
aeson base bytestring containers megaparsec mtl scientific tasty
- tasty-hunit template-haskell text transformers unordered-containers
- uuid vector websockets
+ tasty-hunit template-haskell text th-lift-instances transformers
+ unordered-containers uuid vector websockets
];
description = "Morpheus GraphQL";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.mit;
}) {};
"morpheus-graphql-cli" = callPackage
@@ -164124,6 +165731,8 @@ self: {
];
description = "Morpheus GraphQL CLI";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"morphisms" = callPackage
@@ -164185,8 +165794,8 @@ self: {
}:
mkDerivation {
pname = "morte";
- version = "1.7.1";
- sha256 = "1ff9h3zzcz59q07v0yx93v537z6swy65j88z9cn6mgfjrxjmqx2b";
+ version = "1.7.2";
+ sha256 = "0dpl0siabfyiw940ymy7ba3rx3p939x3ya6ias6l75saw1qw9lvn";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -164280,6 +165889,8 @@ self: {
];
description = "General purpose migrations library";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"moto-postgresql" = callPackage
@@ -164295,6 +165906,8 @@ self: {
];
description = "PostgreSQL-based migrations registry for moto";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"motor" = callPackage
@@ -166368,6 +167981,26 @@ self: {
broken = true;
}) {};
+ "musicw" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, data-default
+ , file-embed, ghcjs-base, ghcjs-dom, ghcjs-prim, json, monad-loops
+ , mtl, safe, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "musicw";
+ version = "0.3.0";
+ sha256 = "143yxcj9c1wabg2nmm3ljpdi1r2ah9mf1c8hc2m74gwq08dl78zj";
+ libraryHaskellDepends = [
+ array base bytestring containers data-default file-embed ghcjs-base
+ ghcjs-dom ghcjs-prim json monad-loops mtl safe text time
+ transformers
+ ];
+ description = "Sound synthesis library, to be used with GHCJS and Web Audio API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {ghcjs-prim = null;};
+
"musicxml" = callPackage
({ mkDerivation, base, containers, directory, HaXml, old-time
, pretty
@@ -166670,6 +168303,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "mx-state-codes" = callPackage
+ ({ mkDerivation, aeson, base, hspec, QuickCheck, text }:
+ mkDerivation {
+ pname = "mx-state-codes";
+ version = "1.0.0.0";
+ sha256 = "1jxw7hh24rqs1c5y4b7bmllvcwq3gsrrn0rixq9lzhn2915ykaq6";
+ libraryHaskellDepends = [ aeson base text ];
+ testHaskellDepends = [ aeson base hspec QuickCheck text ];
+ description = "ISO 3166-2:MX State Codes and Names";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"mxnet" = callPackage
({ mkDerivation, base, c2hs, c2hs-extra, mxnet, pretty, tasty
, tasty-hunit, template-haskell, unordered-containers, vector
@@ -167910,8 +169555,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "natural-arithmetic";
- version = "0.1.0.0";
- sha256 = "0h5ga04hw7v54xsxjj852238spl3px190g67qjqzxvnyn0f76jrp";
+ version = "0.1.1.0";
+ sha256 = "0n2330b2g4gy1ljpcww9vmj74ig23m0zxkg92721zpdfywlcy44g";
libraryHaskellDepends = [ base ];
description = "Arithmetic of natural numbers";
license = stdenv.lib.licenses.bsd3;
@@ -168114,8 +169759,8 @@ self: {
}:
mkDerivation {
pname = "neat-interpolation";
- version = "0.3.2.4";
- sha256 = "0lhpjckwhzlvx4cdhrwprwb85vc7hc44ybvk5nswgn7z73cp0wyy";
+ version = "0.3.2.5";
+ sha256 = "09nb0bypjpfxcm71012c2xxfrq5drvd1nhdmnmhk8wc0r8254g8c";
libraryHaskellDepends = [
base base-prelude megaparsec template-haskell text
];
@@ -168242,8 +169887,8 @@ self: {
}:
mkDerivation {
pname = "neko-obfs";
- version = "0.1.0.2";
- sha256 = "1kqki738d7jfjgr0jcybs9w0fzccmdb1i64caanydpfn6x9rkiac";
+ version = "0.1.0.4";
+ sha256 = "1vffkpxxvxykrjy9awx0vqda6gbpmzz2ybr5ijmb47dl7mr7sl88";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -168299,8 +169944,8 @@ self: {
}:
mkDerivation {
pname = "nerf";
- version = "0.5.3";
- sha256 = "18rkjgk2r6784mjbdd2lydv9yac252xvj18m78bbaplnac1504ak";
+ version = "0.5.4.1";
+ sha256 = "1dwfm00r64vi6by92ggi184747v2mq94fbyl18r46icvgq0h1dl2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -168308,8 +169953,12 @@ self: {
dawg IntervalMap monad-ox mtl network polimorf polysoup sgd tagsoup
text text-binary tokenize vector
];
- executableHaskellDepends = [ directory filepath temporary ];
- description = "Nerf, the named entity recognition tool based on linear-chain CRFs";
+ executableHaskellDepends = [
+ base binary bytestring cmdargs containers crf-chain1 data-named
+ dawg directory filepath IntervalMap monad-ox mtl network polimorf
+ polysoup sgd tagsoup temporary text text-binary tokenize vector
+ ];
+ description = "Nerf, a named entity recognition tool based on linear-chain CRFs";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -168487,8 +170136,8 @@ self: {
}:
mkDerivation {
pname = "net-mqtt";
- version = "0.6.1.1";
- sha256 = "1ym4p5p3g0bzxvvijjafsdh3rkz17infvn2kc2rwpdrvig7j65yg";
+ version = "0.6.2.1";
+ sha256 = "09l9m213x1v7cvrfr039hg2c1pa4dknyhj827h9n0w9pawj61r55";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -168513,6 +170162,29 @@ self: {
broken = true;
}) {};
+ "net-mqtt-rpc" = callPackage
+ ({ mkDerivation, base, bytestring, net-mqtt, network-uri
+ , optparse-applicative, random, stm, text, uuid
+ }:
+ mkDerivation {
+ pname = "net-mqtt-rpc";
+ version = "0.1.0.0";
+ sha256 = "0wzpsjyskgbnyyy7bbbg7plsypwnyi2rblvyn17a33ak43zi1fx5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring net-mqtt random stm text uuid
+ ];
+ executableHaskellDepends = [
+ base bytestring net-mqtt network-uri optparse-applicative random
+ stm text uuid
+ ];
+ description = "Make RPC calls via an MQTT broker";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"net-spider" = callPackage
({ mkDerivation, aeson, base, containers, data-interval, doctest
, doctest-discover, extended-reals, greskell, greskell-websocket
@@ -169110,14 +170782,14 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "network_3_1_1_0" = callPackage
+ "network_3_1_1_1" = callPackage
({ mkDerivation, base, bytestring, deepseq, directory, hspec
, hspec-discover, HUnit
}:
mkDerivation {
pname = "network";
- version = "3.1.1.0";
- sha256 = "0gr99ksn7khijfjf0g4bkp13kb6jbxnq23b6pxflnvlsf5la8yks";
+ version = "3.1.1.1";
+ sha256 = "16ic2hgvadyiy0zfnyd2zknf8rxqmwzpy5mw5x9apwpzfc0mkvyp";
libraryHaskellDepends = [ base bytestring deepseq ];
testHaskellDepends = [ base bytestring directory hspec HUnit ];
testToolDepends = [ hspec-discover ];
@@ -169305,8 +170977,8 @@ self: {
pname = "network-bsd";
version = "2.8.1.0";
sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr";
- revision = "2";
- editedCabalFile = "1cqb720gl960zfzbzxakc2wvrvw8plncgarbb1v1hdzmdxw07js7";
+ revision = "3";
+ editedCabalFile = "1hc3jdbmpq2wxh82xfx452v2m2l97jbdaqqbmj5nz4lljxa2696r";
libraryHaskellDepends = [ base deepseq network ];
description = "POSIX network database () API";
license = stdenv.lib.licenses.bsd3;
@@ -169340,8 +171012,8 @@ self: {
({ mkDerivation, base, bytestring, doctest }:
mkDerivation {
pname = "network-byte-order";
- version = "0.1.1.1";
- sha256 = "19cs6157amcc925vwr92q1azwwzkbam5g0k70i6qi80fhpikh37c";
+ version = "0.1.2.0";
+ sha256 = "1y2azf5zbydzvi4b0hxmy7am4kgpkq8ajnsbrpfrqz87b5y87ccy";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [ base bytestring doctest ];
description = "Network byte order utilities";
@@ -169560,8 +171232,8 @@ self: {
}:
mkDerivation {
pname = "network-ip";
- version = "0.3.0.2";
- sha256 = "1zjy232pamkd3977cyaq5w5r6ksbpqpgzzlds15zrahjccirs9gf";
+ version = "0.3.0.3";
+ sha256 = "0p4mn7vz74kxmsc8xvg7gx5rs38knnv518bc0qv0b07ki51wq7g0";
libraryHaskellDepends = [
base data-default-class data-dword data-endian data-serializer
data-textual hashable parsers text-printer type-hint
@@ -169604,8 +171276,8 @@ self: {
}:
mkDerivation {
pname = "network-messagepack-rpc";
- version = "0.1.1.4";
- sha256 = "040kj2rs80kg7746rqrrsgpbi3vpbfg4c6r5n08nvqqslcx932xb";
+ version = "0.1.2.0";
+ sha256 = "118agkkbvfyynk6qg5yzazbs0s7w0bw9n0ndj8nm35yy6cil9lky";
libraryHaskellDepends = [
base bytestring data-msgpack safe-exceptions text
unordered-containers
@@ -169621,8 +171293,8 @@ self: {
}:
mkDerivation {
pname = "network-messagepack-rpc-websocket";
- version = "0.1.1.0";
- sha256 = "05cd6cqyydjwymnk8rscqngvz3knyibl674rcbjpz28him6gbc7d";
+ version = "0.1.1.1";
+ sha256 = "0adkav3nl7ghbx2r7dx83ki6m397clxaw37s54ivnkxydqscjv06";
libraryHaskellDepends = [
base network-messagepack-rpc text websockets wss-client
];
@@ -169887,6 +171559,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "network-simple-tls_0_4" = callPackage
+ ({ mkDerivation, base, bytestring, data-default, network
+ , network-simple, safe-exceptions, tls, tls-session-manager
+ , transformers, x509, x509-store, x509-system, x509-validation
+ }:
+ mkDerivation {
+ pname = "network-simple-tls";
+ version = "0.4";
+ sha256 = "0c5xxqp2xw1q046sngd5gnwp7gn0ima9wm8drxxry13l0i0bnmn1";
+ libraryHaskellDepends = [
+ base bytestring data-default network network-simple safe-exceptions
+ tls tls-session-manager transformers x509 x509-store x509-system
+ x509-validation
+ ];
+ description = "Simple interface to TLS secured network sockets";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"network-simple-ws" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, network-simple
, safe-exceptions, websockets
@@ -170508,6 +172199,8 @@ self: {
pname = "newtype-generics";
version = "0.5.4";
sha256 = "0cprfg4n0z62cnix1qrbc79bfdd4s50b05fj9m9hk6vm1pc3szq0";
+ revision = "1";
+ editedCabalFile = "1id9a6prj2bzdsyfsfr0pnfy9p8v9wlw59x12fny6y2szfcxcrv7";
libraryHaskellDepends = [ base transformers ];
testHaskellDepends = [ base hspec ];
testToolDepends = [ hspec-discover ];
@@ -170695,8 +172388,8 @@ self: {
}:
mkDerivation {
pname = "ngx-export-tools-extra";
- version = "0.1.0.0";
- sha256 = "0j3bfrmic9zrivsnaf4kzf5bf0inianmnn7v0c21s5ip775k5jy8";
+ version = "0.1.0.1";
+ sha256 = "0f55j4742rimq7jawgk0ca5kcxg9nz0lfpip5p3sw03w3g52xqxh";
libraryHaskellDepends = [
aeson base bytestring containers enclosed-exceptions http-client
ngx-export-tools snap-core snap-server template-haskell text time
@@ -170921,26 +172614,26 @@ self: {
({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
, bytestring, directory, file-embed, filepath, hashable
, http-conduit, mtl, optparse-applicative, process, profunctors
- , string-qq, tasty, tasty-hunit, text, unliftio
+ , pureMD5, string-qq, tasty, tasty-hunit, text, unliftio
, unordered-containers
}:
mkDerivation {
pname = "niv";
- version = "0.2.1";
- sha256 = "18ym8zqxillqf0psc9xyjzgnxhfrfgy5sj3hvrdmggy4dlnn500j";
+ version = "0.2.8";
+ sha256 = "0nggarlbfc8x5y7rp8n5fdzy3xipykxq4fk6irz1jsz4m6fbi9a4";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal base bytestring directory
file-embed filepath hashable http-conduit mtl optparse-applicative
- process profunctors string-qq tasty tasty-hunit text unliftio
- unordered-containers
+ process profunctors pureMD5 string-qq tasty tasty-hunit text
+ unliftio unordered-containers
];
executableHaskellDepends = [
aeson aeson-pretty ansi-terminal base bytestring directory
file-embed filepath hashable http-conduit mtl optparse-applicative
- process profunctors string-qq tasty text unliftio
+ process profunctors pureMD5 string-qq tasty text unliftio
unordered-containers
];
description = "Easy dependency management for Nix projects";
@@ -170972,8 +172665,8 @@ self: {
}:
mkDerivation {
pname = "nix-deploy";
- version = "1.0.3";
- sha256 = "0anhmc9g9k40nwj87f24hq4wnj6mkli36dzhzdpa0p3cpg7sh2kh";
+ version = "1.0.4";
+ sha256 = "1wmwrnm6wflkdaq0m84az1q6245iyvkzd2r47vdy9a2a1szqnvl3";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -171164,6 +172857,8 @@ self: {
];
description = "Tool for semi-automatic updating of nixpkgs repository";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"nkjp" = callPackage
@@ -171599,8 +173294,8 @@ self: {
({ mkDerivation, base, containers, semigroups }:
mkDerivation {
pname = "non-empty-sequence";
- version = "0.2.0.2";
- sha256 = "1qfidlv190wxrrp67h7rcrlczwfv7r0mdbwm31rrf08l1i6618yr";
+ version = "0.2.0.4";
+ sha256 = "0a6xk2ijj3lzhqzdrk6q89538d1a62aw8x0ccvkq2kyl1dlahwc0";
libraryHaskellDepends = [ base containers semigroups ];
description = "Non-empty sequence";
license = stdenv.lib.licenses.bsd3;
@@ -171685,14 +173380,33 @@ self: {
}) {};
"nonempty-containers" = callPackage
+ ({ mkDerivation, base, comonad, containers, deepseq, hedgehog
+ , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these
+ }:
+ mkDerivation {
+ pname = "nonempty-containers";
+ version = "0.3.1.0";
+ sha256 = "15flyfv6w4078wk69d2nb2lx21b76xr6c34rxs0w8jz1mb497f6l";
+ libraryHaskellDepends = [
+ base comonad containers deepseq semigroupoids these
+ ];
+ testHaskellDepends = [
+ base comonad containers hedgehog hedgehog-fn semigroupoids tasty
+ tasty-hedgehog text these
+ ];
+ description = "Non-empty variants of containers data types, with full API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "nonempty-containers_0_3_3_0" = callPackage
({ mkDerivation, base, comonad, containers, deepseq, hedgehog
, hedgehog-fn, nonempty-vector, semigroupoids, tasty
, tasty-hedgehog, text, these, vector
}:
mkDerivation {
pname = "nonempty-containers";
- version = "0.3.2.0";
- sha256 = "0h0djvjhlrm4s79q881gbag4kkabacvj0d5x0dc0xvhg1i0hs9da";
+ version = "0.3.3.0";
+ sha256 = "11mrv2vzdqxjx3xn93zlwfxh7z2d5ca5cbsr25y4zv34brn114g2";
libraryHaskellDepends = [
base comonad containers deepseq nonempty-vector semigroupoids these
vector
@@ -171703,6 +173417,7 @@ self: {
];
description = "Non-empty variants of containers data types, with full API";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"nonempty-lift" = callPackage
@@ -171722,29 +173437,13 @@ self: {
}) {};
"nonempty-vector" = callPackage
- ({ mkDerivation, base, deepseq, hedgehog, primitive, semigroups
- , vector
- }:
- mkDerivation {
- pname = "nonempty-vector";
- version = "0.1.0.0";
- sha256 = "1yc9x0mc30fl348by3586wf2g7q40c98yskyw15cnxj3588p5zv3";
- libraryHaskellDepends = [
- base deepseq primitive semigroups vector
- ];
- testHaskellDepends = [ base hedgehog semigroups vector ];
- description = "Non-empty vectors";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "nonempty-vector_0_2_0_0" = callPackage
({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest
, primitive, semigroups, vector
}:
mkDerivation {
pname = "nonempty-vector";
- version = "0.2.0.0";
- sha256 = "1pgl4kvr1mry3zn4gmdxphx8f9lv1zq8j6s79yrw69h940r6v4r7";
+ version = "0.2.0.1";
+ sha256 = "0qiwl58d5bvack33djhwqkblwk541w63a3hjqc7mik54y3j40s71";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base deepseq primitive semigroups vector
@@ -171752,7 +173451,6 @@ self: {
testHaskellDepends = [ base doctest ];
description = "Non-empty vectors";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"nonemptymap" = callPackage
@@ -171977,6 +173675,8 @@ self: {
transformers tuple
];
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"notmuch" = callPackage
@@ -172673,8 +174373,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "numhask";
- version = "0.3.0.0";
- sha256 = "1zkiqav683mmghxz0hj0wjzg3sf95zfd4ghicw674d9j3vl4gmcw";
+ version = "0.3.1";
+ sha256 = "0r7raa7sw9k6p5xb3kl7jfpfkg4dym2kb8hrdkq9xvj2yrajzg77";
libraryHaskellDepends = [ base ];
description = "numeric classes";
license = stdenv.lib.licenses.bsd3;
@@ -172709,8 +174409,8 @@ self: {
}:
mkDerivation {
pname = "numhask-hedgehog";
- version = "0.3";
- sha256 = "0f7h2ah0z63v40hnk4fcxhj4b8qzi1fy8hipxwvi29g0mvpkxjds";
+ version = "0.3.1";
+ sha256 = "1glg0lapr0fm06z5s8k4xsi99yx3khay4ynvic3kb1xf0iqay818";
libraryHaskellDepends = [
base hedgehog numhask numhask-prelude numhask-space
];
@@ -172722,17 +174422,17 @@ self: {
}) {};
"numhask-histogram" = callPackage
- ({ mkDerivation, base, containers, doctest, foldl, numhask-prelude
- , numhask-range, tdigest
+ ({ mkDerivation, base, containers, doctest, foldl, numhask-space
+ , tdigest
}:
mkDerivation {
pname = "numhask-histogram";
- version = "0.1.3.0";
- sha256 = "1d4b1iv6czhc9747p5df3qlbj34nzlz608qp975cg31i63inz2ix";
+ version = "0.2.0";
+ sha256 = "0bkqn7h2cs5m318zira6idf2jmslgacci4mr2948dki1hbnj59xi";
libraryHaskellDepends = [
- base containers foldl numhask-prelude numhask-range tdigest
+ base containers foldl numhask-space tdigest
];
- testHaskellDepends = [ base doctest numhask-prelude ];
+ testHaskellDepends = [ base doctest ];
description = "See readme.md";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -172740,13 +174440,12 @@ self: {
}) {};
"numhask-prelude" = callPackage
- ({ mkDerivation, base, doctest, numhask, numhask-space, protolude
- }:
+ ({ mkDerivation, base, doctest, numhask, protolude }:
mkDerivation {
pname = "numhask-prelude";
- version = "0.3.1";
- sha256 = "1j9da7ldacfzkw4yxrc84p0diygvbglj4xdqj9bam8ld2hv5i1mq";
- libraryHaskellDepends = [ base numhask numhask-space protolude ];
+ version = "0.3.2";
+ sha256 = "1884pm13wyhqwwl9n2k9wv7r7q86x4c682m78291sh6yinrymazk";
+ libraryHaskellDepends = [ base numhask protolude ];
testHaskellDepends = [ doctest ];
description = "A numeric prelude";
license = stdenv.lib.licenses.bsd3;
@@ -172777,18 +174476,22 @@ self: {
}) {};
"numhask-space" = callPackage
- ({ mkDerivation, adjunctions, base, distributive, numhask
- , semigroupoids
+ ({ mkDerivation, adjunctions, base, containers, distributive
+ , doctest, foldl, lattices, semigroupoids, tdigest, text, time
}:
mkDerivation {
pname = "numhask-space";
- version = "0.1.1";
- sha256 = "1rf86fbyrbs2a1dxrbr35a2dhfimclindlb4iimijs28is0zdz8s";
+ version = "0.3.0";
+ sha256 = "0j75qig7smx2lnl6drmsj2zs4zg6rw9vvcb1d0cjv47haw9xgz62";
libraryHaskellDepends = [
- adjunctions base distributive numhask semigroupoids
+ adjunctions base containers distributive foldl lattices
+ semigroupoids tdigest text time
];
+ testHaskellDepends = [ base doctest ];
description = "numerical spaces";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"numhask-test" = callPackage
@@ -173051,8 +174754,8 @@ self: {
}:
mkDerivation {
pname = "nyx-game";
- version = "1.0.0.0";
- sha256 = "16a1bkw8i81qcp7diblgkc17snxppdsfqly6diirm0sxpbsx5d8s";
+ version = "1.0.1.0";
+ sha256 = "14zxg7znqjglzqlsfvgksknz5ry369x0smjja8dx6h2ih0xf3i06";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -174122,18 +175825,17 @@ self: {
}) {};
"online" = callPackage
- ({ mkDerivation, base, doctest, foldl, numhask-prelude, protolude
- , tasty, tdigest, vector, vector-algorithms
+ ({ mkDerivation, base, doctest, foldl, tasty, tdigest, vector
+ , vector-algorithms
}:
mkDerivation {
pname = "online";
- version = "0.3.0.0";
- sha256 = "056a9dkrzfgj0wf9f9d9d25f6yc03jx9z0p0z5xm8n8brk6b3bds";
+ version = "0.4.0.0";
+ sha256 = "1vb9x90qzmqjydxjcn06gz5lfikwrx73jkkhmqdd5vxmzzj36spz";
libraryHaskellDepends = [
- base foldl numhask-prelude protolude tdigest vector
- vector-algorithms
+ base foldl tdigest vector vector-algorithms
];
- testHaskellDepends = [ base doctest protolude tasty ];
+ testHaskellDepends = [ base doctest tasty ];
description = "online statistics";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -174190,6 +175892,18 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
+ "op" = callPackage
+ ({ mkDerivation, base, containers, doctest }:
+ mkDerivation {
+ pname = "op";
+ version = "0.3.0.0";
+ sha256 = "0as0nswa28mbw7qp1p1pjvvr4iv6zd81rka9g51fy2w52260lmpv";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base containers doctest ];
+ description = "Common operators encouraging large-scale easy reading";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"opaleye" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, bytestring
, case-insensitive, containers, contravariant, dotenv, hspec
@@ -174270,10 +175984,8 @@ self: {
}:
mkDerivation {
pname = "opaleye-trans";
- version = "0.5.0";
- sha256 = "18y9qcs771647g5xy7209rq32w7fqflcr313mdw1fv0m2ak65wb2";
- revision = "2";
- editedCabalFile = "1p51w0q74f8by2yw2hs1z9pfh6jxnlizf4jffjmj6j2kpm9hh3md";
+ version = "0.5.1";
+ sha256 = "11vfp8rb46fvrhryyw9k66cbfnd920n5r4mcasdcnxhn1n8hc7i4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -175997,8 +177709,8 @@ self: {
}:
mkDerivation {
pname = "orgmode-parse";
- version = "0.2.2";
- sha256 = "1f6wcxkln5ddaa2z7wbkp6wndgq38qv9h1wnn27gqcms02758v2r";
+ version = "0.2.3";
+ sha256 = "0vwmxgxvyr44qx2zvc796i7jid3c5nrfa82pf696vvjnxgb805sa";
libraryHaskellDepends = [
aeson attoparsec base bytestring containers free hashable
old-locale semigroups text thyme unordered-containers
@@ -176022,8 +177734,8 @@ self: {
}:
mkDerivation {
pname = "orgstat";
- version = "0.1.6";
- sha256 = "1w6nbgq29bdx0skqsy7h46x46g6rzpsgp2n5ldxv2nmbwbhq6bib";
+ version = "0.1.7";
+ sha256 = "1yvzs6sdkdgi5gfdgznnz1f03sf57icnn7bb5njcam7gxwvswbkp";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -176111,23 +177823,22 @@ self: {
"ormolu" = callPackage
({ mkDerivation, base, bytestring, containers, dlist, exceptions
- , filepath, ghc, ghc-boot-th, ghc-paths, gitrev, hspec
- , hspec-discover, mtl, optparse-applicative, path, path-io, syb
- , text
+ , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl
+ , optparse-applicative, path, path-io, syb, text
}:
mkDerivation {
pname = "ormolu";
- version = "0.0.1.0";
- sha256 = "1p4m9hiavirnhf941fb5pdnrlrknr5rhcvznhqywianvvw6qcm30";
+ version = "0.0.2.0";
+ sha256 = "10p3h98k5ph2awmdd89k8knavv4npvdmh00a9nrzaw6z32j0igfh";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- base bytestring containers dlist exceptions ghc ghc-boot-th
- ghc-paths mtl syb text
+ base bytestring containers dlist exceptions ghc-lib-parser mtl syb
+ text
];
executableHaskellDepends = [
- base ghc gitrev optparse-applicative text
+ base ghc-lib-parser gitrev optparse-applicative text
];
testHaskellDepends = [
base containers filepath hspec path path-io text
@@ -176135,6 +177846,8 @@ self: {
testToolDepends = [ hspec-discover ];
description = "A formatter for Haskell source code";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"os-release" = callPackage
@@ -176419,10 +178132,8 @@ self: {
}:
mkDerivation {
pname = "overloaded";
- version = "0.1.2";
- sha256 = "0m2ddb48vsl0x0hz6pq8wabl1s6vl7s66rz7z9v2i6d809zl83kw";
- revision = "1";
- editedCabalFile = "08w1f1g0vq0q8v93fdhb8w7a2xmq6mbyh8c3s5y5sli1bynsgbzb";
+ version = "0.1.3";
+ sha256 = "0yz94zzcwdw34c5v9qmqak9bwqz8gq1s80phf9rn8p0bg6a4l0h4";
libraryHaskellDepends = [
base bytestring containers fin ghc optics-core record-hasfield
sop-core split syb symbols text time vec
@@ -176883,6 +178594,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pagure-cli" = callPackage
+ ({ mkDerivation, base, bytestring, http-client, http-client-tls
+ , microlens, microlens-aeson, optparse-applicative, simple-cmd-args
+ , text
+ }:
+ mkDerivation {
+ pname = "pagure-cli";
+ version = "0.1";
+ sha256 = "092frs6240wf4nyqdkhny3jkd4v7gjmnd5gwxv9vlprimszns1vi";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring http-client http-client-tls microlens
+ microlens-aeson optparse-applicative simple-cmd-args text
+ ];
+ description = "Pagure client";
+ license = stdenv.lib.licenses.gpl2;
+ }) {};
+
"pagure-hook-receiver" = callPackage
({ mkDerivation, base, containers, scotty, shelly, text
, transformers, unix
@@ -177093,6 +178823,61 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
+ "pandoc_2_9" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
+ , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
+ , case-insensitive, cmark-gfm, containers, criterion, data-default
+ , deepseq, Diff, directory, doclayout, doctemplates, emojis
+ , exceptions, executable-path, filepath, Glob, haddock-library
+ , hslua, hslua-module-system, hslua-module-text, HsYAML, HTTP
+ , http-client, http-client-tls, http-types, ipynb, JuicyPixels, mtl
+ , network, network-uri, pandoc-types, parsec, process, QuickCheck
+ , random, safe, scientific, SHA, skylighting, skylighting-core
+ , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua
+ , tasty-quickcheck, temporary, texmath, text, text-conversions
+ , time, unicode-transforms, unix, unordered-containers, vector
+ , weigh, xml, zip-archive, zlib
+ }:
+ mkDerivation {
+ pname = "pandoc";
+ version = "2.9";
+ sha256 = "1j4n7r4rh22ba4m4h3psy2jm3cxfd6pxlbpw0z613z01g30mr90c";
+ configureFlags = [ "-fhttps" "-f-trypandoc" ];
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty attoparsec base base64-bytestring binary
+ blaze-html blaze-markup bytestring case-insensitive cmark-gfm
+ containers data-default deepseq directory doclayout doctemplates
+ emojis exceptions filepath Glob haddock-library hslua
+ hslua-module-system hslua-module-text HsYAML HTTP http-client
+ http-client-tls http-types ipynb JuicyPixels mtl network
+ network-uri pandoc-types parsec process random safe scientific SHA
+ skylighting skylighting-core split syb tagsoup temporary texmath
+ text text-conversions time unicode-transforms unix
+ unordered-containers vector xml zip-archive zlib
+ ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base base64-bytestring bytestring containers Diff directory
+ doctemplates executable-path filepath Glob hslua mtl pandoc-types
+ process QuickCheck tasty tasty-golden tasty-hunit tasty-lua
+ tasty-quickcheck temporary text time xml zip-archive
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring containers criterion mtl text time weigh
+ ];
+ postInstall = ''
+ mkdir -p $out/share/man/man1
+ mv "man/"*.1 $out/share/man/man1/
+ '';
+ description = "Conversion between markup formats";
+ license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ peti ];
+ }) {};
+
"pandoc-citeproc" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
, Cabal, containers, data-default, directory, filepath, hs-bibutils
@@ -177129,7 +178914,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "pandoc-citeproc_0_16_3" = callPackage
+ "pandoc-citeproc_0_16_4_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
, Cabal, containers, data-default, directory, filepath, hs-bibutils
, HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc
@@ -177139,8 +178924,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-citeproc";
- version = "0.16.3";
- sha256 = "1jj4j71xx63k3hhcr2l9vgxsj3v038dska1pdlz8pi6b4kmp00hb";
+ version = "0.16.4.1";
+ sha256 = "1jbd6g82sn3546kimm0p6n7spfqr3b4dssjkr5v679jwb5w6hwmx";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -177167,18 +178952,21 @@ self: {
"pandoc-citeproc-preamble" = callPackage
({ mkDerivation, base, directory, filepath, pandoc-types, process
+ , text-conversions
}:
mkDerivation {
pname = "pandoc-citeproc-preamble";
- version = "1.2.4";
- sha256 = "0bdarf6rjncd8lfap4xn479675vsvqzxrmdqd367l2gxfi1nmrv5";
+ version = "1.3";
+ sha256 = "1lnsklvqvi9569wxdkyk2qwc33mm5d3n28xj64847i8g9af2jqs9";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base directory filepath pandoc-types process
+ base directory filepath pandoc-types process text-conversions
];
description = "Insert a preamble before pandoc-citeproc's bibliography";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"pandoc-crossref" = callPackage
@@ -177190,8 +178978,8 @@ self: {
}:
mkDerivation {
pname = "pandoc-crossref";
- version = "0.3.4.1";
- sha256 = "19hs4akqsg7nlspnbdbyncq8irj0a3h8akmyfzxmi2yb35x7c8ny";
+ version = "0.3.6.0";
+ sha256 = "0k1wvkjhlwgr8njsrjiivzyb1pbi17y6nxky4pb5wkkg57fd5847";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -177215,6 +179003,8 @@ self: {
];
description = "Pandoc filter for cross-references";
license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"pandoc-csv2table" = callPackage
@@ -177403,24 +179193,23 @@ self: {
"pandoc-placetable" = callPackage
({ mkDerivation, aeson, base, bytestring, explicit-exception
- , http-conduit, pandoc-types, spreadsheet, text, utf8-string
+ , http-conduit, pandoc, pandoc-types, spreadsheet, text
+ , utf8-string
}:
mkDerivation {
pname = "pandoc-placetable";
version = "0.5.1";
sha256 = "0zfqmsq86jvwm4kpjb02whcdxk5xpgaj1sbdh471kr2vz8q4p112";
- configureFlags = [ "-finlineMarkdown" ];
+ configureFlags = [ "-finlinemarkdown" ];
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
executableHaskellDepends = [
- aeson base bytestring explicit-exception http-conduit pandoc-types
- spreadsheet text utf8-string
+ aeson base bytestring explicit-exception http-conduit pandoc
+ pandoc-types spreadsheet text utf8-string
];
description = "Pandoc filter to include CSV files";
license = "GPL";
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"pandoc-plantuml-diagrams" = callPackage
@@ -177479,6 +179268,38 @@ self: {
broken = true;
}) {};
+ "pandoc-pyplot_2_3_0_1" = callPackage
+ ({ mkDerivation, base, containers, data-default-class, deepseq
+ , directory, filepath, hashable, hspec, hspec-expectations, mtl
+ , open-browser, optparse-applicative, pandoc, pandoc-types
+ , shakespeare, tasty, tasty-hspec, tasty-hunit, template-haskell
+ , temporary, text, typed-process, yaml
+ }:
+ mkDerivation {
+ pname = "pandoc-pyplot";
+ version = "2.3.0.1";
+ sha256 = "0jpf1fvn3qqaw7094sa79k12v7a7nbqcr6cambl6jr0mk307zm0a";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers data-default-class directory filepath hashable mtl
+ pandoc pandoc-types shakespeare temporary text typed-process yaml
+ ];
+ executableHaskellDepends = [
+ base data-default-class deepseq directory filepath open-browser
+ optparse-applicative pandoc pandoc-types template-haskell temporary
+ text
+ ];
+ testHaskellDepends = [
+ base data-default-class directory filepath hspec hspec-expectations
+ mtl pandoc-types tasty tasty-hspec tasty-hunit temporary text
+ ];
+ description = "A Pandoc filter to include figures generated from Python code blocks";
+ license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"pandoc-sidenote" = callPackage
({ mkDerivation, base, monad-gen, pandoc, pandoc-types }:
mkDerivation {
@@ -177494,17 +179315,17 @@ self: {
}) {};
"pandoc-stylefrommeta" = callPackage
- ({ mkDerivation, base, bytestring, containers, MissingH, pandoc
+ ({ mkDerivation, base, bytestring, containers, extra, pandoc
, pandoc-types, text
}:
mkDerivation {
pname = "pandoc-stylefrommeta";
- version = "0.2.1.1";
- sha256 = "0jqgpgz1yx85zhm4f6qjaqcj94zi71ab0gam5vdz0jad79szr5l8";
+ version = "0.2.3.0";
+ sha256 = "1145flz4jkn5knqkc5cppc1412m6hfzd13124k2kfm8dmw196k31";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base bytestring containers MissingH pandoc pandoc-types text
+ base bytestring containers extra pandoc pandoc-types text
];
description = "Pandoc filter to customize links, images and paragraphs";
license = stdenv.lib.licenses.bsd3;
@@ -177533,6 +179354,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pandoc-types_1_20" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, criterion
+ , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
+ , test-framework, test-framework-hunit, test-framework-quickcheck2
+ , text, transformers
+ }:
+ mkDerivation {
+ pname = "pandoc-types";
+ version = "1.20";
+ sha256 = "0wz89ywyhvxz8daw4ia132kg6ynx5y4wva4g899wvq4kyjy1dixa";
+ libraryHaskellDepends = [
+ aeson base bytestring containers deepseq ghc-prim QuickCheck syb
+ text transformers
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers HUnit QuickCheck string-qq syb
+ test-framework test-framework-hunit test-framework-quickcheck2 text
+ ];
+ benchmarkHaskellDepends = [ base criterion text ];
+ description = "Types for representing a structured document";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pandoc-unlit" = callPackage
({ mkDerivation, base, pandoc }:
mkDerivation {
@@ -177550,17 +179395,17 @@ self: {
"pandoc-vimhl" = callPackage
({ mkDerivation, base, cond, directory, filepath, pandoc-types
- , process, regex-compat, temporary
+ , process, regex-compat, temporary, text
}:
mkDerivation {
pname = "pandoc-vimhl";
- version = "0.1.2.4";
- sha256 = "16gvlskbp2d000mbx2rkbz6dg6758ni4x2mkzxjyk5m475h13w6b";
+ version = "0.1.3.0";
+ sha256 = "0ppn42jicmx3v0qk6ql0ccx61kk53c75n5wnl3dppgnv1xgmlnq8";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
base cond directory filepath pandoc-types process regex-compat
- temporary
+ temporary text
];
description = "Pandoc filter for native Vim code highlighting";
license = stdenv.lib.licenses.bsd3;
@@ -178460,21 +180305,21 @@ self: {
"parameterized-utils" = callPackage
({ mkDerivation, base, constraints, containers, deepseq, ghc-prim
- , hashable, hashtables, lens, mtl, QuickCheck, tasty, tasty-ant-xml
- , tasty-hunit, tasty-quickcheck, template-haskell, text
+ , hashable, hashtables, hedgehog, lens, mtl, tasty, tasty-ant-xml
+ , tasty-hedgehog, tasty-hunit, template-haskell, text
, th-abstraction, vector
}:
mkDerivation {
pname = "parameterized-utils";
- version = "2.0";
- sha256 = "0wbgjpwmiqll5pjfcf3p2ds3jaqvwx4m2v12a4r658fv18s9c14n";
+ version = "2.0.1.0";
+ sha256 = "1r7bxlb82np6xg7wkqhvja7zkp0l6adwwg0b0h3ji2mcmi47xd2z";
libraryHaskellDepends = [
base constraints containers deepseq ghc-prim hashable hashtables
lens mtl template-haskell text th-abstraction vector
];
testHaskellDepends = [
- base ghc-prim hashable hashtables lens mtl QuickCheck tasty
- tasty-ant-xml tasty-hunit tasty-quickcheck
+ base ghc-prim hashable hashtables hedgehog lens mtl tasty
+ tasty-ant-xml tasty-hedgehog tasty-hunit
];
description = "Classes and data structures for working with data-kind indexed types";
license = stdenv.lib.licenses.bsd3;
@@ -178970,12 +180815,12 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "parser-combinators_1_2_0" = callPackage
+ "parser-combinators_1_2_1" = callPackage
({ mkDerivation, base }:
mkDerivation {
pname = "parser-combinators";
- version = "1.2.0";
- sha256 = "18kfg4sxighqzd64ad98xhc62sh7pd63pv7xhcj601pw922iappa";
+ version = "1.2.1";
+ sha256 = "0k95nvgnl5820y094yfh7b868l0xd1diclm4kx9560p5rm02w5h3";
libraryHaskellDepends = [ base ];
description = "Lightweight package providing commonly useful parser combinators";
license = stdenv.lib.licenses.bsd3;
@@ -179006,15 +180851,15 @@ self: {
broken = true;
}) {};
- "parser-combinators-tests_1_2_0" = callPackage
+ "parser-combinators-tests_1_2_1" = callPackage
({ mkDerivation, base, hspec, hspec-discover, hspec-expectations
, hspec-megaparsec, megaparsec, megaparsec-tests
, parser-combinators, QuickCheck
}:
mkDerivation {
pname = "parser-combinators-tests";
- version = "1.2.0";
- sha256 = "0ainpyrxm03brn6z27jkqp65rc1z3lza00k6mg10506qk83fa52l";
+ version = "1.2.1";
+ sha256 = "0iy4iajpjka1diy660x3mvmh8kldwf3svwdmvlxh26dsqy2s8sx8";
isLibrary = false;
isExecutable = false;
testHaskellDepends = [
@@ -179772,8 +181617,8 @@ self: {
pname = "paths";
version = "0.2.0.0";
sha256 = "18pzjlnmx7w79riig7qzyhw13jla92lals9lwayl23qr02ndna4v";
- revision = "1";
- editedCabalFile = "1k477vwhahdgkf3sm2yjl1638qwq6ddm2x10vdf3cq48js2pkrw5";
+ revision = "2";
+ editedCabalFile = "0r5nm9qqqa4nkz6aymhh62lfmmkjip25a4lk441a108i1ngkjl5m";
libraryHaskellDepends = [
base bytestring deepseq directory filepath template-haskell text
time
@@ -180240,13 +182085,14 @@ self: {
}) {};
"pcre-light" = callPackage
- ({ mkDerivation, base, bytestring, pcre }:
+ ({ mkDerivation, base, bytestring, containers, HUnit, mtl, pcre }:
mkDerivation {
pname = "pcre-light";
- version = "0.4.0.4";
- sha256 = "0xcyi1fivwg7a92mch5bcqzmrfxzqj42rmb3m8kgs61x4qwpxj82";
+ version = "0.4.1.0";
+ sha256 = "0lqvsmc6bfhdv6igm3fmw8nklyhw3j3jsl0s1k6r3fhb6ambzxhn";
libraryHaskellDepends = [ base bytestring ];
- libraryPkgconfigDepends = [ pcre ];
+ librarySystemDepends = [ pcre ];
+ testHaskellDepends = [ base bytestring containers HUnit mtl ];
description = "Portable regex library for Perl 5 compatible regular expressions";
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) pcre;};
@@ -180683,8 +182529,8 @@ self: {
}:
mkDerivation {
pname = "pell";
- version = "0.1.1.0";
- sha256 = "1m2avh9cn51k3m57q4yaqhikipfs7nx2xg3x0kixpgcp1j90482y";
+ version = "0.1.3.0";
+ sha256 = "07l623ja134s99qlhvjrsfcyaj9s504xfm9ml8afc78k9yarly9w";
libraryHaskellDepends = [ arithmoi base containers ];
testHaskellDepends = [
arithmoi base Cabal cabal-test-quickcheck containers primes
@@ -180975,8 +182821,8 @@ self: {
}:
mkDerivation {
pname = "perf";
- version = "0.4.1.0";
- sha256 = "1z0128fnqlraj8sj26fsfy9izfr1ld3k5c3sh0471fh36vf507c8";
+ version = "0.5.0.0";
+ sha256 = "1qbsk523xq27fww7bzd6zcj117630sji9szw3g3d75pbw4x5i5nl";
libraryHaskellDepends = [
base containers deepseq foldl rdtsc text time transformers
];
@@ -180994,17 +182840,16 @@ self: {
}:
mkDerivation {
pname = "perf-analysis";
- version = "0.1.0.0";
- sha256 = "0w7c60fvyqbb4cyffbjz31v0skafcxdzg3fjp10xk7sj6i3w7l4q";
+ version = "0.2.0.0";
+ sha256 = "1dnanink5j2dhqh91dmvrw42n7b1cfrbwglp7yikabwg9888nmax";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base deepseq formatting perf protolude readme-lhs scientific
- tdigest text vector
+ base formatting perf protolude readme-lhs scientific tdigest text
];
executableHaskellDepends = [
base containers deepseq formatting optparse-generic perf protolude
- readme-lhs scientific tdigest text vector
+ readme-lhs text vector
];
description = "analysis example using perf";
license = stdenv.lib.licenses.bsd3;
@@ -181527,6 +183372,8 @@ self: {
pname = "persistent-iproute";
version = "0.2.3";
sha256 = "1amzxmwispqi29ln50mfj43i1srl53n5iz7lsq8rxhd1x8fa35gm";
+ revision = "1";
+ editedCabalFile = "1jly9db968q5j5ly75f77hwxrhky3s6xx8ydgsjn5cdr9rc4iz8k";
libraryHaskellDepends = [
aeson aeson-iproute base bytestring http-api-data iproute
path-pieces persistent text
@@ -181535,6 +183382,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "persistent-iproute_0_2_4" = callPackage
+ ({ mkDerivation, aeson, aeson-iproute, base, bytestring
+ , http-api-data, iproute, path-pieces, persistent, text
+ }:
+ mkDerivation {
+ pname = "persistent-iproute";
+ version = "0.2.4";
+ sha256 = "1lsprnlgcnj8v38cnbgf2vpj9ivgsvgi3yy3nh1gmvyj7maznkq5";
+ libraryHaskellDepends = [
+ aeson aeson-iproute base bytestring http-api-data iproute
+ path-pieces persistent text
+ ];
+ description = "Persistent instances for types in iproute";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"persistent-map" = callPackage
({ mkDerivation, base, binary, containers, directory, EdisonAPI
, EdisonCore, filepath, LRU, mtl, stm-io-hooks
@@ -183326,6 +185190,27 @@ self: {
broken = true;
}) {};
+ "pine" = callPackage
+ ({ mkDerivation, base, containers, sdl2, sdl2-image, stm, text }:
+ mkDerivation {
+ pname = "pine";
+ version = "0.1.0.2";
+ sha256 = "0896l27g1cmrvkq2b1bdy7sfr6z0jg2pk1mvhwr1n3f0gwgiy36i";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers sdl2 sdl2-image stm text
+ ];
+ executableHaskellDepends = [
+ base containers sdl2 sdl2-image stm text
+ ];
+ testHaskellDepends = [ base containers sdl2 sdl2-image stm text ];
+ description = "Functional 2D Game Framework";
+ license = stdenv.lib.licenses.zlib;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"ping" = callPackage
({ mkDerivation, base, cpu, ip, posix-api, primitive
, primitive-addr, primitive-containers, stm, transformers
@@ -183496,8 +185381,8 @@ self: {
}:
mkDerivation {
pname = "pipes";
- version = "4.3.12";
- sha256 = "0ni5szs9jl4map05lcyl97dgb69g2xk1a1rdiw8p4024vfyskp8c";
+ version = "4.3.13";
+ sha256 = "1ch3xr5f5if0psd3lsyrpkwrgh36synnzqcpimghprys68l4zfkn";
libraryHaskellDepends = [
base exceptions mmorph mtl semigroups transformers void
];
@@ -184261,6 +186146,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pipes-network-tls_0_4" = callPackage
+ ({ mkDerivation, base, bytestring, network, network-simple
+ , network-simple-tls, pipes, pipes-network, pipes-safe, tls
+ , transformers
+ }:
+ mkDerivation {
+ pname = "pipes-network-tls";
+ version = "0.4";
+ sha256 = "161nqwgv0r5vlnpa1bq0y2wyh2yp8b583dxbwpbgxfjrnsy5f5vm";
+ libraryHaskellDepends = [
+ base bytestring network network-simple network-simple-tls pipes
+ pipes-network pipes-safe tls transformers
+ ];
+ description = "TLS-secured network connections support for pipes";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pipes-network-ws" = callPackage
({ mkDerivation, base, bytestring, network-simple-ws, pipes }:
mkDerivation {
@@ -185762,8 +187665,8 @@ self: {
}:
mkDerivation {
pname = "pointfree-fancy";
- version = "1.1.1.14";
- sha256 = "08b2dslkblxch8k6wlc6xx50lva8abdkdwibgfxdj2yw4mgdnhry";
+ version = "1.1.1.15";
+ sha256 = "1jbxgn4raa5zzy5riflvx1sch6ar78fi84yf0ag86yxda3lh70qd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -185794,6 +187697,8 @@ self: {
executableHaskellDepends = [ base ];
description = "Pointful refactoring tool";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"pointless-fun" = callPackage
@@ -185963,15 +187868,13 @@ self: {
}) {};
"polimorf" = callPackage
- ({ mkDerivation, base, binary, containers, text, text-binary }:
+ ({ mkDerivation, base, binary, containers, text }:
mkDerivation {
pname = "polimorf";
- version = "0.7.3";
- sha256 = "0vv7j1l0wnjwpd3hpxswq0k33izl0ck2njspcga885bkrd45lzdr";
- libraryHaskellDepends = [
- base binary containers text text-binary
- ];
- description = "Working with the PoliMorf dictionary";
+ version = "0.7.4";
+ sha256 = "0pdz9fwqdwhqm1l81jnji3nm8y51dmfg5i84ggp8gmqfsiczvbj3";
+ libraryHaskellDepends = [ base binary containers text ];
+ description = "Handling the PoliMorf dictionary";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -185997,6 +187900,8 @@ self: {
pname = "poly";
version = "0.3.1.0";
sha256 = "1c8xnkqxwzbpx01clz9spz9zwa18qhsbvscrc381r0f46cjax2ph";
+ revision = "1";
+ editedCabalFile = "10lcg7x6vzrzgj5libfwnmxj2y3f1j5gpz9l8mgzivapknvhhpfx";
libraryHaskellDepends = [
base primitive semirings vector vector-algorithms
];
@@ -186007,17 +187912,21 @@ self: {
benchmarkHaskellDepends = [ base gauge semirings vector ];
description = "Polynomials";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
- "poly_0_3_2_0" = callPackage
+ "poly_0_3_3_0" = callPackage
({ mkDerivation, base, deepseq, gauge, primitive, QuickCheck
, quickcheck-classes, semirings, tasty, tasty-quickcheck, vector
, vector-algorithms
}:
mkDerivation {
pname = "poly";
- version = "0.3.2.0";
- sha256 = "0liphgwfqnpsf410l1hldzqhgjg5p45nlcybyby1fk0ijx96yl5y";
+ version = "0.3.3.0";
+ sha256 = "1hj77nzyfipsycy77h8ccsx4iyy47ljjv0j8ckihxhaq36g0fpan";
+ revision = "1";
+ editedCabalFile = "0iv4363iq22hkwrkgsijgv8ykvj26q895rsbzrrzkydblf4psra9";
libraryHaskellDepends = [
base deepseq primitive semirings vector vector-algorithms
];
@@ -186029,6 +187938,7 @@ self: {
description = "Polynomials";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"poly-arity" = callPackage
@@ -186286,27 +188196,6 @@ self: {
}) {};
"polysemy-plugin" = callPackage
- ({ mkDerivation, base, containers, doctest, ghc
- , ghc-tcplugins-extra, hspec, hspec-discover, inspection-testing
- , polysemy, should-not-typecheck, syb, transformers
- }:
- mkDerivation {
- pname = "polysemy-plugin";
- version = "0.2.3.0";
- sha256 = "1icaxdw2670svhns5g40d1kzxxx3yhcza660a0csdh83f3jzjy2w";
- libraryHaskellDepends = [
- base containers ghc ghc-tcplugins-extra polysemy syb transformers
- ];
- testHaskellDepends = [
- base containers doctest ghc ghc-tcplugins-extra hspec
- inspection-testing polysemy should-not-typecheck syb transformers
- ];
- testToolDepends = [ hspec-discover ];
- description = "Disambiguate obvious uses of effects";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "polysemy-plugin_0_2_4_0" = callPackage
({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest
, ghc, ghc-tcplugins-extra, hspec, hspec-discover
, inspection-testing, polysemy, should-not-typecheck, syb
@@ -186327,7 +188216,6 @@ self: {
testToolDepends = [ hspec-discover ];
description = "Disambiguate obvious uses of effects";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"polysemy-zoo" = callPackage
@@ -187307,12 +189195,17 @@ self: {
}) {};
"postgres-options" = callPackage
- ({ mkDerivation, base, bytestring }:
+ ({ mkDerivation, base, bytestring, generic-monoid, hspec, split
+ , uri-bytestring
+ }:
mkDerivation {
pname = "postgres-options";
- version = "0.1.0.1";
- sha256 = "0pysvgg2p032j5a9qdysbndy0a0fzm41zgv070cwqk199w1lh3h7";
- libraryHaskellDepends = [ base bytestring ];
+ version = "0.2.0.0";
+ sha256 = "1dfr15bg77117y27rr1kvbxcsyh36ha30c8rgiqd15y7pjd4apy4";
+ libraryHaskellDepends = [
+ base bytestring generic-monoid split uri-bytestring
+ ];
+ testHaskellDepends = [ base hspec ];
description = "An Options type representing options for postgres connections";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -187377,8 +189270,8 @@ self: {
}:
mkDerivation {
pname = "postgresql-binary";
- version = "0.12.1.3";
- sha256 = "0y2irx1fw0xqs77qpaa3lk06r2q7j7wzbzriyc274h6lmn85sjdw";
+ version = "0.12.2";
+ sha256 = "1zkhwl8g141p1zgnbxjhh0r6wgvzlpwdbvyl80z31fdxd5v29bv8";
libraryHaskellDepends = [
aeson base base-prelude binary-parser bytestring
bytestring-strict-builder containers loch-th network-ip
@@ -187466,8 +189359,8 @@ self: {
({ mkDerivation, base, bytestring }:
mkDerivation {
pname = "postgresql-copy-escape";
- version = "0.1";
- sha256 = "063phxj8r3vy25awwwn47k9ac0s8z59igpgqrhb9gbfdq4ldrlpm";
+ version = "0.1.0.1";
+ sha256 = "08ld3rqjjjhlikcv1cpxjqs8wlsjhvv7qq9fjb032hx6mvcqwz0i";
libraryHaskellDepends = [ base bytestring ];
description = "Format data to feed to a PostgreSQL COPY FROM statement";
license = stdenv.lib.licenses.bsd3;
@@ -188665,25 +190558,25 @@ self: {
}) {};
"predicate-typed" = callPackage
- ({ mkDerivation, aeson, assoc, base, binary, bytestring, comonad
- , containers, deepseq, directory, doctest, ghc-prim, lens, mtl
- , pcre-heavy, pcre-light, pretty, pretty-terminal, QuickCheck, safe
- , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
- , th-lift, these, time, tree-view
+ ({ mkDerivation, aeson, base, binary, bytestring, comonad
+ , containers, deepseq, directory, doctest, ghc-prim, hashable, lens
+ , mtl, pcre-heavy, pcre-light, pretty, pretty-terminal, QuickCheck
+ , safe, stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+ , text, th-lift, these, time, tree-view
}:
mkDerivation {
pname = "predicate-typed";
- version = "0.1.0.4";
- sha256 = "04bk5p5d91zgaab1z10qy9jm66ksjdsdx0ldvfcs03pn0zfhg8hb";
+ version = "0.6.0.0";
+ sha256 = "0fk30pn759fg9v2k5gw51hk6vkp2vq4sh574zlqdk4vx6r2r5jrp";
libraryHaskellDepends = [
- aeson assoc base binary bytestring comonad containers deepseq
- directory ghc-prim lens mtl pcre-heavy pcre-light pretty
+ aeson base binary bytestring comonad containers deepseq directory
+ ghc-prim hashable lens mtl pcre-heavy pcre-light pretty
pretty-terminal QuickCheck safe template-haskell text th-lift these
time tree-view
];
testHaskellDepends = [
- aeson assoc base binary bytestring comonad containers deepseq
- directory doctest ghc-prim lens mtl pcre-heavy pcre-light pretty
+ aeson base binary bytestring comonad containers deepseq directory
+ doctest ghc-prim hashable lens mtl pcre-heavy pcre-light pretty
pretty-terminal QuickCheck safe stm tasty tasty-hunit
tasty-quickcheck template-haskell text th-lift these time tree-view
];
@@ -189207,6 +191100,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pretty-hex_1_1" = callPackage
+ ({ mkDerivation, base, bytestring }:
+ mkDerivation {
+ pname = "pretty-hex";
+ version = "1.1";
+ sha256 = "0c8pa0rdb2q8rf4acy4gww0hj5lrzclzdh52yi2aiaaij4lqzir7";
+ libraryHaskellDepends = [ base bytestring ];
+ description = "A library for hex dumps of ByteStrings";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pretty-loc" = callPackage
({ mkDerivation, base, text }:
mkDerivation {
@@ -189303,17 +191208,18 @@ self: {
benchmarkHaskellDepends = [ base criterion text ];
description = "pretty printer for data types with a 'Show' instance";
license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
}) {};
- "pretty-simple_3_1_0_0" = callPackage
+ "pretty-simple_3_1_1_0" = callPackage
({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest
, containers, criterion, doctest, Glob, mtl, QuickCheck
, template-haskell, text, transformers
}:
mkDerivation {
pname = "pretty-simple";
- version = "3.1.0.0";
- sha256 = "0p3p5i2rjwv19hzgqyarv7x6g6hvam159y50irvs0dd5wwphd2pa";
+ version = "3.1.1.0";
+ sha256 = "073x8jwnar4p7615dk0x92d76in2xwsgpip3w3hgq948c4ydmv58";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -189327,6 +191233,7 @@ self: {
description = "pretty printer for data types with a 'Show' instance";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
}) {};
"pretty-sop" = callPackage
@@ -189429,7 +191336,7 @@ self: {
license = stdenv.lib.licenses.bsd2;
}) {};
- "prettyprinter_1_4_0" = callPackage
+ "prettyprinter_1_5_1" = callPackage
({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring
, containers, criterion, deepseq, doctest, mtl, pgp-wordlist
, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text
@@ -189437,8 +191344,8 @@ self: {
}:
mkDerivation {
pname = "prettyprinter";
- version = "1.4.0";
- sha256 = "0ifb77nsd2jppc8ryg2am29lw1rgpjvbx5d6vljfnxz5z4j947bz";
+ version = "1.5.1";
+ sha256 = "151p75gkbmjfjb4bw14xxpka6i44x14hpbxxdbrsfsnlrncb8rpv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base text ];
@@ -189759,10 +191666,8 @@ self: {
}:
mkDerivation {
pname = "primitive-containers";
- version = "0.4.0";
- sha256 = "0ljb6np2yxnclqvz2sbpvjs027z701nsdhvmgy607am95sskxlrz";
- revision = "1";
- editedCabalFile = "18pxbfqjy2kfxgq1033bp3ci6xjj1ilnik2v5dzdcqlxr923zvkc";
+ version = "0.4.1";
+ sha256 = "1gi4fbxdhlzdyi9nnfmfyxl012hs5bam2kgvv8240mq5kxgimf06";
libraryHaskellDepends = [
base contiguous deepseq hashable primitive primitive-sort
primitive-unlifted
@@ -189842,8 +191747,8 @@ self: {
({ mkDerivation, base, primitive, QuickCheck }:
mkDerivation {
pname = "primitive-foreign";
- version = "0.1";
- sha256 = "0qznygyj4fsgdggrb02nc78nfjyvfjsdaznw01a0sw2b1yld0zqg";
+ version = "0.1.1";
+ sha256 = "15fv32c5q1x1q4qwwcaqhn01bzv887njc8qnqhnp7p3h5m0xz2pc";
libraryHaskellDepends = [ base primitive ];
testHaskellDepends = [ base primitive QuickCheck ];
description = "using the `Prim` interface for the FFI";
@@ -190214,8 +192119,8 @@ self: {
}:
mkDerivation {
pname = "probability";
- version = "0.2.5.2";
- sha256 = "059l9by2zxb92dd2vshxx9f3sm1kazc2i2ll168hfsya9rrqqaqg";
+ version = "0.2.6";
+ sha256 = "12qzgn9jb9hvbpbkb75ad55yhmhai945rvdbamx6zspbrjlsb9sz";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base containers random transformers utility-ht
@@ -190281,16 +192186,14 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "process_1_6_6_0" = callPackage
+ "process_1_6_7_0" = callPackage
({ mkDerivation, base, bytestring, deepseq, directory, filepath
, unix
}:
mkDerivation {
pname = "process";
- version = "1.6.6.0";
- sha256 = "140as37rfad7hy1lg03n19dzfbcdaahv64aydl6frv06qvdlc49w";
- revision = "1";
- editedCabalFile = "0y3v5ly6fg42ngv41d28ny4x06ddqkivxx16whsfss06k15x3vz5";
+ version = "1.6.7.0";
+ sha256 = "1qplrcdzdv8dhzh859f709facw7xc6kmfwhwmm26qks4arkih7j5";
libraryHaskellDepends = [ base deepseq directory filepath unix ];
testHaskellDepends = [ base bytestring directory ];
description = "Process libraries";
@@ -190715,6 +192618,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "profunctor-arrows" = callPackage
+ ({ mkDerivation, base, comonad, profunctors }:
+ mkDerivation {
+ pname = "profunctor-arrows";
+ version = "0.0.0.2";
+ sha256 = "01ia949b45izrq6p8qvizz05kvy45qydwj5crdac9spad2asr1s3";
+ libraryHaskellDepends = [ base comonad profunctors ];
+ description = "Profunctor arrows";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"profunctor-extras" = callPackage
({ mkDerivation, base, profunctors }:
mkDerivation {
@@ -190754,6 +192668,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "profunctor-optics" = callPackage
+ ({ mkDerivation, base, comonad, connections, containers
+ , distributive, doctest, ilist, mtl, newtype-generics
+ , profunctor-arrows, profunctors, rings, semigroupoids, tagged
+ , transformers, unliftio-core
+ }:
+ mkDerivation {
+ pname = "profunctor-optics";
+ version = "0.0.0.2";
+ sha256 = "0xf7aikcbp1vgdd5bd4rf94w6iavwbxrxbr67prddqanv3jmjqn9";
+ libraryHaskellDepends = [
+ base comonad connections containers distributive ilist mtl
+ newtype-generics profunctor-arrows profunctors rings semigroupoids
+ tagged transformers unliftio-core
+ ];
+ testHaskellDepends = [ base containers doctest mtl ];
+ description = "An optics library compatible with the typeclasses in 'profunctors'";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"profunctors" = callPackage
({ mkDerivation, base, base-orphans, bifunctors, comonad
, contravariant, distributive, semigroups, tagged, transformers
@@ -190772,14 +192708,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "profunctors_5_5" = callPackage
+ "profunctors_5_5_1" = callPackage
({ mkDerivation, base, base-orphans, bifunctors, comonad
, contravariant, distributive, tagged, transformers
}:
mkDerivation {
pname = "profunctors";
- version = "5.5";
- sha256 = "0z7kf8hkfk5wfxw80zs9jsh22mk3mjzfvqbdkihrw1wiyw4xkjfl";
+ version = "5.5.1";
+ sha256 = "0nmiv7hhmimiwj4jnh5vd5n96bihpairq2rf6hrw11rignal2dqx";
libraryHaskellDepends = [
base base-orphans bifunctors comonad contravariant distributive
tagged transformers
@@ -191112,16 +193048,16 @@ self: {
"prometheus" = callPackage
({ mkDerivation, atomic-primops, base, bytestring, containers
- , http-client, http-types, network-uri, text, transformers, wai
- , warp
+ , http-client, http-client-tls, http-types, network-uri, text
+ , transformers, wai, warp
}:
mkDerivation {
pname = "prometheus";
- version = "2.1.2";
- sha256 = "1qr8nnijzlp0rwz3rab7y49kxwa4ka7ipix9dix5d1mzqpa1sj5m";
+ version = "2.1.3";
+ sha256 = "1z8mar0l8kh8wd0hsv4ckgnr5ha1vsx83afg63z9pwmv5l3phj0q";
libraryHaskellDepends = [
- atomic-primops base bytestring containers http-client http-types
- network-uri text transformers wai warp
+ atomic-primops base bytestring containers http-client
+ http-client-tls http-types network-uri text transformers wai warp
];
description = "Prometheus Haskell Client";
license = stdenv.lib.licenses.bsd3;
@@ -191309,8 +193245,8 @@ self: {
}:
mkDerivation {
pname = "propellor";
- version = "5.9.1";
- sha256 = "1v4cpj4kbmhl4xkxm7gxm2z9pqf6zmr4psawaxixvsav6xpxgphr";
+ version = "5.10.1";
+ sha256 = "1ymjlfp7gri82sa26s6a10lqqmzplvl68siai04wshx3jwr3b5y8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -191550,21 +193486,6 @@ self: {
}) {};
"proto-lens-arbitrary" = callPackage
- ({ mkDerivation, base, bytestring, containers, lens-family
- , proto-lens, QuickCheck, text
- }:
- mkDerivation {
- pname = "proto-lens-arbitrary";
- version = "0.1.2.7";
- sha256 = "092gdxw1jbhp0pxzgyg8jmcwiimyhzvhxh29h7c7vmvb6m956d0f";
- libraryHaskellDepends = [
- base bytestring containers lens-family proto-lens QuickCheck text
- ];
- description = "Arbitrary instances for proto-lens";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "proto-lens-arbitrary_0_1_2_8" = callPackage
({ mkDerivation, base, bytestring, containers, lens-family
, proto-lens, QuickCheck, text
}:
@@ -191577,7 +193498,6 @@ self: {
];
description = "Arbitrary instances for proto-lens";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"proto-lens-combinators" = callPackage
@@ -191621,20 +193541,25 @@ self: {
broken = true;
}) {};
- "proto-lens-optparse" = callPackage
- ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
+ "proto-lens-jsonpb" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+ , bytestring, proto-lens-runtime, text, vector
+ }:
mkDerivation {
- pname = "proto-lens-optparse";
- version = "0.1.1.5";
- sha256 = "0p8acjhvaca9bz7hmifi2p39dbzis8gm6f91fz1bn36s0xzb42f2";
+ pname = "proto-lens-jsonpb";
+ version = "0.2.0.0";
+ sha256 = "01m88qfi5lak15n14zlxb5yjyi67h5m47czkzirhi0a615v8bwbr";
libraryHaskellDepends = [
- base optparse-applicative proto-lens text
+ aeson attoparsec base base64-bytestring bytestring
+ proto-lens-runtime text vector
];
- description = "Adapting proto-lens to optparse-applicative ReadMs";
+ description = "JSON protobuf encoding for proto-lens";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
- "proto-lens-optparse_0_1_1_6" = callPackage
+ "proto-lens-optparse" = callPackage
({ mkDerivation, base, optparse-applicative, proto-lens, text }:
mkDerivation {
pname = "proto-lens-optparse";
@@ -191645,7 +193570,6 @@ self: {
];
description = "Adapting proto-lens to optparse-applicative ReadMs";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"proto-lens-protobuf-types_0_2_2_0" = callPackage
@@ -191842,9 +193766,10 @@ self: {
"proto3-suite" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base
, base64-bytestring, binary, bytestring, cereal, containers
- , contravariant, deepseq, doctest, filepath, foldl, hashable
- , haskell-src, insert-ordered-containers, lens, mtl
- , neat-interpolation, optparse-generic, parsec, parsers, pretty
+ , contravariant, deepseq, doctest, filepath, foldl
+ , generic-arbitrary, hashable, haskell-src
+ , insert-ordered-containers, lens, mtl, neat-interpolation
+ , optparse-applicative, optparse-generic, parsec, parsers, pretty
, pretty-show, proto3-wire, QuickCheck, quickcheck-instances
, range-set-list, safe, semigroups, swagger2, system-filepath
, tasty, tasty-hunit, tasty-quickcheck, text, transformers, turtle
@@ -191852,8 +193777,8 @@ self: {
}:
mkDerivation {
pname = "proto3-suite";
- version = "0.3.0.0";
- sha256 = "1dmblb640jc2smm023py3sg49k07v85qmalir5swkj154vlszgli";
+ version = "0.4.0.0";
+ sha256 = "0pmd7fhw4y90h1qffmgxkqijdscqw0qj7nhj0pvrvz1av6svhvr1";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -191866,14 +193791,14 @@ self: {
system-filepath text transformers turtle vector
];
executableHaskellDepends = [
- base containers optparse-generic proto3-wire range-set-list
- system-filepath text turtle
+ base containers mtl optparse-applicative optparse-generic
+ proto3-wire range-set-list system-filepath text turtle
];
testHaskellDepends = [
aeson attoparsec base base64-bytestring bytestring cereal
- containers doctest pretty-show proto3-wire QuickCheck semigroups
- swagger2 tasty tasty-hunit tasty-quickcheck text transformers
- turtle vector
+ containers deepseq doctest generic-arbitrary mtl pretty-show
+ proto3-wire QuickCheck semigroups swagger2 tasty tasty-hunit
+ tasty-quickcheck text transformers turtle vector
];
description = "A low level library for writing out data in the Protocol Buffers wire format";
license = stdenv.lib.licenses.asl20;
@@ -191888,8 +193813,10 @@ self: {
}:
mkDerivation {
pname = "proto3-wire";
- version = "1.0.0";
- sha256 = "1r090s4mqmx0ixr8y6xyzkgcwv0sfjwah7jhb4vr75zpzsvx0bqk";
+ version = "1.1.0";
+ sha256 = "1f8vllbysz6d7njkqd6f52k4nixjj4wf2k4nh4gb4b7dihdzhnmg";
+ revision = "1";
+ editedCabalFile = "1ws072947d8lmchknyhrzpg9mh6dacya872a4b9dw0cdgkn13zm8";
libraryHaskellDepends = [
base bytestring cereal containers deepseq hashable QuickCheck safe
text unordered-containers
@@ -191980,8 +193907,8 @@ self: {
}:
mkDerivation {
pname = "protocol-buffers";
- version = "2.4.12";
- sha256 = "0z1vkqdhj41bqnjhks4d82jby6l9j91k8ycna76bhv9p2w0gvp4g";
+ version = "2.4.13";
+ sha256 = "0xwfb2bkh4nd34s24q786ph4zyrnnl3bcry2kqx3sw20yk3zfdsc";
libraryHaskellDepends = [
aeson array base base16-bytestring binary bytestring containers
directory filepath mtl parsec syb text utf8-string vector
@@ -191994,8 +193921,8 @@ self: {
({ mkDerivation, base, bytestring, containers, protocol-buffers }:
mkDerivation {
pname = "protocol-buffers-descriptor";
- version = "2.4.12";
- sha256 = "0h4c1pgl51h7xrsm76mz6wd1l41ps93y3nvdl0p7mks9w7wlpccn";
+ version = "2.4.13";
+ sha256 = "1c3aiysjlk7r02l5902iq020iasiswk9c1mvf4f9h1yijba4x4fp";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bytestring containers protocol-buffers
@@ -192478,29 +194405,29 @@ self: {
}) {};
"publish" = callPackage
- ({ mkDerivation, base, bytestring, chronologique, deepseq
- , directory, filepath, hinotify, hspec, megaparsec, pandoc
- , pandoc-types, template-haskell, text, typed-process, unbeliever
- , unix, unordered-containers
+ ({ mkDerivation, base, bytestring, chronologique, core-program
+ , core-text, deepseq, directory, filepath, hinotify, hspec
+ , megaparsec, pandoc, pandoc-types, template-haskell, text
+ , typed-process, unix, unordered-containers
}:
mkDerivation {
pname = "publish";
- version = "2.0.1";
- sha256 = "12jhwihg6nlhs1q2cf4ivd7qw724qz1wk1i5rmi4akfga8ad7n4l";
+ version = "2.1.0";
+ sha256 = "03fwk0ami5xxqacqb8gikqzxdp7cavvni5bmxd5bi1lvavk49sh7";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- base bytestring chronologique deepseq directory filepath hinotify
- megaparsec pandoc pandoc-types template-haskell text typed-process
- unbeliever unix unordered-containers
+ base bytestring chronologique core-program core-text deepseq
+ directory filepath hinotify megaparsec pandoc pandoc-types
+ template-haskell text typed-process unix unordered-containers
];
testHaskellDepends = [
- base bytestring chronologique deepseq directory filepath hinotify
- hspec megaparsec pandoc pandoc-types template-haskell text
- typed-process unbeliever unix unordered-containers
+ base bytestring chronologique core-program core-text deepseq
+ directory filepath hinotify hspec megaparsec pandoc pandoc-types
+ template-haskell text typed-process unix unordered-containers
];
description = "Publishing tools for papers, books, and presentations";
- license = stdenv.lib.licenses.bsd3;
+ license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {};
@@ -192958,8 +194885,8 @@ self: {
}:
mkDerivation {
pname = "purescript";
- version = "0.13.4";
- sha256 = "06qy5il369z6f7723zb676wjwqa4rj5wz75isq3s346avsmr3j84";
+ version = "0.13.5";
+ sha256 = "0plqzlcfaw2ik2im7aq8yy1b1y88cnc8qd7wwaayndbdz060s9j4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -193006,8 +194933,7 @@ self: {
doCheck = false;
description = "PureScript Programming Language Compiler";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
+ maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
}) {};
"purescript-bridge" = callPackage
@@ -195257,8 +197183,8 @@ self: {
}:
mkDerivation {
pname = "quokka";
- version = "0.1.1";
- sha256 = "03qzh0s1hmz7fnhyv0krvzr80dz4117nb54br44nc5ybn747r0s0";
+ version = "0.1.2";
+ sha256 = "1g6qphxbfrszsmypyd67dr0rl7vcid1wds2if0pp76yvwhpgdnl5";
libraryHaskellDepends = [
base pcre-utils postgresql-simple regex-pcre-builtin text
];
@@ -195267,6 +197193,8 @@ self: {
];
description = "Test helpers which help generate data for projects that use postgresql";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"quoridor-hs" = callPackage
@@ -195635,6 +197563,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "rainbow_0_34_2_2" = callPackage
+ ({ mkDerivation, base, bytestring, lens, QuickCheck, terminfo, text
+ }:
+ mkDerivation {
+ pname = "rainbow";
+ version = "0.34.2.2";
+ sha256 = "1rx5kci69m7fdi94x35a2wg88fprlix61mvzsqq3waqb7ahc2mlf";
+ libraryHaskellDepends = [ base bytestring lens terminfo text ];
+ testHaskellDepends = [
+ base bytestring lens QuickCheck terminfo text
+ ];
+ description = "Print text to terminal with colors and effects";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"rainbow-tests" = callPackage
({ mkDerivation, barecheck, base, QuickCheck, rainbow, terminfo
, text
@@ -195671,6 +197615,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "rainbox_0_24_4_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, lens, QuickCheck
+ , rainbow, tasty, tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "rainbox";
+ version = "0.24.4.0";
+ sha256 = "13532qzpvlq976049bdfyqzhb4g843ij3b7w654xqb2ng9q4inwz";
+ libraryHaskellDepends = [
+ base bytestring containers lens rainbow text
+ ];
+ testHaskellDepends = [
+ base bytestring containers lens QuickCheck rainbow tasty
+ tasty-quickcheck text
+ ];
+ description = "Two-dimensional box pretty printing, with colors";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"rake" = callPackage
({ mkDerivation, base, containers, text }:
mkDerivation {
@@ -195758,6 +197722,45 @@ self: {
broken = true;
}) {};
+ "ral" = callPackage
+ ({ mkDerivation, adjunctions, base, bin, criterion, deepseq
+ , distributive, fin, hashable, QuickCheck, semigroupoids, vector
+ }:
+ mkDerivation {
+ pname = "ral";
+ version = "0.1";
+ sha256 = "0h8jqaapagrp9faixq817lib8l4nq4ycjj6ppl1ra8llnfsz5304";
+ libraryHaskellDepends = [
+ adjunctions base bin deepseq distributive fin hashable QuickCheck
+ semigroupoids
+ ];
+ benchmarkHaskellDepends = [ base criterion vector ];
+ description = "Random access lists";
+ license = stdenv.lib.licenses.gpl2Plus;
+ }) {};
+
+ "ral-lens" = callPackage
+ ({ mkDerivation, base, bin, fin, lens, ral }:
+ mkDerivation {
+ pname = "ral-lens";
+ version = "0.1";
+ sha256 = "0hm8mzj51hdql8rp3v0yvmcvmgha4ys8zsgbbx93mlp2b4rfhzpv";
+ libraryHaskellDepends = [ base bin fin lens ral ];
+ description = "Length-indexed random access lists: lens utilities";
+ license = stdenv.lib.licenses.gpl2Plus;
+ }) {};
+
+ "ral-optics" = callPackage
+ ({ mkDerivation, base, bin, fin, optics-core, ral }:
+ mkDerivation {
+ pname = "ral-optics";
+ version = "0.1";
+ sha256 = "0sky2zbh6wn4xlfc6sbrx7lvvy01qv69j80k0n4w9fyrq9ammb3r";
+ libraryHaskellDepends = [ base bin fin optics-core ral ];
+ description = "Length-indexed random access lists: optics utilities";
+ license = stdenv.lib.licenses.gpl2Plus;
+ }) {};
+
"ralist" = callPackage
({ mkDerivation, base, criterion, deepseq, hspec }:
mkDerivation {
@@ -196000,16 +198003,16 @@ self: {
}) {};
"random-fu" = callPackage
- ({ mkDerivation, base, erf, log-domain, math-functions, monad-loops
- , mtl, random-shuffle, random-source, rvar, syb, template-haskell
+ ({ mkDerivation, base, erf, math-functions, monad-loops, mtl
+ , random-shuffle, random-source, rvar, syb, template-haskell
, transformers, vector
}:
mkDerivation {
pname = "random-fu";
- version = "0.2.7.0";
- sha256 = "1i5hg74gv6885vnhmyknydhsyrps2h5zjiq4dv992jg3xnrs9cxn";
+ version = "0.2.7.3";
+ sha256 = "071b3gi88kmrfiy6kyz1x67mqljwqb4l45vzg1rc2zig3iwy66ih";
libraryHaskellDepends = [
- base erf log-domain math-functions monad-loops mtl random-shuffle
+ base erf math-functions monad-loops mtl random-shuffle
random-source rvar syb template-haskell transformers vector
];
description = "Random number generation";
@@ -196680,8 +198683,8 @@ self: {
}:
mkDerivation {
pname = "ratel";
- version = "1.0.8";
- sha256 = "045hr0jilydb1xcvhh9q5iwazpf1k1d2q1y0h4gkgnbn6qmgwhnk";
+ version = "1.0.9";
+ sha256 = "1kwn7ahjbp8w83ph73w43mh0szywqd2f817b7mz2wqimzb153k5b";
libraryHaskellDepends = [
aeson base bytestring case-insensitive containers http-client
http-client-tls http-types text uuid
@@ -196700,8 +198703,8 @@ self: {
}:
mkDerivation {
pname = "ratel-wai";
- version = "1.1.0";
- sha256 = "1wgmlcazfbz4y4q9k6367i76l8cal1qgqhqbh2p69ca365w9pf56";
+ version = "1.1.1";
+ sha256 = "1qpbhi1g7j5qbn15s0h8vdhc6zisz5j2hgr6qwg2kipi4kvvsgy9";
libraryHaskellDepends = [
base bytestring case-insensitive containers http-client ratel wai
];
@@ -196807,8 +198810,8 @@ self: {
}:
mkDerivation {
pname = "rattletrap";
- version = "9.0.6";
- sha256 = "1kb3nfm8izgb97f6lbkwcvnc9a2z4hy89hj5hnxmnph7r9s1njii";
+ version = "9.0.7";
+ sha256 = "0kgg1qfhgjajzrw22yvcxmiim14pxr2gim1aak3ivnmhn4yff4fg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -197465,7 +199468,7 @@ self: {
pname = "reactive-banana-wx";
version = "1.1.1.0";
sha256 = "1yzymc6qpjj8d0fal09vxy2yicbrgrg42khylbbsrzmdgqfnf3kr";
- configureFlags = [ "-f-buildExamples" ];
+ configureFlags = [ "-f-buildexamples" ];
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -197748,16 +199751,16 @@ self: {
"readme-lhs" = callPackage
({ mkDerivation, base, containers, doctest, pandoc, pandoc-types
- , protolude, text
+ , protolude, text, transformers
}:
mkDerivation {
pname = "readme-lhs";
- version = "0.2.2";
- sha256 = "1lxa119c7zbqwvjhxrr6cli14f3zrj93ziivi9y8nr0hcv1dx9z6";
+ version = "0.3.0";
+ sha256 = "1w113jr7sjmq4wkilwjmcaic6sgxp3vzg67dfs0imbd730xhqda8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base containers pandoc pandoc-types protolude text
+ base containers pandoc pandoc-types protolude text transformers
];
executableHaskellDepends = [ base protolude ];
testHaskellDepends = [ base doctest protolude ];
@@ -198007,22 +200010,23 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "rebase_1_4" = callPackage
+ "rebase_1_4_1" = callPackage
({ mkDerivation, base, base-prelude, bifunctors, bytestring
- , containers, contravariant, contravariant-extras, deepseq, dlist
- , either, fail, hashable, mtl, profunctors, scientific, selective
- , semigroupoids, semigroups, stm, text, time, transformers
- , unordered-containers, uuid, vector, void
+ , comonad, containers, contravariant, contravariant-extras, deepseq
+ , dlist, either, fail, hashable, mtl, profunctors, scientific
+ , selective, semigroupoids, semigroups, stm, text, time
+ , transformers, unordered-containers, uuid, vector, void
}:
mkDerivation {
pname = "rebase";
- version = "1.4";
- sha256 = "05l1wfriaa391wbbri2kc70svx47djl0k7hhpz21l4h5piizc4j5";
+ version = "1.4.1";
+ sha256 = "13fvhsxkzrghl6d2isjsxjkfkbkpnfgbdb20lc1z7izqjkvjj8rc";
libraryHaskellDepends = [
- base base-prelude bifunctors bytestring containers contravariant
- contravariant-extras deepseq dlist either fail hashable mtl
- profunctors scientific selective semigroupoids semigroups stm text
- time transformers unordered-containers uuid vector void
+ base base-prelude bifunctors bytestring comonad containers
+ contravariant contravariant-extras deepseq dlist either fail
+ hashable mtl profunctors scientific selective semigroupoids
+ semigroups stm text time transformers unordered-containers uuid
+ vector void
];
description = "A more progressive alternative to the \"base\" package";
license = stdenv.lib.licenses.mit;
@@ -198092,8 +200096,8 @@ self: {
}:
mkDerivation {
pname = "record-dot-preprocessor";
- version = "0.2";
- sha256 = "1k2bdinvygn00l12am5n8m2i3vqp6h555mcj6d8xshy320v85np8";
+ version = "0.2.2";
+ sha256 = "1rxa8dzh0ga9xrlwrwzf5lm9miql9lkmcyiy0nrc3s5lkxdsppww";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base extra ghc uniplate ];
@@ -198269,10 +200273,10 @@ self: {
({ mkDerivation, base, composition-prelude }:
mkDerivation {
pname = "recursion";
- version = "2.2.4.0";
- sha256 = "0n50nv1lzahy2mfvia5v41f8jx9w2yygzq584xbkirazhj73sjbx";
+ version = "2.2.4.1";
+ sha256 = "09r4a9h4rd48nqdn08v3mvibqvgb0ym05142jrk0qqq8f4la3dni";
libraryHaskellDepends = [ base composition-prelude ];
- description = "A recursion schemes library for GHC";
+ description = "A recursion schemes library for Haskell";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -198284,8 +200288,8 @@ self: {
pname = "recursion-schemes";
version = "5.1.3";
sha256 = "0a0mkwy3sxg5f1mdlblpn0xl3lwgilnmzs94jqab0pqx9gjkc5xj";
- revision = "1";
- editedCabalFile = "0zxcmga4fy42arbyv1kzbyfnsghnll3prkpva58x654x4cg4diwk";
+ revision = "2";
+ editedCabalFile = "01q18gplv5k328qf74innnx2z2p15pg5nc6sikxq6fkkw4v3rkyb";
libraryHaskellDepends = [
base base-orphans comonad free template-haskell th-abstraction
transformers
@@ -198351,8 +200355,8 @@ self: {
}:
mkDerivation {
pname = "red-black-record";
- version = "2.1.0.2";
- sha256 = "0xfvvhdqnhialxf13xw894mpsf8xj8jig5zipqj1hh6galb0b164";
+ version = "2.1.0.3";
+ sha256 = "0g1av0w52m0admcqif5imkla43yk6id4y8jmiy843xbdqs3qzcx4";
libraryHaskellDepends = [ base sop-core ];
testHaskellDepends = [
aeson base bytestring doctest profunctors sop-core tasty
@@ -198802,6 +200806,19 @@ self: {
broken = true;
}) {};
+ "refined-http-api-data" = callPackage
+ ({ mkDerivation, base, http-api-data, refined, text }:
+ mkDerivation {
+ pname = "refined-http-api-data";
+ version = "0.1.0.0";
+ sha256 = "0064cz00lp023kbn5vqpcsgjzsxd5a9s5fl1klsq6jlk1cmi5c0m";
+ libraryHaskellDepends = [ base http-api-data refined text ];
+ description = "http-api-data instances for refined types";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"refinery" = callPackage
({ mkDerivation, base, containers, exceptions, mmorph, mtl, pipes
, semigroupoids
@@ -198994,8 +201011,8 @@ self: {
}:
mkDerivation {
pname = "reflex-dom";
- version = "0.5";
- sha256 = "167yghrwf6fay03y46xf87p9bhr6s3rlxn0yk5vnx1s5i95ps1x5";
+ version = "0.5.2.0";
+ sha256 = "01sqql44jcn7d9xcb00br99zgyghiyqzcmncfpz4dgik10dam1hv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -199048,32 +201065,33 @@ self: {
, containers, contravariant, data-default, dependent-map
, dependent-sum, dependent-sum-template, directory
, exception-transformers, exceptions, filepath, ghcjs-dom, hlint
- , hspec, hspec-webdriver, http-types, HUnit, jsaddle, jsaddle-warp
- , keycode, lens, lifted-base, monad-control, mtl, network
- , network-uri, primitive, process, random, ref-tf, reflex
- , semigroups, silently, stm, template-haskell, temporary, text
- , these, transformers, unix, wai, wai-websockets, warp, webdriver
- , websockets, zenc
+ , hspec, hspec-core, hspec-webdriver, http-types, HUnit, jsaddle
+ , jsaddle-warp, keycode, lens, lifted-base, monad-control, mtl
+ , network, network-uri, primitive, process, random, ref-tf, reflex
+ , semialign, semigroups, silently, stm, template-haskell, temporary
+ , text, these, transformers, unix, wai, wai-websockets, warp
+ , webdriver, websockets, which, zenc
}:
mkDerivation {
pname = "reflex-dom-core";
- version = "0.5";
- sha256 = "1vzlrqgl48krvm58w4mg5s3xwyc565rgjy7f2g1rxxljr30z95p4";
+ version = "0.5.2.0";
+ sha256 = "1vqd6viqg9di9z0wchi3ffcia4spljf3dal8l21k7qhwcbz4g3jz";
libraryHaskellDepends = [
aeson base bifunctors bimap blaze-builder bytestring constraints
containers contravariant data-default dependent-map dependent-sum
dependent-sum-template directory exception-transformers ghcjs-dom
jsaddle keycode lens monad-control mtl network-uri primitive random
- ref-tf reflex semigroups stm template-haskell text these
+ ref-tf reflex semialign semigroups stm template-haskell text these
transformers unix zenc
];
testHaskellDepends = [
aeson base bytestring chrome-test-utils constraints
constraints-extras containers dependent-map dependent-sum
dependent-sum-template directory exceptions filepath ghcjs-dom
- hlint hspec hspec-webdriver http-types HUnit jsaddle jsaddle-warp
- lens lifted-base network process random ref-tf reflex silently
- temporary text wai wai-websockets warp webdriver websockets
+ hlint hspec hspec-core hspec-webdriver http-types HUnit jsaddle
+ jsaddle-warp lens lifted-base network process random ref-tf reflex
+ silently temporary text wai wai-websockets warp webdriver
+ websockets which
];
description = "Functional Reactive Web Apps with Reflex";
license = stdenv.lib.licenses.bsd3;
@@ -199215,6 +201233,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "reflex-libtelnet" = callPackage
+ ({ mkDerivation, base, bytestring, data-default, dependent-map
+ , dependent-sum, dependent-sum-template, lens, libtelnet, reflex
+ }:
+ mkDerivation {
+ pname = "reflex-libtelnet";
+ version = "0.1.0.0";
+ sha256 = "0abqbbbzgsq2sz1yx9cjl7cjfjaygcv4vc8hp6g4gk7744xdshz3";
+ libraryHaskellDepends = [
+ base bytestring data-default dependent-map dependent-sum
+ dependent-sum-template lens libtelnet reflex
+ ];
+ description = "Reflex bindings for libtelnet";
+ license = stdenv.lib.licenses.gpl3Plus;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"reflex-orphans" = callPackage
({ mkDerivation, base, deepseq, dependent-map, mtl, ref-tf, reflex
, tasty, tasty-hunit, these
@@ -199340,8 +201376,8 @@ self: {
}:
mkDerivation {
pname = "reform-happstack";
- version = "0.2.5.2";
- sha256 = "0d6w500y47ghmiawlv116hqrknr1sx4k525c7arq340slzch03r6";
+ version = "0.2.5.3";
+ sha256 = "04fnn47rcm7n98q0qifyyg9jrh09mzchirwsgi2zzb6j9mciz6ci";
libraryHaskellDepends = [
base bytestring happstack-server mtl random reform text utf8-string
];
@@ -199355,8 +201391,8 @@ self: {
({ mkDerivation, base, hsp, hsx2hs, reform, text }:
mkDerivation {
pname = "reform-hsp";
- version = "0.2.7.1";
- sha256 = "084d03inyplx3n2zykaz2g7gskzs9hcjq8klhlnzpb1b6ahx5va8";
+ version = "0.2.7.2";
+ sha256 = "1vjbj41yl158h59wcx190jb4s627bhrhcbp21ykn93n4j454kfns";
libraryHaskellDepends = [ base hsp hsx2hs reform text ];
description = "Add support for using HSP with Reform";
license = stdenv.lib.licenses.bsd3;
@@ -199455,6 +201491,8 @@ self: {
libraryHaskellDepends = [ base ];
description = "Register allocation API";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"reg-alloc-types" = callPackage
@@ -199478,6 +201516,8 @@ self: {
pname = "regex";
version = "1.0.2.0";
sha256 = "1f2z025hif1fr24b5khq3qxxyvpxrnhyx8xmbms332arw28rpkda";
+ revision = "1";
+ editedCabalFile = "1476dxzj482j6zkvbvyszsjw1bm7jn2nwk40rq99ylvzm2sj0asn";
libraryHaskellDepends = [
array base base-compat bytestring containers hashable regex-base
regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text
@@ -199913,22 +201953,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "regex-tdfa_1_3_0" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, file-embed
- , filepath, ghc-prim, mtl, parsec, regex-base, utf8-string
+ "regex-tdfa_1_3_1_0" = callPackage
+ ({ mkDerivation, array, base, bytestring, containers, directory
+ , filepath, mtl, parsec, regex-base, text, utf8-string
}:
mkDerivation {
pname = "regex-tdfa";
- version = "1.3.0";
- sha256 = "1qzcix4bmz5lj0w433qrfi576rvy8y8flv5wvlp6cchb2s8mfq0v";
+ version = "1.3.1.0";
+ sha256 = "1h1fliv2zjxwmddl9wnn7ckxxpgy1049hdfg6fcknyrr7mw7dhqm";
libraryHaskellDepends = [
- array base bytestring containers ghc-prim mtl parsec regex-base
+ array base bytestring containers mtl parsec regex-base text
];
testHaskellDepends = [
- array base bytestring containers file-embed filepath mtl regex-base
- utf8-string
+ array base bytestring containers directory filepath mtl regex-base
+ text utf8-string
];
- description = "Replaces/Enhances Text.Regex";
+ description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -200077,6 +202117,22 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "regex-wrapper" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, hashable
+ , regex-tdfa, string-conv, text
+ }:
+ mkDerivation {
+ pname = "regex-wrapper";
+ version = "0.1.0.1";
+ sha256 = "0ibkdd5xpilzm5qngn01csrin6ial1hhjzgpi3wjv6krlswdil34";
+ libraryHaskellDepends = [
+ aeson base bytestring containers hashable regex-tdfa string-conv
+ text
+ ];
+ description = "Types that can only be constructed if they match a regular expression";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"regex-xmlschema" = callPackage
({ mkDerivation, base, haskell98, parsec }:
mkDerivation {
@@ -200349,6 +202405,17 @@ self: {
broken = true;
}) {};
+ "regression-simple" = callPackage
+ ({ mkDerivation, base, vector }:
+ mkDerivation {
+ pname = "regression-simple";
+ version = "0.1";
+ sha256 = "0f74xwyrnz39cl24kazvk8rd3px2l2ycx6a5jaqlab6wiwi5xclq";
+ libraryHaskellDepends = [ base vector ];
+ description = "Simple linear and quadratic regression";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"regular" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
@@ -200698,8 +202765,8 @@ self: {
}:
mkDerivation {
pname = "releaser";
- version = "0.2.0.0";
- sha256 = "1hh4z87rc11pgapbrz0sjcy21pvgnm201b85prn09kiwcqrawz8r";
+ version = "0.2.1.0";
+ sha256 = "1nmbqilik3zdcyi7b5hq7xrk1f62g6lw0i8014zxqz56lcwkaj4z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -201719,6 +203786,36 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "req_3_0_0" = callPackage
+ ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
+ , bytestring, case-insensitive, connection, hspec, hspec-core
+ , hspec-discover, http-api-data, http-client, http-client-tls
+ , http-types, modern-uri, monad-control, mtl, QuickCheck, retry
+ , text, time, transformers, transformers-base, unordered-containers
+ }:
+ mkDerivation {
+ pname = "req";
+ version = "3.0.0";
+ sha256 = "0zcali98wlw2r4rl405268n4fsia1gvvnq7ckkinb3adp4aksk18";
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ aeson authenticate-oauth base blaze-builder bytestring
+ case-insensitive connection http-api-data http-client
+ http-client-tls http-types modern-uri monad-control mtl retry text
+ time transformers transformers-base
+ ];
+ testHaskellDepends = [
+ aeson base blaze-builder bytestring case-insensitive hspec
+ hspec-core http-client http-types modern-uri monad-control mtl
+ QuickCheck retry text time unordered-containers
+ ];
+ testToolDepends = [ hspec-discover ];
+ doCheck = false;
+ description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"req-conduit" = callPackage
({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec
, http-client, req, resourcet, temporary, transformers, weigh
@@ -201727,8 +203824,8 @@ self: {
pname = "req-conduit";
version = "1.0.0";
sha256 = "193bv4jp7rrbpb1i9as9s2l978wz5kbz5kvr7ppllif5ppj699qx";
- revision = "5";
- editedCabalFile = "1vbki857d5xj54s83r7kqirrg9a738xr55d40xqcaxxm7ki4s63i";
+ revision = "6";
+ editedCabalFile = "0wmzf62r5jawlccbndvsrr6cj4r0bdl4mqqwcnxz412cdq71w8hz";
libraryHaskellDepends = [
base bytestring conduit http-client req resourcet transformers
];
@@ -201860,12 +203957,12 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "rerebase_1_4" = callPackage
+ "rerebase_1_4_1" = callPackage
({ mkDerivation, rebase }:
mkDerivation {
pname = "rerebase";
- version = "1.4";
- sha256 = "1xqcjzkwjf3zrwsrj4l2d1kg685a4x3bapfypsvk61m1qhvwwxzl";
+ version = "1.4.1";
+ sha256 = "19a3pwi801kfaflnag9n7zzxapcjfpqpykr6rq8b6axhyqj3vxim";
libraryHaskellDepends = [ rebase ];
description = "Reexports from \"base\" with a bunch of other standard libraries";
license = stdenv.lib.licenses.mit;
@@ -203190,21 +205287,21 @@ self: {
}) {};
"rib" = callPackage
- ({ mkDerivation, aeson, async, base, binary, bytestring, clay
- , cmdargs, containers, data-default, fsnotify, http-types, lens
- , lens-aeson, lucid, mtl, pandoc, pandoc-include-code, pandoc-types
- , safe, shake, skylighting, text, time, wai, wai-app-static
- , wai-extra, warp
+ ({ mkDerivation, aeson, async, base-noprelude, binary, clay
+ , cmdargs, containers, directory, exceptions, foldl, fsnotify
+ , lucid, megaparsec, mmark, mmark-ext, modern-uri, mtl, named
+ , pandoc, pandoc-include-code, pandoc-types, path, path-io, relude
+ , shake, text, wai, wai-app-static, warp
}:
mkDerivation {
pname = "rib";
- version = "0.3.0.0";
- sha256 = "1dw86xrz310vrapgln48r46z0ss35jm85c0r95pqvnq4smbwiw18";
+ version = "0.5.0.0";
+ sha256 = "1h9faqwicvgkw5lfj14mcmk0sn8fjzv1vl9887s4y4q4jpi2wfvb";
libraryHaskellDepends = [
- aeson async base binary bytestring clay cmdargs containers
- data-default fsnotify http-types lens lens-aeson lucid mtl pandoc
- pandoc-include-code pandoc-types safe shake skylighting text time
- wai wai-app-static wai-extra warp
+ aeson async base-noprelude binary clay cmdargs containers directory
+ exceptions foldl fsnotify lucid megaparsec mmark mmark-ext
+ modern-uri mtl named pandoc pandoc-include-code pandoc-types path
+ path-io relude shake text wai wai-app-static warp
];
description = "Static site generator using Shake";
license = stdenv.lib.licenses.bsd3;
@@ -203216,10 +205313,12 @@ self: {
({ mkDerivation, base, Only, postgresql-simple, text, time }:
mkDerivation {
pname = "ribbit";
- version = "0.4.0.0";
- sha256 = "0nmpsi8b6m88za9jxawz36jjhsybn39ldi503ap7m9wd765j1dbz";
+ version = "0.4.1.0";
+ sha256 = "1pgyh7ar03k62mpn09g8qm13m1j07wq257hpva3f9sx9n5qd8z2a";
+ revision = "1";
+ editedCabalFile = "11ky88hgkys3bzsqr3sl9j685h6l97r2zccpz1ylinsrvinwnq8s";
libraryHaskellDepends = [ base Only postgresql-simple text time ];
- description = "Type-level Relational DB combinators";
+ description = "Type-level Relational DB language";
license = stdenv.lib.licenses.mit;
}) {};
@@ -203468,19 +205567,21 @@ self: {
}) {};
"rings" = callPackage
- ({ mkDerivation, base, connections, containers, contravariant
- , hedgehog, property, semigroupoids
+ ({ mkDerivation, base, connections, containers, hedgehog, property
+ , semigroupoids
}:
mkDerivation {
pname = "rings";
- version = "0.0.2";
- sha256 = "1jw9wzwixzm970rgv5fbji74dajz8ii4pqngjpihp2g0x8wq1scx";
+ version = "0.0.2.1";
+ sha256 = "00aks4frrnp5wk97zgbg9f1bsj3wm7hppfwa8mwr77lfgvbsd1hn";
libraryHaskellDepends = [
- base connections containers contravariant property semigroupoids
+ base connections containers property semigroupoids
];
testHaskellDepends = [ base connections hedgehog property ];
description = "Rings, semirings, and dioids";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"rio" = callPackage
@@ -204443,17 +206544,18 @@ self: {
"rosa" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, lens
, namecoin-update, optparse-applicative, text, unordered-containers
- , vector, wreq
+ , uri-encode, vector, wreq
}:
mkDerivation {
pname = "rosa";
- version = "0.4.0.0";
- sha256 = "0326ghscyg5rrw54610x8n6mkdr5pim3c7pspb01dg77gbzr0mrm";
+ version = "0.5.0.1";
+ sha256 = "1nk56nm6gcrcgi2i3x683i0ygbl8x5qc3xqhq14n2s5l45fmgw10";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
aeson base bytestring directory lens namecoin-update
- optparse-applicative text unordered-containers vector wreq
+ optparse-applicative text unordered-containers uri-encode vector
+ wreq
];
description = "Query the namecoin blockchain";
license = stdenv.lib.licenses.gpl3;
@@ -205642,8 +207744,10 @@ self: {
({ mkDerivation, base, deepseq, QuickCheck }:
mkDerivation {
pname = "safe";
- version = "0.3.17";
- sha256 = "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr";
+ version = "0.3.18";
+ sha256 = "1v8gxjlq5wz5adyrd8i3dax5hcxrqq0i54m85zpfwfzqibi5nxyp";
+ revision = "1";
+ editedCabalFile = "0zr1di94nbvs6848g1ng6azl7nwm7454kjig2c7gcf9sp4q7z8ba";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base deepseq QuickCheck ];
description = "Library of safe (exception free) functions";
@@ -206320,6 +208424,8 @@ self: {
pname = "salak";
version = "0.3.5.3";
sha256 = "0k6z2vjxg6za6rfhx1xgjdck7ainnsbhrvzav2ngwpvy8li5g02b";
+ revision = "1";
+ editedCabalFile = "138c763crbfipcb9ss1lk3wx3482nm2v4zbm3k88h6jszxhmxvav";
libraryHaskellDepends = [
base bytestring containers data-default directory dlist exceptions
filepath hashable heaps megaparsec mtl scientific text time
@@ -206424,8 +208530,8 @@ self: {
({ mkDerivation, base, doctest }:
mkDerivation {
pname = "salve";
- version = "1.0.6";
- sha256 = "1vgpj0yg27n6hw1gb763hgxv99hpq7511n2ihys0qdi0ri8bpj1j";
+ version = "1.0.8";
+ sha256 = "1hgcyincccib0v671kd8qybgf8q9m0n8lcrpj37pgq9wzq6x34sm";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest ];
description = "Semantic version numbers and constraints";
@@ -207050,8 +209156,6 @@ self: {
testSystemDepends = [ z3 ];
description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {inherit (pkgs) z3;};
"sbv_8_5" = callPackage
@@ -207084,7 +209188,6 @@ self: {
description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {inherit (pkgs) z3;};
"sbvPlugin" = callPackage
@@ -207563,6 +209666,8 @@ self: {
];
description = "Work stealing scheduler";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"schedyield" = callPackage
@@ -207792,31 +209897,33 @@ self: {
}) {};
"scidb-hquery" = callPackage
- ({ mkDerivation, alex, array, base, BNFC, bytestring, Cabal
- , connection, cryptonite, data-default-class, directory, exceptions
- , filepath, happy, haskeline, hostname-validate, HTTP, http-client
- , http-client-tls, http-conduit, http-types, memory, mtl, network
- , process, regex, safe, split, terminal-size, text, tls, x509-store
+ ({ mkDerivation, alex, array, base, base-compat, BNFC, bytestring
+ , Cabal, connection, cryptonite, data-default-class, directory
+ , exceptions, filepath, happy, haskeline, hostname-validate, HTTP
+ , http-client, http-client-tls, http-conduit, http-types, memory
+ , mtl, network, process, regex, safe, split, terminal-size, text
+ , tls, x509-store
}:
mkDerivation {
pname = "scidb-hquery";
- version = "2.8.0.434";
- sha256 = "0q994ac1krcw312nklxxjr9d4r231s50lb2crbpph1swv6h8jwrq";
+ version = "2.8.0.436";
+ sha256 = "0mkicmfvwc7xg37d46s7xrcsdaff09v7x86npd1bgv1k60m4c8gq";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
libraryHaskellDepends = [
- array base bytestring connection cryptonite data-default-class
- exceptions haskeline hostname-validate HTTP http-client
- http-client-tls http-conduit http-types memory mtl network process
- regex safe split terminal-size text tls x509-store
+ array base base-compat bytestring connection cryptonite
+ data-default-class exceptions haskeline hostname-validate HTTP
+ http-client http-client-tls http-conduit http-types memory mtl
+ network process regex safe split terminal-size text tls x509-store
];
libraryToolDepends = [ alex BNFC happy ];
executableHaskellDepends = [
- array base bytestring connection cryptonite data-default-class
- directory exceptions filepath haskeline hostname-validate HTTP
- http-client http-client-tls http-conduit http-types memory mtl
- network process regex safe split terminal-size text tls x509-store
+ array base base-compat bytestring connection cryptonite
+ data-default-class directory exceptions filepath haskeline
+ hostname-validate HTTP http-client http-client-tls http-conduit
+ http-types memory mtl network process regex safe split
+ terminal-size text tls x509-store
];
description = "Haskell query for SciDB via shim";
license = stdenv.lib.licenses.gpl3;
@@ -207881,8 +209988,8 @@ self: {
}:
mkDerivation {
pname = "scientific-notation";
- version = "0.1.0.1";
- sha256 = "1a877ryswq5h7i3lml55ksrx5hzd9gwbm2yzp0a7cw1hb6r5pjs7";
+ version = "0.1.1.0";
+ sha256 = "1s0iyj6dn0nbn8s31b5wwwlyfx5jcnwa3i9gp45idcwfsz5hmdvq";
libraryHaskellDepends = [ base bytesmith ];
testHaskellDepends = [
base byteslice bytesmith bytestring primitive QuickCheck tasty
@@ -208629,6 +210736,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "sdl-try-drivers" = callPackage
+ ({ mkDerivation, base, pretty-simple, sdl2, text }:
+ mkDerivation {
+ pname = "sdl-try-drivers";
+ version = "0.0.0.2";
+ sha256 = "0456j3c6a76ph01cz0cdhgfqyyamrwh0y7v5f336kvh5cmsdyw57";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base pretty-simple sdl2 text ];
+ description = "small testing tool for sdl2 and accelerated drivers";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"sdl2" = callPackage
({ mkDerivation, base, bytestring, deepseq, exceptions, linear
, SDL2, StateVar, text, transformers, vector, weigh
@@ -209594,6 +211714,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "semialign-extras" = callPackage
+ ({ mkDerivation, base, doctest, lens, QuickCheck, semialign
+ , semialign-indexed, these, witherable
+ }:
+ mkDerivation {
+ pname = "semialign-extras";
+ version = "0.1.0.0";
+ sha256 = "0wnaspwfj9rm7g9mz2q9xad5a9rvkfsrjb5lir64csppy3p11276";
+ libraryHaskellDepends = [
+ base lens semialign semialign-indexed these witherable
+ ];
+ testHaskellDepends = [ base doctest QuickCheck ];
+ description = "Extra functions for working with Semialigns";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"semialign-indexed" = callPackage
({ mkDerivation, base, containers, hashable, lens, semialign, these
, unordered-containers, vector
@@ -209663,8 +211801,8 @@ self: {
}:
mkDerivation {
pname = "semigroupoids";
- version = "5.3.3";
- sha256 = "016hc4imr9l4szs3p7f1aahvxr5wv4clvr3qzrm3nibssg5vrs61";
+ version = "5.3.4";
+ sha256 = "0r49qpbi803jk3v4i09jr1a98l6hcgnjhrv1a9fhmay3ff4y9lh0";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base base-orphans bifunctors comonad containers contravariant
@@ -209779,10 +211917,8 @@ self: {
}:
mkDerivation {
pname = "semiring-num";
- version = "1.6.0.1";
- sha256 = "1l9j59r0ph34fqkjw1gdf3yzyzk8p6362cznixzx6qnhphbkqjsi";
- revision = "1";
- editedCabalFile = "123jk59i4ziv6ghmy8349icpvzgw90xjd6dxzlnayf0qg01adzsr";
+ version = "1.6.0.4";
+ sha256 = "1wpszhdjh2hmgnfzwdsdai1xzq0y1panay9jz5sa82hg11p4wa44";
libraryHaskellDepends = [
base containers deepseq hashable log-domain scientific
template-haskell time unordered-containers vector
@@ -210171,8 +212307,8 @@ self: {
({ mkDerivation, base, mtl, transformers }:
mkDerivation {
pname = "seqid";
- version = "0.6.0";
- sha256 = "1zm1zmzp3i60wb17ghr4rp5ljlhvsblll69x2ibjk7kh5icvwfqc";
+ version = "0.6.1";
+ sha256 = "0gqmnckrrs85cwz2jvp2ip7a5c5qfbav4nb9d8bxax093jziz301";
libraryHaskellDepends = [ base mtl transformers ];
description = "Sequence ID production and consumption";
license = stdenv.lib.licenses.bsd3;
@@ -210197,8 +212333,8 @@ self: {
({ mkDerivation, base, io-streams, seqid }:
mkDerivation {
pname = "seqid-streams";
- version = "0.7.0";
- sha256 = "0z80cclvzkr6dg81n96dpan9a7285rlq9nmchiy4raxsjw4cza58";
+ version = "0.7.1";
+ sha256 = "0yasm87kjhdq13zacpd4qa3kssalwvkipf3rz2cq1dgdgps5mxf7";
libraryHaskellDepends = [ base io-streams seqid ];
description = "Sequence ID IO-Streams";
license = stdenv.lib.licenses.bsd3;
@@ -210668,8 +212804,8 @@ self: {
pname = "servant-auth";
version = "0.3.2.0";
sha256 = "12s1m7vqp0ka8nani4cnrb6fad2y5mxji95bba2b6b07ih8xbd3v";
- revision = "1";
- editedCabalFile = "10ss4v45lclf5n0k6rch22zzs59v7p5ppd04dbc97pqxiygpbnd9";
+ revision = "2";
+ editedCabalFile = "06jpxqz5444k19p1n4i4yf2pvql37w9ngssp1grxl42dxk2bcg94";
libraryHaskellDepends = [ base ];
description = "Authentication combinators for servant";
license = stdenv.lib.licenses.bsd3;
@@ -210686,8 +212822,8 @@ self: {
pname = "servant-auth-client";
version = "0.4.0.0";
sha256 = "1kh4kq3cc9fn49vmh304zyzn7idb4k1j0803yp7a6qc733panf9g";
- revision = "1";
- editedCabalFile = "0cynalya2y5bfnhkc49vwf0ldxg4km6nklk77nlxjcrvwas21g7z";
+ revision = "2";
+ editedCabalFile = "0c67m1ckksnmwkya78nn9hy65xb7c4023fy7d3pp6zyq8izrp1v8";
libraryHaskellDepends = [
base bytestring containers servant servant-auth servant-client-core
];
@@ -210742,8 +212878,8 @@ self: {
pname = "servant-auth-docs";
version = "0.2.10.0";
sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd";
- revision = "3";
- editedCabalFile = "0in6rhgwn5idc2rsl4zbh6kkhxq471iczjd3i6ap60xg46ciymga";
+ revision = "4";
+ editedCabalFile = "1dvwkaihrm7dc2zdrqqvc0j7zmij487klrmsggsdiid7y68nyrqh";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base lens servant servant-auth servant-docs text
@@ -210832,8 +212968,8 @@ self: {
pname = "servant-auth-swagger";
version = "0.2.10.0";
sha256 = "04ndbbhdmpgb8yshki6q2j46a5q8fzvlb4nn8x8gv0mqkriq79sh";
- revision = "2";
- editedCabalFile = "1vr0qss87gi6r9z876v9vnmfhr4m58n5x44fgzpmjkn7wlh1i6m7";
+ revision = "3";
+ editedCabalFile = "087faa5bg2hlxyhg7jzy2jj4fzs3dkp0znsbabrharcvdlkpqj1r";
libraryHaskellDepends = [
base lens servant servant-auth servant-swagger swagger2 text
];
@@ -210896,8 +213032,8 @@ self: {
}:
mkDerivation {
pname = "servant-auth-token-api";
- version = "0.5.3.0";
- sha256 = "0i9i89a9h9xq6r23p6xxyf7ywgr90p2dyw8862qz0pdj0qdbbi5v";
+ version = "0.5.4.0";
+ sha256 = "1rjmhyskxypl9gm4g8yq9zfj91dmbz72qxmrijd1gjjv5s5cr91m";
libraryHaskellDepends = [
aeson aeson-injector base lens raw-strings-qq servant servant-docs
servant-swagger swagger2 text
@@ -211101,6 +213237,37 @@ self: {
pname = "servant-cli";
version = "0.1.0.1";
sha256 = "12d18ca90b7mijaav3glx60b9c9qd1f2g4p5m4m7hzz2m22dyimn";
+ revision = "1";
+ editedCabalFile = "1h29x87kqyylwigz86bwrgjdykk1119alsy65a7jkkcrj7a3syqa";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring case-insensitive containers filepath free
+ functor-combinators http-types optparse-applicative profunctors
+ recursion-schemes servant servant-client-core servant-docs text
+ transformers vinyl
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring containers http-client optparse-applicative
+ random servant servant-client servant-server text vinyl warp
+ ];
+ description = "Command line interface for Servant API clients";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
+ "servant-cli_0_1_0_2" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, case-insensitive
+ , containers, filepath, free, functor-combinators, http-client
+ , http-types, optparse-applicative, profunctors, random
+ , recursion-schemes, servant, servant-client, servant-client-core
+ , servant-docs, servant-server, text, transformers, vinyl, warp
+ }:
+ mkDerivation {
+ pname = "servant-cli";
+ version = "0.1.0.2";
+ sha256 = "11pl9z3l2f7py16drqq9zvl9z5358jv1q7pqslhkhrqg5vhp822k";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -213052,8 +215219,8 @@ self: {
}:
mkDerivation {
pname = "serverless-haskell";
- version = "0.9.1";
- sha256 = "09l9d43ls4ca10y0fx39l8bqsmb226sa0f5yprsm5jz5nbvl70qv";
+ version = "0.9.4";
+ sha256 = "11svl9km810xw4vbn3vd9jqnv9fglf5jqfyfshnjachiz38fdsih";
libraryHaskellDepends = [
aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -213793,6 +215960,24 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "sexpresso" = callPackage
+ ({ mkDerivation, base, containers, megaparsec, smallcheck, tasty
+ , tasty-hunit, tasty-smallcheck, text
+ }:
+ mkDerivation {
+ pname = "sexpresso";
+ version = "1.0.0.2";
+ sha256 = "1pyhzxpnzc34dyhs4xh29dzqp8f5zqgdhb20g2gy2l63lh0fickn";
+ libraryHaskellDepends = [ base containers megaparsec text ];
+ testHaskellDepends = [
+ base containers megaparsec smallcheck tasty tasty-hunit
+ tasty-smallcheck text
+ ];
+ description = "A flexible library for parsing and printing S-expression";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sext" = callPackage
({ mkDerivation, base, bytestring, tasty, tasty-hunit
, template-haskell, text, vector
@@ -213869,8 +216054,8 @@ self: {
}:
mkDerivation {
pname = "sgd";
- version = "0.8.0.2";
- sha256 = "1lzfnzk2iqjrsp6xksfa4qm7a2qh4q1y10mdqigl8slr5nsy9045";
+ version = "0.8.0.3";
+ sha256 = "0nl7hiw9b25jgp2742ykx8f4c7irz1b7rd9i19vpcmshkkmqcvsl";
libraryHaskellDepends = [
base binary bytestring containers data-default deepseq filepath
hmatrix logfloat monad-par mtl parallel pipes primitive random
@@ -214108,8 +216293,8 @@ self: {
}:
mkDerivation {
pname = "shake-ats";
- version = "1.10.4.0";
- sha256 = "1kkwkcbzq3dks290c23axg6jidbkjxx750gmixa8n5gr34wmz7hf";
+ version = "1.10.4.1";
+ sha256 = "14b1yiw0bhj81pj1dhax7pdf9c68iwlndqg5c3n3c2p6qlcbbd8f";
libraryHaskellDepends = [
base binary cdeps dependency directory hs2ats language-ats
microlens shake shake-c shake-cabal shake-ext text
@@ -214188,8 +216373,8 @@ self: {
({ mkDerivation, base, directory, shake }:
mkDerivation {
pname = "shake-ext";
- version = "3.1.0.2";
- sha256 = "04nhjq2s7iycjabh33jwbdc8pxdyxnfrwjvl1mxmwrx0zx96dbi9";
+ version = "3.1.1.0";
+ sha256 = "12pfi6rc4y8rjndym0crzyjfmcqnnrh61hww1vrnl614hs00iw6h";
libraryHaskellDepends = [ base directory shake ];
description = "Helper functions for linting with shake";
license = stdenv.lib.licenses.bsd3;
@@ -214377,8 +216562,8 @@ self: {
}:
mkDerivation {
pname = "shakespeare";
- version = "2.0.22";
- sha256 = "1mc1a0vv070gcawwcx6vzpj6gpfh1qnlqrndiyfic3p500y656vh";
+ version = "2.0.23";
+ sha256 = "0i1k6ahpvc45z05lycxs0f70ngm8xrazp6ayyxv1bzw8q8d4bkz3";
libraryHaskellDepends = [
aeson base blaze-html blaze-markup bytestring containers directory
exceptions ghc-prim parsec process scientific template-haskell text
@@ -215878,18 +218063,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "simple-cmd-args" = callPackage
- ({ mkDerivation, base, optparse-applicative }:
+ "simple-cmd_0_2_1" = callPackage
+ ({ mkDerivation, base, directory, filepath, process, unix }:
mkDerivation {
- pname = "simple-cmd-args";
- version = "0.1.3";
- sha256 = "09cp664flacsq565pqva7vsqcq5ddndck4rh74y6n2j3xzl24a2k";
- libraryHaskellDepends = [ base optparse-applicative ];
- description = "Simple command args parsing and execution";
+ pname = "simple-cmd";
+ version = "0.2.1";
+ sha256 = "1b35hsxr63n3nbpjdf7ailsmp4yk6k8nscx8xxv453v0r3v89hss";
+ libraryHaskellDepends = [ base directory filepath process unix ];
+ description = "Simple String-based process commands";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "simple-cmd-args_0_1_4" = callPackage
+ "simple-cmd-args" = callPackage
({ mkDerivation, base, optparse-applicative }:
mkDerivation {
pname = "simple-cmd-args";
@@ -215898,7 +218084,6 @@ self: {
libraryHaskellDepends = [ base optparse-applicative ];
description = "Simple command args parsing and execution";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"simple-conduit" = callPackage
@@ -216991,6 +219176,28 @@ self: {
broken = true;
}) {};
+ "singular-factory" = callPackage
+ ({ mkDerivation, base, containers, directory, filepath, hgmp
+ , process, QuickCheck, random, singular-factory, tasty, tasty-hunit
+ , tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "singular-factory";
+ version = "0.1";
+ sha256 = "0gz9p32y37ci7i1xnq4n086p1ql5nli84z15xyq6dl1jaz0f541r";
+ libraryHaskellDepends = [
+ base containers directory filepath hgmp process text
+ ];
+ libraryPkgconfigDepends = [ singular-factory ];
+ testHaskellDepends = [
+ base QuickCheck random tasty tasty-hunit tasty-quickcheck
+ ];
+ description = "Multivariate polynomial factorization via bindings to Singular-factory";
+ license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {singular-factory = null;};
+
"sink" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -217115,8 +219322,8 @@ self: {
}:
mkDerivation {
pname = "sitepipe";
- version = "0.4.0.0";
- sha256 = "0y8llic3imc1zs53glig24vjm59f2dnw4sw32gzkvlzq33689s7s";
+ version = "0.4.0.1";
+ sha256 = "1iq7i2zs1bqnxqjp5bwsx8q2vvp1kngwg45mzsiwmhzq4m88x80h";
libraryHaskellDepends = [
aeson base bytestring containers directory exceptions filepath Glob
lens lens-aeson megaparsec MissingH mtl mustache
@@ -217542,14 +219749,14 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
- "skylighting_0_8_2_3" = callPackage
+ "skylighting_0_8_3" = callPackage
({ mkDerivation, base, binary, bytestring, containers
, skylighting-core
}:
mkDerivation {
pname = "skylighting";
- version = "0.8.2.3";
- sha256 = "10byr42qnsrqs368li412n8zz405annwmh4vvq2yh6xskipgb32p";
+ version = "0.8.3";
+ sha256 = "1gsmbzgfxwsfvnk3mbd29llv5wkvn5v7ybs46y6kvf51sdf4v6i6";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -217592,7 +219799,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "skylighting-core_0_8_2_3" = callPackage
+ "skylighting-core_0_8_3" = callPackage
({ mkDerivation, aeson, ansi-terminal, attoparsec, base
, base64-bytestring, binary, blaze-html, bytestring
, case-insensitive, colour, containers, criterion, Diff, directory
@@ -217602,8 +219809,8 @@ self: {
}:
mkDerivation {
pname = "skylighting-core";
- version = "0.8.2.3";
- sha256 = "005ancb8y846xsiagnb4gp4bn4h86r551rvpm3x4xj5zpr795pnc";
+ version = "0.8.3";
+ sha256 = "07l8n290wm533qp7h1kdn99b47f2lrq4mag2snfpllll8ss35773";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -217905,8 +220112,8 @@ self: {
}:
mkDerivation {
pname = "slick";
- version = "1.0.0.0";
- sha256 = "11wzfgxx5cjdkwgs23afidvjck8q8vs4p2qm7g9f2zxiq6706y89";
+ version = "1.0.1.0";
+ sha256 = "0zmg8k12dd8apjd6bjjhf5vdfc927pq372r5gvyjx5rmrfkcwx4l";
libraryHaskellDepends = [
aeson base bytestring directory extra mustache pandoc shake text
unordered-containers
@@ -217956,8 +220163,8 @@ self: {
({ mkDerivation, base, doctest, Glob }:
mkDerivation {
pname = "slist";
- version = "0.0.0";
- sha256 = "0w9rgy0afma2gk36jbk7r8kyvl4vfhd0pfbv6ank2pr6kd5a4a0z";
+ version = "0.1.0.0";
+ sha256 = "0yvcy8v9qpg517njy3sr5vqr4jgpynii7lw8gqh9pwjk40q628wf";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base doctest Glob ];
description = "Sized list";
@@ -218107,20 +220314,21 @@ self: {
"small-bytearray-builder" = callPackage
({ mkDerivation, base, byteslice, bytestring, gauge
, natural-arithmetic, primitive, primitive-offset, QuickCheck
- , run-st, tasty, tasty-hunit, tasty-quickcheck, text, text-short
- , vector
+ , quickcheck-classes, run-st, tasty, tasty-hunit, tasty-quickcheck
+ , text, text-short, vector, wide-word
}:
mkDerivation {
pname = "small-bytearray-builder";
- version = "0.3.0.0";
- sha256 = "17c0mwanwj96djirh6vac9k5dh8qsl9inx237wwbln4j3br4mkz4";
+ version = "0.3.1.0";
+ sha256 = "1swv0cwsxrmffkvx16qxxxkxfhqfwxwfz7d2msp5fzzz6all6vli";
libraryHaskellDepends = [
base byteslice bytestring natural-arithmetic primitive
- primitive-offset run-st text-short
+ primitive-offset run-st text-short wide-word
];
testHaskellDepends = [
base byteslice bytestring natural-arithmetic primitive QuickCheck
- tasty tasty-hunit tasty-quickcheck text vector
+ quickcheck-classes tasty tasty-hunit tasty-quickcheck text vector
+ wide-word
];
benchmarkHaskellDepends = [
base byteslice gauge natural-arithmetic primitive text-short
@@ -218372,28 +220580,27 @@ self: {
}) {};
"smcdel" = callPackage
- ({ mkDerivation, alex, ansi-terminal, array, base, containers
- , criterion, cudd, directory, file-embed, filepath, graphviz, happy
- , HasCacBDD, hspec, js-jquery, lens, process, QuickCheck, scotty
- , tagged, template-haskell, temporary, text, time
+ ({ mkDerivation, ansi-terminal, array, base, containers, criterion
+ , cudd, directory, file-embed, filepath, graphviz, HasCacBDD, hspec
+ , js-jquery, process, QuickCheck, scotty, tagged, template-haskell
+ , temporary, text, time
}:
mkDerivation {
pname = "smcdel";
- version = "1.0.0";
- sha256 = "1yi2qw76i9cch1flnqd7gsradkm2gr31i8595rwf11xgvj3r3s3f";
+ version = "1.1.0";
+ sha256 = "0dz1hbhf3y57cn4hh5s2fscnpw7zjnrl2hl644xl81vbpl1zbzyn";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- array base containers cudd graphviz HasCacBDD lens process
- QuickCheck tagged temporary text time
+ array base containers cudd graphviz HasCacBDD process QuickCheck
+ tagged temporary text time
];
executableHaskellDepends = [
ansi-terminal base directory file-embed filepath HasCacBDD
js-jquery process scotty template-haskell text
];
- executableToolDepends = [ alex happy ];
testHaskellDepends = [ base containers hspec QuickCheck ];
- benchmarkHaskellDepends = [ base containers criterion time ];
+ benchmarkHaskellDepends = [ base criterion time ];
description = "Symbolic Model Checking for Dynamic Epistemic Logic";
license = stdenv.lib.licenses.gpl2;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -218930,10 +221137,8 @@ self: {
}:
mkDerivation {
pname = "snap-core";
- version = "1.0.4.0";
- sha256 = "0dklxgrbqhnb6bc4ic358g4fyj11ywmjrkxxhqcjmci2hhpn00mr";
- revision = "1";
- editedCabalFile = "1nw74vpfag6gdh66kq82a0kdb05c2xnwcfacwlcg77j24gxcgi6s";
+ version = "1.0.4.1";
+ sha256 = "19dmfqbsfyk1rkjnnrnajpjfam2xjxgmpfmx10yr5qffgza7gcf0";
libraryHaskellDepends = [
attoparsec base bytestring bytestring-builder case-insensitive
containers directory filepath hashable HUnit io-streams lifted-base
@@ -220862,8 +223067,8 @@ self: {
({ mkDerivation, base, deepseq }:
mkDerivation {
pname = "some";
- version = "1.0.0.3";
- sha256 = "0c2y51gw94faafa0jvb3awnsvj89saan4ryy0d5dwivp0zp9gg64";
+ version = "1.0.1";
+ sha256 = "13dpvxswjcsmic8h2vayp77qzl820gg4g29g5n2xcja8gnzjkkii";
libraryHaskellDepends = [ base deepseq ];
testHaskellDepends = [ base ];
description = "Existential type: Some";
@@ -221026,6 +223231,26 @@ self: {
broken = true;
}) {};
+ "souffle-haskell" = callPackage
+ ({ mkDerivation, base, hspec, mtl, template-haskell
+ , type-errors-pretty
+ }:
+ mkDerivation {
+ pname = "souffle-haskell";
+ version = "0.0.1";
+ sha256 = "1sz5xaw24fknq4y9a9cpp36h6fm46ipclp3nwmpqpnc5svsslgbz";
+ libraryHaskellDepends = [
+ base mtl template-haskell type-errors-pretty
+ ];
+ testHaskellDepends = [
+ base hspec mtl template-haskell type-errors-pretty
+ ];
+ description = "Souffle Datalog bindings for Haskell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"sound-collage" = callPackage
({ mkDerivation, array, base, Cabal, carray, containers, fft
, filepath, numeric-prelude, optparse-applicative, pathtype
@@ -221231,8 +223456,8 @@ self: {
}:
mkDerivation {
pname = "spacecookie";
- version = "0.2.1.0";
- sha256 = "0a8zsywkmbw7rj4iin72l2zcbyzjb0yhpmz6bv226cn0x44iy1nc";
+ version = "0.2.1.1";
+ sha256 = "0l3knzsqab58yyk6kafpxxh465ncgqr2gi388k89gxwrlcqkl8wr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -221245,8 +223470,6 @@ self: {
];
description = "Gopher Library and Server Daemon";
license = stdenv.lib.licenses.gpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
- broken = true;
}) {};
"spacefill" = callPackage
@@ -222840,6 +225063,8 @@ self: {
];
description = "A file-packing application";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"sr-extra" = callPackage
@@ -223147,6 +225372,8 @@ self: {
libraryHaskellDepends = [ base gdp ghc-prim primitive ];
description = "shared heap regions between local mutable state threads";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"stable-heap" = callPackage
@@ -223273,8 +225500,8 @@ self: {
pname = "stache";
version = "2.1.0";
sha256 = "1q34h46px7miy2kx1yzaj785ai70mkchmijpdq2iih1fffir8kvk";
- revision = "1";
- editedCabalFile = "19vkvp6gkhld4lm8d87sicw63cd6d5awphyjpsdg9iha44j6sh11";
+ revision = "2";
+ editedCabalFile = "0vzby2q8qp6z74ighqalw05b94821cl9w6dbwy4hkgd67pc38nph";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base bytestring containers deepseq directory filepath
@@ -223623,6 +225850,24 @@ self: {
broken = true;
}) {};
+ "stack-wrapper" = callPackage
+ ({ mkDerivation, base, filepath, process }:
+ mkDerivation {
+ pname = "stack-wrapper";
+ version = "0.1.0";
+ sha256 = "002id9nd6lsg3hyy93ylj9x1jjdwrg2xhahsnp6m1igxq2yns0xr";
+ revision = "1";
+ editedCabalFile = "0biz4w2xrfj0bsb6xj0sjlrs567zvd207f1bkh7c265ip47gfhni";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base filepath process ];
+ executableHaskellDepends = [ base filepath process ];
+ description = "Call ghc within stack by calling ghc";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"stack-yaml" = callPackage
({ mkDerivation, base, bytestring, directory, doctest, filepath
, Glob, text, yaml
@@ -223640,18 +225885,25 @@ self: {
}) {};
"stack2cabal" = callPackage
- ({ mkDerivation, base, bytestring, Cabal, directory, extra
- , filepath, hpack, stackage-to-hackage, text
+ ({ mkDerivation, base, bytestring, Cabal, containers, directory
+ , extra, filepath, hpack, HsYAML, http-client, http-client-tls
+ , text
}:
mkDerivation {
pname = "stack2cabal";
- version = "1.0.3";
- sha256 = "1bmghzb866p3225ai3w4xxy3s2qic3vr4srcx7xb113qjvmadran";
- isLibrary = false;
+ version = "1.0.5";
+ sha256 = "15swq7rv997fh1qka7ga5hc90gc889xzkx61910jz3an6sy5zx0p";
+ revision = "1";
+ editedCabalFile = "15qc686alcfbxjpr7iyi2bxv801cmbkqvncpb6jd0879ll9lznrh";
+ isLibrary = true;
isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring Cabal containers directory extra filepath hpack
+ HsYAML http-client http-client-tls text
+ ];
executableHaskellDepends = [
- base bytestring Cabal directory extra filepath hpack
- stackage-to-hackage text
+ base bytestring Cabal containers directory extra filepath hpack
+ HsYAML http-client http-client-tls text
];
description = "Convert stack projects to cabal.project + cabal.project.freeze";
license = stdenv.lib.licenses.gpl3Plus;
@@ -223955,6 +226207,8 @@ self: {
pname = "stackage-to-hackage";
version = "1.1.1";
sha256 = "10zd3wqla54mfnwv65gklvmglhcpzhanqfka0l0ilnbkqlgx4acm";
+ revision = "3";
+ editedCabalFile = "07iflizm4w02w8samh5bcydd3jiqxhcwx2w5zylga8g1107cpaa3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -224137,8 +226391,8 @@ self: {
}:
mkDerivation {
pname = "standalone-haddock";
- version = "1.3.0.0";
- sha256 = "1s9b2frpsgvc7nghi314adga8z8rmj1x40j7cic2m3m88nqz3g77";
+ version = "1.4.0.0";
+ sha256 = "0ans74cbh592yramp50056n66cqn3fmyv4qkd1gz4awx6d6xryc1";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -224391,6 +226645,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "statestack_0_3" = callPackage
+ ({ mkDerivation, base, mtl, transformers, transformers-compat }:
+ mkDerivation {
+ pname = "statestack";
+ version = "0.3";
+ sha256 = "1b8yd314h8a97ggjv82cy4mr0f4scb5pjvslxq7hwxxq7cw7mgns";
+ libraryHaskellDepends = [
+ base mtl transformers transformers-compat
+ ];
+ description = "Simple State-like monad transformer with saveable and restorable state";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"statethread" = callPackage
({ mkDerivation, applicative, base, transformers }:
mkDerivation {
@@ -225747,7 +228015,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "store_0_6_0_1" = callPackage
+ "store_0_7_1" = callPackage
({ mkDerivation, array, async, base, base-orphans
, base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
, clock, containers, contravariant, criterion, cryptohash, deepseq
@@ -225761,8 +228029,8 @@ self: {
}:
mkDerivation {
pname = "store";
- version = "0.6.0.1";
- sha256 = "0h64fm3rrz6c5bhg1bk9hvl7invjh24mrh7db4dsx12hc8vlz17p";
+ version = "0.7.1";
+ sha256 = "0mxvyy7l0vg545f3v1y5kh7q58ajhwz02fhfk0km2198bhsdfrij";
libraryHaskellDepends = [
array async base base-orphans base64-bytestring bifunctors
bytestring containers contravariant cryptohash deepseq directory
@@ -225894,15 +228162,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "stratosphere_0_44_0" = callPackage
+ "stratosphere_0_46_0" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
, hashable, hspec, hspec-discover, lens, template-haskell, text
, unordered-containers
}:
mkDerivation {
pname = "stratosphere";
- version = "0.44.0";
- sha256 = "10brxs6hs8s0nb17aycbpn4xhiixxhxnv1wgmkc4jy0pbbrp942w";
+ version = "0.46.0";
+ sha256 = "07qm0bi5f3fkpnbsjbyi4qv2kp7w0wb7zd75q4cikjwkm1wxlldr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -226082,12 +228350,12 @@ self: {
}) {};
"streamdeck" = callPackage
- ({ mkDerivation, base, bytestring, hidapi, mtl }:
+ ({ mkDerivation, base, bytestring, hidapi, mtl, split }:
mkDerivation {
pname = "streamdeck";
- version = "0.0.3";
- sha256 = "1cjvdf9ld55pv7n9cx2c4rsczqjxkrx1mkci8aziz59bs2ipqhak";
- libraryHaskellDepends = [ base bytestring hidapi mtl ];
+ version = "0.1.0";
+ sha256 = "0dg5hmv61jnpqby4v5g4wpsb7ynsm56fmb3xj2pixswnzqz31ian";
+ libraryHaskellDepends = [ base bytestring hidapi mtl split ];
description = "Control library for the Elgato Stream Deck";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -226520,8 +228788,8 @@ self: {
}:
mkDerivation {
pname = "streaming-postgresql-simple";
- version = "0.2.0.3";
- sha256 = "1gy6yy14q18zfbbj6rvsnhvhkra78m2jwbyd3hnpbx25jgvz230n";
+ version = "0.2.0.4";
+ sha256 = "1qdfqp1w7pszks4iqbvgqsxmr2c6bx81jgkyz9k8wfz7vajg6f67";
libraryHaskellDepends = [
base bytestring exceptions postgresql-libpq postgresql-simple
resourcet safe-exceptions streaming transformers
@@ -226657,6 +228925,32 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "streamly_0_7_0" = callPackage
+ ({ mkDerivation, atomic-primops, base, containers, deepseq
+ , directory, exceptions, gauge, ghc-prim, heaps, hspec
+ , lockfree-queue, monad-control, mtl, network, QuickCheck, random
+ , transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "streamly";
+ version = "0.7.0";
+ sha256 = "1v9fndyh1bhdidwg9jpq4j10i5d1w9hw0rbhd69x8pd02gzqkpbh";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ atomic-primops base containers deepseq directory exceptions
+ ghc-prim heaps lockfree-queue monad-control mtl network
+ transformers transformers-base
+ ];
+ testHaskellDepends = [
+ base containers exceptions hspec mtl QuickCheck random transformers
+ ];
+ benchmarkHaskellDepends = [ base deepseq gauge random ];
+ description = "Beautiful Streaming, Concurrent and Reactive Composition";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"streamly-cassava" = callPackage
({ mkDerivation, base, bytestring, cassava, criterion, exceptions
, hspec, mtl, QuickCheck, quickcheck-instances, streaming
@@ -226683,6 +228977,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "streamly-fsnotify" = callPackage
+ ({ mkDerivation, base, fsnotify, paths, semirings, streamly, text
+ , time
+ }:
+ mkDerivation {
+ pname = "streamly-fsnotify";
+ version = "1.0.0.1";
+ sha256 = "0w81r0szdf4q8v6n389qlzwslhfwvjf0m9nihxsm1y0jgxbzy5cb";
+ libraryHaskellDepends = [
+ base fsnotify paths semirings streamly text time
+ ];
+ description = "Folder watching as a Streamly stream";
+ license = stdenv.lib.licenses.gpl3Plus;
+ }) {};
+
"streamproc" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -227508,8 +229817,8 @@ self: {
}:
mkDerivation {
pname = "strive";
- version = "5.0.8";
- sha256 = "0wfi3s8hv11xs0wpvbc9z4nsskdpg5q7ivcpci8cnhn20wffb0nn";
+ version = "5.0.9";
+ sha256 = "1022ir4m0r43717rdb1miynd61mfkfd3mp0dcv5ryb983znn3ag2";
libraryHaskellDepends = [
aeson base bytestring data-default gpolyline http-client
http-client-tls http-types template-haskell text time transformers
@@ -227575,8 +229884,8 @@ self: {
pname = "structs";
version = "0.1.2";
sha256 = "0myv13g48y8vn397lvg45lb942fmw4n9gs80v5nnjfvgika7qbw4";
- revision = "1";
- editedCabalFile = "1snsprlbv9npn06iliy937vxqpsjpcmv880bnkbzj3nz4c6c59pa";
+ revision = "2";
+ editedCabalFile = "0ma2s0by622kaq7p57g859pxha02bqrd7n86cczfb2gzcm7kqma7";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
base deepseq ghc-prim primitive template-haskell
@@ -227841,8 +230150,8 @@ self: {
}:
mkDerivation {
pname = "stylish-haskell";
- version = "0.9.4.3";
- sha256 = "152nzxalmkmsk06i9jhbx1mjqyb0ws96gr5xl3blmyhqiyfc81a6";
+ version = "0.9.4.4";
+ sha256 = "1399q6chjhnyf2vifmwp3cw8253ra762wm5873ndjjd2z6da8gg2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -227864,18 +230173,18 @@ self: {
"stylist" = callPackage
({ mkDerivation, base, css-syntax, hashable, hspec, network-uri
- , QuickCheck, text, unordered-containers
+ , QuickCheck, scientific, text, unordered-containers
}:
mkDerivation {
pname = "stylist";
- version = "1.0.0.0";
- sha256 = "0lh8x8wqq4rsy4zn025qhs6jr9iaw65xqpbrk233h620prj23525";
+ version = "1.1.0.0";
+ sha256 = "1sgfyslbsppndgbywlqynzfxd63y6vr9mig6d76czh427qvn7qpp";
libraryHaskellDepends = [
base css-syntax hashable network-uri text unordered-containers
];
testHaskellDepends = [
- base css-syntax hashable hspec network-uri QuickCheck text
- unordered-containers
+ base css-syntax hashable hspec network-uri QuickCheck scientific
+ text unordered-containers
];
description = "Apply CSS styles to a document tree";
license = stdenv.lib.licenses.mit;
@@ -228906,8 +231215,8 @@ self: {
pname = "svg-builder";
version = "0.1.1";
sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g";
- revision = "1";
- editedCabalFile = "1bhp9gvid2iis411k1vvyj5krzc4ahxcqcd9cwx9h37jxg180xw1";
+ revision = "2";
+ editedCabalFile = "100nmkgcm1ncv4mkr1xcsa7bb3z6zx0lfayk8innd4hm62xsvhj3";
libraryHaskellDepends = [
base blaze-builder bytestring hashable text unordered-containers
];
@@ -229173,6 +231482,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "swagger2_2_5" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries
+ , bytestring, Cabal, cabal-doctest, containers, cookie, doctest
+ , generics-sop, Glob, hashable, hspec, hspec-discover, http-media
+ , HUnit, insert-ordered-containers, lens, mtl, network, optics-core
+ , optics-th, QuickCheck, quickcheck-instances, scientific
+ , template-haskell, text, time, transformers, transformers-compat
+ , unordered-containers, utf8-string, uuid-types, vector
+ }:
+ mkDerivation {
+ pname = "swagger2";
+ version = "2.5";
+ sha256 = "0ywj4536daz43vrxibqn271gq96bzkawx3qcwbm547315jfd4fqf";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ aeson aeson-pretty base base-compat-batteries bytestring containers
+ cookie generics-sop hashable http-media insert-ordered-containers
+ lens mtl network optics-core optics-th QuickCheck scientific
+ template-haskell text time transformers transformers-compat
+ unordered-containers uuid-types vector
+ ];
+ testHaskellDepends = [
+ aeson base base-compat-batteries bytestring containers doctest Glob
+ hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
+ quickcheck-instances template-haskell text time
+ unordered-containers utf8-string vector
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Swagger 2.0 data model";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"swapper" = callPackage
({ mkDerivation, base, binary, bytestring, deepseq, happstack-data
, happstack-state, parallel, tokyocabinet
@@ -229337,8 +231679,8 @@ self: {
}:
mkDerivation {
pname = "syb-with-class";
- version = "0.6.1.11";
- sha256 = "0fgmcxhrhcjcv5nmb5irp6mqcwknpk15azzd0qhajwx8mqpw6b8l";
+ version = "0.6.1.12";
+ sha256 = "1cxy0mph0kqdi3hzy5x3c754a3sjdn14x64ga4bkhvzi6iwbfcq0";
libraryHaskellDepends = [
array base bytestring containers template-haskell
];
@@ -230268,8 +232610,8 @@ self: {
}:
mkDerivation {
pname = "synthesizer-llvm";
- version = "0.8.2";
- sha256 = "0vf0p1ajs7k327cc1dwm6ja2qyby865g1bqc6mzrjn826dv2vric";
+ version = "0.8.2.1";
+ sha256 = "0bgla347pfdaai41rp9jny2k1hv0k1s8jdmqhd54v5c60cxl6p9l";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -231130,8 +233472,8 @@ self: {
pname = "tagged";
version = "0.8.6";
sha256 = "1pciqzxf9ncv954v4r527xkxkn7r5hcr13mfw5dg1xjci3qdw5md";
- revision = "1";
- editedCabalFile = "070xwfw7y81hd63il76dmwbdl9ca1rd07c54zynfx6vpr4wyx4vh";
+ revision = "2";
+ editedCabalFile = "1y8z8hmm846z7h3wqncpi0d4zhsnkwf08q0wchivkjw8di7ahz0z";
libraryHaskellDepends = [
base deepseq template-haskell transformers
];
@@ -231425,8 +233767,8 @@ self: {
}:
mkDerivation {
pname = "tagsoup-navigate";
- version = "0.1.0.2";
- sha256 = "16n0s9vpwrnbknm9yfsh3qv2j3k1h579fwfqjbr1kzjn40729348";
+ version = "0.1.0.4";
+ sha256 = "1mds95a0xz3iklidmvczjpmm9vjhzdrdvcj3dg0n3ivwwli672m9";
libraryHaskellDepends = [
base deriving-compat lens mmorph mtl semigroupoids semigroups
tagsoup tagsoup-selection transformers
@@ -231797,6 +234139,8 @@ self: {
pname = "tar";
version = "0.5.1.1";
sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k";
+ revision = "1";
+ editedCabalFile = "1ni8zym7k6f1hg6wfvnnf3xcs2ar3z8xaabkgjg8q329arjcm8wp";
libraryHaskellDepends = [
array base bytestring containers deepseq directory filepath time
];
@@ -232024,6 +234368,28 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "taskwarrior" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, hspec, hspec-discover
+ , process, QuickCheck, quickcheck-instances, random
+ , string-interpolate, text, time, unordered-containers, uuid
+ }:
+ mkDerivation {
+ pname = "taskwarrior";
+ version = "0.1.1.0";
+ sha256 = "1vr25n4q4rb5z760dpd247h3z6r8ydqgg5z5hihmps1vhazvxa8c";
+ libraryHaskellDepends = [
+ aeson base bytestring process random string-interpolate text time
+ unordered-containers uuid
+ ];
+ testHaskellDepends = [
+ aeson base hspec QuickCheck quickcheck-instances text time
+ unordered-containers uuid
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Types and aeson instances for taskwarrior tasks";
+ license = stdenv.lib.licenses.agpl3Plus;
+ }) {};
+
"tasty" = callPackage
({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
, optparse-applicative, stm, tagged, unbounded-delays, unix
@@ -232470,18 +234836,18 @@ self: {
}) {};
"tasty-rerun" = callPackage
- ({ mkDerivation, base, containers, mtl, optparse-applicative
- , reducers, split, stm, tagged, tasty, transformers
+ ({ mkDerivation, base, containers, mtl, optparse-applicative, split
+ , stm, tagged, tasty, transformers
}:
mkDerivation {
pname = "tasty-rerun";
- version = "1.1.14";
- sha256 = "0s0zj8ds4g1w2cjzm2lh25ivg962jigqdrbj08v3dbz64lx4mlzr";
+ version = "1.1.15";
+ sha256 = "008pwf3mqn18vxzxym6zbfm7kf4g415g3722r41vdbh972xkz3w2";
libraryHaskellDepends = [
- base containers mtl optparse-applicative reducers split stm tagged
- tasty transformers
+ base containers mtl optparse-applicative split stm tagged tasty
+ transformers
];
- description = "Run tests by filtering the test tree depending on the result of previous test runs";
+ description = "Rerun only tests which failed in a previous test run";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -232542,14 +234908,16 @@ self: {
}:
mkDerivation {
pname = "tasty-tap";
- version = "0.0.4";
- sha256 = "0xgz5qyvaabj13jnb5ry1i05c9lldnhaqnyxd9sz7kbvdwsycpn8";
+ version = "0.1.0";
+ sha256 = "16i7pd0xis1fyqgmsy4mq04y87ny61dh2lddnjijcf1s9jz9b6x8";
libraryHaskellDepends = [ base containers stm tasty ];
testHaskellDepends = [
base directory tasty tasty-golden tasty-hunit
];
description = "TAP (Test Anything Protocol) Version 13 formatter for tasty";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"tasty-test-vector" = callPackage
@@ -232585,8 +234953,8 @@ self: {
}:
mkDerivation {
pname = "tasty-tmux";
- version = "0.1.0.1";
- sha256 = "07jx1ik8bmirc6ycimzv763kfqvhi712ivk32npw5iprpn94k6h2";
+ version = "0.1.0.2";
+ sha256 = "0lksanhb1nsk45vqg1h9jigllfg0lrqsynxkplh8lyx6g8k0naav";
libraryHaskellDepends = [
base bytestring mtl regex-posix tasty tasty-hunit text
typed-process
@@ -232886,8 +235254,8 @@ self: {
pname = "tdigest-Chart";
version = "0.2";
sha256 = "1ciq7d187as9sk1dpccm2s02b6jdhij1l477wff0a7labgw21l0l";
- revision = "1";
- editedCabalFile = "1095k2sgyjd5m38j1qxa1df9izzdpjl80lrsmwhjm1jw4lmk8cys";
+ revision = "2";
+ editedCabalFile = "07fg2pnj06vz2cwyxqyx40ghd0d7p9byazds7lhim4z397gngk0f";
libraryHaskellDepends = [
base base-compat Chart colour lens semigroupoids tdigest
];
@@ -233940,8 +236308,8 @@ self: {
}:
mkDerivation {
pname = "terminal-punch";
- version = "0.1.1";
- sha256 = "11z6jb130300yjkrl511960anjac9ncc3g1yj6jqpah6j2imsa8s";
+ version = "0.1.3";
+ sha256 = "1hc8gl0bjrz8h9nfrvlkxbkgys62xr7mcdk22lm8dc1cl8y42nkv";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -234033,12 +236401,12 @@ self: {
, hedgehog, inline-c, lens, mono-traversable, pcre2, pretty-simple
, QuickCheck, singletons, tasty, tasty-hedgehog, tasty-hspec
, template-haskell, text, transformers, vte_291, xml-conduit
- , xml-html-qq
+ , xml-html-qq, yaml
}:
mkDerivation {
pname = "termonad";
- version = "2.1.0.0";
- sha256 = "0acw3qkph2j5vxl1zw4g21z6xn3w8r6q0v6wpnavd3drzyvw6hyn";
+ version = "3.0.0.0";
+ sha256 = "11c58k6iyqry5dfdbxsvmca19w10igb4yd1nk2ap6h7zsav2rjgn";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -234049,6 +236417,7 @@ self: {
focuslist gi-gdk gi-gio gi-glib gi-gtk gi-pango gi-vte
haskell-gi-base inline-c lens mono-traversable pretty-simple
QuickCheck singletons text transformers xml-conduit xml-html-qq
+ yaml
];
libraryPkgconfigDepends = [ gtk3 pcre2 vte_291 ];
executableHaskellDepends = [ base ];
@@ -234058,6 +236427,7 @@ self: {
];
description = "Terminal emulator configurable in Haskell";
license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
}) {inherit (pkgs) gtk3; inherit (pkgs) pcre2;
vte_291 = pkgs.vte;};
@@ -234136,6 +236506,29 @@ self: {
broken = true;
}) {};
+ "tesla" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, casing, containers
+ , generic-deriving, HUnit, lens, lens-aeson, mtl, tasty
+ , tasty-hunit, tasty-quickcheck, template-haskell, text, time
+ , vector, wreq
+ }:
+ mkDerivation {
+ pname = "tesla";
+ version = "0.1.0.0";
+ sha256 = "1asifxkc73n8g30qmr1nr83vpvgx8smi505322n9sknlb1hadgms";
+ libraryHaskellDepends = [
+ aeson base bytestring casing containers generic-deriving lens
+ lens-aeson mtl template-haskell text time vector wreq
+ ];
+ testHaskellDepends = [
+ aeson base bytestring casing containers generic-deriving HUnit lens
+ lens-aeson mtl tasty tasty-hunit tasty-quickcheck template-haskell
+ text time vector wreq
+ ];
+ description = "Tesla API client";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"test-fixture" = callPackage
({ mkDerivation, base, data-default-class, exceptions
, haskell-src-exts, haskell-src-meta, hspec, hspec-discover, mtl
@@ -234812,6 +237205,29 @@ self: {
license = stdenv.lib.licenses.gpl2;
}) {};
+ "texmath_0_12" = callPackage
+ ({ mkDerivation, base, bytestring, containers, directory, filepath
+ , mtl, pandoc-types, parsec, process, syb, temporary, text
+ , utf8-string, xml
+ }:
+ mkDerivation {
+ pname = "texmath";
+ version = "0.12";
+ sha256 = "09c1ga3nw0r0wcw84lf862mp02h5ykhprm2wawrqfhklfyl1a6ay";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base containers mtl pandoc-types parsec syb text xml
+ ];
+ testHaskellDepends = [
+ base bytestring directory filepath process temporary text
+ utf8-string xml
+ ];
+ description = "Conversion between formats used to represent mathematics";
+ license = stdenv.lib.licenses.gpl2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"texrunner" = callPackage
({ mkDerivation, attoparsec, base, bytestring, directory, filepath
, HUnit, io-streams, lens, mtl, process, semigroups, temporary
@@ -234821,8 +237237,8 @@ self: {
pname = "texrunner";
version = "0.0.1.2";
sha256 = "1fxyxwgvn0rxhkl1fs2msr88jqwx5wwfnjsjlcankrwcn7gyk7jy";
- revision = "1";
- editedCabalFile = "137bbyxrrg9yn1060aqkamdk1mb7x12nwndradwp57057ix79fp4";
+ revision = "2";
+ editedCabalFile = "0zv8xp8z2gx9zjqn1f81hri4hn0bws7cq39g5i2g2axrkm9nwj5q";
libraryHaskellDepends = [
attoparsec base bytestring directory filepath io-streams mtl
process semigroups temporary
@@ -235504,6 +237920,37 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "text-show_3_8_3" = callPackage
+ ({ mkDerivation, array, base, base-compat-batteries, base-orphans
+ , bifunctors, bytestring, bytestring-builder, containers, criterion
+ , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim
+ , hspec, hspec-discover, integer-gmp, QuickCheck
+ , quickcheck-instances, template-haskell, text, th-abstraction
+ , th-lift, transformers, transformers-compat
+ }:
+ mkDerivation {
+ pname = "text-show";
+ version = "3.8.3";
+ sha256 = "1l4mg4vgdixhpsncqyf9xq7nw0dskcd41hg4rb12s2623sjdxb2p";
+ libraryHaskellDepends = [
+ array base base-compat-batteries bifunctors bytestring
+ bytestring-builder containers generic-deriving ghc-boot-th ghc-prim
+ integer-gmp template-haskell text th-abstraction th-lift
+ transformers transformers-compat
+ ];
+ testHaskellDepends = [
+ array base base-compat-batteries base-orphans bytestring
+ bytestring-builder deriving-compat generic-deriving ghc-prim hspec
+ QuickCheck quickcheck-instances template-haskell text transformers
+ transformers-compat
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
+ description = "Efficient conversion of values into Text";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"text-show-instances" = callPackage
({ mkDerivation, base, base-compat-batteries, bifunctors, binary
, containers, directory, generic-deriving, ghc-boot-th, ghc-prim
@@ -235515,8 +237962,8 @@ self: {
}:
mkDerivation {
pname = "text-show-instances";
- version = "3.8.2";
- sha256 = "075a2dzbdkh13q9a1w4v0dm40rqrv1wq8nsqh4g4872h29df5mka";
+ version = "3.8.3";
+ sha256 = "11v335p3wzf9ijqlkls5mk4m16dfak8fckn4gj7mahs8c7l9lm5d";
libraryHaskellDepends = [
base base-compat-batteries bifunctors binary containers directory
ghc-boot-th haskeline hpc old-locale old-time pretty random
@@ -235887,6 +238334,8 @@ self: {
pname = "th-abstraction";
version = "0.3.1.0";
sha256 = "1f81w0gshvc816cf9qz0f19jsrzh6wpzmmy317xrgn63dv61p7jb";
+ revision = "1";
+ editedCabalFile = "1c0sy614vfcdvshn0z09nzfiq89v5if31yvvpxzrivrdy9gf912s";
libraryHaskellDepends = [
base containers ghc-prim template-haskell
];
@@ -236123,8 +238572,8 @@ self: {
}:
mkDerivation {
pname = "th-format";
- version = "0.1.2.0";
- sha256 = "1wc9ndqv2qxk75b47s44j0lrx5h9hc1r4h1nvl01pbdks6yyi43j";
+ version = "0.1.3.0";
+ sha256 = "0ckyf5r5sz3x8ixj5nclqsi6ifk7zz08b6wf09gbwb4gbydklw7c";
libraryHaskellDepends = [
base Earley haskell-src-meta template-haskell text
];
@@ -236230,8 +238679,8 @@ self: {
}:
mkDerivation {
pname = "th-lift";
- version = "0.8.0.1";
- sha256 = "1a6qlbdg15cfr5rvl9g3blgwx4v1p0xic0pzv13zx165xbc36ld0";
+ version = "0.8.1";
+ sha256 = "1msyisgn30l2sd7jagab38r8q9mbi4phmqk4g3fddn4l6wcz989z";
libraryHaskellDepends = [
base ghc-prim template-haskell th-abstraction
];
@@ -236280,6 +238729,8 @@ self: {
pname = "th-orphans";
version = "0.13.9";
sha256 = "1xj1gssv77hdx1r3ndg8k49v3ipj3a6r7crkyvx13jrps3m6ng1z";
+ revision = "1";
+ editedCabalFile = "100gpi0np50vxlapyl6d05w8ss9l2gqacn28i228hsvhvrxxwjdy";
libraryHaskellDepends = [
base mtl template-haskell th-lift th-lift-instances th-reify-many
];
@@ -236396,14 +238847,14 @@ self: {
"th-tc" = callPackage
({ mkDerivation, base, containers, lens, mtl, template-haskell
- , transformers
+ , th-orphans, transformers
}:
mkDerivation {
pname = "th-tc";
- version = "0.1.1.0";
- sha256 = "0i2j3iwr5az4hmxhnanh6zrvi1k51jjmwaly4z3rw3h4n717qa2m";
+ version = "0.2.1.0";
+ sha256 = "1wgvglb6k73mslrw1whxyqgxp90l042lm4865qdgvvbli5gk5dva";
libraryHaskellDepends = [
- base containers lens mtl template-haskell transformers
+ base containers lens mtl template-haskell th-orphans transformers
];
description = "Typechecking in Template Haskell";
license = stdenv.lib.licenses.bsd3;
@@ -237042,8 +239493,8 @@ self: {
}:
mkDerivation {
pname = "thrift";
- version = "0.12.0";
- sha256 = "1yzfq671apw3mjaws16a6agjw3vpm7yz0gdp3kyh8vvbp5d0czyf";
+ version = "0.13.0";
+ sha256 = "005gaw3n548l7ij8m2di2b7nmfz2sg6nhafb3xjccw9wgwzl9qs2";
libraryHaskellDepends = [
attoparsec base base64-bytestring binary bytestring containers
ghc-prim hashable hspec-core HTTP network network-uri QuickCheck
@@ -237285,10 +239736,8 @@ self: {
}:
mkDerivation {
pname = "tibetan-utils";
- version = "0.1.1.10";
- sha256 = "11bzcan2vfhdz6lwfvfgiyycqf30p4kdkzn47pm4ydr6bbpz8aia";
- revision = "1";
- editedCabalFile = "0gm271p3m3y0x9lfi5yviznqfr65f0if553z6h977dqk3f3psyfd";
+ version = "0.1.2.0";
+ sha256 = "1bw10jahy0s9ai6ryfdx58jzjib146x7kzqkg65z71brvm0cliza";
libraryHaskellDepends = [
base composition-prelude megaparsec text
];
@@ -237374,8 +239823,8 @@ self: {
}:
mkDerivation {
pname = "tidal";
- version = "1.4.4";
- sha256 = "0ibaq9gyn0iz00jsdmifw5fcj4f01l6z8ds13gxz365r1wgcn2pj";
+ version = "1.4.5";
+ sha256 = "146nhi2y8c5acqmkhgh4f1bb3wrasba0i1w4v2vwnbznpdv6cxs1";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base bifunctors bytestring clock colour containers deepseq hosc
@@ -238254,8 +240703,8 @@ self: {
({ mkDerivation, base, hspec }:
mkDerivation {
pname = "timers-tick";
- version = "0.4.1.0";
- sha256 = "1dbkgsvzfxgf4cgkzlmn1dcjw3rb7rrx56ix7n5r1k42n0wsyfsg";
+ version = "0.4.2.0";
+ sha256 = "079pgfgpgdmn9yqyd81rz615a035zjw24na8q332m1ld51xc0n8f";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base hspec ];
description = "tick based timers";
@@ -238999,27 +241448,37 @@ self: {
broken = true;
}) {};
- "tmp-postgres_1_0_0_1" = callPackage
- ({ mkDerivation, async, base, bytestring, directory, either
- , generic-monoid, hspec, hspec-discover, mtl, network, port-utils
- , postgres-options, postgresql-libpq, postgresql-simple
- , postgresql-simple-opts, process, temporary, transformers, unix
+ "tmp-postgres_1_31_0_1" = callPackage
+ ({ mkDerivation, ansi-wl-pprint, async, base, base64-bytestring
+ , bytestring, containers, criterion, cryptohash-sha1, deepseq
+ , directory, generic-monoid, hspec, mtl, network, port-utils
+ , postgres-options, postgresql-simple, process, stm, temporary
+ , transformers, unix
}:
mkDerivation {
pname = "tmp-postgres";
- version = "1.0.0.1";
- sha256 = "0i777dhx58fwg9m3f4q25bxg5s21rvbg3yqwhfx39zh4pj34pin2";
+ version = "1.31.0.1";
+ sha256 = "0nlg0hi0rcfk77jm927i1w63mh4x9y1p4j3fqbd13c2a6pg084vw";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
- async base bytestring directory either generic-monoid network
- port-utils postgres-options postgresql-simple
- postgresql-simple-opts process temporary transformers unix
+ ansi-wl-pprint async base base64-bytestring bytestring containers
+ cryptohash-sha1 deepseq directory generic-monoid port-utils
+ postgres-options postgresql-simple process stm temporary
+ transformers unix
+ ];
+ executableHaskellDepends = [
+ async base directory postgres-options postgresql-simple process
+ temporary
];
testHaskellDepends = [
- base bytestring directory either hspec hspec-discover mtl
- postgres-options postgresql-libpq postgresql-simple
- postgresql-simple-opts process temporary transformers unix
+ base containers directory generic-monoid hspec mtl network
+ port-utils postgres-options postgresql-simple process temporary
+ unix
+ ];
+ benchmarkHaskellDepends = [
+ base criterion deepseq postgres-options postgresql-simple temporary
];
- testToolDepends = [ hspec-discover ];
description = "Start and stop a temporary postgres";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -239257,9 +241716,14 @@ self: {
}:
mkDerivation {
pname = "token-limiter";
- version = "0.1.0.0";
- sha256 = "1ypvc44h68kshy4nsngxhqip6040cabrf6nf6p48ccav3s5497a2";
+ version = "0.2.0.3";
+ sha256 = "0gplyhx8wicha8j56khiw7992bm1qx7hbckicpfrd1qc94h3iyiy";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [ base clock ghc-prim ];
+ executableHaskellDepends = [
+ async base clock QuickCheck tasty tasty-hunit text
+ ];
testHaskellDepends = [
async base clock QuickCheck tasty tasty-hunit text
];
@@ -239422,8 +241886,8 @@ self: {
pname = "toml-parser";
version = "0.1.0.0";
sha256 = "0p1nl3009qlcqn4jjggbm1v719a6bswklkyjb3plm0cz3bsyr0fs";
- revision = "1";
- editedCabalFile = "0w5vpr6gh0671znv3k90gy9fzjvxzn3g7bir2c6z27ks6y39w0qf";
+ revision = "2";
+ editedCabalFile = "02vblwkja1in6fi3zbvxmw6k1c0zny9jljiis0krvn94h2rdflwd";
libraryHaskellDepends = [ array base text time ];
libraryToolDepends = [ alex happy ];
description = "Parser for the TOML configuration language";
@@ -239466,7 +241930,7 @@ self: {
license = stdenv.lib.licenses.mpl20;
}) {};
- "tomland_1_2_0_0" = callPackage
+ "tomland_1_2_1_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, directory
, hashable, hedgehog, hspec-megaparsec, markdown-unlit, megaparsec
, mtl, parser-combinators, tasty, tasty-discover, tasty-hedgehog
@@ -239475,8 +241939,10 @@ self: {
}:
mkDerivation {
pname = "tomland";
- version = "1.2.0.0";
- sha256 = "1kwrp12x2gyb3syijrd2jbx7sd13p78aq2nspnfff453ki17z8zf";
+ version = "1.2.1.0";
+ sha256 = "0bzwmk3zw2lzhppgr73b5v3i4qz0hxn1zag665vpakq6knssj7qy";
+ revision = "1";
+ editedCabalFile = "00lb4ivrqrj5yqnfz5ji3vjaa284img9xhkjvrzc291bs83vl4kr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -239890,10 +242356,10 @@ self: {
({ mkDerivation, base, containers, semiring-num }:
mkDerivation {
pname = "total-map";
- version = "0.1.0";
- sha256 = "0fqgazhs3ppv4ywdxjrhrdzp5z1szgkq4l0lqpbzqwrhi7axgl69";
+ version = "0.1.3";
+ sha256 = "015bj6g4hjp38fc8bm5z57w6akdgvyab6j2sc666x0qdxgrdwp88";
libraryHaskellDepends = [ base containers semiring-num ];
- description = "Finitely represented /total/ maps";
+ description = "Finitely represented total maps";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
@@ -240141,19 +242607,19 @@ self: {
}) {};
"tptp" = callPackage
- ({ mkDerivation, attoparsec, base, Cabal, directory, doctest, extra
+ ({ mkDerivation, attoparsec, base, Cabal, directory, extra
, generic-random, prettyprinter, QuickCheck, scientific, text
}:
mkDerivation {
pname = "tptp";
- version = "0.1.0.3";
- sha256 = "1h00g4263akyfgirvdw5ylbiskl3hhrx58jar59blj57k0i969wi";
+ version = "0.1.1.0";
+ sha256 = "0cwjl8531zzl9mmgp7hq9jr9i9m32yf2j016v2p6h3r93kysbhrf";
libraryHaskellDepends = [
attoparsec base prettyprinter scientific text
];
testHaskellDepends = [
- attoparsec base Cabal directory doctest extra generic-random
- prettyprinter QuickCheck scientific text
+ attoparsec base Cabal directory extra generic-random prettyprinter
+ QuickCheck scientific text
];
description = "A parser and a pretty printer for the TPTP language";
license = stdenv.lib.licenses.gpl3;
@@ -241013,8 +243479,8 @@ self: {
}:
mkDerivation {
pname = "traverse-with-class";
- version = "1.0.0.0";
- sha256 = "1fqz35kaffq79qs7kgdx2bml2a99x6k87hlczsfjcs1bcpqj18k5";
+ version = "1.0.1.0";
+ sha256 = "1yni197sxfpsjvjablhn8mjqpp1mz0v30r73f9ncs3pjcl93g6yn";
libraryHaskellDepends = [ base template-haskell transformers ];
testHaskellDepends = [ base tasty tasty-hunit ];
description = "Generic applicative traversals";
@@ -241191,8 +243657,8 @@ self: {
}:
mkDerivation {
pname = "tree-sitter";
- version = "0.5.0.0";
- sha256 = "0gf2mcrrib4id0374hs9mf24g09d4rz7nrrgf92ls7b8279xvjkd";
+ version = "0.7.1.0";
+ sha256 = "1xbgii27xn858373nly4q73y1ghrpv069pxjd5bc30rff611rqvz";
libraryHaskellDepends = [
aeson base bytestring containers directory filepath fused-effects
semantic-source split template-haskell text unordered-containers
@@ -241208,8 +243674,8 @@ self: {
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-go";
- version = "0.2.0.1";
- sha256 = "1l1phqnsfsi47pqcjn84i8pqxfyslnrhw8an9g6fxx21gc6sdn45";
+ version = "0.3.0.0";
+ sha256 = "07r8dlx8r3g1sdc23w544clb658wiw5rjl33m967li5sq7g1w1aj";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Go";
@@ -241235,26 +243701,35 @@ self: {
}) {};
"tree-sitter-java" = callPackage
- ({ mkDerivation, base, template-haskell, tree-sitter }:
+ ({ mkDerivation, base, bytestring, pathtype, semantic-source, tasty
+ , tasty-hunit, template-haskell, text, tree-sitter
+ , tree-sitter-test-helpers
+ }:
mkDerivation {
pname = "tree-sitter-java";
- version = "0.4.0.0";
- sha256 = "0v8mw4slp6rgyw2h3qpqkjqs13kg8dcigq7014dh77h804plk0w7";
+ version = "0.6.0.0";
+ sha256 = "1jz740pj2ihmkf06ixii93msfn40lh5mky3qc5bvwk5xqf4ai716";
enableSeparateDataOutput = true;
- libraryHaskellDepends = [ base template-haskell tree-sitter ];
+ libraryHaskellDepends = [
+ base semantic-source template-haskell tree-sitter
+ ];
+ testHaskellDepends = [
+ base bytestring pathtype tasty tasty-hunit text tree-sitter
+ tree-sitter-test-helpers
+ ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Java";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {};
+ }) {tree-sitter-test-helpers = null;};
"tree-sitter-json" = callPackage
({ mkDerivation, base, template-haskell, text, tree-sitter }:
mkDerivation {
pname = "tree-sitter-json";
- version = "0.3.0.0";
- sha256 = "09489gikbmddw28ckgf6mg526j43386sdilvb7gzs5x9kc86sd4q";
+ version = "0.5.0.0";
+ sha256 = "1mq1v81d00l80pg6mji9w1g464hxvgv28djnxany5vy2g38ns7q9";
enableSeparateDataOutput = true;
libraryHaskellDepends = [ base template-haskell text tree-sitter ];
doHaddock = false;
@@ -241270,6 +243745,8 @@ self: {
pname = "tree-sitter-php";
version = "0.2.0.1";
sha256 = "0dxszds10fr3zp1vjcj18b44mv6hmbzskmai14x03zgimxgwwaqm";
+ revision = "1";
+ editedCabalFile = "0k5qq7m0m3imgyhwyakrfjzxf5pjw6p7p3iwm01bj96ya8iy71ia";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for PHP";
@@ -241280,31 +243757,36 @@ self: {
"tree-sitter-python" = callPackage
({ mkDerivation, aeson, base, bytestring, directory, filepath
- , hedgehog, semantic-source, template-haskell, tree-sitter
+ , hedgehog, pathtype, semantic-source, tasty, tasty-hedgehog
+ , tasty-hunit, template-haskell, text, tree-sitter
+ , tree-sitter-test-helpers
}:
mkDerivation {
pname = "tree-sitter-python";
- version = "0.6.0.0";
- sha256 = "041qrxdkn19x9h0vcjb0jvc6d0mp6ysdak7i4yqqww683npxjkp1";
+ version = "0.8.0.0";
+ sha256 = "08a698qqjck0nml11nrgyzvgrjbkanyvfv0x0bqng0w3mjk62yf0";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson base directory filepath semantic-source template-haskell
tree-sitter
];
- testHaskellDepends = [ base bytestring hedgehog tree-sitter ];
+ testHaskellDepends = [
+ base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
+ text tree-sitter tree-sitter-test-helpers
+ ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Python";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
- }) {};
+ }) {tree-sitter-test-helpers = null;};
"tree-sitter-ruby" = callPackage
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-ruby";
- version = "0.2.0.1";
- sha256 = "1rk49pm93avr9fap8xim7zl26wms50q2f5x2yp9nq5w3mbm3j3sc";
+ version = "0.3.1.0";
+ sha256 = "0kndnmnhfff4d936irvsc545x3npxqspf21qwwqwn4c5n3ispv2p";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for Ruby";
@@ -241317,8 +243799,8 @@ self: {
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-tsx";
- version = "0.2.1.1";
- sha256 = "1r4kr4c0vslw3j2hanzf8wifabfynz5brayd6kz1hpczg8icandm";
+ version = "0.3.0.0";
+ sha256 = "029dapll3jw4m0fxmbxn3nj4jgi8j777ajyc8zx8m2f12zly3y5i";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for TSX";
@@ -241331,8 +243813,8 @@ self: {
({ mkDerivation, base, template-haskell, tree-sitter }:
mkDerivation {
pname = "tree-sitter-typescript";
- version = "0.2.1.1";
- sha256 = "0i8vnc0afqnf8lnl8rmsax6b9pfx3s14s8q35f0h3ghpv9b38bs6";
+ version = "0.3.0.0";
+ sha256 = "0gkhbsmrjkf6q4bwlhws2zmnkhjval7qrbvqlcnmmvx384aiis72";
libraryHaskellDepends = [ base template-haskell tree-sitter ];
doHaddock = false;
description = "Tree-sitter grammar/parser for TypeScript";
@@ -241345,8 +243827,8 @@ self: {
({ mkDerivation, base, containers, doctest, mtl }:
mkDerivation {
pname = "tree-traversals";
- version = "0.1.0.0";
- sha256 = "0wdy1p94096qdc00w8pmbz6qcawc0ivlhy0sg0b3jir0s2ksdccb";
+ version = "0.1.1.0";
+ sha256 = "0wsa4qxlxk6308smv957by8fmnsnsxnxxga8c66bvnhlr95rg9rk";
libraryHaskellDepends = [ base containers ];
testHaskellDepends = [ base containers doctest mtl ];
description = "Functions and newtype wrappers for traversing Trees";
@@ -242083,6 +244565,22 @@ self: {
broken = true;
}) {};
+ "ttc" = callPackage
+ ({ mkDerivation, base, bytestring, tasty, tasty-hunit
+ , template-haskell, text
+ }:
+ mkDerivation {
+ pname = "ttc";
+ version = "0.1.0.1";
+ sha256 = "12c781fsa1i2iw03ysdh5fpg0912w9kmzgixzq16kb4mdb0crq30";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base bytestring template-haskell text ];
+ testHaskellDepends = [ base bytestring tasty tasty-hunit text ];
+ description = "Textual Type Classes";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"ttl-hashtables" = callPackage
({ mkDerivation, base, clock, containers, data-default, failable
, hashable, hashtables, hspec, mtl, transformers
@@ -242983,6 +245481,29 @@ self: {
broken = true;
}) {};
+ "twirp" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, http-media, http-types
+ , proto-lens, proto-lens-jsonpb, proto-lens-runtime, servant, text
+ , wai
+ }:
+ mkDerivation {
+ pname = "twirp";
+ version = "0.2.0.0";
+ sha256 = "00dc6bil998fdvb5p0r2782cy3nknw6s8k5a0cv4yqmha4iyn32m";
+ libraryHaskellDepends = [
+ aeson base bytestring http-media http-types proto-lens
+ proto-lens-jsonpb proto-lens-runtime servant text wai
+ ];
+ testHaskellDepends = [
+ aeson base bytestring http-media http-types proto-lens
+ proto-lens-jsonpb proto-lens-runtime servant text wai
+ ];
+ description = "Haskell twirp foundations";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"twisty" = callPackage
({ mkDerivation, array, base, containers, data-memocombinators
, MonadRandom, parallel
@@ -243123,8 +245644,8 @@ self: {
}:
mkDerivation {
pname = "twitter-types";
- version = "0.9.0";
- sha256 = "0hfm2zdgvpkfn06x140pnnbylmgram3i5zqf62c4yg6khi78m7hg";
+ version = "0.10.0";
+ sha256 = "0a2wgidg5dk3cxszb0q07cg0sywqgyxl5scswlr91yjvmjmlnkby";
libraryHaskellDepends = [
aeson base text time unordered-containers
];
@@ -243145,8 +245666,8 @@ self: {
}:
mkDerivation {
pname = "twitter-types-lens";
- version = "0.9.0";
- sha256 = "0xp6dwzw0mba4i6vq1sginn7d6ini2c3ig2ss0pn1m0sjwj8x7yq";
+ version = "0.10.0";
+ sha256 = "1x9w68mr6r6354in9l4vmawk5symvfh2qlhjn2gd30m8b1mzbrjg";
libraryHaskellDepends = [
base lens template-haskell text time twitter-types
];
@@ -244025,6 +246546,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "typed-digits" = callPackage
+ ({ mkDerivation, base, doctest, Glob, hspec, hspec-discover, nats
+ , QuickCheck, singletons
+ }:
+ mkDerivation {
+ pname = "typed-digits";
+ version = "0.1.0.0";
+ sha256 = "1x2kyvz0bdcy9iqh0222386r4kbj2in7dpll9jn461v4v0s9bgvc";
+ libraryHaskellDepends = [ base nats singletons ];
+ testHaskellDepends = [
+ base doctest Glob hspec hspec-discover QuickCheck
+ ];
+ testToolDepends = [ hspec-discover ];
+ description = "Digits, indexed by their base at the type level";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"typed-duration" = callPackage
({ mkDerivation, base, lifted-base, monad-control
, transformers-base
@@ -244482,8 +247020,8 @@ self: {
}:
mkDerivation {
pname = "tz";
- version = "0.1.3.2";
- sha256 = "0k35pw27a3hwg5wqjpfqij0y7rkdlmd85n4kj4ckna4z2v86dl7h";
+ version = "0.1.3.3";
+ sha256 = "1cnin3dlk6xmvk5cz1sjj88djdv1rq87hvwmhc2dj22hgbs3p3ni";
libraryHaskellDepends = [
base binary bytestring containers data-default deepseq
template-haskell time tzdata vector
@@ -244683,6 +247221,24 @@ self: {
license = "(BSD-3-Clause OR Apache-2.0)";
}) {};
+ "ucd" = callPackage
+ ({ mkDerivation, base, Cabal, containers, directory, gauge
+ , regex-applicative, util
+ }:
+ mkDerivation {
+ pname = "ucd";
+ version = "0.0.1.3";
+ sha256 = "1za494jgm3zml4ik203863kwni6pz5dsw6ssn06bjbyk7l7pbg33";
+ setupHaskellDepends = [
+ base Cabal containers directory regex-applicative util
+ ];
+ libraryHaskellDepends = [ base util ];
+ testHaskellDepends = [ base util ];
+ benchmarkHaskellDepends = [ base gauge util ];
+ description = "Unicode Character Database — Predicates on characters specified by Unicode";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"uconv" = callPackage
({ mkDerivation, base, icu }:
mkDerivation {
@@ -244999,8 +247555,8 @@ self: {
({ mkDerivation, base, io-streams, unagi-chan }:
mkDerivation {
pname = "unagi-streams";
- version = "0.2.4";
- sha256 = "126d900vyp0ybg9v80xhj3fv0c8jl9rbqjzq4yy6dazsw270q3lk";
+ version = "0.2.6";
+ sha256 = "1mw5h7dizrh4bg1avah201chfl96lapaj3141czfs9w8hyq4lp9h";
libraryHaskellDepends = [ base io-streams unagi-chan ];
description = "Unagi Chan IO-Streams";
license = stdenv.lib.licenses.bsd3;
@@ -245264,12 +247820,16 @@ self: {
}) {};
"unexceptionalio" = callPackage
- ({ mkDerivation, base }:
+ ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
+ }:
mkDerivation {
pname = "unexceptionalio";
- version = "0.4.0";
- sha256 = "09gynk472l7nn5l2w320n4dwigwp0wh0shfp6dyw6r5h2jdxz18p";
+ version = "0.5.0";
+ sha256 = "04jrmv075cas6qs58m3j0q9h4w14kd4b87bp42k3x3v6hcl62xi9";
libraryHaskellDepends = [ base ];
+ testHaskellDepends = [
+ base HUnit test-framework test-framework-hunit
+ ];
description = "IO without any non-error, synchronous exceptions";
license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none;
@@ -245279,8 +247839,8 @@ self: {
({ mkDerivation, base, transformers, unexceptionalio }:
mkDerivation {
pname = "unexceptionalio-trans";
- version = "0.4.0";
- sha256 = "19jzvxx0z4w7d1mp09spiz01sd349376hf5xkg8r2zfr8fx7hj71";
+ version = "0.5.0";
+ sha256 = "1sd5q97zjk1qkffbhj4rzdrvwwz4q7b6vwrmb6mpkbg7ra4ks49p";
libraryHaskellDepends = [ base transformers unexceptionalio ];
description = "A wrapper around UnexceptionalIO using monad transformers";
license = "unknown";
@@ -246267,7 +248827,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "universum_1_6_0" = callPackage
+ "universum_1_6_1" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, doctest
, gauge, ghc-prim, Glob, hashable, hedgehog, microlens
, microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
@@ -246275,8 +248835,8 @@ self: {
}:
mkDerivation {
pname = "universum";
- version = "1.6.0";
- sha256 = "12gz4hpwmykb73dplbd8j628f54ipk0pygrswy0k1k7j68awnjl6";
+ version = "1.6.1";
+ sha256 = "007nh8kw5a2m681bjwvcdjdf69nb768kwdsckj2kdd7406mfgdm7";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable microlens
microlens-mtl mtl safe-exceptions stm text transformers
@@ -247695,8 +250255,8 @@ self: {
}:
mkDerivation {
pname = "userid";
- version = "0.1.3.3";
- sha256 = "1p1dfbr68bkn09zpy50i1xazvfblds46bs60vra2sqn4hv8vj0s9";
+ version = "0.1.3.4";
+ sha256 = "149c32v5fa4aqkknqwlamf1r06ki0g0q03nbsc0giaw5qsavf7x1";
libraryHaskellDepends = [
aeson base boomerang cereal safecopy web-routes web-routes-th
];
@@ -247885,8 +250445,8 @@ self: {
({ mkDerivation, base, transformers }:
mkDerivation {
pname = "util";
- version = "0.1.14.0";
- sha256 = "0z3zwn3990nx26xrvdaz9dmlr01477jjfiqcjk5h5qy9h0npc4jd";
+ version = "0.1.14.1";
+ sha256 = "17y07674dkhgq8yxrdfqj3ycaw5232rc1dnfh7r0v4ca2fyhx5a8";
libraryHaskellDepends = [ base transformers ];
description = "Utilities";
license = stdenv.lib.licenses.bsd3;
@@ -248250,8 +250810,8 @@ self: {
}:
mkDerivation {
pname = "uuid-orphans";
- version = "1.4.3";
- sha256 = "0bfjyc6dg0k7vrd0i1w7ijdld3ns46jdy3dhybh9r2k08kr7fkgy";
+ version = "1.4.4";
+ sha256 = "1qmlnzqdm9wrczlknw53y91yvdzfjbxs10szxvg9xaa4bj7gs5rw";
libraryHaskellDepends = [
base safecopy text th-lift uuid-types web-routes
];
@@ -249316,17 +251876,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "vec_0_2" = callPackage
+ "vec_0_3" = callPackage
({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq
- , distributive, fin, hashable, inspection-testing, lens
+ , distributive, fin, hashable, inspection-testing, QuickCheck
, semigroupoids, tagged, transformers, vector
}:
mkDerivation {
pname = "vec";
- version = "0.2";
- sha256 = "0jh3na9nvljvshzij3hca8g2gpbsrp253fqnqzpq4p8bkv8zkfj1";
+ version = "0.3";
+ sha256 = "0r2jk3jqwn0r4wnpgc8k8i664g3rrs6dkyfsysysn4w10j22j5sr";
libraryHaskellDepends = [
- adjunctions base base-compat deepseq distributive fin hashable lens
+ adjunctions base deepseq distributive fin hashable QuickCheck
semigroupoids transformers
];
testHaskellDepends = [
@@ -249338,6 +251898,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "vec-lens" = callPackage
+ ({ mkDerivation, base, fin, lens, vec }:
+ mkDerivation {
+ pname = "vec-lens";
+ version = "0.3";
+ sha256 = "0i08p7rfmivf03mir7hcbkr7rarji95icsyvi6diclav1jd6fa7q";
+ libraryHaskellDepends = [ base fin lens vec ];
+ description = "Vec: length-indexed (sized) list: lens support";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "vec-optics" = callPackage
+ ({ mkDerivation, base, fin, optics-core, vec }:
+ mkDerivation {
+ pname = "vec-optics";
+ version = "0.3";
+ sha256 = "13g0j9hn27jfjlrm7c6bdsb2lhwrg016cal7hdic8azdxgdp8n0a";
+ libraryHaskellDepends = [ base fin optics-core vec ];
+ description = "Vec: length-indexed (sized) list: optics support";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"vect" = callPackage
({ mkDerivation, base, random }:
mkDerivation {
@@ -249429,10 +252011,8 @@ self: {
}:
mkDerivation {
pname = "vector-algorithms";
- version = "0.8.0.1";
- sha256 = "1zip8r7hh5g12xrjvhbg38z6hfxy7l6h6pl88qcqc0ygdmwdxg0m";
- revision = "2";
- editedCabalFile = "0ms473xd1d81dbg47kjr9gxqs11ipg2j1kk99q37rhvrbr5xv5l4";
+ version = "0.8.0.3";
+ sha256 = "11vks2h9f5gk0irsx5j9xwlicbzkv3k80sx76j5k3zb38q0izi0s";
libraryHaskellDepends = [ base bytestring primitive vector ];
testHaskellDepends = [
base bytestring containers QuickCheck vector
@@ -249955,6 +252535,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "venzone" = callPackage
+ ({ mkDerivation, ansi-terminal-game, base, containers, directory
+ , file-embed, filepath, fsnotify, hspec, line-drawing, megaparsec
+ , microlens, microlens-platform, mtl, QuickCheck, utf8-light
+ }:
+ mkDerivation {
+ pname = "venzone";
+ version = "1.0.0.4";
+ sha256 = "1jqhv6xi0yn970h0wlzhlhrfwjr44drpwvys9kvfi4di7cg4pc74";
+ isLibrary = false;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ executableHaskellDepends = [
+ ansi-terminal-game base containers directory file-embed filepath
+ fsnotify line-drawing megaparsec microlens microlens-platform mtl
+ utf8-light
+ ];
+ testHaskellDepends = [
+ ansi-terminal-game base containers directory file-embed filepath
+ hspec line-drawing megaparsec microlens microlens-platform mtl
+ QuickCheck utf8-light
+ ];
+ description = "ASCII platform-adventure game";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"verbalexpressions" = callPackage
({ mkDerivation, base, regex-pcre }:
mkDerivation {
@@ -253299,7 +255907,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "warp_3_3_3" = callPackage
+ "warp_3_3_4" = callPackage
({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
, bytestring, case-insensitive, containers, directory, gauge
, ghc-prim, hashable, hspec, http-client, http-date, http-types
@@ -253309,8 +255917,8 @@ self: {
}:
mkDerivation {
pname = "warp";
- version = "3.3.3";
- sha256 = "0s01zj1j518ipf22wpyln7zri15qxmg5p198fsy9qwc84k08h19x";
+ version = "3.3.4";
+ sha256 = "0v9r892xgzaf260fsk2gx747ipkf9b2c1fsjgynwy355xrip8z06";
libraryHaskellDepends = [
array async auto-update base bsb-http-chunked bytestring
case-insensitive containers ghc-prim hashable http-date http-types
@@ -253353,17 +255961,15 @@ self: {
"warp-grpc" = callPackage
({ mkDerivation, async, base, binary, bytestring, case-insensitive
- , http-types, http2-grpc-types, proto-lens, wai, warp, warp-tls
+ , http-types, http2, http2-grpc-types, wai, warp, warp-tls
}:
mkDerivation {
pname = "warp-grpc";
- version = "0.1.0.3";
- sha256 = "1x40jskp4c2dj4w3pfrw4f3ys9c64nlas2068s7zl05qayw21srf";
- revision = "1";
- editedCabalFile = "18mnn9wdhx8kv3y8nagkn7z7qmcyxnrcvigjyy378sfipcgjmdwc";
+ version = "0.2.0.0";
+ sha256 = "180h609sc1ck3xxs4r2hk6bij0g22lxlllpmhqkkf1drvbgygssi";
libraryHaskellDepends = [
- async base binary bytestring case-insensitive http-types
- http2-grpc-types proto-lens wai warp warp-tls
+ async base binary bytestring case-insensitive http-types http2
+ http2-grpc-types wai warp warp-tls
];
description = "A minimal gRPC server on top of Warp";
license = stdenv.lib.licenses.bsd3;
@@ -253879,6 +256485,40 @@ self: {
broken = true;
}) {};
+ "web-rep" = callPackage
+ ({ mkDerivation, aeson, attoparsec, base, bifunctors, box, clay
+ , foldl, generic-lens, interpolatedstring-perl6, javascript-bridge
+ , JuicyPixels, language-javascript, lens, lucid, lucid-svg, mmorph
+ , mtl, optparse-generic, protolude, scotty, streaming, tasty
+ , tasty-hspec, text, text-format, transformers
+ , unordered-containers, wai, wai-extra, wai-middleware-static
+ }:
+ mkDerivation {
+ pname = "web-rep";
+ version = "0.1.3";
+ sha256 = "174q9zaznsy5v9zypxxf6c5xi5syyhdzmwgi07siqp07in8w1jvf";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson attoparsec base bifunctors box clay foldl generic-lens
+ interpolatedstring-perl6 javascript-bridge JuicyPixels
+ language-javascript lens lucid lucid-svg mmorph mtl protolude
+ scotty streaming text text-format transformers unordered-containers
+ wai-middleware-static
+ ];
+ executableHaskellDepends = [
+ attoparsec base box lens lucid optparse-generic protolude scotty
+ text wai wai-extra wai-middleware-static
+ ];
+ testHaskellDepends = [
+ base lens lucid protolude tasty tasty-hspec text
+ ];
+ description = "representations of a web pag";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
+ }) {};
+
"web-routes" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, exceptions
, ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck
@@ -253886,8 +256526,8 @@ self: {
}:
mkDerivation {
pname = "web-routes";
- version = "0.27.14.2";
- sha256 = "0jpps7ay2hw41595hlfrx5k4lh9p2nib02n3rhd1vphpbnf392xg";
+ version = "0.27.14.3";
+ sha256 = "1a66m261ilqafbwwgjvalh3rz38qxcwxw9a99wr18lm0ah27lvx4";
libraryHaskellDepends = [
base blaze-builder bytestring exceptions ghc-prim http-types mtl
parsec split text utf8-string
@@ -253927,8 +256567,8 @@ self: {
}:
mkDerivation {
pname = "web-routes-happstack";
- version = "0.23.11";
- sha256 = "0jzxcwh3g6y5y4whjbw86y94hfrl73iwnwhhm728l69z5knqry9y";
+ version = "0.23.12";
+ sha256 = "0p5fa2cdpk6s9n0wa7nllhk1naa3a8a8vx63q6da8ifk6x8jn68a";
libraryHaskellDepends = [
base bytestring happstack-server text web-routes
];
@@ -253994,8 +256634,8 @@ self: {
}:
mkDerivation {
pname = "web-routes-th";
- version = "0.22.6.4";
- sha256 = "0r0z39hdxm3ggqq9n71wy0k44gb27zpka4pnmp07855czc4l61ca";
+ version = "0.22.6.5";
+ sha256 = "1amzab59hhd723clg9skcn5nhwvlw1la1acc9qdbyg302a75s0l9";
libraryHaskellDepends = [
base parsec split template-haskell text web-routes
];
@@ -254663,40 +257303,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.3";
- sha256 = "0mkxl7iwl5pl2w0svji9248v4c0hi45k725jj5ybaknb73650ns4";
- 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_6_1" = callPackage
({ mkDerivation, async, attoparsec, base, base64-bytestring, binary
, bytestring, bytestring-builder, case-insensitive, containers
, criterion, entropy, HUnit, network, QuickCheck, random, SHA
@@ -254728,7 +257334,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
@@ -254915,16 +257520,19 @@ self: {
];
description = "A school-timetable problem-solver";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"weigh" = callPackage
- ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
+ ({ mkDerivation, base, deepseq, ghc, mtl, process, split, temporary
+ }:
mkDerivation {
pname = "weigh";
- version = "0.0.14";
- sha256 = "0l85marb5rl9nr1c0id42dnr5i9fk1jciy5h6lywhb34w3hbj61g";
+ version = "0.0.16";
+ sha256 = "13pbjr7fzqy3s9c1nd2jhfwzbpccmpfwdn7y46z9k2bfkch1jam9";
libraryHaskellDepends = [
- base deepseq mtl process split temporary
+ base deepseq ghc mtl process split temporary
];
testHaskellDepends = [ base deepseq ];
description = "Measure allocations of a Haskell functions/values";
@@ -255410,6 +258018,8 @@ self: {
pname = "windns";
version = "0.1.0.1";
sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8";
+ revision = "1";
+ editedCabalFile = "17d44pzi4q5yvrygimdrwdrabz62s1ylw918w28sxgcvj64ir22g";
libraryHaskellDepends = [ base bytestring deepseq ];
librarySystemDepends = [ dnsapi ];
description = "Domain Name Service (DNS) lookup via the /dnsapi.dll standard library";
@@ -256102,8 +258712,8 @@ self: {
}:
mkDerivation {
pname = "wordchoice";
- version = "0.1.2.7";
- sha256 = "06xz5xk14fiy1z4j6q7lbjwj13m4hy22pzrcdwk6c078w85rp4yd";
+ version = "0.1.2.8";
+ sha256 = "0ncs3g174db6508fic7x2xibvkccmz068g6hizp8fi20bwxb9js8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -256959,10 +259569,8 @@ self: {
}:
mkDerivation {
pname = "wss-client";
- version = "0.2.1.1";
- sha256 = "1wgqd8hh22ld72c1ccfr191ydqb5fija6c1l0vbg7n8pldhmi92w";
- revision = "1";
- editedCabalFile = "03q6mpdy93y8kjmjcxpjasg6q1mg64az28z99gm2w2iih3mqa702";
+ version = "0.3.0.0";
+ sha256 = "1licynhnyhfdq4gxpsya3gaypjs9inqzr2xqmjs9f99ymbvin8d8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -257109,8 +259717,8 @@ self: {
}:
mkDerivation {
pname = "wuss";
- version = "1.1.14";
- sha256 = "1r0ljrp7kfksvmm4029b633cypdg5lqk5nga31si22bi5yz7fkiq";
+ version = "1.1.15";
+ sha256 = "1i2q96mapld4mnhmy321qyzzizw3k3schhm473qrszdi1yxc837q";
libraryHaskellDepends = [
base bytestring connection network websockets
];
@@ -257684,12 +260292,10 @@ self: {
}:
mkDerivation {
pname = "xeno";
- version = "0.3.5.1";
- sha256 = "1bdvj5ql0q9i8vb3429d8kl3hyk45r37s23rm76mhwhazhqxcm60";
- revision = "1";
- editedCabalFile = "0d9w9x6lwhvshy4dbvd80ckb9p0g4vcmzy6kvwai9rqmszf89cnh";
+ version = "0.3.5.2";
+ sha256 = "0xfhdi5d0y3rlsmzczdg8b896l9q31nify1vsq0vfqqhfn75pw8l";
libraryHaskellDepends = [
- array base bytestring deepseq hspec mtl mutable-containers vector
+ array base bytestring deepseq mtl mutable-containers vector
];
testHaskellDepends = [ base bytestring hexml hspec ];
benchmarkHaskellDepends = [
@@ -258071,6 +260677,35 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "xlsx_0_8_0" = callPackage
+ ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search
+ , bytestring, conduit, containers, criterion, data-default, deepseq
+ , Diff, errors, extra, filepath, groom, lens, mtl, network-uri
+ , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
+ , tasty-smallcheck, text, time, transformers, vector, xeno
+ , xml-conduit, zip-archive, zlib
+ }:
+ mkDerivation {
+ pname = "xlsx";
+ version = "0.8.0";
+ sha256 = "1wp2ybkf5z4x87a73yygi3g1nqjy6pfb1wdwyvmjqk64ibjz0p7d";
+ libraryHaskellDepends = [
+ attoparsec base base64-bytestring binary-search bytestring conduit
+ containers data-default deepseq errors extra filepath lens mtl
+ network-uri old-locale safe text time transformers vector xeno
+ xml-conduit zip-archive zlib
+ ];
+ testHaskellDepends = [
+ base bytestring containers Diff groom lens mtl raw-strings-qq
+ smallcheck tasty tasty-hunit tasty-smallcheck text time vector
+ xml-conduit
+ ];
+ benchmarkHaskellDepends = [ base bytestring criterion ];
+ description = "Simple and incomplete Excel file parser/writer";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"xlsx-tabular" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, data-default
, lens, text, xlsx
@@ -258962,8 +261597,8 @@ self: {
}:
mkDerivation {
pname = "xmobar";
- version = "0.31";
- sha256 = "1sbxva4zaj060bigmxivpn4zlz0q1qbq2np8gljdqkjvysjzpbka";
+ version = "0.32";
+ sha256 = "0x2ki3v0pmhl4bva3qi1xx21axayc4sx1nkzhmk2ap4l0cj52jrd";
configureFlags = [
"-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
"-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
@@ -260065,8 +262700,8 @@ self: {
}:
mkDerivation {
pname = "yaml";
- version = "0.11.1.2";
- sha256 = "028pz77n92l6kjgjv263h4b6yhw1iibdbf3a3dkn5qnz537xpzhc";
+ version = "0.11.2.0";
+ sha256 = "035sqc2bnya3ghv5i0qk9jdg9q6jvqzgnc5gkg9mgf4drjrd5wni";
configureFlags = [ "-fsystem-libyaml" ];
isLibrary = true;
isExecutable = true;
@@ -260092,8 +262727,8 @@ self: {
}:
mkDerivation {
pname = "yaml-combinators";
- version = "1.1.1.1";
- sha256 = "1343q4wddqmszi21qx5a0jjawvqa1aqfzbkn8npi3sy2gmk42zi8";
+ version = "1.1.1.2";
+ sha256 = "13f5z4xq5k8ss3x0afw21cylhpmr1mzsnrj9ck5531p407rj3glw";
libraryHaskellDepends = [
aeson base bytestring generics-sop scientific text transformers
unordered-containers vector yaml
@@ -260103,6 +262738,8 @@ self: {
];
description = "YAML parsing combinators for improved validation and error reporting";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ broken = true;
}) {};
"yaml-config" = callPackage
@@ -260464,8 +263101,8 @@ self: {
}:
mkDerivation {
pname = "yarn-lock";
- version = "0.5.0";
- sha256 = "1nwb0zc4qddvq2rkzb56c56iba7v0yms0hlam8y1nlcbvsqxrnc6";
+ version = "0.6.1";
+ sha256 = "19lkg7qj6m9afy6v6bkkcczz7yp8fsn7q2bpbcnyc06cnkn6hcdn";
libraryHaskellDepends = [
base containers either megaparsec protolude text
];
@@ -260592,22 +263229,18 @@ self: {
"yaya" = callPackage
({ mkDerivation, base, bifunctors, comonad, constraints, containers
- , deriving-compat, distributive, either, errors, free, hedgehog
- , kan-extensions, lens, profunctors, template-haskell, transformers
- , yaya-hedgehog
+ , distributive, either, errors, free, kan-extensions, lens
+ , profunctors, template-haskell, transformers
}:
mkDerivation {
pname = "yaya";
- version = "0.2.1.0";
- sha256 = "0wm01cspfpnfhijmbxpr4n0nr1qgc8g8cg9lqpz8n4lkd8i8bfds";
+ version = "0.2.1.2";
+ sha256 = "179mq32b5gjlwfpldm4msqnxv316gb2gj3s0kzhkcyk0l3i3y8fi";
libraryHaskellDepends = [
base bifunctors comonad constraints containers distributive either
errors free kan-extensions lens profunctors template-haskell
transformers
];
- testHaskellDepends = [
- base deriving-compat hedgehog yaya-hedgehog
- ];
description = "Total recursion schemes";
license = stdenv.lib.licenses.agpl3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -260618,8 +263251,8 @@ self: {
({ mkDerivation, base, deriving-compat, hedgehog, yaya }:
mkDerivation {
pname = "yaya-hedgehog";
- version = "0.1.1.0";
- sha256 = "070xv97j402li75fzhs03svankg0nl2fb1g223kjkq7a704f3dk1";
+ version = "0.1.2.1";
+ sha256 = "18lyhb7fqdbp2p71y5jydcb8xzbahqzy1jmsnsb4hym8v8ax71cv";
libraryHaskellDepends = [ base deriving-compat hedgehog yaya ];
description = "Hedgehog testing support for the Yaya recursion scheme library";
license = stdenv.lib.licenses.agpl3;
@@ -260628,17 +263261,16 @@ self: {
}) {};
"yaya-unsafe" = callPackage
- ({ mkDerivation, base, bifunctors, comonad, either, free, hedgehog
- , lens, yaya, yaya-hedgehog
+ ({ mkDerivation, base, bifunctors, comonad, either, free, lens
+ , yaya
}:
mkDerivation {
pname = "yaya-unsafe";
- version = "0.1.1.0";
- sha256 = "081lha6m5c3iyy61xfrj237g0098l5jsm94yqjbaddl4qixk697q";
+ version = "0.1.1.2";
+ sha256 = "0cvfrzqx5d56nld60p1n5qmwn4j4gbsvy7jf5lk4ar5da4w8a90c";
libraryHaskellDepends = [
base bifunctors comonad either free lens yaya
];
- testHaskellDepends = [ base hedgehog yaya yaya-hedgehog ];
description = "Non-total extensions to the Yaya recursion scheme library";
license = stdenv.lib.licenses.agpl3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -261364,33 +263996,27 @@ self: {
}) {};
"yesod-bin" = callPackage
- ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
- , bytestring, Cabal, conduit, conduit-extra, containers
- , data-default-class, directory, file-embed, filepath, fsnotify
- , http-client, http-client-tls, http-reverse-proxy, http-types
- , network, optparse-applicative, parsec, process, project-template
- , resourcet, say, shakespeare, split, stm, streaming-commons, tar
- , template-haskell, text, time, transformers, transformers-compat
- , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp
- , warp-tls, yaml, zlib
+ ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra
+ , containers, data-default-class, directory, file-embed, filepath
+ , fsnotify, http-client, http-client-tls, http-reverse-proxy
+ , http-types, network, optparse-applicative, process
+ , project-template, say, split, stm, streaming-commons, tar, text
+ , time, transformers, transformers-compat, unliftio
+ , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib
}:
mkDerivation {
pname = "yesod-bin";
- version = "1.6.0.3";
- sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4";
- revision = "4";
- editedCabalFile = "1iw9m3z6m4n9dlwamf1kwr7pp2wpk6awf1m63zjkgw5j4vwxlcpg";
+ version = "1.6.0.4";
+ sha256 = "0wz44w4c86513ss81a18rknkrkalxyj2g4rlq324ykqwwkihlr1a";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
- attoparsec base base64-bytestring blaze-builder bytestring Cabal
- conduit conduit-extra containers data-default-class directory
- file-embed filepath fsnotify http-client http-client-tls
- http-reverse-proxy http-types network optparse-applicative parsec
- process project-template resourcet say shakespeare split stm
- streaming-commons tar template-haskell text time transformers
- transformers-compat unix-compat unliftio unordered-containers wai
- wai-extra warp warp-tls yaml zlib
+ base bytestring Cabal conduit conduit-extra containers
+ data-default-class directory file-embed filepath fsnotify
+ http-client http-client-tls http-reverse-proxy http-types network
+ optparse-applicative process project-template say split stm
+ streaming-commons tar text time transformers transformers-compat
+ unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib
];
description = "The yesod helper executable";
license = stdenv.lib.licenses.mit;
@@ -261546,20 +264172,20 @@ self: {
, conduit, conduit-extra, containers, cookie, deepseq, fast-logger
, gauge, hspec, hspec-expectations, http-types, HUnit, memory
, monad-logger, mtl, network, parsec, path-pieces, primitive
- , random, resourcet, rio, shakespeare, streaming-commons
+ , random, resourcet, shakespeare, streaming-commons
, template-haskell, text, time, transformers, unix-compat, unliftio
, unordered-containers, vector, wai, wai-extra, wai-logger, warp
, word8
}:
mkDerivation {
pname = "yesod-core";
- version = "1.6.16.1";
- sha256 = "0a0yv7wkwvb0n6iia532y9nzrirgnm09pjc8hpm0lx4ff609pgd2";
+ version = "1.6.17";
+ sha256 = "1i31xx9ili9r9il0mqpb04pgnq67rfsfr61pw9xmc163akgdfi4l";
libraryHaskellDepends = [
aeson auto-update base blaze-html blaze-markup bytestring
case-insensitive cereal clientsession conduit conduit-extra
containers cookie deepseq fast-logger http-types memory
- monad-logger mtl parsec path-pieces primitive random resourcet rio
+ monad-logger mtl parsec path-pieces primitive random resourcet
shakespeare template-haskell text time transformers unix-compat
unliftio unordered-containers vector wai wai-extra wai-logger warp
word8
@@ -262011,6 +264637,8 @@ self: {
pname = "yesod-ip";
version = "0.5.1";
sha256 = "1gla2w9xi88y9d149n2r18xj5y1bmaykf258nl7x4hrkl0zgdq62";
+ revision = "2";
+ editedCabalFile = "0yvi3mmknky12dqgjpfwa9nd6sn0n02xal6qcmr37dvnwnl4w87x";
libraryHaskellDepends = [
base http-api-data ip path-pieces persistent text yesod-core
yesod-form
@@ -262263,27 +264891,6 @@ self: {
}) {};
"yesod-persistent" = callPackage
- ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
- , persistent-sqlite, persistent-template, resource-pool, resourcet
- , text, transformers, wai-extra, yesod-core
- }:
- mkDerivation {
- pname = "yesod-persistent";
- version = "1.6.0.2";
- sha256 = "17adw0aaj29ia7ii3jka301442860b5wvfrms079q973gzahz5fd";
- libraryHaskellDepends = [
- base blaze-builder conduit persistent persistent-template
- resource-pool resourcet transformers yesod-core
- ];
- testHaskellDepends = [
- base blaze-builder conduit hspec persistent persistent-sqlite text
- wai-extra yesod-core
- ];
- description = "Some helpers for using Persistent from Yesod";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-persistent_1_6_0_3" = callPackage
({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
, persistent-sqlite, persistent-template, resource-pool, resourcet
, text, transformers, wai-extra, yesod-core
@@ -262302,7 +264909,6 @@ self: {
];
description = "Some helpers for using Persistent from Yesod";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-platform" = callPackage
@@ -262876,25 +265482,27 @@ self: {
}) {};
"yesod-test" = callPackage
- ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+ ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
, bytestring, case-insensitive, conduit, containers, cookie, hspec
, hspec-core, html-conduit, http-types, HUnit, memory, network
- , pretty-show, semigroups, text, time, transformers, unliftio, wai
- , wai-extra, xml-conduit, xml-types, yesod-core, yesod-form
+ , pretty-show, semigroups, text, time, transformers, unliftio
+ , unliftio-core, wai, wai-extra, xml-conduit, xml-types, yesod-core
+ , yesod-form
}:
mkDerivation {
pname = "yesod-test";
- version = "1.6.7";
- sha256 = "1x7fmp1q3zn15av6rhdddnilkb54xmkpb6pkfzfpjm3vff27i7jj";
+ version = "1.6.9";
+ sha256 = "0v25lqq7hgd5lggnyfd9kamkzd4126rd7vlhc131n253n4by4yak";
libraryHaskellDepends = [
- attoparsec base blaze-builder blaze-html bytestring
+ aeson attoparsec base blaze-builder blaze-html bytestring
case-insensitive conduit containers cookie hspec-core html-conduit
http-types HUnit memory network pretty-show semigroups text time
transformers wai wai-extra xml-conduit xml-types yesod-core
];
testHaskellDepends = [
base bytestring containers cookie hspec html-conduit http-types
- HUnit text unliftio wai wai-extra xml-conduit yesod-core yesod-form
+ HUnit text unliftio unliftio-core wai wai-extra xml-conduit
+ yesod-core yesod-form
];
description = "integration testing for WAI/Yesod Applications";
license = stdenv.lib.licenses.mit;
@@ -263112,6 +265720,19 @@ self: {
broken = true;
}) {};
+ "yhseq" = callPackage
+ ({ mkDerivation, base, hspec, hspec-discover }:
+ mkDerivation {
+ pname = "yhseq";
+ version = "0.2.1.2";
+ sha256 = "1mxjfbnic6pn4jnyc83afpmgq4wnb09f72d359pwx693mfi6vbiy";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base hspec hspec-discover ];
+ testToolDepends = [ hspec-discover ];
+ description = "Calculation of Y-sequence Hexirp edition";
+ license = stdenv.lib.licenses.asl20;
+ }) {};
+
"yi" = callPackage
({ mkDerivation, base, microlens-platform, mtl
, optparse-applicative, yi-core, yi-frontend-vty, yi-keymap-emacs
@@ -263814,8 +266435,8 @@ self: {
}:
mkDerivation {
pname = "yst";
- version = "0.7.0.1";
- sha256 = "1cmdx2bghp508qm26xydnljswgldvvv5rapmzcivmnn8pzp9g9kl";
+ version = "0.7.1";
+ sha256 = "0clvfkdrmw7lmrcyn8cilgf0k7438c384vwvjx256pyl46y3ym5m";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -263955,14 +266576,12 @@ self: {
}) {};
"yx" = callPackage
- ({ mkDerivation, array, base, bytestring, hspec }:
+ ({ mkDerivation, array, base, bytestring, hspec, lattices }:
mkDerivation {
pname = "yx";
- version = "0.0.2.0";
- sha256 = "05xh7x02ddh87kwslgckzh3g5i22r01vfrb160gns3zl6fv8sj2z";
- revision = "1";
- editedCabalFile = "19px5wf8ca7awam013ij62z04rsplgn7ks56j8jzhznarsg45ksq";
- libraryHaskellDepends = [ array base bytestring ];
+ version = "0.0.3.0";
+ sha256 = "068xdmi5dn00cx58qrc5hx6vz6byvnh5cp803j7inlynziw3fcgz";
+ libraryHaskellDepends = [ array base bytestring lattices ];
testHaskellDepends = [ array base bytestring hspec ];
description = "Row-major coordinates";
license = stdenv.lib.licenses.bsd3;
@@ -264637,6 +267256,24 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "zinza" = callPackage
+ ({ mkDerivation, base, bytestring, containers, parsec, tasty
+ , tasty-golden, tasty-hunit, text, transformers
+ }:
+ mkDerivation {
+ pname = "zinza";
+ version = "0.1";
+ sha256 = "0p7m15qkp7lsdhckkj2xz7ck54kkaz8pw0gz9dddll57mqjyy6zk";
+ libraryHaskellDepends = [
+ base containers parsec text transformers
+ ];
+ testHaskellDepends = [
+ base bytestring containers tasty tasty-golden tasty-hunit
+ ];
+ description = "Typed templates with jinja like syntax";
+ license = stdenv.lib.licenses.gpl2Plus;
+ }) {};
+
"zip" = callPackage
({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
, cereal, conduit, conduit-extra, containers, digest, directory
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index ba477e06e2f1..e2d01c5798f9 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -181,7 +181,10 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
# '... foo = self.callHackage "foo" "1.5.3" {}; ...'
callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version);
- # callHackageDirect :: Text -> Text -> AttrSet -> HaskellPackage
+ # callHackageDirect
+ # :: { pkg :: Text, ver :: Text, sha256 :: Text }
+ # -> AttrSet
+ # -> HaskellPackage
#
# This function does not depend on all-cabal-hashes and therefore will work
# for any version that has been released on hackage as opposed to only
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index 8b667a1e6693..c292eeec128f 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -13,4 +13,7 @@ self: super: {
# https://github.com/channable/vaultenv/issues/1
vaultenv = self.callPackage ../tools/haskell/vaultenv { };
+ # spago is not released to Hackage.
+ # https://github.com/spacchetti/spago/issues/512
+ spago = self.callPackage ../tools/purescript/spago { };
}
diff --git a/pkgs/development/haskell-modules/patches/GLUT.patch b/pkgs/development/haskell-modules/patches/GLUT.patch
index 3025812213bc..f2b63738611f 100644
--- a/pkgs/development/haskell-modules/patches/GLUT.patch
+++ b/pkgs/development/haskell-modules/patches/GLUT.patch
@@ -6,7 +6,7 @@ index f370d6c..a404e1e 100644
else
cpp-options: "-DCALLCONV=ccall"
cc-options: "-DUSE_DLSYM"
-+ pkgconfig-depends: freeglut
++ pkgconfig-depends: glut
executable BOGLGP01-OnYourOwn1
if !flag(BuildExamples)
diff --git a/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch b/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
index 26ea0eaa5a8b..48cf6a035afb 100644
--- a/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
+++ b/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch
@@ -43,13 +43,13 @@ index c87565d..88b3db4 100644
+ghc = fromMaybe GHC_PATHS_GHC nixGhc
+ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg
diff --git a/Setup.hs b/Setup.hs
-index fad5026..1651650 100644
+index f2d1733..ca4792e 100644
--- a/Setup.hs
+++ b/Setup.hs
-@@ -27,13 +27,13 @@ main = defaultMainWithHooks simpleUserHooks {
- defaultPostConf :: Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
- defaultPostConf args flags pkgdescr lbi = do
+@@ -39,13 +39,13 @@ main = defaultMainWithHooks simpleUserHooks {
+ #else
libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags))
+ #endif
- ghcProgram (withPrograms lbi) ["--print-libdir"]
+ ghcjsProgram (withPrograms lbi) ["--print-libdir"]
let libdir = reverse $ dropWhile isSpace $ reverse libdir_
diff --git a/pkgs/development/haskell-modules/patches/servant-client-core-redact-auth-header.patch b/pkgs/development/haskell-modules/patches/servant-client-core-redact-auth-header.patch
new file mode 100644
index 000000000000..0f6a34f4f265
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/servant-client-core-redact-auth-header.patch
@@ -0,0 +1,75 @@
+diff --git a/servant-client-core.cabal b/servant-client-core.cabal
+index 5789da601..3faf65bb4 100644
+--- a/servant-client-core.cabal
++++ b/servant-client-core.cabal
+@@ -96,6 +96,7 @@ test-suite spec
+ main-is: Spec.hs
+ other-modules:
+ Servant.Client.Core.Internal.BaseUrlSpec
++ Servant.Client.Core.RequestSpec
+
+ -- Dependencies inherited from the library. No need to specify bounds.
+ build-depends:
+diff --git a/src/Servant/Client/Core/Request.hs b/src/Servant/Client/Core/Request.hs
+index 73756e702..0276d46f8 100644
+--- a/src/Servant/Client/Core/Request.hs
++++ b/src/Servant/Client/Core/Request.hs
+@@ -64,8 +64,32 @@ data RequestF body path = Request
+ , requestHeaders :: Seq.Seq Header
+ , requestHttpVersion :: HttpVersion
+ , requestMethod :: Method
+- } deriving (Generic, Typeable, Eq, Show, Functor, Foldable, Traversable)
++ } deriving (Generic, Typeable, Eq, Functor, Foldable, Traversable)
+
++instance (Show a, Show b) =>
++ Show (Servant.Client.Core.Request.RequestF a b) where
++ showsPrec p req
++ = showParen
++ (p >= 11)
++ ( showString "Request {requestPath = "
++ . showsPrec 0 (requestPath req)
++ . showString ", requestQueryString = "
++ . showsPrec 0 (requestQueryString req)
++ . showString ", requestBody = "
++ . showsPrec 0 (requestBody req)
++ . showString ", requestAccept = "
++ . showsPrec 0 (requestAccept req)
++ . showString ", requestHeaders = "
++ . showsPrec 0 (redactSensitiveHeader <$> requestHeaders req))
++ . showString ", requestHttpVersion = "
++ . showsPrec 0 (requestHttpVersion req)
++ . showString ", requestMethod = "
++ . showsPrec 0 (requestMethod req)
++ . showString "}"
++ where
++ redactSensitiveHeader :: Header -> Header
++ redactSensitiveHeader ("Authorization", _) = ("Authorization", "")
++ redactSensitiveHeader h = h
+ instance Bifunctor RequestF where bimap = bimapDefault
+ instance Bifoldable RequestF where bifoldMap = bifoldMapDefault
+ instance Bitraversable RequestF where
+diff --git a/test/Servant/Client/Core/RequestSpec.hs b/test/Servant/Client/Core/RequestSpec.hs
+new file mode 100644
+index 000000000..99a1db7d3
+--- /dev/null
++++ b/test/Servant/Client/Core/RequestSpec.hs
+@@ -0,0 +1,19 @@
++{-# OPTIONS_GHC -fno-warn-orphans #-}
++{-# LANGUAGE OverloadedStrings #-}
++module Servant.Client.Core.RequestSpec (spec) where
++
++
++import Prelude ()
++import Prelude.Compat
++import Control.Monad
++import Data.List (isInfixOf)
++import Servant.Client.Core.Request
++import Test.Hspec
++
++spec :: Spec
++spec = do
++ describe "Request" $ do
++ describe "show" $ do
++ it "redacts the authorization header" $ do
++ let request = void $ defaultRequest { requestHeaders = pure ("authorization", "secret") }
++ isInfixOf "secret" (show request) `shouldBe` False
diff --git a/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch b/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch
deleted file mode 100644
index ebadd215cb76..000000000000
--- a/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/src/Servant/Client/Core/Internal/HasClient.hs b/src/Servant/Client/Core/Internal/HasClient.hs
-index 712007006..6be92ec6d 100644
---- a/src/Servant/Client/Core/Internal/HasClient.hs
-+++ b/src/Servant/Client/Core/Internal/HasClient.hs
-@@ -16,6 +16,8 @@ module Servant.Client.Core.Internal.HasClient where
- import Prelude ()
- import Prelude.Compat
-
-+import Control.Concurrent.MVar
-+ (modifyMVar, newMVar)
- import qualified Data.ByteString as BS
- import qualified Data.ByteString.Lazy as BL
- import Data.Foldable
-@@ -36,13 +38,14 @@ import qualified Network.HTTP.Types as H
- import Servant.API
- ((:<|>) ((:<|>)), (:>), AuthProtect, BasicAuth, BasicAuthData,
- BuildHeadersTo (..), Capture', CaptureAll, Description,
-- EmptyAPI, FramingUnrender (..), FromSourceIO (..), Header',
-- Headers (..), HttpVersion, IsSecure, MimeRender (mimeRender),
-+ EmptyAPI, FramingRender (..), FramingUnrender (..),
-+ FromSourceIO (..), Header', Headers (..), HttpVersion,
-+ IsSecure, MimeRender (mimeRender),
- MimeUnrender (mimeUnrender), NoContent (NoContent), QueryFlag,
- QueryParam', QueryParams, Raw, ReflectMethod (..), RemoteHost,
- ReqBody', SBoolI, Stream, StreamBody', Summary, ToHttpApiData,
-- Vault, Verb, WithNamedContext, contentType, getHeadersHList,
-- getResponse, toQueryParam, toUrlPiece)
-+ ToSourceIO (..), Vault, Verb, WithNamedContext, contentType,
-+ getHeadersHList, getResponse, toQueryParam, toUrlPiece)
- import Servant.API.ContentTypes
- (contentTypes)
- import Servant.API.Modifiers
-@@ -538,7 +541,7 @@ instance (MimeRender ct a, HasClient m api)
- hoistClientMonad pm (Proxy :: Proxy api) f (cl a)
-
- instance
-- ( HasClient m api
-+ ( HasClient m api, MimeRender ctype chunk, FramingRender framing, ToSourceIO chunk a
- ) => HasClient m (StreamBody' mods framing ctype a :> api)
- where
-
-@@ -547,7 +550,39 @@ instance
- hoistClientMonad pm _ f cl = \a ->
- hoistClientMonad pm (Proxy :: Proxy api) f (cl a)
-
-- clientWithRoute _pm Proxy _req _body = error "HasClient @StreamBody"
-+ clientWithRoute pm Proxy req body
-+ = clientWithRoute pm (Proxy :: Proxy api)
-+ $ setRequestBody (RequestBodyStreamChunked givesPopper) (contentType ctypeP) req
-+ where
-+ ctypeP = Proxy :: Proxy ctype
-+ framingP = Proxy :: Proxy framing
-+
-+ sourceIO = framingRender
-+ framingP
-+ (mimeRender ctypeP :: chunk -> BL.ByteString)
-+ (toSourceIO body)
-+
-+ -- not pretty.
-+ givesPopper :: (IO BS.ByteString -> IO ()) -> IO ()
-+ givesPopper needsPopper = S.unSourceT sourceIO $ \step0 -> do
-+ ref <- newMVar step0
-+
-+ -- Note sure we need locking, but it's feels safer.
-+ let popper :: IO BS.ByteString
-+ popper = modifyMVar ref nextBs
-+
-+ needsPopper popper
-+
-+ nextBs S.Stop = return (S.Stop, BS.empty)
-+ nextBs (S.Error err) = fail err
-+ nextBs (S.Skip s) = nextBs s
-+ nextBs (S.Effect ms) = ms >>= nextBs
-+ nextBs (S.Yield lbs s) = case BL.toChunks lbs of
-+ [] -> nextBs s
-+ (x:xs) | BS.null x -> nextBs step'
-+ | otherwise -> return (step', x)
-+ where
-+ step' = S.Yield (BL.fromChunks xs) s
-
-
-
diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix
index 650d843be843..599ca72c615e 100644
--- a/pkgs/development/idris-modules/tparsec.nix
+++ b/pkgs/development/idris-modules/tparsec.nix
@@ -1,18 +1,21 @@
{ build-idris-package
, fetchFromGitHub
+, contrib
, lib
}:
build-idris-package {
name = "tparsec";
- version = "2019-06-18";
+ version = "2019-09-19";
ipkgName = "TParsec";
+
+ idrisDeps = [ contrib ];
src = fetchFromGitHub {
owner = "gallais";
repo = "idris-tparsec";
- rev = "3809afd8735b0054e5db788f18a7fa8ed71d8278";
- sha256 = "0wmgg1zg9p8gqlfvcsnww17jsifx9987cxqdq6kbdgasn26w2rqx";
+ rev = "cbaea6ec7e5b62536666329940f3ffb5b8b59036";
+ sha256 = "0bzdv90a83irn7ca268acl19mjg9vxjmc4saa4naj4hdmg7srb2v";
};
meta = {
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index b5a7c2b467ef..8187bf4af8e1 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -2,30 +2,30 @@
stdenv.mkDerivation rec {
pname = "clojure";
- version = "1.10.1.469";
+ version = "1.10.1.492";
src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
- sha256 = "0hpb6rixmgllss69vl9zlpb41svm4mx4xmfbq1q7y12jsxckzgpq";
+ sha256 = "09mhy5xw9kdr10a1xpbn5v97qyyhngw5s1n1alrs45a4m3l11iky";
};
buildInputs = [ makeWrapper ];
- outputs = [ "out" "prefix" ];
-
installPhase = let
binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
- in ''
- mkdir -p $prefix/libexec
- cp clojure-tools-${version}.jar $prefix/libexec
- cp example-deps.edn $prefix
+ in
+ ''
+ mkdir -p $out/libexec
+ cp clojure-tools-${version}.jar $out/libexec
+ cp example-deps.edn $out
+ cp deps.edn $out
- substituteInPlace clojure --replace PREFIX $prefix
+ substituteInPlace clojure --replace PREFIX $out
- install -Dt $out/bin clj clojure
- wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
- wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
- '';
+ install -Dt $out/bin clj clojure
+ wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
+ wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
+ '';
meta = with stdenv.lib; {
description = "A Lisp dialect for the JVM";
diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix
index f968e04bbe99..369c3840b874 100644
--- a/pkgs/development/interpreters/duktape/default.nix
+++ b/pkgs/development/interpreters/duktape/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "duktape";
- version = "2.4.0";
+ version = "2.5.0";
src = fetchurl {
url = "http://duktape.org/duktape-${version}.tar.xz";
- sha256 = "1z3i0ymnkk6q48bmbgh59g1ryrwjdv46vrf6nbnmqfv3s43r7a46";
+ sha256 = "05ln6b2a0s8ynz28armwqs2r5zjyi3cxi0dx6ahnxlqw19b13m43";
};
buildPhase = ''
diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix
index 7c7cd9abb7e9..9da2b0d899d7 100644
--- a/pkgs/development/interpreters/eff/default.nix
+++ b/pkgs/development/interpreters/eff/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
checkTarget = "test";
meta = with stdenv.lib; {
- homepage = http://www.eff-lang.org;
+ homepage = https://www.eff-lang.org;
description = "A functional programming language based on algebraic effects and their handlers";
longDescription = ''
Eff is a functional language with handlers of not only exceptions,
diff --git a/pkgs/development/interpreters/elixir/1.9.nix b/pkgs/development/interpreters/elixir/1.9.nix
index 2d9fec02e106..4eead35bae37 100644
--- a/pkgs/development/interpreters/elixir/1.9.nix
+++ b/pkgs/development/interpreters/elixir/1.9.nix
@@ -1,7 +1,9 @@
{ mkDerivation }:
+# How to obtain `sha256`:
+# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
mkDerivation {
- version = "1.9.2";
- sha256 = "19yn6nx6r627f5zbyc7ckgr96d6b45sgwx95n2gp2imqwqvpj8wc";
+ version = "1.9.4";
+ sha256 = "1l4318g35y4h0vi2w07ayc3jizw1xc3s7hdb47w6j3iw33y06g6b";
minimumOTPVersion = "20";
}
diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix
index 8b471f632471..88fe21453a82 100644
--- a/pkgs/development/interpreters/erlang/R22.nix
+++ b/pkgs/development/interpreters/erlang/R22.nix
@@ -1,8 +1,10 @@
{ mkDerivation }:
+# How to obtain `sha256`:
+# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
- version = "22.0.4";
- sha256 = "1aqkhd6nwdn4xp5yz02zbymd4x8ij8fjw9ji8kh860n1a513k9ai";
+ version = "22.1.7";
+ sha256 = "18aqy2s8nqd82v4lzzxknrwjva8mv1y2hvai9cakz5nkyd3vwq62";
prePatch = ''
substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index 3f1c21cc8819..76f71745f355 100644
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@@ -2,7 +2,7 @@
, libxml2, libxslt, ncurses, openssl, perl, autoconf
, openjdk ? null # javacSupport
, unixODBC ? null # odbcSupport
-, libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
+, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
, withSystemd ? stdenv.isLinux, systemd # systemd support in epmd
}:
@@ -18,7 +18,7 @@
, enableKernelPoll ? true
, javacSupport ? false, javacPackages ? [ openjdk ]
, odbcSupport ? false, odbcPackages ? [ unixODBC ]
-, wxSupport ? true, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ]
+, wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
, preUnpack ? "", postUnpack ? ""
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""
@@ -32,7 +32,7 @@
assert wxSupport -> (if stdenv.isDarwin
then wxmac != null
- else libGLU_combined != null && wxGTK != null && xorg != null);
+ else libGL != null && libGLU != null && wxGTK != null && xorg != null);
assert odbcSupport -> unixODBC != null;
assert javacSupport -> openjdk != null;
@@ -121,8 +121,7 @@ in stdenv.mkDerivation ({
tolerance.
'';
- # aarch64 is supposed to work but started failing in https://hydra.nixos.org/build/83735973
- platforms = subtractLists [ "aarch64-linux" ] platforms.unix;
+ platforms = platforms.unix;
maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ];
license = licenses.asl20;
} // meta);
diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix
index 71542046af91..9b38d1e4ad54 100644
--- a/pkgs/development/interpreters/gauche/default.nix
+++ b/pkgs/development/interpreters/gauche/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "gauche";
- version = "0.9.8";
+ version = "0.9.9";
src = fetchurl {
url = "mirror://sourceforge/gauche/Gauche-${version}.tgz";
- sha256 = "0jxp1ladpy8kvfvk561c64spf1c3d6giqla6zscqkd6qa480vcry";
+ sha256 = "1yzpszhw52vkpr65r5d4khf3489mnnvnw58dd2wsvvx7499k5aac";
};
nativeBuildInputs = [ pkgconfig texinfo ];
diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix
index 6f5a5ec0f198..4a8330f2749c 100644
--- a/pkgs/development/interpreters/gtk-server/default.nix
+++ b/pkgs/development/interpreters/gtk-server/default.nix
@@ -1,28 +1,34 @@
-{ stdenv, fetchurl, libffcall, gtk2, pkgconfig }:
+{ stdenv, fetchurl
+, glib
+, gtk3
+, libffcall
+, pkgconfig
+, wrapGAppsHook
+}:
stdenv.mkDerivation rec {
- v = "2.3.1";
- name = "gtk-server-${v}";
+ pname = "gtk-server";
+ version = "2.4.5";
src = fetchurl {
- url = "mirror://sourceforge/gtk-server/${name}-sr.tar.gz";
- sha256 = "0z8ng5rhxc7fpsj3d50h25wkgcnxjfy030jm8r9w9m729w2c9hxb";
+ url = "https://www.gtk-server.org/stable/gtk-server-${version}.tar.gz";
+ sha256 = "0vlx5ibvc7hyc8yipjgvrx1azvmh42i9fv1khg3dvn09nrdkrc7f";
};
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libffcall gtk2 ];
+ preConfigure = ''
+ cd src
+ '';
- configureOptions = [ "--with-gtk2" ];
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+ buildInputs = [ libffcall glib gtk3 ];
- NIX_LDFLAGS = [
- "-ldl"
- ];
+ configureOptions = [ "--with-gtk3" ];
- meta = {
+ meta = with stdenv.lib; {
description = "gtk-server for interpreted GUI programming";
- homepage = http://www.gtk-server.org/;
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = [stdenv.lib.maintainers.tohl];
- platforms = stdenv.lib.platforms.linux;
+ homepage = "http://www.gtk-server.org/";
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.tohl ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.0.sh
index c7fb4f70fc6a..6bb3910aaff4 100644
--- a/pkgs/development/interpreters/guile/setup-hook-2.0.sh
+++ b/pkgs/development/interpreters/guile/setup-hook-2.0.sh
@@ -1,12 +1,12 @@
addGuileLibPath () {
if test -d "$1/share/guile/site/2.0"
then
- export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0"
- export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.0"
+ export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0"
+ export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.0"
elif test -d "$1/share/guile/site"
then
- export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
- export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
+ export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
+ export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
fi
}
diff --git a/pkgs/development/interpreters/guile/setup-hook-2.2.sh b/pkgs/development/interpreters/guile/setup-hook-2.2.sh
index 73e700bde026..4b3541fcc7f0 100644
--- a/pkgs/development/interpreters/guile/setup-hook-2.2.sh
+++ b/pkgs/development/interpreters/guile/setup-hook-2.2.sh
@@ -1,12 +1,12 @@
addGuileLibPath () {
if test -d "$1/share/guile/site/2.2"
then
- export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.2"
- export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.2"
+ export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.2"
+ export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.2"
elif test -d "$1/share/guile/site"
then
- export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
- export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
+ export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
+ export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH-}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
fi
}
diff --git a/pkgs/development/interpreters/guile/setup-hook.sh b/pkgs/development/interpreters/guile/setup-hook.sh
index bf04fee1e893..d006b50ce8ef 100644
--- a/pkgs/development/interpreters/guile/setup-hook.sh
+++ b/pkgs/development/interpreters/guile/setup-hook.sh
@@ -1,7 +1,7 @@
addGuileLibPath () {
if test -d "$1/share/guile/site"
then
- export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
+ export GUILE_LOAD_PATH="${GUILE_LOAD_PATH-}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
fi
}
diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix
index a6acd603c815..5816b3a175c6 100644
--- a/pkgs/development/interpreters/hy/default.nix
+++ b/pkgs/development/interpreters/hy/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python2Packages }:
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
pname = "hy";
version = "0.17.0";
- src = pythonPackages.fetchPypi {
+ src = python2Packages.fetchPypi {
inherit pname version;
sha256 = "1gdbqsirsdxj320wnp7my5awzs1kfs6m4fqmkzbd1zd47qzj0zfi";
};
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python2Packages; [
appdirs
astor
clint
diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix
index 6c0568d68134..f763274c15d7 100644
--- a/pkgs/development/interpreters/io/default.nix
+++ b/pkgs/development/interpreters/io/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
- ncurses, freetype, libGLU_combined, libpng, libtiff, libjpeg, readline, libsndfile,
+ ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile,
libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl,
python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
buildInputs = [
zlib sqlite gmp libffi cairo ncurses freetype
- libGLU_combined libpng libtiff libjpeg readline libsndfile libxml2
+ libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2
freeglut libsamplerate pcre libevent libedit yajl
pkgconfig glfw openssl libpthreadstubs libXdmcp
libmemcached python3
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
maintainers = with maintainers; [
raskin
- z77z
+ maggesi
vrthra
];
platforms = [ "x86_64-linux" ];
diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
index 337b83767f4e..be5da812530d 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
- version = "1.4.0";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
- sha256 = "0xszmgw5nl5b6gd3344h1mic1c1a3hj7nivp4d9hqzzh131qvbn5";
+ sha256 = "13b4haaanlgi8qpwwvf59zf7qsw8p0zdqv7xdxjjyid5yww7jmm2";
};
nativeBuildInputs = [ meson ninja ];
diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix
index 91b4c0b9a9e6..09d7fa622fc1 100644
--- a/pkgs/development/interpreters/jimtcl/default.nix
+++ b/pkgs/development/interpreters/jimtcl/default.nix
@@ -5,35 +5,53 @@ let
in stdenv.mkDerivation rec {
pname = "jimtcl";
- version = "0.78";
+ version = "0.79";
src = fetchFromGitHub {
owner = "msteveb";
repo = "jimtcl";
rev = version;
- sha256 = "1nrjxjfh69i35ig8sxdlal4ydd3cl0x68c05s6svnf1y2i1bl23j";
+ sha256 = "1k88hz0v3bi19xdvlp0i9nsx38imzwpjh632w7326zwbv2wldf0h";
};
- buildInputs = [
- sqlite readline asciidoc SDL SDL_gfx
+ nativeBuildInputs = [
+ asciidoc
];
- NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ];
+ buildInputs = [
+ sqlite readline SDL SDL_gfx
+ ];
configureFlags = [
+ "--shared"
"--with-ext=oo"
"--with-ext=tree"
"--with-ext=binary"
"--with-ext=sqlite3"
"--with-ext=readline"
"--with-ext=sdl"
+ "--with-ext=json"
"--enable-utf8"
"--ipv6"
];
+ NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ];
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+ preCheck = ''
+ # test exec2-3.2 fails depending on platform or sandboxing (?)
+ rm tests/exec2.test
+ '';
+
+ postInstall = ''
+ ln -sr $out/lib/libjim.so.${version} $out/lib/libjim.so
+ '';
+
meta = {
description = "An open source small-footprint implementation of the Tcl programming language";
- homepage = http://jim.tcl.tk/;
+ homepage = "http://jim.tcl.tk/";
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ dbohdan vrthra ];
diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix
index 7e90c6dfb287..6a3aa9f648f4 100644
--- a/pkgs/development/interpreters/love/0.10.nix
+++ b/pkgs/development/interpreters/love/0.10.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit,
+{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit,
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
libtheora, which, autoconf, automake, libtool
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123
+ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123
libvorbis libogg libtheora autoconf which libtool automake
];
diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix
index 7f39259c298e..3bf8aee0d07b 100644
--- a/pkgs/development/interpreters/love/0.7.nix
+++ b/pkgs/development/interpreters/love/0.7.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
-, SDL, libGLU_combined, openal, lua
+, SDL, libGLU, libGL, openal, lua
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
, libmng
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- SDL libGLU_combined openal lua
+ SDL libGLU libGL openal lua
libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng
];
diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix
index 792fe299e4dd..57c1a6ce5641 100644
--- a/pkgs/development/interpreters/love/0.8.nix
+++ b/pkgs/development/interpreters/love/0.8.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
-, SDL, libGLU_combined, openal, lua
+, SDL, libGLU, libGL, openal, lua
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- SDL libGLU_combined openal lua
+ SDL libGLU libGL openal lua
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
];
diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix
index f1571dc726c0..a2182f454361 100644
--- a/pkgs/development/interpreters/love/0.9.nix
+++ b/pkgs/development/interpreters/love/0.9.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
-, SDL2, libGLU_combined, openal, luajit
+, SDL2, libGLU, libGL, openal, luajit
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- SDL2 libGLU_combined openal luajit
+ SDL2 libGLU libGL openal luajit
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
];
diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix
index 6f3f7161a0b8..0a60a4cacfe7 100644
--- a/pkgs/development/interpreters/love/11.1.nix
+++ b/pkgs/development/interpreters/love/11.1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit,
+{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit,
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
libtheora, which, autoconf, automake, libtool
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123
+ SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123
libvorbis libogg libtheora autoconf which libtool automake
];
diff --git a/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch b/pkgs/development/interpreters/lua-5/CVE-2014-5461.patch
similarity index 100%
rename from pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch
rename to pkgs/development/interpreters/lua-5/CVE-2014-5461.patch
diff --git a/pkgs/development/interpreters/lua-5/CVE-2019-6706.patch b/pkgs/development/interpreters/lua-5/CVE-2019-6706.patch
new file mode 100644
index 000000000000..89e81b7eb68b
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/CVE-2019-6706.patch
@@ -0,0 +1,22 @@
+--- a/src/lapi.c
++++ b/src/lapi.c
+@@ -1285,14 +1285,14 @@ LUA_API void *lua_upvalueid (lua_State *
+
+ LUA_API void lua_upvaluejoin (lua_State *L, int fidx1, int n1,
+ int fidx2, int n2) {
+- LClosure *f1;
+- UpVal **up1 = getupvalref(L, fidx1, n1, &f1);
++ UpVal **up1 = getupvalref(L, fidx1, n1, NULL); /* the last parameter not needed */
+ UpVal **up2 = getupvalref(L, fidx2, n2, NULL);
++ if (*up1 == *up2) return; /* Already joined */
++ (*up2)->refcount++;
++ if (upisopen(*up2)) (*up2)->u.open.touched = 1;
++ luaC_upvalbarrier(L, *up2);
+ luaC_upvdeccount(L, *up1);
+ *up1 = *up2;
+- (*up1)->refcount++;
+- if (upisopen(*up1)) (*up1)->u.open.touched = 1;
+- luaC_upvalbarrier(L, *up1);
+ }
+
+
diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix
index 74ccb91030aa..be7aa5fc09d7 100644
--- a/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix
@@ -161,7 +161,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps"] // {
# enabled only for src.rock
setSourceRoot= let
- name_only=(builtins.parseDrvName name).name;
+ name_only= lib.getName name;
in
lib.optionalString (knownRockspec == null) ''
# format is rockspec_basename/source_basename
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 08645dfb77f3..7e79ff8f117a 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -1,5 +1,5 @@
# similar to interpreters/python/default.nix
-{ stdenv, lib, callPackage, fetchurl }:
+{ stdenv, lib, callPackage, fetchurl, fetchpatch }:
let
dsoPatch51 = fetchurl {
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/lua-arch.patch?h=packages/lua51";
@@ -18,7 +18,10 @@ in rec {
lua5_3 = callPackage ./interpreter.nix {
sourceVersion = { major = "5"; minor = "3"; patch = "5"; };
hash = "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac";
- patches = lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ] ;
+ patches =
+ lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ] ++ [
+ ./CVE-2019-6706.patch
+ ];
postConfigure = lib.optionalString (!stdenv.isDarwin) ''
cat ${./lua-5.3-dso.make} >> src/Makefile
sed -e 's/ALL_T *= */& $(LUA_SO)/' -i src/Makefile
@@ -49,7 +52,7 @@ in rec {
sourceVersion = { major = "5"; minor = "1"; patch = "5"; };
hash = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333";
patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch51 ])
- ++ [ ./5.1.0004-Fix-stack-overflow-in-vararg-functions.patch ];
+ ++ [ ./CVE-2014-5461.patch ];
};
luajit_2_0 = import ../luajit/2.0.nix {
diff --git a/pkgs/development/interpreters/lua-5/setup-hook.sh b/pkgs/development/interpreters/lua-5/setup-hook.sh
index f7e56b62ac90..1c445b82afde 100644
--- a/pkgs/development/interpreters/lua-5/setup-hook.sh
+++ b/pkgs/development/interpreters/lua-5/setup-hook.sh
@@ -20,7 +20,7 @@ addToLuaSearchPathWithCustomDelimiter() {
if [[ ! -d "$topDir" ]]; then return; fi
# export only if we haven't already got this dir in the search path
- if [[ ${!varName} == *"$absPattern"* ]]; then return; fi
+ if [[ ${!varName-} == *"$absPattern"* ]]; then return; fi
export "${varName}=${!varName:+${!varName};}${absPattern}"
}
diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix
index 816744e61cff..53ec2baeb5e5 100644
--- a/pkgs/development/interpreters/lua-5/wrapper.nix
+++ b/pkgs/development/interpreters/lua-5/wrapper.nix
@@ -11,7 +11,7 @@
let
env = let
paths = requiredLuaModules (extraLibs ++ [ lua ] );
- in buildEnv {
+ in (buildEnv {
name = "${lua.name}-env";
inherit paths;
@@ -20,12 +20,6 @@ let
# we create wrapper for the binaries in the different packages
postBuild = ''
-
- . "${makeWrapper}/nix-support/setup-hook"
-
- # get access to lua functions
- . ${lua}/nix-support/setup-hook
-
if [ -L "$out/bin" ]; then
unlink "$out/bin"
fi
@@ -68,5 +62,8 @@ let
'';
};
};
- };
+ }).overrideAttrs (_: {
+ # Add extra deps needed for postBuild hook.
+ nativeBuildInputs = [ makeWrapper lua ];
+ });
in env
diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix
index 5a241fbf83ee..a8db08e87a2c 100644
--- a/pkgs/development/interpreters/lush/default.nix
+++ b/pkgs/development/interpreters/lush/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU_combined, SDL
+{stdenv, fetchurl, libX11, xorgproto, indent, readline, gsl, freeglut, libGLU, libGL, SDL
, blas, libbfd, intltool, gettext, zlib, libSM}:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- libX11 libSM xorgproto indent readline gsl freeglut libGLU_combined SDL blas libbfd
+ libX11 libSM xorgproto indent readline gsl freeglut libGLU libGL SDL blas libbfd
intltool gettext zlib
];
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index cc9f6fcc3c90..eb9827969e12 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
-, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGLU_combined, fltk
-, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp
+, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGL, libGLU, fltk
+, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp, gl2ps
, qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null
}:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw
- fftwSinglePrec portaudio qrupdate arpack libwebp ]
+ fftwSinglePrec portaudio qrupdate arpack libwebp gl2ps ]
++ (stdenv.lib.optional (qt != null) qt)
++ (stdenv.lib.optional (qscintilla != null) qscintilla)
++ (stdenv.lib.optional (ghostscript != null) ghostscript)
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optional (jdk != null) jdk)
++ (stdenv.lib.optional (gnuplot != null) gnuplot)
++ (stdenv.lib.optional (python != null) python)
- ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGLU_combined libX11 ])
+ ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
;
# makeinfo is required by Octave at runtime to display help
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 2ecc5cbb2ef6..89979e18bdc6 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -1,5 +1,5 @@
{ config, lib, stdenv, fetchurl, pkgs, buildPackages, callPackage
-, enableThreading ? stdenv ? glibc, makeWrapper
+, enableThreading ? stdenv ? glibc, coreutils, makeWrapper
}:
with lib;
@@ -35,7 +35,7 @@ let
# TODO: Add a "dev" output containing the header files.
outputs = [ "out" "man" "devdoc" ] ++
- stdenv.lib.optional crossCompiling "dev";
+ optional crossCompiling "dev";
setOutputFlags = false;
disallowedReferences = [ stdenv.cc ];
@@ -57,12 +57,20 @@ let
++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
++ optional crossCompiling ./MakeMaker-cross.patch;
- postPatch = ''
- pwd="$(type -P pwd)"
+ # This is not done for native builds because pwd may need to come from
+ # bootstrap tools when building bootstrap perl.
+ postPatch = (if crossCompiling then ''
substituteInPlace dist/PathTools/Cwd.pm \
- --replace "/bin/pwd" "$pwd"
- '' + stdenv.lib.optionalString crossCompiling ''
+ --replace "/bin/pwd" '${coreutils}/bin/pwd'
substituteInPlace cnf/configure_tool.sh --replace "cc -E -P" "cc -E"
+ '' else ''
+ substituteInPlace dist/PathTools/Cwd.pm \
+ --replace "/bin/pwd" "$(type -P pwd)"
+ '') +
+ # Perl's build system uses the src variable, and its value may end up in
+ # the output in some cases (when cross-compiling)
+ ''
+ unset src
'';
# Build a thread-safe Perl with a dynamic libperls.o. We need the
@@ -85,7 +93,7 @@ let
++ optional stdenv.isSunOS "-Dcc=gcc"
++ optional enableThreading "-Dusethreads";
- configureScript = stdenv.lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure";
+ configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure";
dontAddPrefix = !crossCompiling;
@@ -140,7 +148,7 @@ let
}" /no-such-path \
--replace "${stdenv.cc}" /no-such-path \
--replace "$man" /no-such-path
- '' + stdenv.lib.optionalString crossCompiling
+ '' + optionalString crossCompiling
''
mkdir -p $dev/lib/perl5/cross_perl/${version}
for dir in cnf/{stub,cpan}; do
@@ -172,12 +180,12 @@ let
platforms = platforms.all;
priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
};
- } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
- crossVersion = "980998f7d11baf97284426ca91f84681d49a08f5"; # Jul 20, 2019
+ } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec {
+ crossVersion = "ba90816ef2c24dc06fd6cd2c854abcfa1aae00a3"; # Nov 22, 2019
perl-cross-src = fetchurl {
url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz";
- sha256 = "1hg3k2rhjs5gclrm05z87nvlh4j9pg7mkm9998h9gy6mzk8224q5";
+ sha256 = "19jq5fz6l64s0v6j64n5mkk5v2srpyfn9sc09hwbpkp9n74q82j4";
};
depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ];
@@ -205,15 +213,15 @@ in {
perl530 = common {
perl = pkgs.perl530;
buildPerl = buildPackages.perl530;
- version = "5.30.0";
- sha256 = "1wkmz6xn3fswpqhz29akiklcxclnlykhp96a8bqcz36rak3i64l5";
+ version = "5.30.1";
+ sha256 = "0r7r8a7pkgxp3w5lza559ahxczw6hzpwvhkpc4c99vpi3xbjagdz";
};
# the latest Devel version
perldevel = common {
perl = pkgs.perldevel;
buildPerl = buildPackages.perldevel;
- version = "5.31.2";
- sha256 = "00bdh9lmjb0m7dhk8mj7kab7cg2zn9zgw82y4hgkwydzg6d1jis0";
+ version = "5.31.6";
+ sha256 = "08n3c8xm1brxpckqy8i1xgjrpl4afrhcva9bhxswr938n675x71k";
};
}
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 4778f08560df..26798d676e04 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -4,7 +4,7 @@
, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
-, libzip, valgrind
+, libzip, valgrind, oniguruma
}:
with lib;
@@ -78,6 +78,7 @@ let
buildInputs = [ ]
++ optional (versionOlder version "7.3") pcre
++ optional (versionAtLeast version "7.3") pcre2
+ ++ optional (versionAtLeast version "7.4") oniguruma
++ optional withSystemd systemd
++ optionals imapSupport [ uwimap openssl pam ]
++ optionals curlSupport [ curl openssl ]
@@ -114,7 +115,8 @@ let
"--with-config-file-scan-dir=/etc/php.d"
]
++ optional (versionOlder version "7.3") "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
- ++ optional (versionAtLeast version "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
+ ++ optional (versions.majorMinor version == "7.3") "--with-pcre-regex=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
+ ++ optional (versionAtLeast version "7.4") "--with-external-pcre=${pcre2.dev} PCRE_LIBDIR=${pcre2}"
++ optional stdenv.isDarwin "--with-iconv=${libiconv}"
++ optional withSystemd "--with-fpm-systemd"
++ optionals imapSupport [
@@ -133,10 +135,11 @@ let
++ optional mhashSupport "--with-mhash"
++ optional curlSupport "--with-curl=${curl.dev}"
++ optional zlibSupport "--with-zlib=${zlib.dev}"
- ++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}"
+ ++ optional (libxml2Support && (versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}"
++ optional (!libxml2Support) [
"--disable-dom"
"--disable-libxml"
+ (if (versionOlder version "7.4") then "--disable-libxml" else "--without-libxml")
"--disable-simplexml"
"--disable-xml"
"--disable-xmlreader"
@@ -156,7 +159,12 @@ let
++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
++ optional bcmathSupport "--enable-bcmath"
# FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
- ++ optionals gdSupport [
+ ++ optionals (gdSupport && versionAtLeast version "7.4") [
+ "--enable-gd"
+ "--with-jpeg=${libjpeg.dev}"
+ "--with-freetype=${freetype.dev}"
+ "--enable-gd-jis-conv"
+ ] ++ optionals (gdSupport && versionOlder version "7.4") [
"--with-gd"
"--with-freetype-dir=${freetype.dev}"
"--with-png-dir=${libpng.dev}"
@@ -173,7 +181,8 @@ let
++ optional xslSupport "--with-xsl=${libxslt.dev}"
++ optional mcryptSupport "--with-mcrypt=${libmcrypt'}"
++ optional bz2Support "--with-bz2=${bzip2.dev}"
- ++ optional zipSupport "--enable-zip"
+ ++ optional (zipSupport && (versionOlder version "7.4")) "--enable-zip"
+ ++ optional (zipSupport && (versionAtLeast version "7.4")) "--with-zip"
++ optional ftpSupport "--enable-ftp"
++ optional fpmSupport "--enable-fpm"
++ optional ztsSupport "--enable-maintainer-zts"
@@ -181,7 +190,7 @@ let
++ optional sodiumSupport "--with-sodium=${libsodium.dev}"
++ optional tidySupport "--with-tidy=${html-tidy}"
++ optional argon2Support "--with-password-argon2=${libargon2}"
- ++ optional libzipSupport "--with-libzip=${libzip.dev}"
+ ++ optional (libzipSupport && (versionOlder version "7.4")) "--with-libzip=${libzip.dev}"
++ optional phpdbgSupport "--enable-phpdbg"
++ optional (!phpdbgSupport) "--disable-phpdbg"
++ optional (!cgiSupport) "--disable-cgi"
@@ -254,18 +263,23 @@ let
in {
php72 = generic {
- version = "7.2.24";
- sha256 = "00znhjcn6k4mbxz6jqlqf6bzr4cqdf8pnbmxkg6bns1hnr6r6yd0";
+ version = "7.2.26";
+ sha256 = "0yw49v3rk3cd0fb4gsli74pgd4qrykhn9c37dyfr3zsprzp8cvgk";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
};
php73 = generic {
- version = "7.3.11";
- sha256 = "1rxm256vhnvyabfwmyv51sqrkjlid1g8lczcy4skc2f72d5zzlcj";
+ version = "7.3.13";
+ sha256 = "1g376b9caw21mw8738z354llbzb3shzgc60m7naw7wql5038jysw";
# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
};
+
+ php74 = generic {
+ version = "7.4.1";
+ sha256 = "0klfwhm2935ariwzqdri1fwh4a0vbrk3jis53qzi18isp3qa073b";
+ };
}
diff --git a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
new file mode 100644
index 000000000000..a1f9d68eb166
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch
@@ -0,0 +1,100 @@
+From 597e73f2a4b2f0b508127931b36d5540d6941823 Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk
+Date: Mon, 28 Aug 2017 09:24:06 +0200
+Subject: [PATCH] Don't use ldconfig
+
+---
+ Lib/ctypes/util.py | 70 ++----------------------------------------------------
+ 1 file changed, 2 insertions(+), 68 deletions(-)
+
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 5e8b31a854..7b45ce6c15 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -94,46 +94,7 @@ elif os.name == "posix":
+ import re, tempfile
+
+ def _findLib_gcc(name):
+- # Run GCC's linker with the -t (aka --trace) option and examine the
+- # library name it prints out. The GCC command will fail because we
+- # haven't supplied a proper program with main(), but that does not
+- # matter.
+- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name))
+-
+- c_compiler = shutil.which('gcc')
+- if not c_compiler:
+- c_compiler = shutil.which('cc')
+- if not c_compiler:
+- # No C compiler available, give up
+- return None
+-
+- temp = tempfile.NamedTemporaryFile()
+- try:
+- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name]
+-
+- env = dict(os.environ)
+- env['LC_ALL'] = 'C'
+- env['LANG'] = 'C'
+- try:
+- proc = subprocess.Popen(args,
+- stdout=subprocess.PIPE,
+- stderr=subprocess.STDOUT,
+- env=env)
+- except OSError: # E.g. bad executable
+- return None
+- with proc:
+- trace = proc.stdout.read()
+- finally:
+- try:
+- temp.close()
+- except FileNotFoundError:
+- # Raised if the file was already removed, which is the normal
+- # behaviour of GCC if linking fails
+- pass
+- res = re.search(expr, trace)
+- if not res:
+- return None
+- return os.fsdecode(res.group(0))
++ return None
+
+
+ if sys.platform == "sunos5":
+@@ -255,34 +216,7 @@ elif os.name == "posix":
+ else:
+
+ def _findSoname_ldconfig(name):
+- import struct
+- if struct.calcsize('l') == 4:
+- machine = os.uname().machine + '-32'
+- else:
+- machine = os.uname().machine + '-64'
+- mach_map = {
+- 'x86_64-64': 'libc6,x86-64',
+- 'ppc64-64': 'libc6,64bit',
+- 'sparc64-64': 'libc6,64bit',
+- 's390x-64': 'libc6,64bit',
+- 'ia64-64': 'libc6,IA-64',
+- }
+- abi_type = mach_map.get(machine, 'libc6')
+-
+- # XXX assuming GLIBC's ldconfig (with option -p)
+- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s'
+- regex = os.fsencode(regex % (re.escape(name), abi_type))
+- try:
+- with subprocess.Popen(['/sbin/ldconfig', '-p'],
+- stdin=subprocess.DEVNULL,
+- stderr=subprocess.DEVNULL,
+- stdout=subprocess.PIPE,
+- env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
+- res = re.search(regex, p.stdout.read())
+- if res:
+- return os.fsdecode(res.group(1))
+- except OSError:
+- pass
++ return None
+
+ def _findLib_ld(name):
+ # See issue #9998 for why this is needed
+--
+2.15.0
+
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 09c324716bda..43d2d159e36a 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -17,6 +17,7 @@
# For the Python package set
, packageOverrides ? (self: super: {})
, buildPackages
+, pythonForBuild ? buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"}
, sourceVersion
, sha256
, passthruFun
@@ -63,7 +64,7 @@ let
hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
- pythonForBuild = buildPackages.${"python${sourceVersion.major}${sourceVersion.minor}"};
+ inherit pythonForBuild;
pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then
"$out/bin/python"
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index ddfa9557582a..76065dcdc29a 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -29,6 +29,7 @@ with pkgs;
isPy36 = pythonVersion == "3.6";
isPy37 = pythonVersion == "3.7";
isPy38 = pythonVersion == "3.8";
+ isPy39 = pythonVersion == "3.9";
isPy2 = lib.strings.substring 0 1 pythonVersion == "2";
isPy3 = lib.strings.substring 0 1 pythonVersion == "3";
isPy3k = isPy3;
@@ -78,10 +79,10 @@ in {
sourceVersion = {
major = "3";
minor = "6";
- patch = "9";
+ patch = "10";
suffix = "";
};
- sha256 = "1nkh70azbv866aw5a9bbxsxarsf40233vrzpjq17z3rz9ramybsy";
+ sha256 = "1pj0mz1xl27khi250p29c0y99vxg662js8zp71aprkf8i8wkr0qa";
inherit (darwin) CF configd;
inherit passthruFun;
};
@@ -104,27 +105,31 @@ in {
sourceVersion = {
major = "3";
minor = "8";
- patch = "0";
+ patch = "1";
suffix = "";
};
- sha256 = "110d0did9rxn7rg85kf2fwli5hqq44xv2d8bi7d92m7v2d728mmk";
+ sha256 = "1s4lwn5vzsajlc88m6hkghsvnjw4d00l2dsgng0m2w6vyqbl32bm";
+ inherit (darwin) CF configd;
+ inherit passthruFun;
+ };
+
+ python39 = callPackage ./cpython {
+ self = python39;
+ sourceVersion = {
+ major = "3";
+ minor = "9";
+ patch = "0";
+ suffix = "a2";
+ };
+ sha256 = "02a301bdcldin05ksdg8xw8xr6gdkpf73p0cabvn9rdl6yhkr3q8";
inherit (darwin) CF configd;
inherit passthruFun;
};
# Minimal versions of Python (built without optional dependencies)
- python3Minimal = (callPackage ./cpython {
+ python3Minimal = (python37.override {
self = python3Minimal;
- sourceVersion = {
- major = "3";
- minor = "7";
- patch = "4";
- suffix = "";
- };
- sha256 = "0gxiv5617zd7dnqm5k9r4q2188lk327nf9jznwq9j6b8p0s92ygv";
- inherit (darwin) CF configd;
- inherit passthruFun;
-
+ pythonForBuild = pkgs.buildPackages.python3Minimal;
# strip down that python version as much as possible
openssl = null;
readline = null;
diff --git a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh b/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
index 48295dc36430..45893aae00f4 100644
--- a/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/flit-build-hook.sh
@@ -9,7 +9,7 @@ flitBuildPhase () {
echo "Finished executing flitBuildPhase"
}
-if [ -z "$dontUseFlitBuild" ] && [ -z "$buildPhase" ]; then
+if [ -z "${dontUseFlitBuild-}" ] && [ -z "${buildPhase-}" ]; then
echo "Using flitBuildPhase"
buildPhase=flitBuildPhase
fi
diff --git a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
index c297bfffb1e2..292f13d30154 100644
--- a/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pip-build-hook.sh
@@ -31,12 +31,12 @@ pipShellHook() {
echo "Finished executing pipShellHook"
}
-if [ -z "$dontUsePipBuild" ] && [ -z "$buildPhase" ]; then
+if [ -z "${dontUsePipBuild-}" ] && [ -z "${buildPhase-}" ]; then
echo "Using pipBuildPhase"
buildPhase=pipBuildPhase
fi
-if [ -z "$shellHook" ]; then
+if [ -z "${shellHook-}" ]; then
echo "Using pipShellHook"
shellHook=pipShellHook
fi
diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
index f528ec63cb8e..4eefe22d3f28 100644
--- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh
@@ -18,7 +18,7 @@ pipInstallPhase() {
echo "Finished executing pipInstallPhase"
}
-if [ -z "$dontUsePipInstall" ] && [ -z "$installPhase" ]; then
+if [ -z "${dontUsePipInstall-}" ] && [ -z "${installPhase-}" ]; then
echo "Using pipInstallPhase"
installPhase=pipInstallPhase
fi
diff --git a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
index 24510b9f9931..18f05b6d218c 100644
--- a/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/pytest-check-hook.sh
@@ -43,7 +43,7 @@ function pytestCheckPhase() {
echo "Finished executing pytestCheckPhase"
}
-if [ -z "$dontUsePytestCheck" ] && [ -z "$installCheckPhase" ]; then
+if [ -z "${dontUsePytestCheck-}" ] && [ -z "${installCheckPhase-}" ]; then
echo "Using pytestCheckPhase"
preDistPhases+=" pytestCheckPhase"
fi
diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh
index e9065cf17934..374a2eddb407 100644
--- a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook.sh
@@ -5,6 +5,6 @@ pythonCatchConflictsPhase() {
@pythonInterpreter@ @catchConflicts@
}
-if [ -z "$dontUsePythonCatchConflicts" ]; then
+if [ -z "${dontUsePythonCatchConflicts-}" ]; then
preDistPhases+=" pythonCatchConflictsPhase"
fi
diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
index 7e2b3f69d6dd..0fc55145a8eb 100644
--- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
@@ -10,7 +10,7 @@ pythonImportsCheckPhase () {
fi
}
-if [ -z "$dontUsePythonImportsCheck" ]; then
+if [ -z "${dontUsePythonImportsCheck-}" ]; then
echo "Using pythonImportsCheckPhase"
preDistPhases+=" pythonImportsCheckPhase"
fi
diff --git a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh
index 960de767be79..2add23f23165 100644
--- a/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/python-remove-bin-bytecode-hook.sh
@@ -12,6 +12,6 @@ pythonRemoveBinBytecodePhase () {
fi
}
-if [ -z "$dontUsePythonRemoveBinBytecode" ]; then
+if [ -z "${dontUsePythonRemoveBinBytecode-}" ]; then
preDistPhases+=" pythonRemoveBinBytecodePhase"
fi
diff --git a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh
index c99ef313c102..2aec92793825 100644
--- a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh
@@ -17,7 +17,7 @@ setuptoolsBuildPhase() {
eval "@pythonInterpreter@ nix_run_setup $args bdist_wheel"
runHook postBuild
- echo "Finished executing setuptoolsInstallPhase"
+ echo "Finished executing setuptoolsBuildPhase"
}
setuptoolsShellHook() {
@@ -36,12 +36,12 @@ setuptoolsShellHook() {
echo "Finished executing setuptoolsShellHook"
}
-if [ -z "$dontUseSetuptoolsBuild" ] && [ -z "$buildPhase" ]; then
+if [ -z "${dontUseSetuptoolsBuild-}" ] && [ -z "${buildPhase-}" ]; then
echo "Using setuptoolsBuildPhase"
buildPhase=setuptoolsBuildPhase
fi
-if [ -z "$dontUseSetuptoolsShellHook" ] && [ -z "$shellHook" ]; then
+if [ -z "${dontUseSetuptoolsShellHook-}" ] && [ -z "${shellHook-}" ]; then
echo "Using setuptoolsShellHook"
shellHook=setuptoolsShellHook
fi
diff --git a/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh
index 71bb036a91ad..88b7b11931b0 100644
--- a/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/setuptools-check-hook.sh
@@ -12,7 +12,7 @@ setuptoolsCheckPhase() {
echo "Finished executing setuptoolsCheckPhase"
}
-if [ -z "$dontUseSetuptoolsCheck" ] && [ -z "$installCheckPhase" ]; then
+if [ -z "${dontUseSetuptoolsCheck-}" ] && [ -z "${installCheckPhase-}" ]; then
echo "Using setuptoolsCheckPhase"
preDistPhases+=" setuptoolsCheckPhase"
fi
diff --git a/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh b/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh
index 6dd0c5be4cb2..fca808a933ba 100644
--- a/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/wheel-unpack-hook.sh
@@ -12,7 +12,7 @@ wheelUnpackPhase(){
echo "Finished executing wheelUnpackPhase"
}
-if [ -z "$dontUseWheelUnpack" ] && [ -z "$unpackPhase" ]; then
+if [ -z "${dontUseWheelUnpack-}" ] && [ -z "${unpackPhase-}" ]; then
echo "Using wheelUnpackPhase"
unpackPhase=wheelUnpackPhase
fi
diff --git a/pkgs/development/interpreters/python/manylinux/default.nix b/pkgs/development/interpreters/python/manylinux/default.nix
new file mode 100644
index 000000000000..a44ead23752b
--- /dev/null
+++ b/pkgs/development/interpreters/python/manylinux/default.nix
@@ -0,0 +1,86 @@
+{ lib, pkgs }:
+
+let
+ # Create a derivation that links all desired manylinux libraries
+ createManyLinuxPackage = name: libs: let
+ drvs = lib.unique (lib.attrValues libs);
+ names = lib.attrNames libs;
+ in pkgs.runCommand name {
+ buildInputs = drvs;
+ } ''
+ mkdir -p $out/lib
+ num_found=0
+
+ IFS=:
+ export DESIRED_LIBRARIES=${lib.concatStringsSep ":" names}
+ export LIBRARY_PATH=${lib.makeLibraryPath drvs}
+ for desired in $DESIRED_LIBRARIES; do
+ for path in $LIBRARY_PATH; do
+ if [ -e $path/$desired ]; then
+ echo "FOUND $path/$desired"
+ ln -s $path/$desired $out/lib/$desired
+ num_found=$((num_found+1))
+ break
+ fi
+ done
+ done
+
+ num_desired=${toString (lib.length names)}
+ echo "Found $num_found of $num_desired libraries"
+ if [ "$num_found" -ne "$num_desired" ]; then
+ echo "Error: not all desired libraries were found"
+ exit 1
+ fi
+ '';
+
+ getLibOutputs = lib.mapAttrs (k: v: lib.getLib v);
+
+ # https://www.python.org/dev/peps/pep-0599/
+ manylinux2014Libs = getLibOutputs(with pkgs; {
+ "libgcc_s.so.1" = glibc;
+ "libstdc++.so.6" = stdenv.cc.cc;
+ "libm.so.6" = glibc;
+ "libdl.so.2" = glibc;
+ "librt.so.1" = glibc;
+ "libc.so.6" = glibc;
+ "libnsl.so.1" = glibc;
+ "libutil.so.1" = glibc;
+ "libpthread.so.0" = glibc;
+ "libresolv.so.2" = glibc;
+ "libX11.so.6" = xorg.libX11;
+ "libXext.so.6" = xorg.libXext;
+ "libXrender.so.1" = xorg.libXrender;
+ "libICE.so.6" = xorg.libICE;
+ "libSM.so.6" = xorg.libSM;
+ "libGL.so.1" = libGL;
+ "libgobject-2.0.so.0" = glib;
+ "libgthread-2.0.so.0" = glib;
+ "libglib-2.0.so.0" = glib;
+ });
+
+ # https://www.python.org/dev/peps/pep-0571/
+ manylinux2010Libs = manylinux2014Libs;
+
+ # https://www.python.org/dev/peps/pep-0513/
+ manylinux1Libs = getLibOutputs(manylinux2010Libs // (with pkgs; {
+ "libpanelw.so.5" = ncurses5;
+ "libncursesw.so.5" = ncurses5;
+ "libcrypt.so.1" = glibc;
+ }));
+
+in {
+ # List of libraries that are needed for manylinux compatibility.
+ # When using a wheel that is manylinux1 compatible, just extend
+ # the `buildInputs` with one of these `manylinux` lists.
+ # Additionally, add `autoPatchelfHook` to `nativeBuildInputs`.
+ manylinux1 = lib.unique (lib.attrValues manylinux1Libs);
+ manylinux2010 = lib.unique (lib.attrValues manylinux2010Libs);
+ manylinux2014 = lib.unique (lib.attrValues manylinux2014Libs);
+
+ # These are symlink trees to the relevant libs and are typically not needed
+ # These exist so as to quickly test whether all required libraries are provided
+ # by the mapped packages.
+ manylinux1Package = createManyLinuxPackage "manylinux1" manylinux1Libs;
+ manylinux2010Package = createManyLinuxPackage "manylinux2010" manylinux2010Libs;
+ manylinux2014Package = createManyLinuxPackage "manylinux2014" manylinux2014Libs;
+}
diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
index 82b2aac39a9f..7e0580ce063d 100755
--- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
+++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
@@ -229,6 +229,8 @@ def _determine_extension(text, fetcher):
raise ValueError("Don't know how to update a Flit package.")
elif src_format == 'other':
raise ValueError("Don't know how to update a format='other' package.")
+ elif src_format == 'pyproject':
+ raise ValueError("Don't know how to update a pyproject package.")
extension = FORMATS[src_format]
elif fetcher == 'fetchurl':
diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix
new file mode 100644
index 000000000000..23191b0e6d35
--- /dev/null
+++ b/pkgs/development/interpreters/quickjs/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ pname = "quickjs";
+ version = "2019-10-27";
+
+ src = fetchurl {
+ url = "https://bellard.org/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "0xm16ja3c0k80jy0xkx0f40r44v2lgx2si4dnaw2w7c5nx7cmkai";
+ };
+
+ makeFlags = [ "prefix=${placeholder ''out''}" ];
+ enableParallelBuilding = true;
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ PATH="$out/bin:$PATH"
+
+ # Programs exit with code 1 when testing help, so grep for a string
+ set +o pipefail
+ qjs --help 2>&1 | grep "QuickJS version"
+ qjsbn --help 2>&1 | grep "QuickJS version"
+ qjscalc --help 2>&1 | grep "QuickJS version"
+ set -o pipefail
+
+ temp=$(mktemp).js
+ echo "console.log('Output from compiled program');" > "$temp"
+ set -o verbose
+ out=$(mktemp) && qjsc "$temp" -o "$out" && "$out" | grep -q "Output from compiled program"
+ out=$(mktemp) && qjsbnc "$temp" -o "$out" && "$out" | grep -q "Output from compiled program"
+ out=$(mktemp) && qjsc -flto "$temp" -o "$out" && "$out" | grep -q "Output from compiled program"
+ out=$(mktemp) && qjsbnc -flto "$temp" -o "$out" && "$out" | grep -q "Output from compiled program"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A small and embeddable Javascript engine";
+ homepage = "https://bellard.org/quickjs/";
+ maintainers = with maintainers; [ stesie ivan ];
+ platforms = platforms.linux;
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 22b4d84f0509..3b3b91afd6f0 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -46,7 +46,7 @@ in
stdenv.mkDerivation rec {
pname = "racket";
- version = "7.4"; # always change at once with ./minimal.nix
+ version = "7.5"; # always change at once with ./minimal.nix
src = (stdenv.lib.makeOverridable ({ name, sha256 }:
fetchurl {
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
inherit sha256;
}
)) {
- inherit ;name = "${pname}-${version}";
- sha256 = "07rf8sakwssl0gn9g4d3ls2cr10zlhghz0pscrh0jc6mnprrb10i";
+ name = "${pname}-${version}";
+ sha256 = "0b74v0pqkx57x2gk0m4sp94jaf6bi1mci4ix9vx4sh2442sbds1j";
};
FONTCONFIG_FILE = fontsConf;
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
GUIs and charts.
'';
homepage = http://racket-lang.org/;
- license = licenses.lgpl3;
+ license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ kkallio henrytill vrthra ];
platforms = [ "x86_64-darwin" "x86_64-linux" ];
broken = stdenv.isDarwin; # No support yet for setting FFI lookup path
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index b05d449ea2fb..df7c72c4a681 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
name = "racket-minimal-${oldAttrs.version}";
src = oldAttrs.src.override {
inherit name;
- sha256 = "0ixha4hcxlrsqjszjlr7xv6nn3mc5pb6szlbn4cq0880avakmml7";
+ sha256 = "0478f0phkjch10ncsl8lm8a1m8qvgchrkgzpcaxyhmg2clyjgn8r";
};
meta = oldAttrs.meta // {
diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 846bba9e7e7e..759a44b5760f 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL2
-, libpng, ffmpeg, freetype, glew, libGLU_combined, fribidi, zlib
+{ stdenv, fetchurl, python2Packages, pkgconfig, SDL2
+, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib
, glib
}:
-with pythonPackages;
+with python2Packages;
stdenv.mkDerivation rec {
pname = "renpy";
- version = "7.3.3";
+ version = "7.3.5";
meta = with stdenv.lib; {
description = "Ren'Py Visual Novel Engine";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2";
- sha256 = "0wwsm0vg6zd07xmkqrqprymahdl4ifg7bc1lpbrh0qlfs1pvjlss";
+ sha256 = "1anr5cfbvbsbik4v4rvrkdkciwhg700k4lydfbs4n85raimz9mw4";
};
patches = [
@@ -32,13 +32,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
python cython wrapPython tkinter
- SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib
+ SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib
];
pythonPath = [ pygame_sdl2 tkinter ];
RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: path) [
- SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib
+ SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU libGL fribidi zlib
]);
buildPhase = ''
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 723a49782345..ee9b61259bb0 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -3,7 +3,7 @@
, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison
, autoconf, libiconv, libobjc, libunwind, Foundation
, buildEnv, bundler, bundix
-, makeWrapper, buildRubyGem, defaultGemConfig
+, makeWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo
} @ args:
let
@@ -27,6 +27,7 @@ let
ver = version;
tag = ver.gitTag;
atLeast25 = lib.versionAtLeast ver.majMin "2.5";
+ atLeast27 = lib.versionAtLeast ver.majMin "2.7";
baseruby = self.override {
useRailsExpress = false;
docSupport = false;
@@ -44,6 +45,11 @@ let
, groff, docSupport ? true
, libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true
+ # ruby -e "puts RbConfig::CONFIG['configure_args']"
+ # puts a reference to the C compiler in the binary.
+ # This might be required by some gems at runtime,
+ # but we allow to strip it out for smaller closure size.
+ , removeReferencesTo, removeReferenceToCC ? false
, autoreconfHook, bison, autoconf
, buildEnv, bundler, bundix
, libiconv, libobjc, libunwind, Foundation
@@ -111,7 +117,13 @@ let
cp ${config}/config.sub tool/
'';
- configureFlags = ["--enable-shared" "--enable-pthread"]
+ # Force the revision.h generation. Somehow `revision.tmp` is an empty
+ # file and because we don't add `git` to buildInputs, hence the check is
+ # always true.
+ # https://github.com/ruby/ruby/commit/97a5af62a318fcd93a4e5e4428d576c0280ddbae
+ buildFlags = lib.optionals atLeast27 [ "REVISION_LATEST=0" ];
+
+ configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby_${tag}"]
++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"
++ op (!docSupport) "--disable-install-doc"
++ ops stdenv.isDarwin [
@@ -144,7 +156,14 @@ let
postInstall = ''
# Remove unnecessary groff reference from runtime closure, since it's big
sed -i '/NROFF/d' $out/lib/ruby/*/*/rbconfig.rb
-
+ ${
+ lib.optionalString removeReferenceToCC ''
+ # Get rid of the CC runtime dependency
+ ${removeReferencesTo}/bin/remove-references-to \
+ -t ${stdenv.cc} \
+ $out/lib/libruby*
+ ''
+ }
# Bundler tries to create this directory
mkdir -p $out/nix-support
cat > $out/nix-support/setup-hook <"
-+"checksum wasi-common-cbindgen 0.1.0 (git+https://github.com/CraneStation/wasi-common)" = ""
-+"checksum wasmparser 0.29.2 (registry+https://github.com/rust-lang/crates.io-index)" = "981a8797cf89762e0233ec45fae731cb79a4dfaee12d9f0fe6cee01e4ac58d00"
-+"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164"
-+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
++"checksum walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85ce93ab0c27412ba41d509f2410fa575ecbfdb4a6aba0e02e79e12c09745485"
++"checksum walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8757b0da38353d55a9687f4dee68a8f441f980dd36e16ab07d6e6c673f505f76"
++"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
++"checksum wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cae185868c6038a48f487b9af3766ee0c68d4a85fa3610c3a0522092b3cec1"
++"checksum wasmparser 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e5083b449454f7de0b15f131eee17de54b5a71dcb9adcf11df2b2f78fad0cd82"
++"checksum wast 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "86b52202bd73a756b216bbfea019991ff317b1e5f22677da5cef2964696a3245"
++"checksum wat 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "80db13d155bab63db0f19c24a0e12bf60c3fe346edba8da508ba6962e08c137b"
++"checksum which 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "240a31163872f7e8e49f35b42b58485e35355b07eb009d9f3686733541339a69"
++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-+"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
++"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"
++"checksum zstd 0.5.1+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c5d978b793ae64375b80baf652919b148f6a496ac8802922d9999f5a553194f"
++"checksum zstd-safe 2.0.3+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bee25eac9753cfedd48133fa1736cbd23b774e253d89badbeac7d12b23848d3f"
++"checksum zstd-sys 1.4.15+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "89719b034dc22d240d5b407fb0a3fe6d29952c181cff9a9f95c0bd40b4f8f7d8"
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index b53b3ed9dbfb..0cdf1aae3f7c 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -1,24 +1,24 @@
-{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang }:
+{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang, stdenv, darwin }:
rustPlatform.buildRustPackage {
pname = "wasmtime";
- version = "20190521";
+ version = "20191111";
src = fetchFromGitHub {
- owner = "CraneStation";
+ owner = "bytecodealliance";
repo = "wasmtime";
- rev = "e530a582afe6a2b5735fd7cdf5e2e88391e58669";
- sha256 = "13lqf9dp1cnw7ms7hcgirmlfkr0v7nrn3p5g7yacfasrqgnwsyl8";
+ rev = "0006a2af954eba74c79885cb1fe8cdeb68f531c1";
+ sha256 = "0lf3pdkjxcrjmjic7xxyjl5dka3arxi809sp9hm4hih5p2fhf2gw";
fetchSubmodules = true;
};
- cargoSha256 = "1jbpq09czm295316gdv3y0pfapqs0ynj3qbarwlnrv7valq5ak13";
+ cargoSha256 = "0mnwaipa2az3vpgbz4m9siz6bfyhmzwz174k678cv158m7mxx12f";
cargoPatches = [ ./cargo-lock.patch ];
nativeBuildInputs = [ python cmake clang ];
- buildInputs = [ llvmPackages.libclang ];
-
+ buildInputs = [ llvmPackages.libclang ] ++
+ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
meta = with lib; {
diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix
index 94b36b855f25..1ae6346cbe58 100644
--- a/pkgs/development/libraries/AntTweakBar/default.nix
+++ b/pkgs/development/libraries/AntTweakBar/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, unzip, xorg, libGLU_combined }:
+{ stdenv, fetchurl, unzip, xorg, libGLU, libGL }:
stdenv.mkDerivation {
name = "AntTweakBar-1.16";
- buildInputs = [ unzip xorg.libX11 libGLU_combined ];
+ buildInputs = [ unzip xorg.libX11 libGLU libGL ];
src = fetchurl {
url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip";
diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix
new file mode 100644
index 000000000000..60c244009ceb
--- /dev/null
+++ b/pkgs/development/libraries/CGAL/4.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
+
+stdenv.mkDerivation rec {
+ version = "4.14.2";
+ name = "cgal-" + version;
+
+ src = fetchFromGitHub {
+ owner = "CGAL";
+ repo = "releases";
+ rev = "CGAL-${version}";
+ sha256 = "1p1xyws2s9h2c8hlkz1af4ix48qma160av24by6lcm8al1g44pca";
+ };
+
+ # note: optional component libCGAL_ImageIO would need zlib and opengl;
+ # there are also libCGAL_Qt{3,4} omitted ATM
+ buildInputs = [ boost gmp mpfr ];
+ nativeBuildInputs = [ cmake ];
+
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ description = "Computational Geometry Algorithms Library";
+ homepage = http://cgal.org;
+ license = with licenses; [ gpl3Plus lgpl3Plus];
+ platforms = platforms.all;
+ maintainers = [ maintainers.raskin ];
+ };
+}
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index 95984c970018..d2d74769a1fc 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.14";
+ version = "5.0";
name = "cgal-" + version;
src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
- sha256 = "0p0s1dl5a261zwy0hxa7ylkypk45rwc6n84lx507dwdhfz4ihv12";
+ sha256 = "15r631kddphw3wsvrxrkdbq9y7m0q8kx0kwc9zq97x6ksg3v0gs3";
};
# note: optional component libCGAL_ImageIO would need zlib and opengl;
diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/pkgs/development/libraries/SDL/setup-hook.sh
index e8f96fdd1ac9..553e8553a77f 100644
--- a/pkgs/development/libraries/SDL/setup-hook.sh
+++ b/pkgs/development/libraries/SDL/setup-hook.sh
@@ -1,7 +1,9 @@
addSDLPath () {
if [ -e "$1/include/SDL" ]; then
- export SDL_PATH="$SDL_PATH $1/include/SDL"
- export SDL_LIB_PATH="$SDL_LIB_PATH -L$1/lib"
+ export SDL_PATH="${SDL_PATH-}${SDL_PATH:+ }$1/include/SDL"
+ fi
+ if [ -e "$1/lib" ]; then
+ export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib"
fi
}
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 8fe6bbe61130..e02ea05a7262 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -75,9 +75,21 @@ stdenv.mkDerivation rec {
++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"
++ optional stdenv.isDarwin "--disable-sdltest";
+ # We remove libtool .la files when static libs are requested,
+ # because they make the builds of downstream libs like `SDL_tff`
+ # fail with `cannot find -lXext, `-lXcursor` etc. linker errors
+ # because the `.la` files are not pruned if static libs exist
+ # (see https://github.com/NixOS/nixpkgs/commit/fd97db43bcb05e37f6bb77f363f1e1e239d9de53)
+ # and they also don't carry the necessary `-L` paths of their
+ # X11 dependencies.
+ # For static linking, it is better to rely on `pkg-config` `.pc`
+ # files.
postInstall = ''
- moveToOutput lib/libSDL2main.a "$dev"
- rm $out/lib/*.a
+ if [ "$dontDisableStatic" -eq "1" ]; then
+ rm $out/lib/*.la
+ else
+ rm $out/lib/*.a
+ fi
moveToOutput bin/sdl2-config "$dev"
'';
diff --git a/pkgs/development/libraries/SDL2/setup-hook.sh b/pkgs/development/libraries/SDL2/setup-hook.sh
index 3acce9d473c5..0119926491af 100644
--- a/pkgs/development/libraries/SDL2/setup-hook.sh
+++ b/pkgs/development/libraries/SDL2/setup-hook.sh
@@ -1,6 +1,6 @@
addSDL2Path () {
if [ -e "$1/include/SDL2" ]; then
- export SDL2_PATH="$SDL2_PATH $1/include/SDL2"
+ export SDL2_PATH="${SDL2_PATH-}${SDL2_PATH:+ }$1/include/SDL2"
fi
}
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index 04ab13314755..ea352772b33a 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ace";
- version = "6.5.6";
+ version = "6.5.7";
src = fetchurl {
url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
- sha256 = "15lfjc8r854hvjfvimhnqc3987b3cdngilhkii9rwpzginbyipi4";
+ sha256 = "0hvd7y3hs8r3r7qbllfaqrva3jrx5razcnwlws822k66v4r10cbx";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
index 6ab7455915cc..62856157b4b6 100644
--- a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
+++ b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix
@@ -18,7 +18,7 @@ agda.mkDerivation (self: rec {
description = "Sheaves in Agda";
license = stdenv.lib.licenses.cc-by-40;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
broken = true; # replaced by constructive-sheaf-semantics
};
})
diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
index ac9ce9dd84f4..344da00d04f2 100644
--- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
+++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix
@@ -20,7 +20,7 @@ agda.mkDerivation (self: rec {
description = "A monadic parser combinator library which guarantees termination of parsing";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
broken = true;
};
})
diff --git a/pkgs/development/libraries/agda/agda-base/default.nix b/pkgs/development/libraries/agda/agda-base/default.nix
index 146e44182ed2..1bc9d0cb882e 100644
--- a/pkgs/development/libraries/agda/agda-base/default.nix
+++ b/pkgs/development/libraries/agda/agda-base/default.nix
@@ -17,7 +17,7 @@ agda.mkDerivation (self: rec {
description = "Base library for HoTT in Agda";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
broken = true; # largely replaced by HoTT-Agda
};
})
diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
index e2d64841985c..30a03980e44d 100644
--- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
@@ -22,6 +22,6 @@ agda.mkDerivation (self: rec {
description = "Agda standard library developed at Iowa";
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
})
diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix
index a57ee6e08bae..bcdad18bedec 100644
--- a/pkgs/development/libraries/agda/agda-prelude/default.nix
+++ b/pkgs/development/libraries/agda/agda-prelude/default.nix
@@ -18,6 +18,6 @@ agda.mkDerivation (self: rec {
description = "Programming library for Agda";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
- maintainers = with maintainers; [ fuuzetsu mudri ];
+ maintainers = with maintainers; [ mudri ];
};
})
diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix
index 4d071251ee8e..033ba67f661b 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -23,7 +23,6 @@ agda.mkDerivation (self: rec {
description = "A standard library for use with the Agda compiler";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
- broken = stdenv.isDarwin;
- maintainers = with maintainers; [ jwiegley fuuzetsu mudri ];
+ maintainers = with maintainers; [ jwiegley mudri ];
};
})
diff --git a/pkgs/development/libraries/agda/bitvector/default.nix b/pkgs/development/libraries/agda/bitvector/default.nix
index 6306bb89b5c7..c09702c48d78 100644
--- a/pkgs/development/libraries/agda/bitvector/default.nix
+++ b/pkgs/development/libraries/agda/bitvector/default.nix
@@ -18,7 +18,7 @@ agda.mkDerivation (self: rec {
description = "Sequences of bits and common operations on them";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
broken = true;
};
})
diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix
index ea232f2853d6..a58afd7e8667 100644
--- a/pkgs/development/libraries/agda/categories/default.nix
+++ b/pkgs/development/libraries/agda/categories/default.nix
@@ -18,7 +18,7 @@ agda.mkDerivation (self: rec {
description = "Categories parametrized by morphism equality, in Agda";
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
broken = true; # doesn't work due to new agdastdlib, see #9471
};
})
diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix
index 0e4f1da6e140..ffae1f6f900c 100644
--- a/pkgs/development/libraries/agda/pretty/default.nix
+++ b/pkgs/development/libraries/agda/pretty/default.nix
@@ -20,7 +20,7 @@ agda.mkDerivation (self: rec {
description = "Correct-by-Construction Pretty-Printing";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
broken = true; # 2018-04-11
};
})
diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index b267c62d6c70..5f5368f2866d 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11
, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc
-, libXxf86vm, openal, libGLU_combined, libjpeg, flac
+, libXxf86vm, openal, libGLU, libGL, libjpeg, flac
, libXi, libXfixes, freetype, libopus, libtheora
, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs
, libXdmcp
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [
texinfo libXext xorgproto libX11 libXpm libXt libXcursor
alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
- libXxf86vm openal libGLU_combined
+ libXxf86vm openal libGLU libGL
libjpeg flac
libXi libXfixes
enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp
diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 6b44ec1b598a..64488b25b094 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, texinfo, libXext, xorgproto, libX11
, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc
-, libXxf86vm, openal, libGLU_combined }:
+, libXxf86vm, openal, libGLU, libGL }:
stdenv.mkDerivation rec {
pname = "allegro";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [
texinfo libXext xorgproto libX11 libXpm libXt libXcursor
alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
- libXxf86vm openal libGLU_combined
+ libXxf86vm openal libGLU libGL
];
hardeningDisable = [ "format" ];
diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix
index 23c300ab48a3..32ec4dd06fd6 100644
--- a/pkgs/development/libraries/aqbanking/libchipcard.nix
+++ b/pkgs/development/libraries/aqbanking/libchipcard.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Library for access to chipcards";
- homepage = http://www2.aquamaniac.de/sites/download/packages.php?package=02&showall=1;
+ homepage = "https://www.aquamaniac.de/rdm/projects/libchipcard";
license = licenses.lgpl21;
maintainers = with maintainers; [ aszlig ];
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index 0e24d556b1a5..6393e25f561d 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}:
stdenv.mkDerivation rec {
pname = "arb";
- version = "2.16.0";
+ version = "2.17.0";
src = fetchFromGitHub {
owner = "fredrik-johansson";
repo = pname;
rev = version;
- sha256 = "0478671wfwy3gl26sbxh1jq1ih36z4k72waa8y2y2lvn649gb7cd";
+ sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1";
};
buildInputs = [mpir gmp mpfr flint];
configureFlags = [
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
inherit version;
description = ''A library for arbitrary-precision interval arithmetic'';
+ homepage = "http://arblib.org/";
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = with maintainers; [ raskin timokau ];
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix
index 17093deae00f..8fe3bd287c10 100644
--- a/pkgs/development/libraries/argp-standalone/default.nix
+++ b/pkgs/development/libraries/argp-standalone/default.nix
@@ -43,6 +43,8 @@ stdenv.mkDerivation {
doCheck = true;
+ makeFlags = [ "AR:=$(AR)" ];
+
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index a74e883dca52..8dec98271413 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
- version = "9.800.1";
+ version = "9.800.3";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
- sha256 = "1vnshgkz4d992kk2fwqigqfx7gx3145ryb8d2794hn2667h5gkzb";
+ sha256 = "16bm1pa5a8wsk497y9s18dyi3hax03z6g2x2z19b6z0bi3ff30d4";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix
index 17f43a9ddfae..21e93a8cd492 100644
--- a/pkgs/development/libraries/arrayfire/default.nix
+++ b/pkgs/development/libraries/arrayfire/default.nix
@@ -1,36 +1,16 @@
{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig
, cudatoolkit, opencl-clhpp, ocl-icd, fftw, fftwFloat, mkl
-, blas, openblas, boost, mesa, libGLU_combined
-, freeimage, python
+, blas, openblas, boost, mesa, libGLU, libGL
+, freeimage, python, clfft, clblas
+, doxygen, buildDocs ? false
}:
let
- version = "3.6.4";
+ strOnLinux = stdenv.lib.optionalString stdenv.isLinux;
- clfftSource = fetchFromGitHub {
- owner = "arrayfire";
- repo = "clFFT";
- rev = "16925fb93338b3cac66490b5cf764953d6a5dac7";
- sha256 = "0y35nrdz7w4n1l17myhkni3hwm37z775xn6f76xmf1ph7dbkslsc";
- fetchSubmodules = true;
- };
-
- clblasSource = fetchFromGitHub {
- owner = "arrayfire";
- repo = "clBLAS";
- rev = "1f3de2ae5582972f665c685b18ef0df43c1792bb";
- sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs";
- fetchSubmodules = true;
- };
-
- cl2hppSource = fetchurl {
- url = "https://github.com/KhronosGroup/OpenCL-CLHPP/releases/download/v2.0.10/cl2.hpp";
- sha256 = "1v4q0g6b6mwwsi0kn7kbjn749j3qafb9r4ld3zdq1163ln9cwnvw";
- };
-
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
pname = "arrayfire";
- inherit version;
+ version = "3.6.4";
src = fetchurl {
url = "http://arrayfire.com/arrayfire_source/arrayfire-full-${version}.tar.bz2";
@@ -41,21 +21,21 @@ in stdenv.mkDerivation {
"-DAF_BUILD_OPENCL=OFF"
"-DAF_BUILD_EXAMPLES=OFF"
"-DBUILD_TESTING=OFF"
- "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs"
+ (strOnLinux "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs")
];
patches = [ ./no-download.patch ];
postPatch = ''
mkdir -p ./build/third_party/clFFT/src
- cp -R --no-preserve=mode,ownership ${clfftSource}/ ./build/third_party/clFFT/src/clFFT-ext/
+ cp -R --no-preserve=mode,ownership ${clfft.src}/ ./build/third_party/clFFT/src/clFFT-ext/
mkdir -p ./build/third_party/clBLAS/src
- cp -R --no-preserve=mode,ownership ${clblasSource}/ ./build/third_party/clBLAS/src/clBLAS-ext/
+ cp -R --no-preserve=mode,ownership ${clblas.src}/ ./build/third_party/clBLAS/src/clBLAS-ext/
mkdir -p ./build/include/CL
- cp -R --no-preserve=mode,ownership ${cl2hppSource} ./build/include/CL/cl2.hpp
+ cp -R --no-preserve=mode,ownership ${opencl-clhpp}/include/CL/cl2.hpp ./build/include/CL/cl2.hpp
'';
- preBuild = ''
+ preBuild = strOnLinux ''
export CUDA_PATH="${cudatoolkit}"
'';
@@ -64,23 +44,27 @@ in stdenv.mkDerivation {
nativeBuildInputs = [
cmake
pkgconfig
+ python
];
buildInputs = [
opencl-clhpp fftw fftwFloat
mkl
openblas
- libGLU_combined
+ libGLU libGL
mesa freeimage
- boost.out boost.dev python
- ] ++ (stdenv.lib.optional stdenv.isLinux [ cudatoolkit ocl-icd ]);
+ boost.out boost.dev
+ ] ++ (stdenv.lib.optional stdenv.isLinux [ cudatoolkit ocl-icd ])
+ ++ (stdenv.lib.optional buildDocs [ doxygen ]);
meta = with stdenv.lib; {
- description = "A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices";
+ description = "A general-purpose library for parallel and massively-parallel computations";
+ longDescription = ''
+ A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.";
+ '';
license = licenses.bsd3;
- homepage = https://arrayfire.com/ ;
+ homepage = "https://arrayfire.com/";
platforms = platforms.linux ++ platforms.darwin;
- maintainers = with stdenv.lib.maintainers; [ chessai ];
- inherit version;
+ maintainers = with maintainers; [ chessai ];
};
}
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index aaf228e73a68..f6f3493002ad 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -12,12 +12,12 @@ let
in stdenv.mkDerivation rec {
pname = "arrow-cpp";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchurl {
url =
"mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
- sha256 = "0n7xrn5490r2snjl45pm2a4pr2x8a29sh8mpyi4nj5pr9f62s1yi";
+ sha256 = "1jbghpppabsix2rkxbnh41inj9lcxfz4q94p96xzxshh4g3mhb4s";
};
sourceRoot = "apache-arrow-${version}/cpp";
@@ -93,7 +93,7 @@ in stdenv.mkDerivation rec {
];
in ''
ctest -L unittest -V \
- --exclude-regex '(${builtins.concatStringsSep "|" excludedTests})'
+ --exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$'
'');
meta = {
diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix
index 5c3c6272f83d..ad0f910dcbf6 100644
--- a/pkgs/development/libraries/aspell/default.nix
+++ b/pkgs/development/libraries/aspell/default.nix
@@ -15,26 +15,20 @@ let
in
stdenv.mkDerivation rec {
- name = "aspell-0.60.6.1";
+ name = "aspell-0.60.8";
src = fetchurl {
url = "mirror://gnu/aspell/${name}.tar.gz";
- sha256 = "1qgn5psfyhbrnap275xjfrzppf5a83fb67gpql0kfqv37al869gm";
+ sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr";
};
- patches = [
- (fetchpatch { # remove in >= 0.60.7
- name = "gcc-7.patch";
- url = "https://github.com/GNUAspell/aspell/commit/8089fa02122fed0a.diff";
- sha256 = "1b3p1zy2lqr2fknddckm58hyk95hw4scf6hzjny1v9iaic2p37ix";
- })
- ] ++ stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
+ patches = stdenv.lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch;
postPatch = ''
patch interfaces/cc/aspell.h < ${./clang.patch}
'';
- nativeBuildInputs = [ perl ];
+ buildInputs = [ perl ];
doCheck = true;
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index 4af9c9ce32b6..f63a341e26ea 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -16,11 +16,11 @@
stdenv.mkDerivation rec {
pname = "at-spi2-atk";
- version = "2.34.0";
+ version = "2.34.1";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "00250s72ii8w6lb6ww61v49y9k4cswfj0hhawqlram7bl6b7x6is";
+ sha256 = "05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp";
};
nativeBuildInputs = [ meson ninja pkgconfig ];
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index bda809b1a5a9..84a8a6b90265 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -10,6 +10,7 @@
, dbus
, glib
+, dconf
, libX11
, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
, libXi
@@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
postFixup = ''
# Cannot use wrapGAppsHook'due to a dependency cycle
wrapProgram $out/libexec/at-spi-bus-launcher \
- --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" \
+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}
'';
diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
index ac8d78731236..c541159a96eb 100644
--- a/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libmysofa";
- version = "0.8";
+ version = "0.9";
src = fetchFromGitHub {
owner = "hoene";
repo = "libmysofa";
rev = "v${version}";
- sha256 = "1gas6fp0xy57wwdvsdfq1yq2hg4zl2c074b260y7hh92z96pj22j";
+ sha256 = "14k8c31xh0v4r34h89ld440j9zri4plblmlhj5ddhdmzqmh4lr9f";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
index 58d44a541374..1bce315878d0 100644
--- a/pkgs/development/libraries/bamf/default.nix
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -1,6 +1,25 @@
-{ stdenv, autoconf, automake, libtool, gnome3, which, fetchgit, libgtop, libwnck3, glib, vala, pkgconfig
-, libstartup_notification, gobject-introspection, gtk-doc, docbook_xsl
-, xorgserver, dbus, python2, wrapGAppsHook }:
+{ stdenv
+, pantheon
+, autoconf
+, automake
+, libtool
+, gnome3
+, which
+, fetchgit
+, libgtop
+, libwnck3
+, glib
+, vala
+, pkgconfig
+, libstartup_notification
+, gobject-introspection
+, gtk-doc
+, docbook_xsl
+, xorgserver
+, dbus
+, python3
+, wrapGAppsHook
+}:
stdenv.mkDerivation rec {
pname = "bamf";
@@ -9,14 +28,16 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" ];
src = fetchgit {
- url = https://git.launchpad.net/~unity-team/bamf;
+ url = "https://git.launchpad.net/~unity-team/bamf";
rev = version;
sha256 = "1klvij1wyhdj5d8sr3b16pfixc1yk8ihglpjykg7zrr1f50jfgsz";
};
nativeBuildInputs = [
+ (python3.withPackages (ps: with ps; [ lxml ])) # Tests
autoconf
automake
+ dbus
docbook_xsl
gnome3.gnome-common
gobject-introspection
@@ -25,13 +46,8 @@ stdenv.mkDerivation rec {
pkgconfig
vala
which
- # Tests
- python2
- python2.pkgs.libxslt
- python2.pkgs.libxml2
- dbus
- xorgserver
wrapGAppsHook
+ xorgserver
];
buildInputs = [
@@ -41,6 +57,11 @@ stdenv.mkDerivation rec {
libwnck3
];
+ patches = [
+ # Port tests and checks to python3 lxml.
+ ./gtester2xunit-python3.patch
+ ];
+
# Fix hard-coded path
# https://bugs.launchpad.net/bamf/+bug/1780557
postPatch = ''
@@ -49,8 +70,8 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
- "--enable-headless-tests"
"--enable-gtk-doc"
+ "--enable-headless-tests"
];
# fix paths
@@ -67,7 +88,9 @@ stdenv.mkDerivation rec {
doCheck = false;
# glib-2.62 deprecations
- NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+ NIX_CFLAGS_COMPILE = [
+ "-DGLIB_DISABLE_DEPRECATION_WARNINGS"
+ ];
meta = with stdenv.lib; {
description = "Application matching framework";
@@ -78,6 +101,6 @@ stdenv.mkDerivation rec {
homepage = https://launchpad.net/bamf;
license = licenses.lgpl3;
platforms = platforms.linux;
- maintainers = with maintainers; [ davidak ];
+ maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers;
};
}
diff --git a/pkgs/development/libraries/bamf/gtester2xunit-python3.patch b/pkgs/development/libraries/bamf/gtester2xunit-python3.patch
new file mode 100644
index 000000000000..8dc478541943
--- /dev/null
+++ b/pkgs/development/libraries/bamf/gtester2xunit-python3.patch
@@ -0,0 +1,53 @@
+diff --git a/configure.ac b/configure.ac
+index 41cb7db..93ef0ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -115,9 +115,9 @@ GTK_DOC_CHECK(1.0)
+
+ AC_PATH_PROG([PYTHON],[python])
+ AC_MSG_CHECKING(for gtester2xunit dependencies)
+-if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then
++if !($PYTHON -c "import lxml" 2> /dev/null); then
+ AC_MSG_RESULT([no])
+- AC_MSG_ERROR([You need to install python-libxslt1 and python-libxml2]);
++ AC_MSG_ERROR([You need to install python-lxml]);
+ fi
+ AC_MSG_RESULT([yes])
+
+@@ -189,6 +189,6 @@ ${PACKAGE}-${VERSION}
+ Introspection: ${enable_introspection}
+ Headless tests: ${enable_headless_tests}
+ Coverage Reporting: ${use_gcov}
+- Export actions menus: ${enable_export_actions_menu}
++ Export actions menus: ${enable_export_actions_menu}
+
+ EOF
+diff --git a/tests/gtester2xunit.py b/tests/gtester2xunit.py
+index fbe3c66..861d541 100755
+--- a/tests/gtester2xunit.py
++++ b/tests/gtester2xunit.py
+@@ -1,18 +1,17 @@
+ #! /usr/bin/python
+ from argparse import ArgumentParser
+-import libxslt
+-import libxml2
+ import sys
+ import os
++from lxml import etree
+
+ XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl'
+
+ def transform_file(input_filename, output_filename, xsl_file):
+- gtester = libxml2.parseFile(xsl_file)
+- style = libxslt.parseStylesheetDoc(gtester)
+- doc = libxml2.parseFile(input_filename)
+- result = style.applyStylesheet(doc, None)
+- result.saveFormatFile(filename=output_filename, format=True)
++ gtester = etree.parse(xsl_file)
++ style = etree.XSLT(gtester)
++ doc = etree.parse(input_filename)
++ result = style(doc)
++ result.write(filename=output_filename, format=True)
+
+
+ def get_output_filename(input_filename):
diff --git a/pkgs/development/libraries/bcg729/default.nix b/pkgs/development/libraries/bcg729/default.nix
new file mode 100644
index 000000000000..4363948e830d
--- /dev/null
+++ b/pkgs/development/libraries/bcg729/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+ pname = "bcg729";
+ version = "1.0.4";
+
+ src = fetchFromGitHub {
+ owner = "BelledonneCommunications";
+ repo = pname;
+ rev = version;
+ sha256 = "05s0c5ps3a763y0v34wg5zghj0cdjnq4ch7g81848xxry7q90fwa";
+ };
+
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/BelledonneCommunications/bcg729/commit/a5907daf1b111e4ad7aab4f558f57e2af1e37e55.patch";
+ sha256 = "0445syfwj4w4chh8ak80rq77iqcr27924n1ld5snshk3d21nxd64";
+ })
+ (fetchpatch {
+ url = "https://github.com/BelledonneCommunications/bcg729/commit/697bf6653a8c7421f0e821ee8d42471246e6850f.patch";
+ sha256 = "1h3gf5sj2sg5cs5iv1lcav3lkqmd5jf4agvjzz83l89wd5f5hp5l";
+ })
+ (fetchpatch {
+ url = "https://github.com/BelledonneCommunications/bcg729/commit/d63ce04a93711820d9a6985b1d11d8d91ed8e6b6.patch";
+ sha256 = "1piwf63ci2gma6jd6b4adkvxirysvazf0vklb5pc6vx1g93nkgxs";
+ })
+ ];
+
+ nativeBuildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ description = "Opensource implementation of both encoder and decoder of the ITU G729 Annex A/B speech codec";
+ homepage = "https://linphone.org/technical-corner/bcg729";
+ changelog = "https://gitlab.linphone.org/BC/public/bcg729/raw/${version}/NEWS";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ c0bw3b ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix
index 3f64ca2addf1..a9d21a1f5a96 100644
--- a/pkgs/development/libraries/bctoolbox/default.nix
+++ b/pkgs/development/libraries/bctoolbox/default.nix
@@ -1,27 +1,23 @@
-{stdenv, fetchpatch, fetchFromGitHub, cmake, mbedtls, bcunit, srtp}:
+{ stdenv, fetchFromGitHub, cmake, bcunit, mbedtls }:
+
stdenv.mkDerivation rec {
- name = "${baseName}-${version}";
- baseName = "bctoolbox";
+ pname = "bctoolbox";
version = "0.6.0";
- nativeBuildInputs = [cmake];
- buildInputs = [mbedtls bcunit srtp];
- patches = [
- (fetchpatch {
- name = "fix-gcc9.patch";
- url = "https://github.com/BelledonneCommunications/bctoolbox/commit/2425a224634c7a70ae91f809bbab51771f0a30d7.patch";
- sha256 = "0ib859mwwlr6jk6qbwp6x25pp8wgv21lh0qgdsx5hyzwdzqx1b3h";
- })
- ];
+
+ nativeBuildInputs = [ cmake bcunit ];
+ buildInputs = [ mbedtls ];
+
src = fetchFromGitHub {
owner = "BelledonneCommunications";
- repo = baseName;
+ repo = pname;
rev = version;
sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909";
};
meta = {
inherit version;
- description = ''Utilities library for Linphone'';
+ description = "Utilities library for Linphone";
+ homepage = "https://github.com/BelledonneCommunications/bctoolbox";
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index d4420e40ab69..1745614f741c 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, antlr3_4, libantlr3c, jre, polarssl, fetchFromGitHub
+{ stdenv, antlr3_4, libantlr3c, jre, mbedtls, fetchFromGitHub
, cmake, zlib, bctoolbox
}:
stdenv.mkDerivation rec {
- baseName = "belle-sip";
+ pname = "belle-sip";
version = "1.6.3";
- name = "${baseName}-${version}";
src = fetchFromGitHub {
owner = "BelledonneCommunications";
- repo = baseName;
+ repo = pname;
rev = version;
sha256 = "0q70db1klvhca1af29bm9paka3gyii5hfbzrj4178gclsg7cj8fk";
};
@@ -24,18 +23,14 @@ stdenv.mkDerivation rec {
"-Wno-error=cast-function-type"
];
- propagatedBuildInputs = [ antlr3_4 libantlr3c polarssl bctoolbox ];
-
- configureFlags = [
- "--with-polarssl=${polarssl}"
- ];
+ propagatedBuildInputs = [ antlr3_4 libantlr3c mbedtls bctoolbox ];
# Fails to build with lots of parallel jobs
enableParallelBuilding = false;
meta = with stdenv.lib; {
- homepage = http://www.linphone.org/index.php/eng;
- description = "A Voice-over-IP phone";
+ homepage = https://linphone.org/technical-corner/belle-sip;
+ description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers";
license = licenses.gpl2;
platforms = platforms.all;
};
diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix
index c2b5c7b60626..1cbbee469e6b 100644
--- a/pkgs/development/libraries/boehm-gc/7.6.6.nix
+++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
urls = [
- "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
+ "https://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";
@@ -63,10 +63,10 @@ stdenv.mkDerivation rec {
C or C++ programs, though that is not its primary goal.
'';
- homepage = http://hboehm.info/gc/;
+ homepage = https://hboehm.info/gc/;
# non-copyleft, X11-style license
- license = http://hboehm.info/gc/license.txt;
+ license = https://hboehm.info/gc/license.txt;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index bc8b7a8c7600..f061626a897d 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl
+, autoreconfHook
, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179
}:
@@ -9,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
urls = [
"https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
- "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
+ "https://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
];
sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3";
};
@@ -22,12 +23,17 @@ stdenv.mkDerivation rec {
'';
patches = # https://github.com/ivmai/bdwgc/pull/208
- lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;
+ lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch
+ # boehm-gc whitelists GCC threading models
+ ++ lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch;
configureFlags =
[ "--enable-cplusplus" "--with-libatomic-ops=none" ]
++ lib.optional enableLargeConfig "--enable-large-config";
+ nativeBuildInputs =
+ lib.optional stdenv.hostPlatform.isMinGW autoreconfHook;
+
doCheck = true; # not cross;
enableParallelBuilding = true;
@@ -52,10 +58,10 @@ stdenv.mkDerivation rec {
C or C++ programs, though that is not its primary goal.
'';
- homepage = http://hboehm.info/gc/;
+ homepage = https://hboehm.info/gc/;
# non-copyleft, X11-style license
- license = http://hboehm.info/gc/license.txt;
+ license = https://hboehm.info/gc/license.txt;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/libraries/boehm-gc/mcfgthread.patch b/pkgs/development/libraries/boehm-gc/mcfgthread.patch
new file mode 100644
index 000000000000..c4aa996aebd7
--- /dev/null
+++ b/pkgs/development/libraries/boehm-gc/mcfgthread.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -277,7 +277,7 @@ case "$THREADS" in
+ ;;
+ esac
+ ;;
+- win32)
++ win32 | mcf)
+ AC_DEFINE(GC_THREADS)
+ use_parallel_mark=$enable_parallel_mark
+ if test "${enable_parallel_mark}" != no \
diff --git a/pkgs/development/libraries/boost/1.71.nix b/pkgs/development/libraries/boost/1.71.nix
new file mode 100644
index 000000000000..f66bd4cd6fb1
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.71.nix
@@ -0,0 +1,15 @@
+{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+ version = "1.71.0";
+
+ src = fetchurl {
+ #url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2";
+ urls = [
+ "mirror://sourceforge/boost/boost_1_71_0.tar.bz2"
+ "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2"
+ ];
+ # SHA256 from http://www.boost.org/users/history/version_1_71_0.html
+ sha256 = "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee";
+ };
+})
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index f7bd189022f8..2d0a5a63d6f7 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -14,6 +14,7 @@
, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
, patches ? []
, mpi ? null
+, extraB2Args ? []
# Attributes inherit from specific versions
, version, src
@@ -92,7 +93,8 @@ let
++ optional (mpi != null || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam"
++ optionals (stdenv.hostPlatform.libc == "msvcrt") [
"threadapi=win32"
- ]);
+ ] ++ extraB2Args
+ );
in
diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index 328ac434d85a..d4b4c33f35b5 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xorgproto
+{ stdenv, fetchurl, unzip, cmake, libGLU, libGL, freeglut, libX11, xorgproto
, libXi, pkgconfig }:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- unzip cmake libGLU_combined freeglut libX11 xorgproto libXi
+ unzip cmake libGLU libGL freeglut libX11 xorgproto libXi
];
cmakeFlags = [
diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix
new file mode 100644
index 000000000000..95c1afd090f4
--- /dev/null
+++ b/pkgs/development/libraries/boxfort/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, cmake, pkg-config, gettext, libcsptr, dyncall
+, nanomsg, python37Packages }:
+
+stdenv.mkDerivation rec {
+ version = "unstable-2019-09-19";
+ pname = "boxfort";
+
+ src = fetchFromGitHub {
+ owner = "Snaipe";
+ repo = "BoxFort";
+ rev = "926bd4ce968592dbbba97ec1bb9aeca3edf29b0d";
+ sha256 = "0mzy4f8qij6ckn5578y3l4rni2470pdkjy5xww7ak99l1kh3p3v6";
+ };
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ buildInputs = [
+ dyncall
+ gettext
+ libcsptr
+ nanomsg
+ ];
+
+ checkInputs = with python37Packages; [ cram ];
+
+ cmakeFlags = [ "-DBXF_FORK_RESILIENCE=OFF" ];
+
+ doCheck = true;
+ preCheck = ''
+ export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
+ '';
+
+ outputs = [ "dev" "out" ];
+
+ meta = with stdenv.lib; {
+ description = "Convenient & cross-platform sandboxing C library";
+ homepage = "https://github.com/Snaipe/BoxFort";
+ license = licenses.mit;
+ maintainers = with maintainers; [
+ thesola10
+ Yumasi
+ ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix
index 1b6c56f13afd..5b4e37eff9f6 100644
--- a/pkgs/development/libraries/bullet/default.nix
+++ b/pkgs/development/libraries/bullet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut
+{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut
, Cocoa, OpenGL
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ]
+ buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
patches = [ ./gwen-narrowing.patch ];
diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix
index 8b0901832d11..34a9ee3b6ee8 100644
--- a/pkgs/development/libraries/bullet/roboschool-fork.nix
+++ b/pkgs/development/libraries/bullet/roboschool-fork.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut
+{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut
, Cocoa, OpenGL
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake ];
- buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut ]
+ buildInputs = stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
patches = [ ./gwen-narrowing.patch ];
diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix
index 196dd9ca3f9b..4a9e627e5442 100644
--- a/pkgs/development/libraries/c-blosc/default.nix
+++ b/pkgs/development/libraries/c-blosc/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A blocking, shuffling and loss-less compression library";
- homepage = http://www.blosc.org;
+ homepage = https://www.blosc.org;
license = licenses.bsd3;
platforms = platforms.all;
};
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index 4a4cba31735c..ecf991cb59ce 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -1,23 +1,36 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake, openssl }:
stdenv.mkDerivation rec {
pname = "actor-framework";
- version = "0.17.1";
+ version = "0.17.3";
src = fetchFromGitHub {
owner = "actor-framework";
repo = "actor-framework";
rev = version;
- sha256 = "1xbq591m3v6pkz4z3dg2lsxr6bxv1lpz4yhdci3vi55y6x9pwyfw";
+ sha256 = "187r7vc4kpd0v6bb1y51zwqm9y1lh0m84vkwmrxn8rrp4bwdxlpj";
};
nativeBuildInputs = [ cmake ];
+ buildInputs = [ openssl ];
+
+ cmakeFlags = [
+ "-DCAF_NO_EXAMPLES:BOOL=TRUE"
+ ];
+
+ doCheck = true;
+ checkTarget = "test";
+ preCheck = ''
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
+ export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD/lib
+ '';
+
meta = with stdenv.lib; {
description = "An open source implementation of the actor model in C++";
homepage = http://actor-framework.org/;
license = licenses.bsd3;
platforms = platforms.unix;
- maintainers = with maintainers; [ bobakker ];
+ maintainers = with maintainers; [ bobakker tobim ];
};
}
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 82570fbf7b40..80f8f9498d7c 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -4,8 +4,8 @@
, gobjectSupport ? true, glib
, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips)
-, libGL ? null # libGLU_combined is no longer a big dependency
+, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux)
+, libGL ? null # libGLU libGL is no longer a big dependency
, pdfSupport ? true
, darwin
}:
diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index 19768d77a8dd..86a5e52353ad 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "catch2";
- version = "2.10.2";
+ version = "2.11.0";
src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
rev = "v${version}";
- sha256="01ldfv4337s3vdhsx415d49jchpvqy61c77dhnri30ip5af0ipjs";
+ sha256="1b07drrclvxj17s67ivypr9vr27rg0m36jqnrbci6f4wsp1b0gbl";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix
index 08610d1e9aff..6a94d9a71ce3 100644
--- a/pkgs/development/libraries/check/default.nix
+++ b/pkgs/development/libraries/check/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "check";
- version = "0.12.0";
+ version = "0.13.0";
src = fetchurl {
url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz";
- sha256 = "0d22h8xshmbpl9hba9ch3xj8vb9ybm5akpsbbh7yj07fic4h2hj6";
+ sha256 = "02crar51gniijrrl9p8f9maibnwc33n76kw5cqr7xk3s8hqnncy4";
};
# Test can randomly fail: http://hydra.nixos.org/build/7243912
diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix
index 76f722f31aa7..5dd9917bc52b 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/pkgs/development/libraries/chipmunk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xorgproto
+{ stdenv, fetchurl, cmake, freeglut, libGLU, libGL, glfw2, glew, libX11, xorgproto
, libXi, libXmu
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs =
- [ freeglut libGLU_combined glfw2 glew libX11 xorgproto libXi libXmu ];
+ [ freeglut libGLU libGL glfw2 glew libX11 xorgproto libXi libXmu ];
postInstall = ''
mkdir -p $out/bin
diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix
index a7d7a0ea982b..2c8ac5113b12 100644
--- a/pkgs/development/libraries/cl/default.nix
+++ b/pkgs/development/libraries/cl/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ erlang rebar opencl-headers ocl-icd ];
-
+
buildPhase = ''
rebar compile
'';
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
homepage = https://github.com/tonyrog/cl;
description = "OpenCL binding for Erlang";
license = licenses.mit;
+ # https://github.com/tonyrog/cl/issues/39
+ broken = stdenv.isAarch64;
platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/clipper/default.nix b/pkgs/development/libraries/clipper/default.nix
index 117524239061..ebb41fde4238 100644
--- a/pkgs/development/libraries/clipper/default.nix
+++ b/pkgs/development/libraries/clipper/default.nix
@@ -15,11 +15,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja unzip ];
meta = with stdenv.lib; {
+ description = "A polygon and line clipping and offsetting library (C++, C#, Delphi)";
longDescription = ''
The Clipper library performs line & polygon clipping - intersection, union, difference & exclusive-or,
and line & polygon offsetting. The library is based on Vatti's clipping algorithm.
'';
- homepage = https://sourceforge.net/projects/polyclipping;
+ homepage = "https://sourceforge.net/projects/polyclipping";
license = licenses.boost;
maintainers = with maintainers; [ mpickering ];
platforms = with platforms; unix;
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 7adc2a365c5b..dc36414fc28d 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
pname = "cln";
- version = "1.3.4";
+ version = "1.3.5";
src = fetchurl {
url = "${meta.homepage}${pname}-${version}.tar.bz2";
- sha256 = "0j5p18hwbbrchsdbnc8d2bf9ncslhflri4i950gdnq7v6g2dg69d";
+ sha256 = "0bc43v4fyxwik9gjkvm8jan74bkx9bjssv61lfh9jhhblmj010bq";
};
buildInputs = [ gmp ];
meta = with stdenv.lib; {
description = "C/C++ library for numbers, a part of GiNaC";
- homepage = http://www.ginac.de/CLN/;
+ homepage = https://www.ginac.de/CLN/;
license = licenses.gpl2;
platforms = platforms.unix; # Once had cygwin problems
};
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 7095a808540f..32e723671e8c 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libGLU_combined, libX11, libXext, libXfixes
+{ stdenv, fetchurl, pkgconfig, libGLU, libGL, libX11, libXext, libXfixes
, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib
, gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk3 ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs =
- [ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango
+ [ libX11 libGL libGLU libXext libXfixes libXdamage libXcomposite libXi cogl pango
atk json-glib gobject-introspection libxcb libinput libgudev libxkbcommon
];
diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix
index 7c42a7479b1a..9c31b50c0285 100644
--- a/pkgs/development/libraries/codec2/default.nix
+++ b/pkgs/development/libraries/codec2/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchsvn, cmake } :
+{ stdenv, fetchFromGitHub, cmake } :
let
- version = "0.8";
+ version = "0.9.2";
in stdenv.mkDerivation {
pname = "codec2";
inherit version;
- src = fetchsvn {
- url = "https://svn.code.sf.net/p/freetel/code/codec2/branches/${version}";
- sha256 = "0qbyaqdn37253s30n6m2ric8nfdsxhkslb9h572kdx18j2yjccki";
+ src = fetchFromGitHub {
+ owner = "drowe67";
+ repo = "codec2";
+ rev = "v${version}";
+ sha256 = "1jpvr7bra8srz8jvnlbmhf8andbaavq5v01qjnp2f61za93rzwba";
};
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 4700d9e2418e..e122c1e7b120 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk-pixbuf, xorg, libintl
, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3
-, mesa
+, mesa, automake, autoconf
, gstreamerSupport ? true, gst_all_1 }:
let
@@ -29,11 +29,17 @@ in stdenv.mkDerivation rec {
url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056;
sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490";
})
+
+ # Fix build with libglvnd headers (these headers used to be provided by mesa)
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/cogl/commit/9c4764224aded552fb855b1c2b85b26d2b894adf.patch";
+ sha256 = "1v9drpzgcd5pq2shhdcw5px7mdiggk6ga13qjbklq8xpd92ac0i1";
+ })
];
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkgconfig libintl ];
+ nativeBuildInputs = [ pkgconfig libintl automake autoconf ];
configureFlags = [
"--enable-introspection"
@@ -41,7 +47,7 @@ in stdenv.mkDerivation rec {
"--enable-wayland-egl-platform"
"--enable-wayland-egl-server"
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"
- ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
+ ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
propagatedBuildInputs = with xorg; [
glib gdk-pixbuf gobject-introspection wayland mesa
diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix
index 74fd12ffea26..634ac27058bb 100644
--- a/pkgs/development/libraries/coin3d/default.nix
+++ b/pkgs/development/libraries/coin3d/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromBitbucket, stdenv, boost, cmake, libGLU_combined }:
+{ fetchFromBitbucket, stdenv, boost, cmake, libGL, libGLU }:
stdenv.mkDerivation {
pname = "coin";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
'';
nativeBuildInputs = [ cmake ];
- buildInputs = [ boost libGLU_combined ];
+ buildInputs = [ boost libGL libGLU ];
meta = {
homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home";
diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix
deleted file mode 100644
index 86f4485a900d..000000000000
--- a/pkgs/development/libraries/coprthr/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, libelf, libconfig, libevent, which, unzip, perl, python
-, bison, flex }:
-
-stdenv.mkDerivation rec {
- pname = "coprthr";
- version = "1.6";
-
- src = fetchurl {
- url = "https://github.com/browndeer/coprthr/archive/stable-${version}.zip";
- sha256 = "0ilx4v1ydppjnq1i0z5j0x4lmi29z39sappar7c0wqady0b5dpz9";
- };
-
- buildInputs =
- [ libelf libconfig libevent which unzip perl python bison flex ];
-
- patchPhase = ''
- for x in src/libocl/gen_oclcall_hook.pl tools/cltrace/gen_interceptor.pl src/libocl/gen_oclcall.pl src/scripts/gen_ocl_call_vector.pl src/libstdcl/gen_clarg_setn.pl; do
- substituteInPlace $x --replace "/usr/bin/perl" ${perl}/bin/perl
- done
- '';
-
- configureFlags =
- [ "--with-libelf=${libelf}"
- "--with-libevent=${libevent.dev}"
- "--with-libconfig=${libconfig}"
- "--with-opencl-icd-path=$out/etc/OpenCL/vendors"
- "--enable-user-install"
- ];
-
- meta = {
- description = "The CO-PRocessing THReads SDK for OpenCL/STDCL";
- homepage = "http://www.browndeertechnology.com/coprthr.htm";
- license = stdenv.lib.licenses.lgpl3;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
- broken = true;
- };
-}
diff --git a/pkgs/development/libraries/coredumper/default.nix b/pkgs/development/libraries/coredumper/default.nix
deleted file mode 100644
index ddd0d87a5511..000000000000
--- a/pkgs/development/libraries/coredumper/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
- name = "coredumper-1.1";
- src = fetchurl {
- url = http://google-coredumper.googlecode.com/files/coredumper-1.1.tar.gz;
- sha256 = "1phl1zg2n17rp595dyzz9iw01gfdpsdh0l6wy2hfb5shi71h63rx";
- };
-
- # Doesn't build:
- #
- # src/elfcore.c: In function 'CreatePipeline':
- # src/elfcore.c:1424:26: error: 'CLONE_VM' undeclared (first use in this function)
- # CLONE_VM|CLONE_UNTRACED|SIGCHLD, &args, 0, 0, 0);
- # ^
- # src/elfcore.c:1424:26: note: each undeclared identifier is reported only once for each function it appears in
- meta.broken = true;
-}
diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index 2328bd533629..ccf38fa09fbb 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "cppzmq";
- version = "4.4.1";
+ version = "4.5.0";
src = fetchFromGitHub {
owner = "zeromq";
repo = "cppzmq";
rev = "v${version}";
- sha256 = "15dgkv51csfkafplf0n0vqbjdr4pxqxq44dln0dcizhsn1p0a57q";
+ sha256 = "1n34sj322ay8839q6cxivckkrhz9avy31615i5jdxfal06mgya43";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix
new file mode 100644
index 000000000000..c2721d3839a1
--- /dev/null
+++ b/pkgs/development/libraries/criterion/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext
+, dyncall , nanomsg, python37Packages }:
+
+stdenv.mkDerivation rec {
+ version = "2.3.3";
+ pname = "criterion";
+
+ src = fetchFromGitHub {
+ owner = "Snaipe";
+ repo = "Criterion";
+ rev = "v${version}";
+ sha256 = "0y1ay8is54k3y82vagdy0jsa3nfkczpvnqfcjm5n9iarayaxaq8p";
+ fetchSubmodules = true;
+ };
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [ cmake pkg-config ];
+
+ buildInputs = [
+ boxfort.dev
+ dyncall
+ gettext
+ libcsptr
+ nanomsg
+ ];
+
+ checkInputs = with python37Packages; [ cram ];
+
+ cmakeFlags = [ "-DCTESTS=ON" ];
+ doCheck = true;
+ preCheck = ''
+ export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
+ '';
+ checkTarget = "criterion_tests test";
+
+ outputs = [ "dev" "out" ];
+
+ meta = with stdenv.lib; {
+ description = "A cross-platform C and C++ unit testing framework for the 21th century";
+ homepage = "https://github.com/Snaipe/Criterion";
+ license = licenses.mit;
+ maintainers = with maintainers; [
+ thesola10
+ Yumasi
+ ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix
index 506aa5f475d6..9bfff5c4aa81 100644
--- a/pkgs/development/libraries/csfml/default.nix
+++ b/pkgs/development/libraries/csfml/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, sfml }:
let
- version = "2.4";
+ version = "2.5";
in
stdenv.mkDerivation {
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "SFML";
repo = "CSFML";
- rev = "b5facb85d13bff451a5fd2d088a97472a685576c";
- sha256 = "1q716gd7c7jlxzwpq5z4rjj5lsrn71ql2djphccdf9jannllqizn";
+ rev = version;
+ sha256 = "071magxif5nrdddzk2z34czqmz1dfws4d7dqynb2zpn7cwhwxcpm";
};
buildInputs = [ cmake sfml ];
cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ];
diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index 8abae8b8bb3f..5542a37661ac 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -9,14 +9,14 @@ assert useVulkan -> withExamples;
stdenv.mkDerivation rec {
pname = "dav1d";
- version = "0.5.1";
+ version = "0.5.2";
src = fetchFromGitLab {
domain = "code.videolan.org";
owner = "videolan";
repo = pname;
rev = version;
- sha256 = "08cgccp7xvwn24w9iab4fzi18x3m6xyvvnz36qf7clcz0aqbfb9w";
+ sha256 = "0acxlgyz6c8ckw8vfgn60y2zg2n00l5xsq5jlxvwbh5w5pkc3ahf";
};
nativeBuildInputs = [ meson ninja nasm pkgconfig ];
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix
similarity index 85%
rename from pkgs/desktops/gnome-3/core/dconf/default.nix
rename to pkgs/development/libraries/dconf/default.nix
index 7ce498da9f30..5b37088cd95f 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/development/libraries/dconf/default.nix
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
};
patches = [
+ # Fix build with Meson 0.52
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/dconf/commit/cc32667c5d7d9ff95e65cc21f59905d8f9218394.patch";
+ sha256 = "02gfadn34bg818a7vb3crhsiahskiflcvx9l6iqwf1v269q93mr8";
+ })
];
postPatch = ''
diff --git a/pkgs/development/libraries/dleyna-core/setup-hook.sh b/pkgs/development/libraries/dleyna-core/setup-hook.sh
index 87b5c67dff58..287ad4dc1897 100644
--- a/pkgs/development/libraries/dleyna-core/setup-hook.sh
+++ b/pkgs/development/libraries/dleyna-core/setup-hook.sh
@@ -1,7 +1,7 @@
addDleynaConnectorPath () {
if test -d "$1/lib/dleyna-1.0/connectors"
then
- export DLEYNA_CONNECTOR_PATH="${DLEYNA_CONNECTOR_PATH}${DLEYNA_CONNECTOR_PATH:+:}$1/lib/dleyna-1.0/connectors"
+ export DLEYNA_CONNECTOR_PATH="${DLEYNA_CONNECTOR_PATH-}${DLEYNA_CONNECTOR_PATH:+:}$1/lib/dleyna-1.0/connectors"
fi
}
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index aae8989c2383..6d6bef21f39e 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "dlib";
- version = "19.18";
+ version = "19.19";
src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev ="v${version}";
- sha256 = "1kbrcf35pn2ymyr8q48ls98n2zb7rrz5207kwpisfh6k22g802ic";
+ sha256 = "0574p46zf85nx33cam4yqcg20g94kkmrvi5689r1xshprr0szghp";
};
postPatch = ''
diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix
new file mode 100644
index 000000000000..fa2c3687ba77
--- /dev/null
+++ b/pkgs/development/libraries/egl-wayland/default.nix
@@ -0,0 +1,79 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkgconfig
+, meson
+, ninja
+, libX11
+, mesa
+, libGL
+, wayland
+}:
+
+let
+ eglexternalplatform = stdenv.mkDerivation {
+ pname = "eglexternalplatform";
+ version = "1.1";
+
+ src = fetchFromGitHub {
+ owner = "Nvidia";
+ repo = "eglexternalplatform";
+ rev = "7c8f8e2218e46b1a4aa9538520919747f1184d86";
+ sha256 = "0lr5s2xa1zn220ghmbsiwgmx77l156wk54c7hybia0xpr9yr2nhb";
+ };
+
+ installPhase = ''
+ mkdir -p "$out/include/"
+ cp interface/eglexternalplatform.h "$out/include/"
+ cp interface/eglexternalplatformversion.h "$out/include/"
+
+ substituteInPlace eglexternalplatform.pc \
+ --replace "/usr/include/EGL" "$out/include"
+ mkdir -p "$out/share/pkgconfig"
+ cp eglexternalplatform.pc "$out/share/pkgconfig/"
+ '';
+
+ meta = with lib; {
+ license = licenses.mit;
+ };
+ };
+
+in stdenv.mkDerivation rec {
+ pname = "egl-wayland";
+ version = "1.1.4";
+
+ outputs = [ "out" "dev" ];
+
+ src = fetchFromGitHub {
+ owner = "Nvidia";
+ repo = pname;
+ rev = version;
+ sha256 = "0wvamjcfycd7rgk7v14g2rin55xin9rfkxmivyay3cm08vnl7y1d";
+ };
+
+ # Add missing include
+ # https://github.com/NVIDIA/egl-wayland/pull/24
+ patches = [ ./eglmesaext.patch ];
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ ];
+
+ buildInputs = [
+ eglexternalplatform
+ libX11
+ mesa
+ libGL
+ wayland
+ ];
+
+ meta = with lib; {
+ description = "The EGLStream-based Wayland external platform";
+ homepage = https://github.com/NVIDIA/egl-wayland/;
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ hedning ];
+ };
+}
diff --git a/pkgs/development/libraries/egl-wayland/eglmesaext.patch b/pkgs/development/libraries/egl-wayland/eglmesaext.patch
new file mode 100644
index 000000000000..9384ecff9b0f
--- /dev/null
+++ b/pkgs/development/libraries/egl-wayland/eglmesaext.patch
@@ -0,0 +1,12 @@
+diff --git a/src/wayland-eglsurface.c b/src/wayland-eglsurface.c
+index 01c9cb3..45736b0 100644
+--- a/src/wayland-eglsurface.c
++++ b/src/wayland-eglsurface.c
+@@ -37,6 +37,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #define WL_EGL_WINDOW_DESTROY_CALLBACK_SINCE 3
+
diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index c0df404e60eb..bf6260ca7664 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
homepage = http://enet.bespin.org/;
description = "Simple and robust network communication layer on top of UDP";
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index 22c812ba4c21..5638db712451 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
doCheck = stdenv.isLinux;
meta = with stdenv.lib; {
- homepage = https://libopenraw.freedesktop.org/wiki/Exempi/;
+ description = "An implementation of XMP (Adobe's Extensible Metadata Platform)";
+ homepage = "https://libopenraw.freedesktop.org/wiki/Exempi/";
platforms = platforms.linux ++ platforms.darwin;
license = licenses.bsd3;
};
diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix
index b0818d79dfad..1658d69d7a1b 100644
--- a/pkgs/development/libraries/faudio/default.nix
+++ b/pkgs/development/libraries/faudio/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "faudio";
- version = "19.10";
+ version = "19.12";
src = fetchFromGitHub {
owner = "FNA-XNA";
repo = "FAudio";
rev = version;
- sha256 = "1z7j803nxhgvjwpxr1m5d490yji727v7pn0ghhipbrfxlwzkw1sz";
+ sha256 = "0y8dc7lnhh69wcwqma9spyxcahfhbfyg92h35sqkin6qfh5mngxr";
};
nativeBuildInputs = [cmake];
diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
index 70269002e2fe..16560f19c861 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "fdk-aac";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchurl {
url = "mirror://sourceforge/opencore-amr/fdk-aac/${pname}-${version}.tar.gz";
- sha256 = "0v6rbyw9f9lpfvcg3v1qyapga5hqfnb3wp3x5yaxpwcgjw7ydmpp";
+ sha256 = "0wgjjc0dfkm2w966lc9c8ir8f671vl1ppch3mya3h58jjjm360c4";
};
configureFlags = [ ]
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 9ab112dac127..afdc6c0f5e89 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -104,7 +104,7 @@
#, opencl ? null # OpenCL code
, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
#, opencv ? null # Video filtering
-, openglExtlib ? false, libGLU_combined ? null # OpenGL rendering
+, openglExtlib ? false, libGL ? null, libGLU ? null # OpenGL rendering
#, openh264 ? null # H.264/AVC encoder
, openjpeg ? null # JPEG 2000 de/encoder
, opensslExtlib ? false, openssl ? null
@@ -234,7 +234,7 @@ assert gnutls != null -> !opensslExtlib;
assert libxcbshmExtlib -> libxcb != null;
assert libxcbxfixesExtlib -> libxcb != null;
assert libxcbshapeExtlib -> libxcb != null;
-assert openglExtlib -> libGLU_combined != null;
+assert openglExtlib -> libGL != null && libGLU != null;
assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
stdenv.mkDerivation rec {
@@ -353,6 +353,7 @@ stdenv.mkDerivation rec {
#(enableFeature (cdio-paranoia != null && gplLicensing) "libcdio")
(enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394")
(enableFeature (libiconv != null) "iconv")
+ (enableFeature (libjack2 != null) "libjack")
#(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883")
(enableFeature (if isLinux && !isAarch64 then libmfx != null else false) "libmfx")
(enableFeature (libmodplug != null) "libmodplug")
@@ -424,7 +425,7 @@ stdenv.mkDerivation rec {
libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr
samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore
zeromq4 zlib
- ] ++ optional openglExtlib libGLU_combined
+ ] ++ optionals openglExtlib [ libGL libGLU ]
++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optional (!isAarch64 && libvmaf != null && version3Licensing) libvmaf
@@ -466,6 +467,6 @@ stdenv.mkDerivation rec {
licenses.lgpl21Plus
);
platforms = platforms.all;
- maintainers = with maintainers; [ codyopel fuuzetsu ];
+ maintainers = with maintainers; [ codyopel ];
};
}
diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix
index 5ffbc215d8b3..98ada9a3f09f 100644
--- a/pkgs/development/libraries/ffmpeg/2.8.nix
+++ b/pkgs/development/libraries/ffmpeg/2.8.nix
@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (rec {
version = "${branch}.14";
branch = "2.8";
sha256 = "1g6x3lyjl1zlfksizj1ys61kj97yg0xf4dlr6sr5acpbja3a26yn";
-})
+} // args)
diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix
index bea367b2554e..759fba65587f 100644
--- a/pkgs/development/libraries/ffmpeg/3.4.nix
+++ b/pkgs/development/libraries/ffmpeg/3.4.nix
@@ -4,9 +4,9 @@
, ...
}@args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (rec {
version = branch;
branch = "3.4.6";
sha256 = "1s20wzgxxrm56gckyb8cf1lh36hdnkdxvmmnnvdxvia4zb3grf1b";
darwinFrameworks = [ Cocoa CoreMedia ];
-})
+} // args)
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index a0b95cecaaba..387069d16189 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -4,9 +4,9 @@
, ...
}@args:
-callPackage ./generic.nix (args // rec {
+callPackage ./generic.nix (rec {
version = "4.2.1";
branch = "4.2";
sha256 = "090naa6rj46pzkgh03bf51hbqdz356qqckr2pw6pykc6ysiryak8";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
-})
+} // args)
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index b3310e44ae06..3424493c2098 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -2,7 +2,9 @@
, alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg
, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr
, x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d
-, openglSupport ? false, libGLU_combined ? null
+, openglSupport ? false, libGLU ? null, libGL ? null
+, libmfxSupport ? false, intel-media-sdk ? null
+, libaomSupport ? false, libaom ? null
# Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
, multithreadBuild ? true # Multithreading via pthreads/win32 threads
@@ -61,7 +63,9 @@ let
vpxSupport = reqMin "0.6" && !isAarch32;
in
-assert openglSupport -> libGLU_combined != null;
+assert openglSupport -> libGL != null && libGLU != null;
+assert libmfxSupport -> intel-media-sdk != null;
+assert libaomSupport -> libaom != null;
stdenv.mkDerivation rec {
@@ -135,6 +139,8 @@ stdenv.mkDerivation rec {
(ifMinVer "0.6" (enableFeature vpxSupport "libvpx"))
(ifMinVer "2.4" "--enable-lzma")
(ifMinVer "2.2" (enableFeature openglSupport "opengl"))
+ (ifMinVer "4.2" (enableFeature libmfxSupport "libmfx"))
+ (ifMinVer "4.2" (enableFeature libaomSupport "libaom"))
(disDarwinOrArmFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse")
(ifMinVer "2.5" (if sdlSupport && reqMin "3.2" then "--enable-sdl2" else if sdlSupport then "--enable-sdl" else null)) # autodetected before 2.5, SDL1 support removed in 3.2 for SDL2
(ifMinVer "1.2" "--enable-libsoxr")
@@ -162,7 +168,9 @@ stdenv.mkDerivation rec {
buildInputs = [
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora
libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers
- ] ++ optional openglSupport libGLU_combined
+ ] ++ optionals openglSupport [ libGL libGLU ]
+ ++ optional libmfxSupport intel-media-sdk
+ ++ optional vpxSupport libaom
++ optional vpxSupport libvpx
++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM
++ optional ((isLinux || isFreeBSD) && !isAarch32) libva
@@ -210,7 +218,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl3;
platforms = platforms.all;
- maintainers = with maintainers; [ codyopel fuuzetsu ];
+ maintainers = with maintainers; [ codyopel ];
inherit branch;
};
}
diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index c404a12f3dfd..30fb94aa2483 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/FFMS/ffms2/;
description = "Libav/ffmpeg based source library for easy frame accurate access";
license = licenses.mit;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index edb3c27ebf54..945f1d4931fb 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
, gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
-, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse
-, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }:
+, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse, nixosTests
+, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, dconf, gsettings-desktop-schemas, librsvg }:
stdenv.mkDerivation rec {
pname = "flatpak";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp
+ bubblewrap bzip2 dbus dconf glib gpgme json-glib libarchive libcap libseccomp
libsoup lzma ostree polkit python3 systemd xorg.libXau fuse
gsettings-desktop-schemas glib-networking
librsvg # for flatpak-validate-icon
@@ -76,6 +76,12 @@ stdenv.mkDerivation rec {
patchShebangs tests
'';
+ passthru = {
+ tests = {
+ installedTests = nixosTests.installed-tests.flatpak;
+ };
+ };
+
meta = with stdenv.lib; {
description = "Linux application sandboxing and distribution framework";
homepage = https://flatpak.org/;
diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix
index eebe119d142f..1fe50b402cb6 100644
--- a/pkgs/development/libraries/fltk/1.4.nix
+++ b/pkgs/development/libraries/fltk/1.4.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
-, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
+, freeglut, libGLU, libGL, libjpeg, zlib, libXft, libpng
, libtiff, freetype, Cocoa, AGL, GLUT
}:
@@ -12,14 +12,14 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
- url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
+ url = "https://www.fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz";
sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63";
};
patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libGLU_combined libjpeg zlib libpng libXft ]
+ buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
propagatedBuildInputs = [ xorgproto ]
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A C++ cross-platform lightweight GUI library";
- homepage = http://www.fltk.org;
+ homepage = https://www.fltk.org;
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2;
};
diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix
index a22b5eef8d2e..fe7de504b4f3 100644
--- a/pkgs/development/libraries/fltk/default.nix
+++ b/pkgs/development/libraries/fltk/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorgproto, libXi
-, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
+, freeglut, libGL, libGLU, libjpeg, zlib, libXft, libpng
, libtiff, freetype, Cocoa, AGL, GLUT
}:
@@ -12,14 +12,14 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
- url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
+ url = "https://www.fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz";
sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7";
};
patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libGLU_combined libjpeg zlib libpng libXft ]
+ buildInputs = [ libGLU libGL libjpeg zlib libpng libXft ]
++ stdenv.lib.optional stdenv.isDarwin [ AGL Cocoa GLUT ];
propagatedBuildInputs = [ xorgproto ]
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A C++ cross-platform lightweight GUI library";
- homepage = http://www.fltk.org;
+ homepage = https://www.fltk.org;
platforms = platforms.linux ++ platforms.darwin;
license = licenses.gpl2;
};
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 2dfb5e9e2485..15f29ce77f59 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "folly";
- version = "2019.10.21.00";
+ version = "2019.11.11.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
- sha256 = "1jy0yxqzcxxs6sq8161zbdzj4ngwjs0h2aca6n9qkaj1v5jd27c7";
+ sha256 = "1sgv7sdalbs7zhz3zcc95gn2h8j2xjf7hkw2c618zc3pdn6aa58w";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix
deleted file mode 100644
index b95d6dd559d4..000000000000
--- a/pkgs/development/libraries/fontconfig-ultimate/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-let version = "2016-04-23"; in
-stdenv.mkDerivation {
- pname = "fontconfig-ultimate";
- inherit version;
-
- src = fetchFromGitHub {
- sha256 = "1rd2n60l8bamx84q3l91pd9a0wz9h7p6ajvx1dw22qn8rah4h498";
- rev = version;
- repo = "fontconfig-ultimate";
- owner = "bohoomil";
- };
-
- installPhase = ''
- mkdir -p $out/etc/fonts/conf.d
- cp conf.d.infinality/*.conf $out/etc/fonts/conf.d
-
- # Base rendering settings will be determined by NixOS module
- rm $out/etc/fonts/conf.d/10-base-rendering.conf
-
- # Options controlled by NixOS module
- rm $out/etc/fonts/conf.d/35-repl-custom.conf
- rm $out/etc/fonts/conf.d/38-repl-*.conf
- rm $out/etc/fonts/conf.d/82-*.conf
- rm $out/etc/fonts/conf.d/83-*.conf
-
- # Inclusion of local and user configs handled by global configuration
- rm $out/etc/fonts/conf.d/29-local.conf
- rm $out/etc/fonts/conf.d/28-user.conf
-
- cp fontconfig_patches/fonts-settings/*.conf $out/etc/fonts/conf.d
-
- # fix font priority issue https://github.com/bohoomil/fontconfig-ultimate/issues/173
- mv $out/etc/fonts/conf.d/{43,60}-wqy-zenhei-sharp.conf
-
- mkdir -p $out/etc/fonts/presets/{combi,free,ms}
- cp fontconfig_patches/combi/*.conf $out/etc/fonts/presets/combi
- cp fontconfig_patches/free/*.conf $out/etc/fonts/presets/free
- cp fontconfig_patches/ms/*.conf $out/etc/fonts/presets/ms
- '';
-
- meta = with stdenv.lib; {
- description = "Font configuration files, patches, scripts and source packages (Infinality & friends)";
- homepage = https://github.com/bohoomil/fontconfig-ultimate;
- license = licenses.mit;
- platforms = platforms.all;
- };
-}
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 5b98d6523b9a..f1a2e865bb73 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -2,7 +2,7 @@
runCommand "fc-cache"
{
- buildInputs = [ fontconfig.bin ];
+ nativeBuildInputs = [ fontconfig.bin ];
preferLocalBuild = true;
allowSubstitutes = false;
passAsFile = [ "fontDirs" ];
diff --git a/pkgs/development/libraries/forge/default.nix b/pkgs/development/libraries/forge/default.nix
index e6e002f16c5a..83630aef9aa8 100644
--- a/pkgs/development/libraries/forge/default.nix
+++ b/pkgs/development/libraries/forge/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
, arrayfire, expat, fontconfig, freeimage, freetype, boost
-, mesa, libGLU_combined, glfw3, SDL2, cudatoolkit
+, mesa, libGLU, libGL, glfw3, SDL2, cudatoolkit
}:
stdenv.mkDerivation rec {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
boost.dev
freeimage
mesa
- libGLU_combined
+ libGLU libGL
glfw3
SDL2
cudatoolkit
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index af387b7232f4..bb59a34b1cc7 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
-, libXrandr, libGLU_combined, libXft, libXfixes, xinput
+, libXrandr, libGLU, libGL, libXft, libXfixes, xinput
, CoreServices }:
let
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [
xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
- libXft libGLU_combined libXfixes xinput
+ libXft libGLU libGL libXfixes xinput
] ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
doCheck = true;
diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index c2952cb47f1c..f53d55c2ca94 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -1,22 +1,46 @@
-{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook
-, gmp, mpfr
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, gettext
+, autoreconfHook
+, gmp
+, mpfr
}:
+
stdenv.mkDerivation rec {
pname = "fplll";
- version = "5.2.1";
+ version = "5.3.1";
+
src = fetchFromGitHub {
- owner = pname;
- repo = pname;
+ owner = "fplll";
+ repo = "fplll";
rev = version;
- sha256 = "015qmrd7nfaysbv1hbwiprz9g6hnww1y1z1xw8f43ysb7k1b5nbg";
+ sha256 = "1bzlqavbch5smra75znh4ljr490wyx5v6hax8r9rjbgk605i33ns";
};
- nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
- buildInputs = [gmp mpfr];
- meta = {
- inherit version;
+
+ nativeBuildInputs = [
+ gettext
+ autoreconfHook
+ ];
+
+ buildInputs = [
+ gmp
+ mpfr
+ ];
+
+ meta = with stdenv.lib; {
description = ''Lattice algorithms using floating-point arithmetic'';
- license = stdenv.lib.licenses.lgpl21Plus;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.unix;
+ changelog = [
+ # Some release notes are added to the github tags, though they are not
+ # always complete.
+ "https://github.com/fplll/fplll/releases/tag/${version}"
+ # Releases are announced on this mailing list. Unfortunately it is not
+ # possible to generate a direct link to the most recent announcement, but
+ # this search should find it.
+ "https://groups.google.com/forum/#!searchin/fplll-devel/FPLLL$20${version}"
+ ];
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [raskin timokau];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix
index 8412248b6170..16c35347bc5d 100644
--- a/pkgs/development/libraries/freeglut/default.nix
+++ b/pkgs/development/libraries/freeglut/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }:
-let version = "3.0.0";
+let version = "3.2.1";
in stdenv.mkDerivation {
pname = "freeglut";
inherit version;
src = fetchurl {
url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz";
- sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra";
+ sha256 = "0s6sk49q8ijgbsrrryb7dzqx2fa744jhx1wck5cz5jia2010w06l";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index 41480789a08a..9520542481c8 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU_combined, libXi, libXmu
+{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu
, GLUT, Cocoa
}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6";
};
- buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ]
+ buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ]
++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ];
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index 0ff9cea3d27c..855ca0385dfd 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases";
- homepage = http://www.freetds.org;
+ homepage = https://www.freetds.org;
license = licenses.lgpl2;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index 859258f59565..3b0b30f573b5 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -20,6 +20,14 @@ stdenv.mkDerivation rec {
sha256 = "0pckda4fcn0aw32lpycwdp25r2m7vca8zspq815ppi9gkwgg5das";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2019-18397.patch";
+ url = "https://github.com/fribidi/fribidi/commit/034c6e9a1d296286305f4cfd1e0072b879f52568.patch";
+ sha256 = "102xrbf1l5gvavkxd6csx8pj3rlgcw10c0y4h4d40yhn84b1p0y8";
+ })
+ ];
+
postPatch = ''
patchShebangs test
'';
diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix
index 289a57399854..a99228efcf4d 100644
--- a/pkgs/development/libraries/ftgl/default.nix
+++ b/pkgs/development/libraries/ftgl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, freetype, libGLU_combined, OpenGL }:
+{ stdenv, fetchurl, freetype, libGL, libGLU, OpenGL }:
let
name = "ftgl-2.1.3-rc5";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
++ (if stdenv.isDarwin then
[ OpenGL ]
else
- [ libGLU_combined ])
+ [ libGL libGLU ])
;
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/gaia/default.nix b/pkgs/development/libraries/gaia/default.nix
new file mode 100644
index 000000000000..b154f80c1dd2
--- /dev/null
+++ b/pkgs/development/libraries/gaia/default.nix
@@ -0,0 +1,87 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, libyaml
+, swig
+, eigen
+, pkgconfig
+, wafHook
+, makeWrapper
+, qt4
+, pythonPackages
+, pythonSupport ? false
+# Default to false since it breaks the build, see https://github.com/MTG/gaia/issues/11
+, stlfacadeSupport ? false
+, assertsSupport ? true
+, cyclopsSupport ? true
+}:
+
+assert pythonSupport -> pythonPackages != null;
+
+stdenv.mkDerivation rec {
+ pname = "gaia";
+ version = "2.4.6";
+
+ src = fetchFromGitHub {
+ owner = "MTG";
+ repo = "gaia";
+ rev = "v${version}";
+ sha256 = "03vmdq7ca4f7zp2f4sxyqa8sdpdma3mn9fz4z7d93qryl0bhi7z3";
+ };
+
+ # Fix installation error when waf tries to put files in /etc/
+ prePatch = ''
+ '' + lib.optionalString cyclopsSupport ''
+ substituteInPlace src/wscript \
+ --replace "/etc/cyclops" "$out/etc/cyclops" \
+ --replace "/etc/init.d" "$out/etc/init.d"
+ '';
+
+ nativeBuildInputs = [
+ wafHook
+ pkgconfig
+ swig
+ ]
+ # The gaiafusion binary inside $out/bin needs a shebangs patch, and
+ # wrapping with the appropriate $PYTHONPATH
+ ++ lib.optionals (pythonSupport) [
+ pythonPackages.wrapPython
+ ]
+ ;
+
+ buildInputs = [
+ libyaml
+ eigen
+ qt4
+ ];
+
+ propagatedBuildInputs = []
+ ++ lib.optionals (pythonSupport) [
+ # This is not exactly specified in upstream's README but it's needed by the
+ # resulting $out/bin/gaiafusion script
+ pythonPackages.pyyaml
+ ]
+ ;
+
+ wafConfigureFlags = []
+ ++ lib.optionals (pythonSupport) [ "--with-python-bindings" ]
+ ++ lib.optionals (stlfacadeSupport) [ "--with-stlfacade" ]
+ ++ lib.optionals (assertsSupport) [ "--with-asserts" ]
+ ++ lib.optionals (cyclopsSupport) [ "--with-cyclops" ]
+ ;
+
+ postFixup = ''
+ ''
+ + lib.optionalString pythonSupport ''
+ wrapPythonPrograms
+ ''
+ ;
+
+ meta = with lib; {
+ homepage = "https://github.com/MTG/gaia";
+ description = "General library to work with points in a semimetric space";
+ maintainers = with maintainers; [ doronbehar ];
+ platforms = platforms.x86; # upstream assume SSE2 / fails on ARM
+ license = licenses.agpl3;
+ };
+}
diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix
index c1f9c6ad0137..a086648c9124 100644
--- a/pkgs/development/libraries/garmintools/default.nix
+++ b/pkgs/development/libraries/garmintools/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
};
buildInputs = [ libusb ];
meta = {
- homepage = https://code.google.com/archive/p/garmintools/; # community clone at https://github.com/ianmartin/garmintools
+ description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface";
+ homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.ocharles ];
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix
index ee5988b30f57..c05bb95913e6 100644
--- a/pkgs/development/libraries/gcab/default.nix
+++ b/pkgs/development/libraries/gcab/default.nix
@@ -1,38 +1,83 @@
-{ stdenv, fetchurl, gettext, gobject-introspection, pkgconfig
-, meson, ninja, glibcLocales, git, vala, glib, zlib, gnome3
+{ stdenv
+, fetchurl
+, gettext
+, gobject-introspection
+, gtk-doc
+, docbook_xsl
+, docbook_xml_dtd_43
+, pkgconfig
+, meson
+, ninja
+, git
+, vala
+, glib
+, zlib
+, gnome3
+, nixosTests
}:
stdenv.mkDerivation rec {
pname = "gcab";
- version = "1.2";
+ version = "1.3";
- LC_ALL = "en_US.UTF-8";
+ outputs = [ "bin" "out" "dev" "devdoc" "installedTests" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "038h5kk41si2hc9d9169rrlvp8xgsxq27kri7hv2vr39gvz9cbas";
+ sha256 = "1rv81b37d5ya7xpfdxrfk173jjcwabxyng7vafgwyl5myv44qc0h";
};
- nativeBuildInputs = [ meson ninja glibcLocales git pkgconfig vala gettext gobject-introspection ];
+ patches = [
+ # allow installing installed tests to a separate output
+ ./installed-tests-path.patch
+ ];
- buildInputs = [ glib zlib ];
+ nativeBuildInputs = [
+ meson
+ ninja
+ git
+ pkgconfig
+ vala
+ gettext
+ gobject-introspection
+ gtk-doc
+ docbook_xsl
+ docbook_xml_dtd_43
+ ];
+
+ buildInputs = [
+ glib
+ zlib
+ ];
+
+ # required by libgcab-1.0.pc
+ propagatedBuildInputs = [
+ glib
+ ];
mesonFlags = [
- "-Ddocs=false"
- "-Dtests=false"
+ "-Dinstalled_tests=true"
+ "-Dinstalled_test_prefix=${placeholder ''installedTests''}"
];
+ doCheck = true;
+
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none";
};
+
+ tests = {
+ installedTests = nixosTests.installed-tests.gcab;
+ };
};
meta = with stdenv.lib; {
+ description = "GObject library to create cabinet files";
+ homepage = "https://gitlab.gnome.org/GNOME/gcab";
+ license = licenses.lgpl21Plus;
+ maintainers = gnome3.maintainers;
platforms = platforms.linux;
- license = licenses.lgpl21;
- homepage = "https://wiki.gnome.org/msitools";
- maintainers = [ maintainers.lethalman ];
};
}
diff --git a/pkgs/development/libraries/gcab/installed-tests-path.patch b/pkgs/development/libraries/gcab/installed-tests-path.patch
new file mode 100644
index 000000000000..ab3b6b3fae3f
--- /dev/null
+++ b/pkgs/development/libraries/gcab/installed-tests-path.patch
@@ -0,0 +1,21 @@
+diff --git a/meson_options.txt b/meson_options.txt
+index c1b1da1..9b76022 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -4,3 +4,4 @@
+ option('vapi', type : 'boolean', value : true, description: 'generate Vala bindings (requires introspection)')
+ option('tests', type : 'boolean', value : true, description : 'enable tests')
+ option('installed_tests', type : 'boolean', value : false, description : 'install tests for "as-installed" testing')
++option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
+diff --git a/tests/meson.build b/tests/meson.build
+index 1e46e2a..aa780d0 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -1,5 +1,5 @@
+-installed_tests_metadir = join_paths(get_option('datadir'), 'installed-tests', 'libgcab-1.0')
+-installed_tests_execdir = join_paths(get_option('libexecdir'), 'installed-tests', 'libgcab-1.0')
++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'libgcab-1.0')
++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', 'libgcab-1.0')
+ installed_tests_enabled = get_option('installed_tests')
+ installed_tests_template_tap = files('template-tap.test.in')
+ abs_installed_tests_execdir = join_paths(get_option('prefix'), installed_tests_execdir)
diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix
index 1947d40dc85d..cf0f22fdd408 100644
--- a/pkgs/development/libraries/gcr/default.nix
+++ b/pkgs/development/libraries/gcr/default.nix
@@ -1,49 +1,84 @@
-{ stdenv, fetchurl, pkgconfig, gettext, gnupg, p11-kit, glib
-, libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk-pixbuf, atk
-, gobject-introspection, makeWrapper, libxslt, vala, gnome3
-, python3 }:
+{ stdenv
+, fetchurl
+, pkgconfig
+, gettext
+, gnupg
+, p11-kit
+, glib
+, libgcrypt
+, libtasn1
+, gtk3
+, pango
+, gobject-introspection
+, makeWrapper
+, libxslt
+, vala
+, gnome3
+, python3
+}:
stdenv.mkDerivation rec {
pname = "gcr";
- version = "3.33.4";
+ version = "3.34.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1hf06p4qfyywnb6334ysnr6aqxik3srb37glclvr4yhb3wzrjqnm";
- };
-
- passthru = {
- updateScript = gnome3.updateScript { packageName = pname; };
+ sha256 = "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9";
};
postPatch = ''
- patchShebangs .
+ patchShebangs build/ gcr/fixtures/
'';
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkgconfig gettext gobject-introspection libxslt makeWrapper vala ];
+ nativeBuildInputs = [
+ pkgconfig
+ gettext
+ gobject-introspection
+ libxslt
+ makeWrapper
+ vala
+ ];
- buildInputs = [ gnupg libgcrypt libtasn1 dbus-glib pango gdk-pixbuf atk ];
+ buildInputs = [
+ gnupg
+ libgcrypt
+ libtasn1
+ pango
+ ];
- propagatedBuildInputs = [ glib gtk3 p11-kit ];
+ propagatedBuildInputs = [
+ glib
+ gtk3
+ p11-kit
+ ];
+
+ checkInputs = [
+ python3
+ ];
- checkInputs = [ python3 ];
doCheck = false; # fails 21 out of 603 tests, needs dbus daemon
- #enableParallelBuilding = true; issues on hydra
+ enableParallelBuilding = true;
preFixup = ''
wrapProgram "$out/bin/gcr-viewer" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
+ passthru = {
+ updateScript = gnome3.updateScript {
+ packageName = pname;
+ };
+ };
+
meta = with stdenv.lib; {
platforms = platforms.linux;
maintainers = gnome3.maintainers;
description = "GNOME crypto services (daemon and tools)";
- homepage = https://gitlab.gnome.org/GNOME/gcr;
- license = licenses.gpl2;
+ homepage = "https://gitlab.gnome.org/GNOME/gcr";
+ license = licenses.lgpl2Plus;
longDescription = ''
GCR is a library for displaying certificates, and crypto UI, accessing
diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix
index d41b4c55f867..f914a112e106 100644
--- a/pkgs/development/libraries/gdal/2.4.0.nix
+++ b/pkgs/development/libraries/gdal/2.4.0.nix
@@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2019-17545.patch";
+ url = "https://github.com/OSGeo/gdal/commit/8cd2d2eb6327cf782a74dae263ffa6f89f46c93d.patch";
+ stripLen = 1;
+ sha256 = "06h88a659jcqf6ps1m91qy78s6s9krbkwnz28f5qh7032vlp6qpw";
+ })
+ ];
+
buildInputs = [ unzip libjpeg libtiff libgeotiff libpng proj openssl sqlite
libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
++ (with pythonPackages; [ python numpy wrapPython ])
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index bb53277075f1..922877f6f461 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -20,7 +20,15 @@ stdenv.mkDerivation rec {
sourceRoot = "source/gdal";
- patches = [ ./001.3_0_1.darwin.patch ];
+ patches = [
+ ./001.3_0_1.darwin.patch
+ (fetchpatch {
+ name = "CVE-2019-17545.patch";
+ url = "https://github.com/OSGeo/gdal/commit/148115fcc40f1651a5d15fa34c9a8c528e7147bb.patch";
+ stripLen = 1;
+ sha256 = "0hai59hhvrci9xwjw4lp3wc1brn00imngmqrbbs8v9yr3b0fzbgs";
+ })
+ ];
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 4cf28b7dbee5..9c2da3c5b695 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
+{ stdenv, fetchurl, nixosTests, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, jasper, gobject-introspection, doCheck ? false, makeWrapper }:
+, gobject-introspection, doCheck ? false, makeWrapper }:
let
pname = "gdk-pixbuf";
@@ -31,11 +31,10 @@ in stdenv.mkDerivation rec {
]
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
- propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
+ propagatedBuildInputs = [ glib libtiff libjpeg libpng ];
mesonFlags = [
"-Ddocs=true"
- "-Djasper=true"
"-Dx11=true"
"-Dgir=${if gobject-introspection != null then "true" else "false"}"
"-Dgio_sniffing=false"
@@ -85,6 +84,10 @@ in stdenv.mkDerivation rec {
packageName = pname;
};
+ tests = {
+ installedTests = nixosTests.installed-tests.gdk-pixbuf;
+ };
+
# gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc
moduleDir = "lib/gdk-pixbuf-2.0/2.10.0/loaders";
};
diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
index 5a7dcd792996..06958be32131 100644
--- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
+++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh
@@ -2,9 +2,9 @@ findGdkPixbufLoaders() {
# choose the longest loaders.cache
local loadersCache="$1/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
- if [ -f "$loadersCache" ]; then
- if [ -f "$GDK_PIXBUF_MODULE_FILE" ]; then
- if [ $(cat "$loadersCache"|wc -l) -gt $(cat "$GDK_PIXBUF_MODULE_FILE"|wc -l) ]; then
+ if [[ -f "$loadersCache" ]]; then
+ if [[ -f "${GDK_PIXBUF_MODULE_FILE-}" ]]; then
+ if (( "$(cat "$loadersCache" | wc -l)" > "$(cat "$GDK_PIXBUF_MODULE_FILE" | wc -l)" )); then
export GDK_PIXBUF_MODULE_FILE="$loadersCache"
fi
else
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index 2edb47cb9bb4..ca7163af49bc 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -105,6 +105,9 @@ stdenv.mkDerivation rec {
"-Dlibv4l=disabled"
"-Dlibv4l2=disabled"
"-Dumfpack=disabled"
+ # Disabled due to multiple vulnerabilities, see
+ # https://github.com/NixOS/nixpkgs/pull/73586
+ "-Djasper=disabled"
];
# TODO: Fix missing math symbols in gegl seamless clone.
diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix
index 4525f9232862..d55983952b8c 100644
--- a/pkgs/development/libraries/geoip/default.nix
+++ b/pkgs/development/libraries/geoip/default.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ thoughtpolice raskin ];
license = licenses.lgpl21;
platforms = platforms.unix;
- homepage = "http://maxmind.com";
+ homepage = "https://www.maxmind.com";
};
}
diff --git a/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch b/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch
deleted file mode 100644
index b734c1c8b027..000000000000
--- a/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-This patch was generated by re-running Bison 3.0.4 on pro-gram-gen.y after
-applying CVE-2018-18751.patch. This patch removes the need to add bison to
-nativeBuildInputs.
-
---- a/gettext-tools/src/po-gram-gen.c
-+++ b/gettext-tools/src/po-gram-gen.c
-@@ -568,9 +568,9 @@ static const yytype_uint8 yytranslate[] =
- static const yytype_uint16 yyrline[] =
- {
- 0, 169, 169, 171, 172, 173, 174, 179, 187, 195,
-- 216, 240, 249, 258, 269, 278, 292, 301, 315, 321,
-- 332, 338, 350, 361, 372, 376, 391, 414, 422, 434,
-- 442
-+ 216, 237, 246, 255, 266, 275, 289, 298, 312, 318,
-+ 329, 335, 347, 358, 369, 373, 388, 411, 419, 431,
-+ 439
- };
- #endif
-
-@@ -1419,14 +1419,11 @@ yyreduce:
- check_obsolete ((yyvsp[-3].message_intro), (yyvsp[-1].string));
- check_obsolete ((yyvsp[-3].message_intro), (yyvsp[0].rhs));
- if (!(yyvsp[-3].message_intro).obsolete || pass_obsolete_entries)
-- {
-- do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string,
-- (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos,
-- (yyvsp[-3].message_intro).prev_ctxt,
-- (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural,
-- (yyvsp[-3].message_intro).obsolete);
-- free ((yyvsp[-1].string).string);
-- }
-+ do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string,
-+ (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos,
-+ (yyvsp[-3].message_intro).prev_ctxt,
-+ (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural,
-+ (yyvsp[-3].message_intro).obsolete);
- else
- {
- free_message_intro ((yyvsp[-3].message_intro));
-@@ -1435,11 +1432,11 @@ yyreduce:
- free ((yyvsp[0].rhs).rhs.msgstr);
- }
- }
--#line 1439 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1436 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 11:
--#line 241 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 238 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist));
- check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].string));
-@@ -1448,11 +1445,11 @@ yyreduce:
- string_list_destroy (&(yyvsp[-1].stringlist).stringlist);
- free ((yyvsp[0].string).string);
- }
--#line 1452 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1449 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 12:
--#line 250 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 247 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist));
- check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].rhs));
-@@ -1461,22 +1458,22 @@ yyreduce:
- string_list_destroy (&(yyvsp[-1].stringlist).stringlist);
- free ((yyvsp[0].rhs).rhs.msgstr);
- }
--#line 1465 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1462 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 13:
--#line 259 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 256 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-1].message_intro), (yyvsp[0].stringlist));
- po_gram_error_at_line (&(yyvsp[-1].message_intro).pos, _("missing 'msgstr' section"));
- free_message_intro ((yyvsp[-1].message_intro));
- string_list_destroy (&(yyvsp[0].stringlist).stringlist);
- }
--#line 1476 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1473 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 14:
--#line 270 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 267 "po-gram-gen.y" /* yacc.c:1646 */
- {
- (yyval.message_intro).prev_ctxt = NULL;
- (yyval.message_intro).prev_id = NULL;
-@@ -1485,11 +1482,11 @@ yyreduce:
- (yyval.message_intro).pos = (yyvsp[0].string).pos;
- (yyval.message_intro).obsolete = (yyvsp[0].string).obsolete;
- }
--#line 1489 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1486 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 15:
--#line 279 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 276 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-1].prev), (yyvsp[0].string));
- (yyval.message_intro).prev_ctxt = (yyvsp[-1].prev).ctxt;
-@@ -1499,11 +1496,11 @@ yyreduce:
- (yyval.message_intro).pos = (yyvsp[0].string).pos;
- (yyval.message_intro).obsolete = (yyvsp[0].string).obsolete;
- }
--#line 1503 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1500 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 16:
--#line 293 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 290 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-1].string), (yyvsp[0].stringlist));
- (yyval.prev).ctxt = (yyvsp[-1].string).string;
-@@ -1512,11 +1509,11 @@ yyreduce:
- (yyval.prev).pos = (yyvsp[-1].string).pos;
- (yyval.prev).obsolete = (yyvsp[-1].string).obsolete;
- }
--#line 1516 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1513 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 17:
--#line 302 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 299 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-2].string), (yyvsp[-1].stringlist));
- check_obsolete ((yyvsp[-2].string), (yyvsp[0].string));
-@@ -1526,21 +1523,21 @@ yyreduce:
- (yyval.prev).pos = (yyvsp[-2].string).pos;
- (yyval.prev).obsolete = (yyvsp[-2].string).obsolete;
- }
--#line 1530 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1527 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 18:
--#line 316 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 313 "po-gram-gen.y" /* yacc.c:1646 */
- {
- (yyval.string).string = NULL;
- (yyval.string).pos = (yyvsp[0].pos).pos;
- (yyval.string).obsolete = (yyvsp[0].pos).obsolete;
- }
--#line 1540 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1537 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 19:
--#line 322 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 319 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist));
- check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos));
-@@ -1548,21 +1545,21 @@ yyreduce:
- (yyval.string).pos = (yyvsp[0].pos).pos;
- (yyval.string).obsolete = (yyvsp[0].pos).obsolete;
- }
--#line 1552 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1549 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 20:
--#line 333 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 330 "po-gram-gen.y" /* yacc.c:1646 */
- {
- (yyval.string).string = NULL;
- (yyval.string).pos = (yyvsp[0].pos).pos;
- (yyval.string).obsolete = (yyvsp[0].pos).obsolete;
- }
--#line 1562 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1559 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 21:
--#line 339 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 336 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist));
- check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos));
-@@ -1570,11 +1567,11 @@ yyreduce:
- (yyval.string).pos = (yyvsp[0].pos).pos;
- (yyval.string).obsolete = (yyvsp[0].pos).obsolete;
- }
--#line 1574 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1571 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 22:
--#line 351 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 348 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist));
- plural_counter = 0;
-@@ -1582,30 +1579,30 @@ yyreduce:
- (yyval.string).pos = (yyvsp[-1].pos).pos;
- (yyval.string).obsolete = (yyvsp[-1].pos).obsolete;
- }
--#line 1586 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1583 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 23:
--#line 362 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 359 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist));
- (yyval.string).string = string_list_concat_destroy (&(yyvsp[0].stringlist).stringlist);
- (yyval.string).pos = (yyvsp[-1].pos).pos;
- (yyval.string).obsolete = (yyvsp[-1].pos).obsolete;
- }
--#line 1597 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1594 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 24:
--#line 373 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 370 "po-gram-gen.y" /* yacc.c:1646 */
- {
- (yyval.rhs) = (yyvsp[0].rhs);
- }
--#line 1605 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1602 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 25:
--#line 377 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 374 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-1].rhs), (yyvsp[0].rhs));
- (yyval.rhs).rhs.msgstr = XNMALLOC ((yyvsp[-1].rhs).rhs.msgstr_len + (yyvsp[0].rhs).rhs.msgstr_len, char);
-@@ -1617,11 +1614,11 @@ yyreduce:
- (yyval.rhs).pos = (yyvsp[-1].rhs).pos;
- (yyval.rhs).obsolete = (yyvsp[-1].rhs).obsolete;
- }
--#line 1621 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1618 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 26:
--#line 392 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 389 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-4].pos), (yyvsp[-3].pos));
- check_obsolete ((yyvsp[-4].pos), (yyvsp[-2].number));
-@@ -1640,11 +1637,11 @@ yyreduce:
- (yyval.rhs).pos = (yyvsp[-4].pos).pos;
- (yyval.rhs).obsolete = (yyvsp[-4].pos).obsolete;
- }
--#line 1644 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1641 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 27:
--#line 415 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 412 "po-gram-gen.y" /* yacc.c:1646 */
- {
- string_list_init (&(yyval.stringlist).stringlist);
- string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string);
-@@ -1652,11 +1649,11 @@ yyreduce:
- (yyval.stringlist).pos = (yyvsp[0].string).pos;
- (yyval.stringlist).obsolete = (yyvsp[0].string).obsolete;
- }
--#line 1656 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1653 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 28:
--#line 423 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 420 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string));
- (yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist;
-@@ -1665,11 +1662,11 @@ yyreduce:
- (yyval.stringlist).pos = (yyvsp[-1].stringlist).pos;
- (yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete;
- }
--#line 1669 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1666 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 29:
--#line 435 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 432 "po-gram-gen.y" /* yacc.c:1646 */
- {
- string_list_init (&(yyval.stringlist).stringlist);
- string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string);
-@@ -1677,11 +1674,11 @@ yyreduce:
- (yyval.stringlist).pos = (yyvsp[0].string).pos;
- (yyval.stringlist).obsolete = (yyvsp[0].string).obsolete;
- }
--#line 1681 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1678 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
- case 30:
--#line 443 "po-gram-gen.y" /* yacc.c:1646 */
-+#line 440 "po-gram-gen.y" /* yacc.c:1646 */
- {
- check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string));
- (yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist;
-@@ -1690,11 +1687,11 @@ yyreduce:
- (yyval.stringlist).pos = (yyvsp[-1].stringlist).pos;
- (yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete;
- }
--#line 1694 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1691 "po-gram-gen.c" /* yacc.c:1646 */
- break;
-
-
--#line 1698 "po-gram-gen.c" /* yacc.c:1646 */
-+#line 1695 "po-gram-gen.c" /* yacc.c:1646 */
- default: break;
- }
- /* User semantic actions sometimes alter yychar, and that requires
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 9547c6c31ada..157f801d2f2f 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,24 +1,16 @@
-{ stdenv, lib, fetchurl, libiconv, xz, bison, automake115x, autoconf }:
+{ stdenv, lib, fetchurl, libiconv, xz }:
-let allowBisonDependency = !stdenv.isDarwin; in
stdenv.mkDerivation rec {
pname = "gettext";
- version = "0.19.8.1";
+ version = "0.20.1";
src = fetchurl {
url = "mirror://gnu/gettext/${pname}-${version}.tar.gz";
- sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z";
+ sha256 = "0p3zwkk27wm2m2ccfqm57nj7vqkmfpn7ja1nf65zmhz8qqs5chb6";
};
patches = [
./absolute-paths.diff
- (fetchurl {
- name = "CVE-2018-18751.patch";
- url = "https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=patch;h=dce3a16e5e9368245735e29bf498dcd5e3e474a4";
- sha256 = "1lpjwwcjr1sb879faj0xyzw02kma0ivab6xwn3qciy13qy6fq5xn";
- })
- ] ++ lib.optionals (!allowBisonDependency) [
- # Only necessary for CVE-2018-18751.patch:
- ./CVE-2018-18751-bison.patch
+ ./gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch
];
outputs = [ "out" "man" "doc" "info" ];
@@ -29,10 +21,6 @@ stdenv.mkDerivation rec {
configureFlags = [
"--disable-csharp" "--with-xz"
- # avoid retaining reference to CF during stdenv bootstrap
- ] ++ lib.optionals stdenv.isDarwin [
- "gt_cv_func_CFPreferencesCopyAppValue=no"
- "gt_cv_func_CFLocaleCopyCurrent=no"
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# On cross building, gettext supposes that the wchar.h from libc
# does not fulfill gettext needs, so it tries to work with its
@@ -54,14 +42,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
xz
xz.bin
- ]
- # Only necessary for CVE-2018-18751.patch (unless CVE-2018-18751-bison.patch
- # is also applied):
- ++ lib.optional allowBisonDependency bison
- ++ [
- # Only necessary for CVE-2018-18751.patch:
- automake115x
- autoconf
];
# HACK, see #10874 (and 14664)
buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv;
diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh
index ad3763c29b64..69020146f84d 100644
--- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh
+++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh
@@ -10,7 +10,7 @@ addEnvHooks "$hostOffset" gettextDataDirsHook
# libintl must be listed in load flags on non-Glibc
# it doesn't hurt to have it in Glibc either though
-if [ -n "@gettextNeedsLdflags@" -a -z "$dontAddExtraLibs" ]; then
+if [ -n "@gettextNeedsLdflags@" -a -z "${dontAddExtraLibs-}" ]; then
# See pkgs/build-support/setup-hooks/role.bash
getHostRole
export NIX_${role_pre}LDFLAGS+=" -lintl"
diff --git a/pkgs/development/libraries/gettext/gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch b/pkgs/development/libraries/gettext/gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch
new file mode 100644
index 000000000000..4a19b11507ac
--- /dev/null
+++ b/pkgs/development/libraries/gettext/gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch
@@ -0,0 +1,82 @@
+From 2336451ed68d91ff4b5ae1acbc1eca30e47a86a9 Mon Sep 17 00:00:00 2001
+From: Bruno Haible
+Date: Sun, 19 May 2019 13:10:06 +0200
+Subject: [PATCH] msgmerge: Fix behaviour of --for-msgfmt on PO files with no
+ translations.
+
+Reported by Don Lawrence
+in
+via Daiki Ueno
+in .
+
+* gettext-tools/src/msgmerge.c (main): Treat force_po like true if for_msgfmt
+is true.
+* gettext-tools/tests/msgmerge-26: Add test of PO file with no translations.
+---
+ gettext-tools/src/msgmerge.c | 4 ++--
+ gettext-tools/tests/msgmerge-26 | 36 +++++++++++++++++++++++++++++++++---
+ 2 files changed, 35 insertions(+), 5 deletions(-)
+
+diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
+index cd762c0..92c9b7a 100644
+--- a/gettext-tools/src/msgmerge.c
++++ b/gettext-tools/src/msgmerge.c
+@@ -520,8 +520,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\
+ else
+ {
+ /* Write the merged message list out. */
+- msgdomain_list_print (result, output_file, output_syntax, force_po,
+- false);
++ msgdomain_list_print (result, output_file, output_syntax,
++ for_msgfmt || force_po, false);
+ }
+
+ exit (EXIT_SUCCESS);
+diff --git a/gettext-tools/tests/msgmerge-26 b/gettext-tools/tests/msgmerge-26
+index cd3862e..b86f7a0 100755
+--- a/gettext-tools/tests/msgmerge-26
++++ b/gettext-tools/tests/msgmerge-26
+@@ -73,7 +73,37 @@ msgstr "Papaya"
+ EOF
+
+ : ${DIFF=diff}
+-${DIFF} mm-test26.ok mm-test26.out
+-result=$?
++${DIFF} mm-test26.ok mm-test26.out || Exit 1
+
+-exit $result
++# Test with a PO file that has no translated messages.
++
++cat <<\EOF > mm-test26a.in1
++msgid ""
++msgstr ""
++"Content-Type: text/plain; charset=UTF-8\n"
++
++msgid "Hello world"
++msgstr "Hallo Welt"
++EOF
++
++cat <<\EOF > mm-test26a.in2
++msgid ""
++msgstr ""
++"Content-Type: text/plain; charset=ASCII\n"
++
++msgid "Hello, world!"
++msgstr ""
++EOF
++
++: ${MSGMERGE=msgmerge}
++${MSGMERGE} --for-msgfmt -o mm-test26a.tmp mm-test26a.in1 mm-test26a.in2 \
++ || Exit 1
++LC_ALL=C tr -d '\r' < mm-test26a.tmp > mm-test26a.out || Exit 1
++
++cat <<\EOF > mm-test26a.ok
++msgid ""
++msgstr "Content-Type: text/plain; charset=UTF-8\n"
++EOF
++
++: ${DIFF=diff}
++${DIFF} mm-test26a.ok mm-test26a.out || Exit 1
+--
+1.9.1
+
diff --git a/pkgs/development/libraries/giflib/default.nix b/pkgs/development/libraries/giflib/default.nix
index e047bdbb6481..5d7b95136ddf 100644
--- a/pkgs/development/libraries/giflib/default.nix
+++ b/pkgs/development/libraries/giflib/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "A library for reading and writing gif images";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.mit;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
branch = "5.2";
};
}
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
similarity index 54%
rename from pkgs/desktops/gnome-3/core/gjs/default.nix
rename to pkgs/development/libraries/gjs/default.nix
index b0c1e2d30773..7facdc1426fe 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -1,26 +1,50 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, atk, gobject-introspection
-, spidermonkey_60, pango, readline, glib, libxml2, dbus, gdk-pixbuf
-, makeWrapper }:
+{ fetchurl
+, stdenv
+, pkgconfig
+, gnome3
+, gtk3
+, atk
+, gobject-introspection
+, spidermonkey_60
+, pango
+, cairo
+, readline
+, glib
+, libxml2
+, dbus
+, gdk-pixbuf
+, makeWrapper
+, nixosTests
+}:
stdenv.mkDerivation rec {
pname = "gjs";
- version = "1.58.1";
+ version = "1.58.3";
src = fetchurl {
url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1xf68rbagkflb9yi3visfw8cbxqlzd717y8jakgw0y6whzm1dpxl";
+ sha256 = "1bkksx362007zs8c31ydygb29spwa5g5kch1ad2grc2sp53wv7ya";
};
- passthru = {
- updateScript = gnome3.updateScript { packageName = "gjs"; attrPath = "gnome3.gjs"; };
- };
+ outputs = [ "out" "dev" "installedTests" ];
- outputs = [ "out" "installedTests" ];
+ nativeBuildInputs = [
+ pkgconfig
+ makeWrapper
+ libxml2 # for xml-stripblanks
+ ];
- nativeBuildInputs = [ pkgconfig makeWrapper ];
- buildInputs = [ libxml2 gobject-introspection glib pango readline dbus ];
+ buildInputs = [
+ gobject-introspection
+ cairo
+ readline
+ spidermonkey_60
+ dbus # for dbus-run-session
+ ];
- propagatedBuildInputs = [ spidermonkey_60 ];
+ propagatedBuildInputs = [
+ glib
+ ];
configureFlags = [
"--enable-installed-tests"
@@ -33,8 +57,6 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
- sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
-
moveToOutput "share/installed-tests" "$installedTests"
moveToOutput "libexec/gjs/installed-tests" "$installedTests"
@@ -42,10 +64,23 @@ stdenv.mkDerivation rec {
--prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gtk3 atk pango.out gdk-pixbuf ]}:$installedTests/libexec/gjs/installed-tests"
'';
+ separateDebugInfo = stdenv.isLinux;
+
+ passthru = {
+ tests = {
+ installed-tests = nixosTests.installed-tests.gjs;
+ };
+
+ updateScript = gnome3.updateScript {
+ packageName = "gjs";
+ };
+ };
+
meta = with stdenv.lib; {
description = "JavaScript bindings for GNOME";
+ homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md";
+ license = licenses.lgpl2Plus;
maintainers = gnome3.maintainers;
platforms = platforms.linux;
- license = licenses.lgpl2Plus;
};
}
diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix
index dd72637f2eb0..d656473ba807 100644
--- a/pkgs/development/libraries/gle/default.nix
+++ b/pkgs/development/libraries/gle/default.nix
@@ -1,7 +1,7 @@
-{stdenv, fetchurl, libGLU_combined, freeglut, libX11, libXt, libXmu, libXi, libXext}:
+{stdenv, fetchurl, freeglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}:
stdenv.mkDerivation {
name = "gle-3.1.0";
- buildInputs = [libGLU_combined freeglut libX11 libXt libXmu libXi libXext];
+ buildInputs = [libGLU libGL freeglut libX11 libXt libXmu libXi libXext];
src = fetchurl {
urls = [
"mirror://sourceforge/project/gle/gle/gle-3.1.0/gle-3.1.0.tar.gz"
diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index 6532d6f81b54..cf988d323994 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -1,16 +1,17 @@
-{ stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11
+{ stdenv, lib, fetchFromGitHub, cmake
+, libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext
, Cocoa, Kernel, fixDarwinDylibNames
}:
stdenv.mkDerivation rec {
- version = "3.2.1";
+ version = "3.3";
pname = "glfw";
src = fetchFromGitHub {
owner = "glfw";
repo = "GLFW";
rev = version;
- sha256 = "0gq6ad38b3azk0w2yy298yz2vmg2jmf9g0ydidqbmiswpk25ills";
+ sha256 = "1f1hqpqffzg46z33ybs2c3akmkly7b3qmgp5byk50nvad6g2pm4p";
};
enableParallelBuilding = true;
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
- buildInputs = [ libX11 libXrandr libXinerama libXcursor ]
+ buildInputs = [ libX11 libXrandr libXinerama libXcursor libXi libXext ]
++ lib.optionals stdenv.isDarwin [ Cocoa Kernel fixDarwinDylibNames ];
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
homepage = https://www.glfw.org/;
license = licenses.zlib;
- maintainers = with maintainers; [ marcweber ];
+ maintainers = with maintainers; [ marcweber twey ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index a571fffebf01..802a18dfda5d 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
};
tests = {
- installedTests = nixosTests.glib-networking;
+ installedTests = nixosTests.installed-tests.glib-networking;
};
};
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 68bc169bb89b..706e99179f5d 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -48,11 +48,11 @@ in
stdenv.mkDerivation rec {
pname = "glib";
- version = "2.62.1";
+ version = "2.62.3";
src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "1pzrw2x9r0kyghrvwdbx3nqn2wcrrxy962f5gbdacwh83m705n9x";
+ sha256 = "1i2mlrd351dnmpfi465qmx9rhgyff01j29a2x3lczzyky34ss024";
};
patches = optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index a1cb1f40c58a..37c750b8db66 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -1,9 +1,11 @@
make_glib_find_gsettings_schemas() {
# For packages that need gschemas of other packages (e.g. empathy)
- if [ -d "$1"/share/gsettings-schemas/*/glib-2.0/schemas ]; then
- addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/share/gsettings-schemas/"*
- fi
+ for maybe_dir in "$1"/share/gsettings-schemas/*; do
+ if [[ -d "$maybe_dir/glib-2.0/schemas" ]]; then
+ addToSearchPath GSETTINGS_SCHEMAS_PATH "$maybe_dir"
+ fi
+ done
}
addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas
diff --git a/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch b/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch
new file mode 100644
index 000000000000..2c558f53b735
--- /dev/null
+++ b/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch
@@ -0,0 +1,18 @@
+Adapted from https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=patch;h=4d5cfeb510125345cb41431afc9022492994cffa, omitting changes to NEWS
+diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
+index 1943691..ac694c0 100644
+--- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
++++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
+@@ -31,7 +31,8 @@
+ environment variable, LD_PREFER_MAP_32BIT_EXEC. */
+ #define EXTRA_LD_ENVVARS \
+ case 21: \
+- if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
++ if (!__libc_enable_secure \
++ && memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \
+ GLRO(dl_x86_cpu_features).feature[index_arch_Prefer_MAP_32BIT_EXEC] \
+ |= bit_arch_Prefer_MAP_32BIT_EXEC; \
+ break;
+--
+2.9.3
+
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index edf4d135aba7..32be2205bcc1 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -98,7 +98,10 @@ stdenv.mkDerivation ({
# https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f51c8367685dc888a02f7304c729ed5277904aff
./CVE-2018-11237.patch
]
- ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch
+ ++ lib.optionals stdenv.isx86_64 [
+ ./fix-x64-abi.patch
+ ./2.27-CVE-2019-19126.patch
+ ]
++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch
diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix
index e7d4c934db81..88b33601ee70 100644
--- a/pkgs/development/libraries/glm/default.nix
+++ b/pkgs/development/libraries/glm/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
homepage = http://glm.g-truc.net/;
license = licenses.mit;
platforms = platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix
index 6aa300e2b627..792217043da7 100644
--- a/pkgs/development/libraries/glog/default.nix
+++ b/pkgs/development/libraries/glog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, perl }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, perl }:
stdenv.mkDerivation rec {
pname = "glog";
@@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "1xd3maiipfbxmhc9rrblc5x52nxvkwxp14npg31y5njqvkvzax9b";
};
+ patches = lib.optionals stdenv.hostPlatform.isMusl [
+ # TODO: Remove at next release that includes this commit.
+ (fetchpatch {
+ name = "glog-Fix-symbolize_unittest-for-musl-builds.patch";
+ url = "https://github.com/google/glog/commit/834dd780bf1fe0704b8ed0350ca355a55f711a9f.patch";
+ sha256 = "0k4lanxg85anyvjsj3mh93bcgds8gizpiamcy2zvs3yyfjl40awn";
+ })
+ ];
+
nativeBuildInputs = [ autoreconfHook ];
checkInputs = [ perl ];
diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index 51e981a2a338..3343c78bea1c 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -11,7 +11,7 @@ assert idnSupport -> libidn != null;
with stdenv.lib;
let
- version = "1.0.22";
+ version = "1.0.23";
in
stdenv.mkDerivation {
pname = "gloox";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://camaya.net/download/gloox-${version}.tar.bz2";
- sha256 = "0r69gq8if9yy1amjzl7qrq9lzhhna7qgz905ln4wvkwchha1ppja";
+ sha256 = "12jz8glg9zmyk0iyv1ywf5i0hq93dfq8lvn6lyjgy8730w66mjwp";
};
buildInputs = [ ]
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
description = "A portable high-level Jabber/XMPP library for C++";
homepage = http://camaya.net/gloox;
license = licenses.gpl3;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix
index 59357bf6fb1b..d84a9227c3b8 100644
--- a/pkgs/development/libraries/glui/default.nix
+++ b/pkgs/development/libraries/glui/default.nix
@@ -1,8 +1,27 @@
-{stdenv, fetchurl, freeglut, libGLU_combined, libXmu, libXext, libX11, libXi}:
-stdenv.mkDerivation {
- name = "glui-2.35";
- buildInputs = [freeglut libGLU_combined libXmu libXext libX11 libXi];
- preConfigure = ''cd src'';
+{ stdenv
+, fetchFromGitHub
+, freeglut
+, libGL
+, libGLU
+, libX11
+, libXext
+, libXi
+, libXmu
+}:
+
+stdenv.mkDerivation rec {
+ pname = "glui";
+ version = "2.37";
+
+ src = fetchFromGitHub {
+ owner = "libglui";
+ repo = "glui";
+ rev = version;
+ sha256 = "0qg2y8w95s03zay1qsqs8pqxxlg6l9kwm7rrs1qmx0h22sxb360i";
+ };
+
+ buildInputs = [ freeglut libGLU libGL libXmu libXext libX11 libXi ];
+
installPhase = ''
mkdir -p "$out"/{bin,lib,share/glui/doc,include}
cp -rT bin "$out/bin"
@@ -11,14 +30,11 @@ stdenv.mkDerivation {
cp -rT doc "$out/share/glui/doc"
cp LICENSE.txt "$out/share/glui/doc"
'';
- src = fetchurl {
- url = "mirror://sourceforge/project/glui/Source/2.36/glui-2.36.tgz";
- sha256 = "11r7f0k5jlbl825ibhm5c6bck0fn1hbliya9x1f253ikry1mxvy1";
- };
- meta = {
+
+ meta = with stdenv.lib; {
description = ''A user interface library using OpenGL'';
- license = stdenv.lib.licenses.zlib ;
- maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.zlib ;
+ maintainers = [ maintainers.raskin ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 81546e5c1272..754d5aa74114 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection }:
stdenv.mkDerivation rec {
- version = "3.2.3";
+ version = "3.2.5";
pname = "gmime";
src = fetchurl {
url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz";
- sha256 = "04bk7rqs5slpvlvqf11i6s37s8b2xn6acls8smyl9asjnpp7a23a";
+ sha256 = "0ndsg1z1kq4w4caascydvialpyn4rfbjdn7xclzbzhw53x85cxgv";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index d9ea5a71dd30..4b35f7828fe0 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -37,7 +37,9 @@ let self = stdenv.mkDerivation rec {
"--build=${stdenv.buildPlatform.config}"
] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
- ++ optional (with stdenv.hostPlatform; (useAndroidPrebuilt || useiOSPrebuilt) && !isx86) "--disable-assembly"
+ # to build a .dll on windows, we need --disable-static + --enable-shared
+ # see https://gmplib.org/manual/Notes-for-Particular-Systems.html
+ ++ optional (!withStatic && stdenv.hostPlatform.isWindows) "--disable-static --enable-shared"
;
doCheck = true; # not cross;
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 6ae1f47e38cd..b5b8add2db52 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -1,16 +1,24 @@
-{ stdenv, buildPackages, fetchurl, pciutils }:
+{ stdenv, buildPackages, fetchurl, fetchpatch, pciutils }:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "gnu-efi";
- version = "3.0.9";
+ version = "3.0.11";
src = fetchurl {
url = "mirror://sourceforge/gnu-efi/${pname}-${version}.tar.bz2";
- sha256 = "1w3p4aqlc5j93q44la7dc8cr3hky20zvsd0h0k2lyzhwmrzfl5b7";
+ sha256 = "1ffnc4xbzfggs37ymrgfx76j56kk2644c081ivhr2bjkla9ag3gj";
};
+ patches = [
+ # Fix build on armv6l
+ (fetchpatch {
+ url = "https://sourceforge.net/p/gnu-efi/patches/_discuss/thread/25bb273a18/9c4d/attachment/0001-Fix-ARCH-on-armv6-and-other-32-bit-ARM-platforms.patch";
+ sha256 = "0pj03h20g2bbz6fr753bj1scry6919h57l1h86z3b6q7hqfj0b4r";
+ })
+ ];
+
buildInputs = [ pciutils ];
hardeningDisable = [ "stackprotector" ];
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 1b97c369edf6..deef141c5dfe 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -8,7 +8,7 @@
assert guileBindings -> guile != null;
let
- version = "3.6.10";
+ version = "3.6.11.1";
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
- sha256 = "14r2h73yfj66cm14k9mnb3kgzq5a7qjg5b31m53bf19vcxkwmwxi";
+ sha256 = "1y1wadpsrj5ai603xv5bgssl9v0pb1si2hg14zqdnmcsvgri5fpv";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index a18bdb177449..f41fa73a6ef4 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "goffice";
- version = "0.10.45";
+ version = "0.10.46";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "702ba567e9ec0bbdd9b1a8161cd24648b4868d57a6cb89128f13c125f6f31947";
+ sha256 = "058d6d3a40e1f60525682ec6b857c441d5deb50d0d30a76804f9f36f865a13a9";
};
nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix
index 9a947c3ff828..e006f8cd6f8e 100644
--- a/pkgs/development/libraries/gom/default.nix
+++ b/pkgs/development/libraries/gom/default.nix
@@ -55,7 +55,8 @@ stdenv.mkDerivation rec {
"-Dpygobject-override-dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides"
];
- doCheck = true;
+ # Success is more likely on x86_64
+ doCheck = stdenv.isx86_64;
passthru = {
updateScript = gnome3.updateScript {
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 26d5e9c88c75..63072273c2ed 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
'';
license = with licenses; [ lgpl21Plus gpl3Plus ];
platforms = platforms.unix;
- maintainers = with maintainers; [ fuuzetsu primeos ];
+ maintainers = with maintainers; [ primeos ];
};
}
diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix
index f1a9dacd4e2b..e540604c9cb9 100644
--- a/pkgs/development/libraries/graphene/default.nix
+++ b/pkgs/development/libraries/graphene/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
passthru = {
tests = {
- installedTests = nixosTests.graphene;
+ installedTests = nixosTests.installed-tests.graphene;
};
};
diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index 38243ce5a6d8..0c9e4bf31563 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv,
- cmake, netcdf, gfortran, jasper, libpng,
+{ fetchurl, fetchpatch, stdenv,
+ cmake, netcdf, gfortran, libpng, openjpeg,
enablePython ? false, pythonPackages }:
stdenv.mkDerivation rec{
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec{
sha256 = "0qbj12ap7yy2rl1pq629chnss2jl73wxdj1lwzv0xp87r6z5qdfl";
};
+ patches = [
+ (fetchpatch {
+ url = "https://salsa.debian.org/science-team/grib-api/raw/debian/1.28.0-2/debian/patches/openjpeg2.patch";
+ sha256 = "05faxh51vlidiazxq1ssd3k4cjivk1adyn30k94mxqa1xnb2r2pc";
+ })
+ ];
+
preConfigure = ''
# Fix "no member named 'inmem_' in 'jas_image_t'"
substituteInPlace "src/grib_jasper_encoding.c" --replace "image.inmem_ = 1;" ""
@@ -19,8 +26,8 @@ stdenv.mkDerivation rec{
buildInputs = [ cmake
netcdf
gfortran
- jasper
libpng
+ openjpeg
] ++ stdenv.lib.optionals enablePython [
pythonPackages.python
];
@@ -32,6 +39,7 @@ stdenv.mkDerivation rec{
cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}"
"-DENABLE_PNG=ON"
"-DENABLE_FORTRAN=ON"
+ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/${openjpeg.incDir}"
];
enableParallelBuilding = true;
@@ -52,13 +60,15 @@ stdenv.mkDerivation rec{
homepage = https://software.ecmwf.int/wiki/display/GRIB/Home;
license = licenses.asl20;
platforms = with platforms; linux ++ darwin;
- description = "ECMWF Library for the GRIB file format";
+ description = "ECMWF Library for the GRIB file format -- DEPRECATED";
longDescription = ''
The ECMWF GRIB API is an application program interface accessible from C,
FORTRAN and Python programs developed for encoding and decoding WMO FM-92
GRIB edition 1 and edition 2 messages.
+
+ Please note: GRIB-API support is being discontinued at the end of 2018.
+ After which there will be no further releases. Please upgrade to ecCodes
'';
maintainers = with maintainers; [ knedlsepp ];
};
}
-
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 5d6a10ff1132..2fa76b2e0858 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,15 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
stdenv.mkDerivation rec {
- version = "1.24.3"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
+ version = "1.25.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
pname = "grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
- sha256 = "19g3fihds9rih2ciypkwi4jahjaymyqnjhd9id397fgj1qkw4w69";
+ sha256 = "02nbmbk1xpibjzvbhi8xpazmwry46ki24vks1sh2p0aqwy4hv6yb";
fetchSubmodules = true;
};
+ patches = [
+ # Fix build on armv6l (https://github.com/grpc/grpc/pull/21341)
+ (fetchpatch {
+ url = "https://github.com/grpc/grpc/commit/ffb8a278389c8e3403b23a9897b65a7390c34645.patch";
+ sha256 = "1lc12a3gccg9wxqhnwgldlj3zmlm6lxg8dssvvj1x7hf655kw3w3";
+ })
+ ];
+
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 735ab4e6e18e..9b2d3d0e2470 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -1,16 +1,40 @@
-{ stdenv, fetchurl, fetchpatch, meson, ninja, gettext
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, gettext
, config
-, pkgconfig, python3, gst-plugins-base, orc
+, pkgconfig
+, python3
+, gst-plugins-base
+, orc
, gobject-introspection
, enableZbar ? true
-, faacSupport ? false, faac ? null
-, faad2, libass, libkate, libmms, librdf, ladspaH
-, libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom
-, libbs2b, libmodplug, mpeg2dec
-, openjpeg, libopus, librsvg
+, faacSupport ? false
+, faac ? null
+, faad2
+, libass
+, libkate
+, libmms
+, librdf
+, ladspaH
+, libnice
+, webrtc-audio-processing
+, lilv
+, lv2
+, serd
+, sord
+, sratom
+, libbs2b
+, libmodplug
+, mpeg2dec
+, openjpeg
+, libopus
+, librsvg
, bluez
, chromaprint
, curl
+, darwin
, directfb
, fdk_aac
, flite
@@ -27,7 +51,7 @@
, libusb1
, neon
, openal
-, opencv3
+, opencv4
, openexr
, openh264
, pango
@@ -38,10 +62,21 @@
, srtp
, zbar
, wayland-protocols
-, wildmidi, fluidsynth, libvdpau, wayland
-, libwebp, xvidcore, gnutls, mjpegtools
-, libGLU_combined, libintl, libgme
-, openssl, x265, libxml2
+, wildmidi
+, fluidsynth
+, libvdpau
+, wayland
+, libwebp
+, xvidcore
+, gnutls
+, mjpegtools
+, libGLU
+, libGL
+, libintl
+, libgme
+, openssl
+, x265
+, libxml2
, srt
}:
@@ -49,113 +84,128 @@ assert faacSupport -> faac != null;
let
inherit (stdenv.lib) optional optionals;
-in
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
pname = "gst-plugins-bad";
- version = "1.16.0";
-
- meta = with stdenv.lib; {
- description = "Gstreamer Bad Plugins";
- homepage = "https://gstreamer.freedesktop.org";
- longDescription = ''
- a set of plug-ins that aren't up to par compared to the
- rest. They might be close to being good quality, but they're missing
- something - be it a good code review, some documentation, a set of tests,
- a real live maintainer, or some actual wide use.
- '';
- license = licenses.lgpl2Plus;
- platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ matthewbauer ];
- };
-
- preConfigure = ''
- patchShebangs .
- '';
-
- patches = [
- ./fix_pkgconfig_includedir.patch
- # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/312 is merged and available to us
- (fetchpatch {
- url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/99790eaad9083cce5ab2b1646489e1a1c0faad1e.patch";
- sha256 = "11bqy4sl05qq5mj4bx5s09rq106s3j0vnpjl4np058im32j69lr3";
- })
- # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/312 is merged and available to us
- (fetchpatch {
- url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/1872da81c48d3a719bd39955fd97deac7d037d74.patch";
- sha256 = "11zwrr5ggflmvr0qfssj7dmhgd3ybiadmy79b4zh24022zgw3xpz";
- })
- ];
-
- src = fetchurl {
- url = "${meta.homepage}/src/gst-plugins-bad/${pname}-${version}.tar.xz";
- sha256 = "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2";
- };
+ version = "1.16.2";
outputs = [ "out" "dev" ];
+ src = fetchurl {
+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi";
+ };
+
+ patches = [
+ ./fix_pkgconfig_includedir.patch
+ ];
+
nativeBuildInputs = [
- meson ninja pkgconfig python3 gettext gobject-introspection
- ]
- ++ optionals stdenv.isLinux [
+ meson
+ ninja
+ pkgconfig
+ python3
+ gettext
+ gobject-introspection
+ ] ++ optionals stdenv.isLinux [
wayland-protocols
];
buildInputs = [
- gst-plugins-base orc
- faad2 libass libkate libmms
- libnice webrtc-audio-processing # webrtc
+ gst-plugins-base
+ orc
+ faad2
+ libass
+ libkate
+ libmms
+ webrtc-audio-processing # webrtc
libbs2b
- ladspaH librdf # ladspa plug-in
- lilv lv2 serd sord sratom # lv2 plug-in
- libmodplug mpeg2dec
- openjpeg libopus librsvg
- bluez
- chromaprint
+ libmodplug
+ mpeg2dec
+ openjpeg
+ libopus
+ librsvg
curl.dev
- directfb
fdk_aac
- flite
gsm
libaom
libdc1394
libde265
- libdrm
libdvdnav
libdvdread
- libgudev
- libofa
libsndfile
libusb1
+ mjpegtools
neon
openal
- opencv3
+ opencv4
openexr
openh264
rtmpdump
pango
- sbc
soundtouch
- spandsp
srtp
- fluidsynth libvdpau
- libwebp xvidcore gnutls libGLU_combined
- libgme openssl x265 libxml2
+ fluidsynth
+ libvdpau
+ libwebp
+ xvidcore
+ gnutls
+ libGL
+ libGLU
+ libgme
+ openssl
+ x265
+ libxml2
libintl
srt
- ]
- ++ optional enableZbar zbar
- ++ optional faacSupport faac
- ++ optional stdenv.isLinux wayland
+ ] ++ optionals enableZbar [
+ zbar
+ ] ++ optionals faacSupport [
+ faac
+ ] ++ optionals stdenv.isLinux [
+ bluez
+ wayland
+ ] ++ optionals (!stdenv.isDarwin) [
# wildmidi requires apple's OpenAL
# TODO: package apple's OpenAL, fix wildmidi, include on Darwin
- ++ optional (!stdenv.isDarwin) wildmidi
+ wildmidi
# TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin
- ++ optional (!stdenv.isDarwin) mjpegtools;
+ mjpegtools
+
+ chromaprint
+ directfb
+ flite
+ libdrm
+ libgudev
+ libnice
+ libofa
+ librdf
+ sbc
+ spandsp
+
+ # ladspa plug-in
+ ladspaH
+ librdf # TODO: make build on Darwin
+
+ # lv2 plug-in
+ lilv
+ lv2
+ serd
+ sord
+ sratom
+ ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ # For unknown reasons the order is important, e.g. if
+ # VideoToolbox is last, we get:
+ # fatal error: 'VideoToolbox/VideoToolbox.h' file not found
+ VideoToolbox
+ AudioToolbox
+ AVFoundation
+ CoreMedia
+ CoreVideo
+ Foundation
+ MediaToolbox
+ ]);
mesonFlags = [
- # Enables all features, so that we know when new dependencies are necessary.
- "-Dauto_features=enabled"
-
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
"-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development"
@@ -191,10 +241,50 @@ stdenv.mkDerivation rec {
# see https://github.com/NixOS/nixpkgs/issues/54395
"-Dnvdec=disabled"
"-Dnvenc=disabled"
+ ]
+ ++ optionals stdenv.isDarwin [
+ "-Dbluez=disabled"
+ "-Dchromaprint=disabled"
+ "-Ddirectfb=disabled"
+ "-Dflite=disabled"
+ "-Dkms=disabled" # renders to libdrm output
+ "-Dofa=disabled"
+ "-Dlv2=disabled"
+ "-Dsbc=disabled"
+ "-Dspandsp=disabled"
+ "-Ddvb=disabled"
+ "-Dfbdev=disabled"
+ "-Duvch264=disabled" # requires gudev
+ "-Dladspa=disabled" # requires lrdf
+ "-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs
+ "-Dwildmidi=disabled" # see dependencies above
+ ] ++ optionals (!gst-plugins-base.glEnabled) [
+ "-Dgl=disabled"]
+ ++ optionals (!gst-plugins-base.waylandEnabled) [
+ "-Dwayland=disabled"
+ ] ++ optionals (!gst-plugins-base.glEnabled) [
+ # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`,
+ # but its meson build system does not declare the dependency.
+ "-Dapplemedia=disabled"
];
- enableParallelBuilding = true;
+ # This package has some `_("string literal")` string formats
+ # that trip up clang with format security enabled.
+ hardeningDisable = [ "format" ];
doCheck = false; # fails 20 out of 58 tests, expensive
+ meta = with stdenv.lib; {
+ description = "GStreamer Bad Plugins";
+ homepage = "https://gstreamer.freedesktop.org";
+ longDescription = ''
+ a set of plug-ins that aren't up to par compared to the
+ rest. They might be close to being good quality, but they're missing
+ something - be it a good code review, some documentation, a set of tests,
+ a real live maintainer, or some actual wide use.
+ '';
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux ++ platforms.darwin;
+ maintainers = with maintainers; [ matthewbauer ];
+ };
}
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 81d914581321..178f6a1fe893 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,100 +1,158 @@
-{ stdenv, fetchurl, fetchpatch, lib
-, pkgconfig, meson, ninja, gettext, gobject-introspection
-, python3, gstreamer, orc, pango, libtheora
-, libintl, libopus
+{ stdenv
+, fetchurl
+, lib
+, pkgconfig
+, meson
+, ninja
+, gettext
+, gobject-introspection
+, python3
+, gstreamer
+, orc
+, pango
+, libtheora
+, libintl
+, libopus
, isocodes
, libjpeg
+, libpng
, libvisual
, tremor # provides 'virbisidec'
, libGL
-, gtk-doc, docbook_xsl, docbook_xml_dtd_412
-, enableX11 ? stdenv.isLinux, libXv
-, enableWayland ? stdenv.isLinux, wayland
-, enableAlsa ? stdenv.isLinux, alsaLib
-, enableCocoa ? false, darwin
-, enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }:
+, gtk-doc
+, docbook_xsl
+, docbook_xml_dtd_43
+, enableX11 ? stdenv.isLinux
+, libXv
+, enableWayland ? stdenv.isLinux
+, wayland
+, wayland-protocols
+, enableAlsa ? stdenv.isLinux
+, alsaLib
+# Enabling Cocoa seems to currently not work, giving compile
+# errors. Suspected is that a newer version than clang
+# is needed than 5.0 but it is not clear.
+, enableCocoa ? false
+, darwin
+, enableGl ? (enableX11 || enableWayland || enableCocoa)
+, enableCdparanoia ? (!stdenv.isDarwin)
+, cdparanoia
+}:
stdenv.mkDerivation rec {
pname = "gst-plugins-base";
- version = "1.16.0";
-
- meta = with lib; {
- description = "Base plugins and helper libraries";
- homepage = https://gstreamer.freedesktop.org;
- license = licenses.lgpl2Plus;
- platforms = platforms.unix;
- maintainers = with maintainers; [ matthewbauer ];
- };
-
- src = fetchurl {
- url = "${meta.homepage}/src/gst-plugins-base/${pname}-${version}.tar.xz";
- sha256 = "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0";
- };
+ version = "1.16.2";
outputs = [ "out" "dev" ];
- nativeBuildInputs = [
- pkgconfig python3 gettext gobject-introspection
- gtk-doc
- # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install`
- docbook_xsl docbook_xml_dtd_412
- ]
- # Broken meson with Darwin. Should hopefully be fixed soon. Tracking
- # in https://bugzilla.gnome.org/show_bug.cgi?id=781148.
- ++ lib.optionals (!stdenv.isDarwin) [ meson ninja ];
-
- # On Darwin, we currently use autoconf, on all other systems Meson
- # TODO Switch to Meson on Darwin as well
-
- # TODO How to pass these to Meson?
- configureFlags = lib.optionals stdenv.isDarwin [
- "--enable-x11=${if enableX11 then "yes" else "no"}"
- "--enable-wayland=${if enableWayland then "yes" else "no"}"
- "--enable-cocoa=${if enableCocoa then "yes" else "no"}"
- ]
- # Introspection fails on my MacBook currently
- ++ lib.optional stdenv.isDarwin "--disable-introspection";
-
- mesonFlags = lib.optionals (!stdenv.isDarwin) [
- # Enables all features, so that we know when new dependencies are necessary.
- "-Dauto_features=enabled"
- "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
- "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing
- # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
- "-Dgl_winsys=[${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}]"
- # We must currently disable gtk_doc API docs generation,
- # because it is not compatible with some features being disabled.
- # See for example
- # https://gitlab.gnome.org/GNOME/gnome-build-meta/issues/38
- # for it failing because some Wayland symbols are missing.
- # This problem appeared between 1.15.1 and 1.16.0.
- "-Dgtk_doc=disabled"
- ]
- ++ lib.optional (!enableX11) "-Dx11=disabled"
- # TODO How to disable Wayland?
- ++ lib.optional (!enableAlsa) "-Dalsa=disabled"
- ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled"
- ;
-
- buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor libGL ]
- ++ lib.optional (!stdenv.isDarwin) libvisual
- ++ lib.optional enableAlsa alsaLib
- ++ lib.optionals enableX11 [ libXv pango ]
- ++ lib.optional enableWayland wayland
- ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa
- ++ lib.optional enableCdparanoia cdparanoia;
-
- propagatedBuildInputs = [ gstreamer ];
-
- postPatch = ''
- patchShebangs .
- '';
-
- enableParallelBuilding = true;
-
- doCheck = false; # fails, wants DRI access for OpenGL
+ src = fetchurl {
+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "0sl1hxlyq46r02k7z70v09vx1gi4rcypqmzra9jid93lzvi76gmi";
+ };
patches = [
./fix_pkgconfig_includedir.patch
];
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ python3
+ gettext
+ gobject-introspection
+
+ # docs
+ gtk-doc
+ docbook_xsl
+ docbook_xml_dtd_43
+ ];
+
+ buildInputs = [
+ orc
+ libtheora
+ libintl
+ libopus
+ isocodes
+ libpng
+ libjpeg
+ tremor
+ libGL
+ ] ++ lib.optional (!stdenv.isDarwin) [
+ libvisual
+ ] ++ lib.optionals stdenv.isDarwin [
+ pango
+ darwin.apple_sdk.frameworks.OpenGL
+ ] ++ lib.optionals enableAlsa [
+ alsaLib
+ ] ++ lib.optionals enableX11 [
+ libXv
+ pango
+ ] ++ lib.optionals enableWayland [
+ wayland
+ wayland-protocols
+ ] ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa
+ ++ lib.optional enableCdparanoia cdparanoia;
+
+ propagatedBuildInputs = [
+ gstreamer
+ ];
+
+ mesonFlags = [
+ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
+ "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing
+ # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices
+ "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}"
+ # We must currently disable gtk_doc API docs generation,
+ # because it is not compatible with some features being disabled.
+ # See for example
+ # https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/564
+ # for it failing because some Wayland symbols are missing.
+ # This problem appeared between 1.15.1 and 1.16.0.
+ # In 1.18 they should switch to hotdoc, which should make this issue irrelevant.
+ "-Dgtk_doc=disabled"
+ ]
+ ++ lib.optional (!enableX11) "-Dx11=disabled"
+ # TODO How to disable Wayland?
+ ++ lib.optional (!enableGl) "-Dgl=disabled"
+ ++ lib.optional (!enableAlsa) "-Dalsa=disabled"
+ ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled"
+ ++ lib.optionals stdenv.isDarwin [
+ "-Dlibvisual=disabled"
+ ];
+
+ postPatch = ''
+ patchShebangs common/scangobj-merge.py
+ '';
+
+ # This package has some `_("string literal")` string formats
+ # that trip up clang with format security enabled.
+ hardeningDisable = [ "format" ];
+
+ doCheck = false; # fails, wants DRI access for OpenGL
+
+ passthru = {
+ # Downstream `gst-*` packages depending on `gst-plugins-base`
+ # have meson build options like 'gl' etc. that depend
+ # on these features being built in `-base`.
+ # If they are not built here, then the downstream builds
+ # will fail, as they, too, use `-Dauto_features=enabled`
+ # which would enable these options unconditionally.
+ # That means we must communicate to these downstream packages
+ # if the `-base` enabled these options or not, so that
+ # the can enable/disable those features accordingly.
+ # The naming `*Enabled` vs `enable*` is intentional to
+ # distinguish inputs from outputs (what is to be built
+ # vs what was built) and to make them easier to search for.
+ glEnabled = enableGl;
+ waylandEnabled = enableWayland;
+ };
+
+ meta = with lib; {
+ description = "Base GStreamer plug-ins and helper libraries";
+ homepage = "https://gstreamer.freedesktop.org";
+ license = licenses.lgpl2Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ matthewbauer ];
+ };
}
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index f0f01a977fd1..3dd7a547de96 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -1,10 +1,23 @@
-{ stdenv, fetchurl, fetchpatch, meson, ninja
-, pkgconfig, gettext, gobject-introspection
-, bison, flex, python3, glib, makeWrapper
-, libcap,libunwind, darwin
+{ stdenv
+, fetchurl
+, fetchpatch
+, meson
+, ninja
+, pkgconfig
+, gettext
+, gobject-introspection
+, bison
+, flex
+, python3
+, glib
+, makeWrapper
+, libcap
+, libunwind
+, darwin
, elfutils # for libdw
, bash-completion
-, docbook_xsl, docbook_xml_dtd_412
+, docbook_xsl
+, docbook_xml_dtd_43
, gtk-doc
, lib
, CoreServices
@@ -12,50 +25,66 @@
stdenv.mkDerivation rec {
pname = "gstreamer";
- version = "1.16.0";
+ version = "1.16.2";
- meta = with lib ;{
- description = "Open source multimedia framework";
- homepage = https://gstreamer.freedesktop.org;
- license = licenses.lgpl2Plus;
- platforms = platforms.unix;
- maintainers = with maintainers; [ ttuegel matthewbauer ];
- };
+ outputs = [ "out" "dev" "devdoc" ];
+ outputBin = "dev";
src = fetchurl {
- url = "${meta.homepage}/src/gstreamer/${pname}-${version}.tar.xz";
- sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf";
+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "0kp93622y29pck8asvil1fmzf55s2gx76wv475a6izc3cwj49w73";
};
patches = [
./fix_pkgconfig_includedir.patch
];
- outputs = [ "out" "dev" ];
- outputBin = "dev";
-
nativeBuildInputs = [
- meson ninja pkgconfig gettext bison flex python3 makeWrapper gobject-introspection
+ meson
+ ninja
+ pkgconfig
+ gettext
+ bison
+ flex
+ python3
+ makeWrapper
+ gobject-introspection
bash-completion
+
+ # documentation
gtk-doc
- # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install`
- docbook_xsl docbook_xml_dtd_412
+ docbook_xsl
+ docbook_xml_dtd_43
];
- buildInputs =
- lib.optionals stdenv.isLinux [ libcap libunwind elfutils ]
- ++ lib.optional stdenv.isDarwin CoreServices;
+ buildInputs = lib.optionals stdenv.isLinux [
+ libcap
+ libunwind
+ elfutils
+ ] ++ lib.optionals stdenv.isDarwin [
+ CoreServices
+ ];
- propagatedBuildInputs = [ glib ];
+ propagatedBuildInputs = [
+ glib
+ ];
mesonFlags = [
- # Enables all features, so that we know when new dependencies are necessary.
- "-Dauto_features=enabled"
"-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
- ]
+ ] ++ lib.optionals stdenv.isDarwin [
# darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it.
- ++ stdenv.lib.optionals stdenv.isDarwin [ "-Dlibunwind=disabled" "-Dlibdw=disabled" ];
+ "-Dlibunwind=disabled"
+ "-Dlibdw=disabled"
+ ];
+
+ postPatch = ''
+ patchShebangs \
+ gst/parse/get_flex_version.py \
+ gst/parse/gen_grammar.py.in \
+ gst/parse/gen_lex.py.in \
+ libs/gst/helpers/ptp_helper_post_install.sh
+ '';
postInstall = ''
for prog in "$dev/bin/"*; do
@@ -64,21 +93,17 @@ stdenv.mkDerivation rec {
done
'';
- preConfigure=
- # These files are not executable upstream, so we need to
- # make them executable for `patchShebangs` to pick them up.
- # Can be removed when this is merged and available:
- # https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/141
- ''
- chmod +x gst/parse/get_flex_version.py
- '' +
- ''
- patchShebangs .
- '';
-
preFixup = ''
moveToOutput "share/bash-completion" "$dev"
'';
setupHook = ./setup-hook.sh;
+
+ meta = with lib ;{
+ description = "Open source multimedia framework";
+ homepage = "https://gstreamer.freedesktop.org";
+ license = licenses.lgpl2Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ ttuegel matthewbauer ];
+ };
}
diff --git a/pkgs/development/libraries/gstreamer/core/setup-hook.sh b/pkgs/development/libraries/gstreamer/core/setup-hook.sh
index b8c741af578f..026a4e5f55a0 100644
--- a/pkgs/development/libraries/gstreamer/core/setup-hook.sh
+++ b/pkgs/development/libraries/gstreamer/core/setup-hook.sh
@@ -1,7 +1,7 @@
addGstreamer1LibPath () {
if test -d "$1/lib/gstreamer-1.0"
then
- export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_SYSTEM_PATH_1_0}${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$1/lib/gstreamer-1.0"
+ export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_SYSTEM_PATH_1_0-}${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$1/lib/gstreamer-1.0"
fi
}
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index 810cee650ca8..6e9a604f7946 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -1,39 +1,66 @@
-{ stdenv, fetchurl, fetchpatch, meson, ninja
-, pkgconfig, python, gst-plugins-base, libxml2
-, flex, perl, gettext, gobject-introspection
+{ stdenv
+, fetchurl
+, fetchpatch
+, meson
+, ninja
+, pkgconfig
+, python
+, gst-plugins-base
+, libxml2
+, flex
+, perl
+, gettext
+, gobject-introspection
}:
stdenv.mkDerivation rec {
pname = "gstreamer-editing-services";
- version = "1.16.0";
-
- meta = with stdenv.lib; {
- description = "Library for creation of audio/video non-linear editors";
- homepage = "https://gstreamer.freedesktop.org";
- license = licenses.lgpl2Plus;
- platforms = platforms.unix;
- };
-
- src = fetchurl {
- url = "${meta.homepage}/src/gstreamer-editing-services/${pname}-${version}.tar.xz";
- sha256 = "1las94jkx83sxmzi5w6b0xm89dqqwzpdsb6h9w9ixndhnbpzm8w2";
- };
+ version = "1.16.2";
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection python flex perl ];
-
- propagatedBuildInputs = [ gst-plugins-base libxml2 ];
-
- mesonFlags = [
- "-Dgtk_doc=disabled"
- ];
+ src = fetchurl {
+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "05hcf3prna8ajjnqd53221gj9syarrrjbgvjcbhicv0c38csc1hf";
+ };
patches = [
./fix_pkgconfig_includedir.patch
];
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ gettext
+ gobject-introspection
+ python
+ flex
+ perl
+ ];
+
+ buildInputs = [
+ libxml2
+ ];
+
+ propagatedBuildInputs = [
+ gst-plugins-base
+ ];
+
+ mesonFlags = [
+ "-Dgtk_doc=disabled"
+ ];
+
postPatch = ''
+ # for some reason, gst-plugins-bad cannot be found
+ # fortunately, they are only used by tests, which we do not run
sed -i -r -e 's/p(bad|good) = .*/p\1 = pbase/' tests/check/meson.build
'';
+
+ meta = with stdenv.lib; {
+ description = "Library for creation of audio/video non-linear editors";
+ homepage = "https://gstreamer.freedesktop.org";
+ license = licenses.lgpl2Plus;
+ platforms = platforms.unix;
+ };
}
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index c801684b0659..136dd1e1712f 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -1,14 +1,37 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, python
-, gst-plugins-base, orc, bzip2, gettext
-, libv4l, libdv, libavc1394, libiec61883
-, libvpx, speex, flac, taglib, libshout
-, cairo, gdk-pixbuf, aalib, libcaca
-, libsoup, libpulseaudio, libintl
-, darwin, lame, mpg123, twolame
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, python
+, gst-plugins-base
+, orc
+, bzip2
+, gettext
+, libv4l
+, libdv
+, libavc1394
+, libiec61883
+, libvpx
+, speex
+, flac
+, taglib
+, libshout
+, cairo
+, gdk-pixbuf
+, aalib
+, libcaca
+, libsoup
+, libpulseaudio
+, libintl
+, darwin
+, lame
+, mpg123
+, twolame
, gtkSupport ? false, gtk3 ? null
-# As of writing, jack2 incurs a Qt dependency (big!) via `ffado`.
-# In the fuure we should probably split `ffado`.
-, enableJack ? false
+ # As of writing, jack2 incurs a Qt dependency (big!) via `ffado`.
+ # In the future we should probably split `ffado`.
+, enableJack ? false, jack2
, libXdamage
, libXext
, libXfixes
@@ -16,49 +39,53 @@
, xorg
, libgudev
, wavpack
-, jack2
}:
assert gtkSupport -> gtk3 != null;
let
- inherit (stdenv.lib) optional optionals;
+ inherit (stdenv.lib) optionals;
in
stdenv.mkDerivation rec {
pname = "gst-plugins-good";
- version = "1.16.0";
-
- meta = with stdenv.lib; {
- description = "Gstreamer Good Plugins";
- homepage = "https://gstreamer.freedesktop.org";
- longDescription = ''
- a set of plug-ins that we consider to have good quality code,
- correct functionality, our preferred license (LGPL for the plug-in
- code, LGPL or LGPL-compatible for the supporting library).
- '';
- license = licenses.lgpl2Plus;
- platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ matthewbauer ];
- };
-
- src = fetchurl {
- url = "${meta.homepage}/src/gst-plugins-good/${pname}-${version}.tar.xz";
- sha256 = "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5";
- };
+ version = "1.16.2";
outputs = [ "out" "dev" ];
+ src = fetchurl {
+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "068k3cbv1yf3gbllfdzqsg263kzwh21y8dpwr0wvgh15vapkpfs0";
+ };
+
patches = [ ./fix_pkgconfig_includedir.patch ];
- nativeBuildInputs = [ pkgconfig python meson ninja gettext ];
-
- NIX_LDFLAGS = "-lncurses";
+ nativeBuildInputs = [
+ pkgconfig
+ python
+ meson
+ ninja
+ gettext
+ ];
buildInputs = [
- gst-plugins-base orc bzip2
- libdv libvpx speex flac taglib
- cairo gdk-pixbuf aalib libcaca
- libsoup libshout lame mpg123 twolame libintl
+ gst-plugins-base
+ orc
+ bzip2
+ libdv
+ libvpx
+ speex
+ flac
+ taglib
+ cairo
+ gdk-pixbuf
+ aalib
+ libcaca
+ libsoup
+ libshout
+ lame
+ mpg123
+ twolame
+ libintl
libXdamage
libXext
libXfixes
@@ -66,29 +93,59 @@ stdenv.mkDerivation rec {
xorg.libXfixes
xorg.libXdamage
wavpack
- ]
- ++ optional gtkSupport gtk3 # for gtksink
- ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
- ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev ]
- ++ optionals (stdenv.isLinux && enableJack) [
+ ] ++ optionals gtkSupport [
+ # for gtksink
+ gtk3
+ ] ++ optionals stdenv.isDarwin [
+ darwin.apple_sdk.frameworks.Cocoa
+ ] ++ optionals stdenv.isLinux [
+ libv4l
+ libpulseaudio
+ libavc1394
+ libiec61883
+ libgudev
+ ] ++ optionals (stdenv.isLinux && enableJack) [
jack2
];
mesonFlags = [
- # Enables all features, so that we know when new dependencies are necessary.
- "-Dauto_features=enabled"
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
"-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps
- ]
- ++ optional (!gtkSupport) "-Dgtk3=disabled"
- ++ optionals (!stdenv.isLinux || !enableJack) [
+ ] ++ optionals (!gtkSupport) [
+ "-Dgtk3=disabled"
+ ] ++ optionals (!stdenv.isLinux || !enableJack) [
"-Djack=disabled" # unclear whether Jack works on Darwin
- ]
- ++ optionals (!stdenv.isLinux) [
- "-Dv4l2-gudev=disabled"
+ ] ++ optionals (!stdenv.isLinux) [
+ "-Ddv1394=disabled" # Linux only
+ "-Doss4=disabled" # Linux only
+ "-Doss=disabled" # Linux only
+ "-Dpulse=disabled" # TODO check if we can keep this enabled
+ "-Dv4l2-gudev=disabled" # Linux-only
+ "-Dv4l2=disabled" # Linux-only
+ "-Dximagesrc=disabled" # Linux-only
+ "-Dpulse=disabled" # TODO check if we can keep this enabled
+ ];
+
+
+ NIX_LDFLAGS = [
+ # linking error on Darwin
+ # https://github.com/NixOS/nixpkgs/pull/70690#issuecomment-553694896
+ "-lncurses"
];
# fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''"
doCheck = false;
+ meta = with stdenv.lib; {
+ description = "GStreamer Good Plugins";
+ homepage = "https://gstreamer.freedesktop.org";
+ longDescription = ''
+ a set of plug-ins that we consider to have good quality code,
+ correct functionality, our preferred license (LGPL for the plug-in
+ code, LGPL or LGPL-compatible for the supporting library).
+ '';
+ license = licenses.lgpl2Plus;
+ platforms = platforms.linux ++ platforms.darwin;
+ maintainers = with maintainers; [ matthewbauer ];
+ };
}
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
index 5a942b49cc03..eed9d423fdb9 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gstreamer, xorg, alsaLib, cdparanoia
+{ fetchurl, fetchpatch, stdenv, pkgconfig, gstreamer, xorg, alsaLib, cdparanoia
, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
, libintl
, ApplicationServices
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
patches = [
./gcc-4.9.patch
- (fetchurl {
+ (fetchpatch {
url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/commit/f672277509705c4034bc92a141eefee4524d15aa.patch";
name = "CVE-2019-9928.patch";
- sha256 = "0hz3lsq3ppmaf329sbyi05y1qniqfj9vlp2f3z918383pvrcms4i";
+ sha256 = "1dlamsmyr7chrb6vqqmwikqvvqcx5l7k72p98448qm6k59ndnimc";
})
];
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
index 65ce26112519..636e20b732b4 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
@@ -1,7 +1,7 @@
addGstreamerLibPath () {
if test -d "$1/lib/gstreamer-0.10"
then
- export GST_PLUGIN_SYSTEM_PATH="${GST_PLUGIN_SYSTEM_PATH}${GST_PLUGIN_SYSTEM_PATH:+:}$1/lib/gstreamer-0.10"
+ export GST_PLUGIN_SYSTEM_PATH="${GST_PLUGIN_SYSTEM_PATH-}${GST_PLUGIN_SYSTEM_PATH:+:}$1/lib/gstreamer-0.10"
fi
}
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 1847b8d0c12b..e36eba370071 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -1,43 +1,46 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig
-, python, yasm, gst-plugins-base, orc, bzip2
-, gettext, withSystemLibav ? true, libav ? null
+{ stdenv
+, lib
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, python3
+, gst-plugins-base
+, gettext
+, libav
}:
# Note that since gst-libav-1.6, libav is actually ffmpeg. See
# https://gstreamer.freedesktop.org/releases/1.6/ for more info.
-assert withSystemLibav -> libav != null;
-
stdenv.mkDerivation rec {
pname = "gst-libav";
- version = "1.16.0";
-
- meta = {
- homepage = https://gstreamer.freedesktop.org;
- license = stdenv.lib.licenses.lgpl2Plus;
- platforms = stdenv.lib.platforms.unix;
- };
+ version = "1.16.2";
src = fetchurl {
- url = "${meta.homepage}/src/gst-libav/${pname}-${version}.tar.xz";
- sha256 = "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z";
+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "1wpfilc98bad9nsv3y1qapxp35dvn2mvwvrmqwrsj58cf09gc967";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = with stdenv.lib;
- [ meson ninja gettext pkgconfig python ]
- ++ optional (!withSystemLibav) yasm
- ;
-
- buildInputs = with stdenv.lib;
- [ gst-plugins-base orc bzip2 ]
- ++ optional withSystemLibav libav
- ;
-
- mesonFlags = [
- # Enables all features, so that we know when new dependencies are necessary.
- "-Dauto_features=enabled"
+ nativeBuildInputs = [
+ meson
+ ninja
+ gettext
+ pkgconfig
+ python3
];
+ buildInputs = [
+ gst-plugins-base
+ libav
+ ];
+
+ meta = with lib; {
+ description = "FFmpeg/libav plugin for GStreamer";
+ homepage = "https://gstreamer.freedesktop.org";
+ license = licenses.lgpl2Plus;
+ platforms = platforms.unix;
+ };
}
diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
index 5c571fa4a1e7..dfb18754c839 100644
--- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
+++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix
@@ -1,38 +1,50 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig
-, gettext, gobject-introspection
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, gettext
+, gobject-introspection
, gst-plugins-base
, gst-plugins-bad
}:
stdenv.mkDerivation rec {
pname = "gst-rtsp-server";
- version = "1.16.0";
-
- meta = with stdenv.lib; {
- description = "Gstreamer RTSP server";
- homepage = "https://gstreamer.freedesktop.org";
- longDescription = ''
- a library on top of GStreamer for building an RTSP server.
- '';
- license = licenses.lgpl2Plus;
- platforms = platforms.linux ++ platforms.darwin;
- maintainers = with maintainers; [ bkchr ];
- };
+ version = "1.16.2";
src = fetchurl {
- url = "${meta.homepage}/src/gst-rtsp-server/${pname}-${version}.tar.xz";
- sha256 = "069zy159izy50blci9fli1i2r8jh91qkmgrz1n0xqciy3bn9x3hr";
+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "0vn23nxwvs96g7gcxw5zbnw23hkhky8a8r42wq68411vgf1s41yy";
};
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ meson ninja gettext gobject-introspection pkgconfig ];
+ nativeBuildInputs = [
+ meson
+ ninja
+ gettext
+ gobject-introspection
+ pkgconfig
+ ];
- buildInputs = [ gst-plugins-base gst-plugins-bad ];
+ buildInputs = [
+ gst-plugins-base
+ gst-plugins-bad
+ ];
mesonFlags = [
- # Enables all features, so that we know when new dependencies are necessary.
- "-Dauto_features=enabled"
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
];
+
+ meta = with stdenv.lib; {
+ description = "GStreamer RTSP server";
+ homepage = "https://gstreamer.freedesktop.org";
+ longDescription = ''
+ A library on top of GStreamer for building an RTSP server.
+ '';
+ license = licenses.lgpl2Plus;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ bkchr ];
+ };
}
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 552ab1ec2921..870b4468860f 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -1,53 +1,76 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, python
-, gst-plugins-base, orc, gettext
-, a52dec, libcdio, libdvdread
-, libmad, libmpeg2, x264, libintl, lib
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, python
+, gst-plugins-base
+, orc
+, gettext
+, a52dec
+, libcdio
+, libdvdread
+, libmad
+, libmpeg2
+, x264
+, libintl
+, lib
, opencore-amr
, darwin
}:
stdenv.mkDerivation rec {
pname = "gst-plugins-ugly";
- version = "1.16.0";
+ version = "1.16.2";
+
+ outputs = [ "out" "dev" ];
+
+ src = fetchurl {
+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "1jpvc32x6q01zjkfgh6gmq6aaikiyfwwnhj7bmvn52syhrdl202m";
+ };
+
+ nativeBuildInputs = [
+ meson
+ ninja
+ gettext
+ pkgconfig
+ python
+ ];
+
+ buildInputs = [
+ gst-plugins-base
+ orc
+ a52dec
+ libcdio
+ libdvdread
+ libmad
+ libmpeg2
+ x264
+ libintl
+ opencore-amr
+ ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+ IOKit
+ CoreFoundation
+ DiskArbitration
+ ]);
+
+ mesonFlags = [
+ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
+ "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing
+ ];
meta = with lib; {
description = "Gstreamer Ugly Plugins";
- homepage = "https://gstreamer.freedesktop.org";
+ homepage = "https://gstreamer.freedesktop.org";
longDescription = ''
a set of plug-ins that have good quality and correct functionality,
but distributing them might pose problems. The license on either
the plug-ins or the supporting libraries might not be how we'd
like. The code might be widely known to present patent problems.
'';
- license = licenses.lgpl2Plus;
- platforms = platforms.unix;
+ license = licenses.lgpl2Plus;
+ platforms = platforms.unix;
maintainers = with maintainers; [ matthewbauer ];
};
-
- src = fetchurl {
- url = "${meta.homepage}/src/gst-plugins-ugly/${pname}-${version}.tar.xz";
- sha256 = "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3";
- };
-
- outputs = [ "out" "dev" ];
-
- nativeBuildInputs = [ meson ninja gettext pkgconfig python ];
-
- buildInputs = [
- gst-plugins-base orc
- a52dec libcdio libdvdread
- libmad libmpeg2 x264
- libintl
- opencore-amr
- ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks;
- [ IOKit CoreFoundation DiskArbitration ]);
-
- mesonFlags = [
- # Enables all features, so that we know when new dependencies are necessary.
- "-Dauto_features=enabled"
- "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
- "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing
- ];
-
- NIX_LDFLAGS = [ "-lm" ];
}
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index adb495689e33..cac56f64cc91 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -1,49 +1,72 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland
-, libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm
-, libvpx, python, fetchpatch
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, gst-plugins-base
+, bzip2
+, libva
+, wayland
+, libdrm
+, udev
+, xorg
+, libGLU
+, libGL
+, gstreamer
+, gst-plugins-bad
+, nasm
+, libvpx
+, python
}:
stdenv.mkDerivation rec {
- pname = "gst-vaapi";
- version = "1.16.0";
+ pname = "gstreamer-vaapi";
+ version = "1.16.2";
src = fetchurl {
- url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
- sha256 = "07qpynamiz0lniqajcaijh3n7ixs4lfk9a5mfk50sng0dricwzsf";
+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "00f6sx700qm1ximi1ag2c27m35dywwhhg6awhz85va34mfqff78r";
};
- patches = [
- # See: https://mail.gnome.org/archives/distributor-list/2019-September/msg00000.html
- # Note that the patch has now been actually accepted upstream.
- (fetchpatch {
- url = "https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/commit/a90daabb84f983d2fa05ff3159f7ad59aa648b55.patch";
- sha256 = "0p2qygq6b5h6nxjdfnlzbsyih43hjq5c94ag8sbyyb8pmnids9rb";
- })
- ];
-
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ meson ninja pkgconfig bzip2 ];
-
- buildInputs = [
- gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev
- xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM
- xorg.libICE libGLU_combined nasm libvpx python
+ nativeBuildInputs = [
+ meson
+ ninja
+ pkgconfig
+ bzip2
];
- preConfigure = ''
- export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0
- mkdir -p $GST_PLUGIN_PATH_1_0
- '';
+ buildInputs = [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-bad
+ libva
+ wayland
+ libdrm
+ udev
+ xorg.libX11
+ xorg.libXext
+ xorg.libXv
+ xorg.libXrandr
+ xorg.libSM
+ xorg.libICE
+ libGL
+ libGLU
+ nasm
+ libvpx
+ python
+ ];
mesonFlags = [
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
];
- meta = {
- homepage = https://gstreamer.freedesktop.org;
- license = stdenv.lib.licenses.lgpl21Plus;
- platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [ tstrobel ];
+ meta = with stdenv.lib; {
+ description = "Set of VAAPI GStreamer Plug-ins";
+ homepage = "https://gstreamer.freedesktop.org";
+ license = licenses.lgpl21Plus;
+ maintainers = with maintainers; [ tstrobel ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index ad013d1570e1..9439ddd94e8f 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -1,39 +1,43 @@
-{ stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base
-, python, gobject-introspection, json-glib
+{ stdenv
+, fetchurl
+, pkgconfig
+, gstreamer
+, gst-plugins-base
+, python
+, gobject-introspection
+, json-glib
}:
stdenv.mkDerivation rec {
pname = "gst-validate";
- version = "1.16.0";
-
- meta = {
- description = "Integration testing infrastructure for the GStreamer framework";
- homepage = https://gstreamer.freedesktop.org;
- license = stdenv.lib.licenses.lgpl2Plus;
- platforms = stdenv.lib.platforms.unix;
- };
+ version = "1.16.2";
src = fetchurl {
- url = "${meta.homepage}/src/gst-validate/${pname}-${version}.tar.xz";
- sha256 = "1jfnd0g9hmdbqfxsx96yc9vpf1w6m33hqwrr6lj4i83kl54awcck";
+ url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz";
+ sha256 = "1jpfrzg3yc6kp66bgq3jy14xsj3x71mk2zh0k16yf0326awwqqa8";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [
- pkgconfig gobject-introspection
+ pkgconfig
+ gobject-introspection
];
buildInputs = [
- python json-glib
+ python
+ json-glib
];
- propagatedBuildInputs = [ gstreamer gst-plugins-base ];
-
- enableParallelBuilding = true;
-
- mesonFlags = [
- # Enables all features, so that we know when new dependencies are necessary.
- "-Dauto_features=enabled"
+ propagatedBuildInputs = [
+ gstreamer
+ gst-plugins-base
];
+
+ meta = with stdenv.lib; {
+ description = "Integration testing infrastructure for the GStreamer framework";
+ homepage = "https://gstreamer.freedesktop.org";
+ license = licenses.lgpl2Plus;
+ platforms = platforms.unix;
+ };
}
diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix
index 5fecd45b7da1..4326be597246 100644
--- a/pkgs/development/libraries/gtest/default.nix
+++ b/pkgs/development/libraries/gtest/default.nix
@@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
pname = "gtest";
- version = "1.8.1";
+ version = "1.10.0";
outputs = [ "out" "dev" ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "google";
repo = "googletest";
rev = "release-${version}";
- sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk";
+ sha256 = "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz";
};
patches = [
diff --git a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix
similarity index 100%
rename from pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix
rename to pkgs/development/libraries/gtk-engine-bluecurve/default.nix
diff --git a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix b/pkgs/development/libraries/gtk-engine-murrine/default.nix
similarity index 100%
rename from pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix
rename to pkgs/development/libraries/gtk-engine-murrine/default.nix
diff --git a/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/pkgs/development/libraries/gtk-engines/default.nix
similarity index 100%
rename from pkgs/misc/themes/gtk2/gtk-engines/default.nix
rename to pkgs/development/libraries/gtk-engines/default.nix
diff --git a/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh b/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh
index 8f2cb8a334ae..f28a856c4f50 100644
--- a/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh
+++ b/pkgs/development/libraries/gtk/hooks/drop-icon-theme-cache.sh
@@ -16,4 +16,4 @@ dropIconThemeCache() {
fi
}
-preFixupPhases="$preFixupPhases dropIconThemeCache"
+preFixupPhases="${preFixupPhases-} dropIconThemeCache"
diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 54b4b001d817..b68c814ad543 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
description = "Word-processor-style highlighting GtkTextView widget";
license = licenses.gpl2Plus;
platforms = platforms.unix;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 181d5e4c1969..f8db6f573d93 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -41,11 +41,11 @@
stdenv.mkDerivation rec {
pname = "gvfs";
- version = "1.42.1";
+ version = "1.42.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0c3pqc8qc2pn08by43rkkmk725k3cqmw7qyhfqgng0qx98dhf1lx";
+ sha256 = "0jgrbid8a61hgh05wl8c4f4638x7dffd5vip02jmladxfdszjymm";
};
postPatch = ''
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 361ac4f27aa0..42f68eea83f2 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,7 +8,7 @@
}:
let
- version = "2.6.2";
+ version = "2.6.4";
inherit (stdenv.lib) optional optionals optionalString;
in
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz";
- sha256 = "097ncrkaawdzpgwlrpp4kwciq4z5pqz2n4f3yra5vc7jyxr6lk1v";
+ sha256 = "04iwq13w6zkdhljmsxrzgg4fyh04qnwfn57rgrl9kmijc7cvh4wl";
};
postPatch = ''
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index a8dcea0059a2..f2f8cdcab205 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.all;
license = with licenses; [ gpl2 lgpl21 mpl11 ];
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
};
}
diff --git a/pkgs/development/libraries/hyphen/default.nix b/pkgs/development/libraries/hyphen/default.nix
new file mode 100644
index 000000000000..9f30ff54823f
--- /dev/null
+++ b/pkgs/development/libraries/hyphen/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, perl, ... }:
+
+let
+ version = "2.8.8";
+ folder = with builtins;
+ let parts = splitVersion version;
+ in concatStringsSep "." [ (elemAt parts 0) (elemAt parts 1) ];
+in stdenv.mkDerivation rec {
+ pname = "hyphen";
+ inherit version;
+
+ nativeBuildInputs = [ perl ];
+
+ src = fetchurl {
+ url =
+ "https://sourceforge.net/projects/hunspell/files/Hyphen/${folder}/${pname}-${version}.tar.gz";
+ sha256 = "01ap9pr6zzzbp4ky0vy7i1983fwyqy27pl0ld55s30fdxka3ciih";
+ };
+
+ meta = with stdenv.lib; {
+ description = "A text hyphenation library";
+ homepage = "https://sourceforge.net/projects/hunspell/files/Hyphen/";
+ platforms = platforms.all;
+ license = with licenses; [ gpl2 lgpl21 mpl11 ];
+ maintainers = with maintainers; [ filalex77 ];
+ };
+}
diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix
index 0a8cb7d46843..47ca63fca990 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -63,10 +63,16 @@ let
# remove dependency on bootstrap-tools in early stdenv build
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
- '' + ''
+ '' + (let
+ replacements = [
+ { from = "\${prefix}/include"; to = "${placeholder "dev"}/include"; } # --cppflags-searchpath
+ { from = "\${pkglibdir}/Makefile.inc"; to = "${placeholder "dev"}/lib/icu/Makefile.inc"; } # --incfile
+ { from = "\${pkglibdir}/pkgdata.inc"; to = "${placeholder "dev"}/lib/icu/pkgdata.inc"; } # --incpkgdatafile
+ ];
+ in ''
substituteInPlace "$dev/bin/icu-config" \
- --replace \''${pkglibdir}/Makefile.inc "$dev/lib/icu/Makefile.inc"
- '';
+ ${lib.concatMapStringsSep " " (r: "--replace '${r.from}' '${r.to}'") replacements}
+ '');
postFixup = ''moveToOutput lib/icu "$dev" '';
};
diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix
index 5cc0f7c1f46d..a25a590b3705 100644
--- a/pkgs/development/libraries/ilmbase/default.nix
+++ b/pkgs/development/libraries/ilmbase/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which }:
+{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which,
+ fetchpatch }:
stdenv.mkDerivation rec {
pname = "ilmbase";
@@ -21,7 +22,17 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_LINK = [ "-pthread" ];
- patches = [ ./bootstrap.patch ./cross.patch ];
+ patches = [
+ ./bootstrap.patch
+ ./cross.patch
+ (fetchpatch {
+ name = "CVE-2018-18443.patch";
+ url = "https://github.com/kdt3rd/openexr/commit/5fa930b82cff2db386c64ca512af19e60c14d32a.patch";
+ sha256 = "1j6xd0qkx99acc1szycxaj0wwp01yac67jz48hwc4fwwpz8blx4s";
+ stripLen = 1;
+ excludes = [ "CHANGES.md" ];
+ })
+ ];
# fails 1 out of 1 tests with
# "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed"
@@ -29,6 +40,7 @@ stdenv.mkDerivation rec {
doCheck = stdenv.isx86_64;
meta = with stdenv.lib; {
+ description = " A library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics";
homepage = https://www.openexr.com/;
license = licenses.bsd3;
platforms = platforms.all;
diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index f74477eab384..e7f575b04be7 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation {
pname = "incrtcl";
- version = "4.0.4";
+ version = "4.2.0";
src = fetchurl {
- url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.0.4.tar.gz;
- sha256 = "1ppc9b13cvmc6rp77k7dl2zb26xk0z30vxygmr4h1xr2r8w091k3";
+ url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.2.0.tar.gz;
+ sha256 = "0w28v0zaraxcq1s9pa6cihqqwqvvwfgz275lks7w4gl7hxjxmasw";
};
buildInputs = [ tcl ];
diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix
index 6657409a7089..6c872272e379 100644
--- a/pkgs/development/libraries/intel-gmmlib/default.nix
+++ b/pkgs/development/libraries/intel-gmmlib/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "intel-gmmlib";
- version = "19.3.2";
+ version = "19.3.4";
src = fetchFromGitHub {
owner = "intel";
repo = "gmmlib";
rev = "${pname}-${version}";
- sha256 = "04jmzyciswvfb31h9shkja9183bmm1clw0l0sn1flq76888nngma";
+ sha256 = "1vgh14vdmwr34l6rfzmbpsdwp4xi7qp8lg527p16pm7nv0bwx2zk";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix
index 731289d6f9c7..49375830ccbb 100644
--- a/pkgs/development/libraries/intel-media-sdk/default.nix
+++ b/pkgs/development/libraries/intel-media-sdk/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "intel-media-sdk";
- version = "19.3.0";
+ version = "19.3.1";
src = fetchurl {
url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz";
- sha256 = "0pgg16a4gsh8yjyz64r28bmkg9xxcy8m0dkvrdz03svkll9v7v3n";
+ sha256 = "12w1f3krcrjyhax4y3hbs7galhf4rabxym2fxjyil8cszx5fh433";
};
# patchelf is needed for binaries in $out/share/samples
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
description = "Intel Media SDK.";
license = licenses.mit;
maintainers = with maintainers; [ midchildan ];
- platforms = with platforms; linux;
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 35ef14cbc135..788772888c6d 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, libGLU_combined, unzip, libXrandr, libX11, libXxf86vm }:
+{ stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }:
stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib
'';
- buildInputs = [ unzip libGLU_combined libXrandr libX11 libXxf86vm ];
+ buildInputs = [ unzip libGLU libGL libXrandr libX11 libXxf86vm ];
meta = {
homepage = http://irrlicht.sourceforge.net/;
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 1bad3394b6ac..093fd0c5f28a 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -42,5 +42,10 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
license = licenses.jasper;
maintainers = with maintainers; [ pSub ];
+ knownVulnerabilities = [
+ "Numerous CVE unsolved upstream"
+ "See: https://github.com/NixOS/nixpkgs/pull/57681#issuecomment-475857499"
+ "See: https://github.com/mdadams/jasper/issues/208"
+ ];
};
}
diff --git a/pkgs/development/libraries/java/hsqldb/builder.sh b/pkgs/development/libraries/java/hsqldb/builder.sh
deleted file mode 100755
index d7de23ab95eb..000000000000
--- a/pkgs/development/libraries/java/hsqldb/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-source $stdenv/setup
-
-unzip $src
-cd hsqldb*
-mkdir -p $out
-cp -R * $out/
diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix
index a478ab0fc502..d9139ec1d823 100644
--- a/pkgs/development/libraries/java/hsqldb/default.nix
+++ b/pkgs/development/libraries/java/hsqldb/default.nix
@@ -1,19 +1,37 @@
-{ stdenv, fetchurl, unzip
-}:
+{ stdenv, fetchurl, unzip, makeWrapper, jre }:
-stdenv.mkDerivation {
- name = "hsqldb-2.4.0";
- builder = ./builder.sh;
+stdenv.mkDerivation rec {
+ pname = "hsqldb";
+ version = "2.5.0";
+ underscoreMajMin = stdenv.lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version);
src = fetchurl {
- url = mirror://sourceforge/hsqldb/hsqldb_1_8_0_9.zip;
- sha256 = "1v5dslwsqb7csjmi5g78pghsay2pszidvlzhyi79y18mra5iv3g9";
+ url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip";
+ sha256 = "0s64w7qq5vayrzcmdhrdfmd6iqqv6x6fpiq9lpy2gva3dckv3q6j";
};
- buildInputs = [ unzip
- ];
+ nativeBuildInputs = [ unzip makeWrapper ];
+ buildInputs = [ jre ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/lib $out/bin
+ cp -R hsqldb/lib/*.jar $out/lib
+
+ makeWrapper ${jre}/bin/java $out/bin/hsqldb --add-flags "-classpath $out/lib/hsqldb.jar org.hsqldb.server.Server"
+ makeWrapper ${jre}/bin/java $out/bin/runServer --add-flags "-classpath $out/lib/hsqldb.jar org.hsqldb.server.Server"
+ makeWrapper ${jre}/bin/java $out/bin/runManagerSwing --add-flags "-classpath $out/lib/hsqldb.jar org.hsqldb.util.DatabaseManagerSwing"
+ makeWrapper ${jre}/bin/java $out/bin/runWebServer --add-flags "-classpath $out/lib/hsqldb.jar org.hsqldb.server.WebServer"
+ makeWrapper ${jre}/bin/java $out/bin/runManager --add-flags "-classpath $out/lib/hsqldb.jar org.hsqldb.util.DatabaseManager"
+ makeWrapper ${jre}/bin/java $out/bin/sqltool --add-flags "-jar $out/lib/sqltool.jar"
+
+ runHook postInstall
+ '';
meta = with stdenv.lib; {
+ homepage = "http://hsqldb.org";
+ description = "A relational, embedable database management system written in Java and a set of related tools";
platforms = platforms.unix;
license = licenses.bsd3;
};
diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix
index e28925c65bb2..d5f8ac217f3d 100644
--- a/pkgs/development/libraries/java/smack/default.nix
+++ b/pkgs/development/libraries/java/smack/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
};
meta = {
+ description = "A XMPP (Jabber) client library for instant messaging and presence";
+ homepage = "http://www.igniterealtime.org/projects/smack/";
platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.asl20;
};
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index a93d77742915..6eb5a1f53553 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2
-, libXt, libXtst, libXi, libGLU_combined, webkitgtk, libsoup, xorg
+, libXt, libXtst, libXi, libGLU, libGL, webkitgtk, libsoup, xorg
, pango, gdk-pixbuf, glib
}:
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
sourceRoot = ".";
nativeBuildInputs = [ unzip pkgconfig ];
- buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU_combined webkitgtk libsoup ];
+ buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU libGL webkitgtk libsoup ];
NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) ++
[ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ];
diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix
index 31c9c89d96fc..35fbdfe488af 100644
--- a/pkgs/development/libraries/jbig2dec/default.nix
+++ b/pkgs/development/libraries/jbig2dec/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python, autoconf }:
stdenv.mkDerivation rec {
- name = "jbig2dec-0.16";
+ name = "jbig2dec-0.17";
src = fetchurl {
- url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs927/${name}.tar.gz";
- sha256 = "00h61y7bh3z6mqfzxyb318gyh0f8jwarg4hvlrm83rqps8avzxm4";
+ url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs950/${name}.tar.gz";
+ sha256 = "0wpvslmwazia3z8gyk343kbq6yj47pxr4x5yjvx332v309qssazp";
};
postPatch = ''
diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix
index f6a70deb8c2d..ddf4ba621697 100644
--- a/pkgs/development/libraries/jitterentropy/default.nix
+++ b/pkgs/development/libraries/jitterentropy/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
preInstall = ''
mkdir -p $out/include
+ substituteInPlace Makefile \
+ --replace "install -m 0755 -s" \
+ 'install -m 0755 -s --strip-program $(STRIP)'
'';
installFlags = [
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index c62f1e2de3f3..72158e186ac2 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -1,14 +1,14 @@
-{ stdenv , fetchFromGitHub , cmake , python }:
+{ stdenv, fetchFromGitHub, cmake, python, fetchpatch }:
stdenv.mkDerivation rec {
pname = "jsoncpp";
- version = "1.9.1";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "open-source-parsers";
repo = "jsoncpp";
rev = version;
- sha256 = "00g356iv3kcp0gadj7gbyzf9jn9avvx9vxbxc7c2i5nnry8z72wj";
+ sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg";
};
/* During darwin bootstrap, we have a cp that doesn't understand the
@@ -30,6 +30,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python ];
+ # fix inverted sense in isAnyCharRequiredQuoting on aarch64. See: https://github.com/open-source-parsers/jsoncpp/pull/1120
+ patches = stdenv.lib.optionals stdenv.isAarch64 [
+ (fetchpatch {
+ url = "https://github.com/open-source-parsers/jsoncpp/commit/9093358efae9e5981aa60013487fc7215f040a59.patch";
+ sha256 = "1wiqp70sck2md14sfc0zdkblqk9750cl55ykf9d6b9vs1ifzzzq5";
+ })
+ ];
+
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DBUILD_STATIC_LIBS=OFF"
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index ef1171b17601..d18dea1c3817 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -42,13 +42,13 @@ let
propagate = out:
let setupHook = { writeScript }:
writeScript "setup-hook" ''
- if [ "$hookName" != postHook ]; then
+ if [ "''${hookName:-}" != postHook ]; then
postHooks+=("source @dev@/nix-support/setup-hook")
else
# Propagate $dev so that this setup hook is propagated
# But only if there is a separate $dev output
if [ "''${outputDev:?}" != out ]; then
- propagatedBuildInputs="$propagatedBuildInputs @dev@"
+ propagatedBuildInputs="''${propagatedBuildInputs-} @dev@"
fi
fi
'';
@@ -97,6 +97,7 @@ let
breeze-icons = callPackage ./breeze-icons.nix {};
kapidox = callPackage ./kapidox.nix {};
karchive = callPackage ./karchive.nix {};
+ kcalendarcore = callPackage ./kcalendarcore.nix {};
kcodecs = callPackage ./kcodecs.nix {};
kconfig = callPackage ./kconfig.nix {};
kcoreaddons = callPackage ./kcoreaddons.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
index 35982e866284..4135f6bfd7aa 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
@@ -42,12 +42,12 @@ ecmPostHook() {
cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg"
cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart"
- if [ -n "$qtPluginPrefix" ]; then
+ if [ -n "${qtPluginPrefix-}" ]; then
cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix"
cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix"
fi
- if [ -n "$qtQmlPrefix" ]; then
+ if [ -n "${qtQmlPrefix-}" ]; then
cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix"
fi
}
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index f06a515a83be..c76ff9fb2c81 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.62/ )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.64/ )
diff --git a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix
new file mode 100644
index 000000000000..e0b6c5313bb9
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix
@@ -0,0 +1,16 @@
+{
+ mkDerivation,
+ lib,
+ extra-cmake-modules,
+ libical
+}:
+
+mkDerivation {
+ name = "kcalendarcore";
+ meta = {
+ maintainers = [ lib.maintainers.nyanloutre ];
+ };
+ nativeBuildInputs = [ extra-cmake-modules ];
+ propagatedBuildInputs = [ libical ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index 3b9ca74bbd07..69ad2fbc737e 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -1,6 +1,6 @@
{
mkDerivation, lib,
- extra-cmake-modules, gettext, python,
+ extra-cmake-modules, gettext, python3,
qtbase, qtdeclarative, qtscript,
}:
@@ -11,6 +11,6 @@ mkDerivation {
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
- propagatedNativeBuildInputs = [ gettext python ];
+ propagatedNativeBuildInputs = [ gettext python3 ];
buildInputs = [ qtdeclarative qtscript ];
}
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 6cf89669df01..fee21a6a9235 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -20,5 +20,6 @@ mkDerivation {
kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice
kxmlgui qtbase qttools solid
];
+ outputs = [ "out" "dev" ];
patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
}
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
index 7c86454c5cf6..27501732210f 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
@@ -1,17 +1,19 @@
-diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp
-index 8e6298a..210989a 100644
---- a/src/pluginwrapper.cpp
-+++ b/src/pluginwrapper.cpp
-@@ -37,14 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapper, s_pluginWrapper)
+Index: kwindowsystem-5.64.0/src/pluginwrapper.cpp
+===================================================================
+--- kwindowsystem-5.64.0.orig/src/pluginwrapper.cpp
++++ kwindowsystem-5.64.0/src/pluginwrapper.cpp
+@@ -37,16 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp
static QStringList pluginCandidates()
{
QStringList ret;
-- foreach (const QString &path, QCoreApplication::libraryPaths()) {
+- const auto paths = QCoreApplication::libraryPaths();
+- for (const QString &path : paths) {
- QDir pluginDir(path + QLatin1String("/kf5/org.kde.kwindowsystem.platforms"));
- if (!pluginDir.exists()) {
- continue;
- }
-- foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
+- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
+- for (const QString &entry : entries) {
- ret << pluginDir.absoluteFilePath(entry);
- }
+ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 6a7c7bc0c9c4..32edca387102 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,635 +3,651 @@
{
attica = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/attica-5.62.0.tar.xz";
- sha256 = "86b5388c93dd3375dbdca23b20d539af5ed9516f6a573e32549baac3200d029f";
- name = "attica-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/attica-5.64.0.tar.xz";
+ sha256 = "c9b060693656a458f92905091e12d800be020abbf47bb68b9f769a191aa368d9";
+ name = "attica-5.64.0.tar.xz";
};
};
baloo = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/baloo-5.62.0.tar.xz";
- sha256 = "454e6808a5fe523785e5e67b7c0453fd1b6c42035aaf8084c39ad30bcbbc8d1a";
- name = "baloo-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/baloo-5.64.0.tar.xz";
+ sha256 = "adaaef1aeec07ccc210210a2e67f4d12c0275226bb05d0220da0281f1a3984c2";
+ name = "baloo-5.64.0.tar.xz";
};
};
bluez-qt = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/bluez-qt-5.62.0.tar.xz";
- sha256 = "545a6c76042a077f04b0a6c2b8dfbe3b5b1a582edaae4454d7a57c06ab033715";
- name = "bluez-qt-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/bluez-qt-5.64.0.tar.xz";
+ sha256 = "7d6c7ba913cea6059327726325b8af4cf2baa7594b8be3143e0649eaa36f8384";
+ name = "bluez-qt-5.64.0.tar.xz";
};
};
breeze-icons = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/breeze-icons-5.62.0.tar.xz";
- sha256 = "5858100f1a87dc865f44cde159aaee025ec46f894f544c75086ea0e8f9555951";
- name = "breeze-icons-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/breeze-icons-5.64.0.tar.xz";
+ sha256 = "08c2f7efc5f1550668dd2e0cff1641b1b6ec8a91f01614ee14c6abc4d975672f";
+ name = "breeze-icons-5.64.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/extra-cmake-modules-5.62.0.tar.xz";
- sha256 = "e07acfecef1b4c7a481a253b58b75072a4f887376301108ed2c753b5002adcd4";
- name = "extra-cmake-modules-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/extra-cmake-modules-5.64.0.tar.xz";
+ sha256 = "1865efc6254bed44e0a6918c5af3da62be4008ba7a197a47f35251f298041a69";
+ name = "extra-cmake-modules-5.64.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/frameworkintegration-5.62.0.tar.xz";
- sha256 = "0d43d6cd008359eac4840c8b6e12d2b17eeb53c95111af1f7e8ca6ae8e6aca2c";
- name = "frameworkintegration-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/frameworkintegration-5.64.0.tar.xz";
+ sha256 = "6c1880f8300a014bb835ce29fd68651bfd38400de8044fe5914cb4392df48a26";
+ name = "frameworkintegration-5.64.0.tar.xz";
};
};
kactivities = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kactivities-5.62.0.tar.xz";
- sha256 = "b466b8921adad6d887f93f760634dfa344ae52df83c58dd7ae75174961def85b";
- name = "kactivities-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kactivities-5.64.0.tar.xz";
+ sha256 = "5afbd0785c04127c91f1ad7402c95ce3f994fb94b216baf56cd802a3a230a3f9";
+ name = "kactivities-5.64.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kactivities-stats-5.62.0.tar.xz";
- sha256 = "e6850a59d2e3dd566c77aa2b2fdc684737634b59755dcc7de231b8b496acbc1a";
- name = "kactivities-stats-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kactivities-stats-5.64.0.tar.xz";
+ sha256 = "ca1c07b1250735372a4f6aa6b493536d420a902de0d7a8c9777b437fb6ab0bf9";
+ name = "kactivities-stats-5.64.0.tar.xz";
};
};
kapidox = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kapidox-5.62.0.tar.xz";
- sha256 = "6aa3928b26acc23f5271ba0591d64a55c342e36ae16094e09be1ef038538952f";
- name = "kapidox-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kapidox-5.64.0.tar.xz";
+ sha256 = "f75eedfa1af51f5224b14d8bc4c229c2c2d27f607e00172d24bdcede1c899fb4";
+ name = "kapidox-5.64.0.tar.xz";
};
};
karchive = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/karchive-5.62.0.tar.xz";
- sha256 = "99980ebdc16dd9ac062fcfda0974c0ce894c09a395caf914518646ffdc48e3ca";
- name = "karchive-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/karchive-5.64.0.tar.xz";
+ sha256 = "135fbfb2dfe107e4487723a5f887d1d074e13258a4583d592639366094aafe1a";
+ name = "karchive-5.64.0.tar.xz";
};
};
kauth = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kauth-5.62.0.tar.xz";
- sha256 = "31162621200df4b927719e34ce62004c51e79b9d785f9c3056c6902f80eeefe6";
- name = "kauth-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kauth-5.64.0.tar.xz";
+ sha256 = "ac95525bf1430868c8f54dbdc986478cf7b21192ad3b486381485b429eadddcc";
+ name = "kauth-5.64.0.tar.xz";
};
};
kbookmarks = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kbookmarks-5.62.0.tar.xz";
- sha256 = "69318784fa5feaee3e60bb159fb6c827475a8ce28a74bedf5939ad592c29ea4f";
- name = "kbookmarks-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kbookmarks-5.64.0.tar.xz";
+ sha256 = "51343a57b50032d60ffae123f426cdd67cd290ce306ae494c1956d0b899d4ff2";
+ name = "kbookmarks-5.64.0.tar.xz";
+ };
+ };
+ kcalendarcore = {
+ version = "5.64.0";
+ src = fetchurl {
+ url = "${mirror}/stable/frameworks/5.64/kcalendarcore-5.64.0.tar.xz";
+ sha256 = "983f240a7478a780dc403d577827f027856f9f67e8c3bfe8b69d56093e5bb80e";
+ name = "kcalendarcore-5.64.0.tar.xz";
};
};
kcmutils = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kcmutils-5.62.0.tar.xz";
- sha256 = "93fd9b7b97cb4488f2007a4f518159129f0caafc05a004be56c87dd355870b1b";
- name = "kcmutils-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kcmutils-5.64.0.tar.xz";
+ sha256 = "f55938c566669e9fcdd786ebfd89edfc11b0c283532aed04cfe4162b58a8b649";
+ name = "kcmutils-5.64.0.tar.xz";
};
};
kcodecs = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kcodecs-5.62.0.tar.xz";
- sha256 = "1b015be0200444f1ce18ecc5c05dbafde62575a8e094e48698b4b64f43f307b1";
- name = "kcodecs-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kcodecs-5.64.0.tar.xz";
+ sha256 = "24cbffb123179cf4386500ae7bc7c99f65c4422cd7b91f314152f11cd596402a";
+ name = "kcodecs-5.64.0.tar.xz";
};
};
kcompletion = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kcompletion-5.62.0.tar.xz";
- sha256 = "af774190ca1a0e4d335485548d6e5c1e02042a5d0e29a3c0db17c24e3656edec";
- name = "kcompletion-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kcompletion-5.64.0.tar.xz";
+ sha256 = "4fe5b9254e038e654d55167163b2812582f31fe550c977979d692b69424c2508";
+ name = "kcompletion-5.64.0.tar.xz";
};
};
kconfig = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kconfig-5.62.0.tar.xz";
- sha256 = "fffe16924245e34d6267e67a6d425dc7b4fdab405968bffa4fff7bea5779bb51";
- name = "kconfig-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kconfig-5.64.0.tar.xz";
+ sha256 = "112c1db9f038dbacf357d08645c83ca103d8c3e7fb0c880ac16f665fdf7d9157";
+ name = "kconfig-5.64.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kconfigwidgets-5.62.0.tar.xz";
- sha256 = "6c10810725e0b109c96ddc2246ca1741bcae012296e31caf7b41167a04ae31d6";
- name = "kconfigwidgets-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kconfigwidgets-5.64.0.tar.xz";
+ sha256 = "e84d590c064f2a86d5b9d2fb5d8aa7abc8ac8752125f5d3197cca6dc7e115c56";
+ name = "kconfigwidgets-5.64.0.tar.xz";
+ };
+ };
+ kcontacts = {
+ version = "5.64.0";
+ src = fetchurl {
+ url = "${mirror}/stable/frameworks/5.64/kcontacts-5.64.0.tar.xz";
+ sha256 = "0bf0a1ba6ebedd400bed7a490093962cde6a2b26c49627d6770a71524db63058";
+ name = "kcontacts-5.64.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kcoreaddons-5.62.0.tar.xz";
- sha256 = "3819e2792a2e61444e337cd1a4cbdc362c18810918376eefc30b203fbd160b41";
- name = "kcoreaddons-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kcoreaddons-5.64.0.tar.xz";
+ sha256 = "3f0cb3273debf9791dda3f1ad135b6b1a20d88fed1e21890c4b70bac64fdb188";
+ name = "kcoreaddons-5.64.0.tar.xz";
};
};
kcrash = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kcrash-5.62.0.tar.xz";
- sha256 = "9fac9396212148aade4b59665ec1725fa76e229f24c46b601f066e0026eddd2c";
- name = "kcrash-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kcrash-5.64.0.tar.xz";
+ sha256 = "9e9ad5e7a6a3e9a128128a7863204f8c4a555bd8659d8ed4ef4cc6bb2fc48290";
+ name = "kcrash-5.64.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kdbusaddons-5.62.0.tar.xz";
- sha256 = "d32e0b16abcb2b1593a567b0ef12cfb94ec2f08e5b8a3ec56efac19b22ca0152";
- name = "kdbusaddons-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kdbusaddons-5.64.0.tar.xz";
+ sha256 = "74a6eb443a74eb74a859238b555a3b16be1d6367c4db2a7af5b16da528d57f62";
+ name = "kdbusaddons-5.64.0.tar.xz";
};
};
kdeclarative = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kdeclarative-5.62.0.tar.xz";
- sha256 = "804bc6dd1848fe38b9160a680f3d9f9b67d47150ee9683b3d2c5a07b96a12e46";
- name = "kdeclarative-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kdeclarative-5.64.0.tar.xz";
+ sha256 = "1bf199aebabe63880babc364572de44f6b0a94ffbbffd955bc85916c2be7701d";
+ name = "kdeclarative-5.64.0.tar.xz";
};
};
kded = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kded-5.62.0.tar.xz";
- sha256 = "d2d7a979114ca770442cec0f89fe87730ff0c44b98ee64b39c2cada672fc03b1";
- name = "kded-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kded-5.64.0.tar.xz";
+ sha256 = "2e8bda93918ac174254c8f70a71c9d6966a4721e14a631760e1b912d108001be";
+ name = "kded-5.64.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/portingAids/kdelibs4support-5.62.0.tar.xz";
- sha256 = "9cc10b4727b8ee3bae46af796e7da5d6ae620c543278814176a389ea178595ed";
- name = "kdelibs4support-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/portingAids/kdelibs4support-5.64.0.tar.xz";
+ sha256 = "8c9e23e0e22ccec8b46b4c4b160adb8c8765c1dc308bf297f6f72ccc97c7b682";
+ name = "kdelibs4support-5.64.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/portingAids/kdesignerplugin-5.62.0.tar.xz";
- sha256 = "b5c0769d0b1df99f456c3c6f22a48e8bdf9c15f00be2e0795ae5bc5170596e47";
- name = "kdesignerplugin-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/portingAids/kdesignerplugin-5.64.0.tar.xz";
+ sha256 = "1ca638ec822d9882f4a865d599ce8ad94785fa890ce73bccd5e78210c4a3d95b";
+ name = "kdesignerplugin-5.64.0.tar.xz";
};
};
kdesu = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kdesu-5.62.0.tar.xz";
- sha256 = "9c22ad0a5c1d948a91846a34066155f64758b69ab005eb423bb02ba06301c80e";
- name = "kdesu-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kdesu-5.64.0.tar.xz";
+ sha256 = "f4644b0ee91c55473589909c20a7fa1cfbd3d466f1c72b330d53871a2346d4f0";
+ name = "kdesu-5.64.0.tar.xz";
};
};
kdewebkit = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/portingAids/kdewebkit-5.62.0.tar.xz";
- sha256 = "5e45a7866b28d69e6d28f821011c020e53cc6e5b59bcdb7a5d9cb7bda37175e4";
- name = "kdewebkit-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/portingAids/kdewebkit-5.64.0.tar.xz";
+ sha256 = "882801a1fd944b08918cb7d9341985e4330e7adac00ae4e6dddcea5343393ac1";
+ name = "kdewebkit-5.64.0.tar.xz";
};
};
kdnssd = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kdnssd-5.62.0.tar.xz";
- sha256 = "21554c6faf2f7136fb8f7a2908340c120ed0d5dc1475f5aeb8cafed1e4228009";
- name = "kdnssd-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kdnssd-5.64.0.tar.xz";
+ sha256 = "92d9a4947c45e56ea15e417eaf87121b4b3a4f1f81dfd154d2ee968a9797f46b";
+ name = "kdnssd-5.64.0.tar.xz";
};
};
kdoctools = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kdoctools-5.62.0.tar.xz";
- sha256 = "471ce5106f80af7272d2ea54265bde5a833c8de7716e8bd82f7a5742939c3f48";
- name = "kdoctools-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kdoctools-5.64.0.tar.xz";
+ sha256 = "3e669c9bdf8822c262d834a9fbe9250ffdc91ea49c916b2c16ac8483b62f8fce";
+ name = "kdoctools-5.64.0.tar.xz";
};
};
kemoticons = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kemoticons-5.62.0.tar.xz";
- sha256 = "fab145b2c4106be8a4f0024cb436d02d0fdcbf8666e9a790cc1cd98db1e70313";
- name = "kemoticons-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kemoticons-5.64.0.tar.xz";
+ sha256 = "0b586957bfe26ce0fe44eca305992f99e3c31fbeb19a9d369c4abfdf9cc0400f";
+ name = "kemoticons-5.64.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kfilemetadata-5.62.0.tar.xz";
- sha256 = "2d8488500b19a7d8f90712775e0353e16957857a89162d6c7b947dd5536245b0";
- name = "kfilemetadata-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kfilemetadata-5.64.0.tar.xz";
+ sha256 = "4b581e4d659defe4db595a984ed4c037bc80e0bf7b298ec79e6aa5061fa56e23";
+ name = "kfilemetadata-5.64.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kglobalaccel-5.62.0.tar.xz";
- sha256 = "b087ec1a23a50787d27e8c5d618d4097375a2f7b6188bc9077a5e60d11e2c04d";
- name = "kglobalaccel-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kglobalaccel-5.64.0.tar.xz";
+ sha256 = "6863515428988c129acfcceaa3518f90d72c590aff2c295a958a68d0c4cd02ab";
+ name = "kglobalaccel-5.64.0.tar.xz";
};
};
kguiaddons = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kguiaddons-5.62.0.tar.xz";
- sha256 = "5fc61818ed054901a8b1a6a56a83ccaf5f38d9ea7c5761fa6279cd7316d81e44";
- name = "kguiaddons-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kguiaddons-5.64.0.tar.xz";
+ sha256 = "4caac79b7341c7796f3ca5e1d88cef57ecab2eefcac9ab654fd977706c89bae4";
+ name = "kguiaddons-5.64.0.tar.xz";
};
};
kholidays = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kholidays-5.62.0.tar.xz";
- sha256 = "f9f7cc399b35cef9348b8fbaabb87145b689165a66b874e3250456f6bbdcb329";
- name = "kholidays-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kholidays-5.64.0.tar.xz";
+ sha256 = "65b847ba7a00e1a42c0048fe05a400f584e1d9e746edb5d935331ffcb1f5d4ab";
+ name = "kholidays-5.64.0.tar.xz";
};
};
khtml = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/portingAids/khtml-5.62.0.tar.xz";
- sha256 = "35e3f7e419041f0892ea42c6506b627661137602c25f0f1d6a81537b583682c1";
- name = "khtml-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/portingAids/khtml-5.64.0.tar.xz";
+ sha256 = "00d3a3e8c8b8072f4894d74f91d963cfefbd681e47da0b8e80e1297224c5af85";
+ name = "khtml-5.64.0.tar.xz";
};
};
ki18n = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/ki18n-5.62.0.tar.xz";
- sha256 = "b11a0c94c7149798f3f6592e2c386a682d9c528d1e10a59ed3934a93acbc79cb";
- name = "ki18n-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/ki18n-5.64.0.tar.xz";
+ sha256 = "ccd2c2f8b14251701f902c9e7d046da1582e544d31edae743911f3554022d024";
+ name = "ki18n-5.64.0.tar.xz";
};
};
kiconthemes = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kiconthemes-5.62.0.tar.xz";
- sha256 = "33fb5caf28ee763edeb3def66386a27f6a7b2bac6a6a0f0728dd4b222d11ebfe";
- name = "kiconthemes-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kiconthemes-5.64.0.tar.xz";
+ sha256 = "f89a97e9501d841d4543249776783ebd1fc4d7f69e114f8a56027f59ad32000a";
+ name = "kiconthemes-5.64.0.tar.xz";
};
};
kidletime = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kidletime-5.62.0.tar.xz";
- sha256 = "dd2b6a9f7815c8e84b635e694cbf9ee207996d2cf3adb5a85eadd4a8de37f276";
- name = "kidletime-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kidletime-5.64.0.tar.xz";
+ sha256 = "8287e958a8a2a9538bec1038f5e31ebba338ff522de9c51265ca1d63030581d0";
+ name = "kidletime-5.64.0.tar.xz";
};
};
kimageformats = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kimageformats-5.62.0.tar.xz";
- sha256 = "65c179e15dd9c81a4515eb9189951641cca4aad9e7456067a208658ce205c2c2";
- name = "kimageformats-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kimageformats-5.64.0.tar.xz";
+ sha256 = "48c6a7026854127fc83698ab11e6639a525d387cf384f2558db6c7478bceae4c";
+ name = "kimageformats-5.64.0.tar.xz";
};
};
kinit = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kinit-5.62.0.tar.xz";
- sha256 = "5c4b066362ab6528b5c9ac654c20cc4eeed87e5384b26b3aa1df968c98c1e21a";
- name = "kinit-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kinit-5.64.0.tar.xz";
+ sha256 = "5298b783499cedb681c334b20234a511cb3377e66d140e7df6b7c1899186263d";
+ name = "kinit-5.64.0.tar.xz";
};
};
kio = {
- version = "5.62.1";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kio-5.62.1.tar.xz";
- sha256 = "4b149085bcfbcd729d808a34bcbd4b11f5f9526aa919c82eaddabc1e88113df0";
- name = "kio-5.62.1.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kio-5.64.0.tar.xz";
+ sha256 = "e38c8dcf634989f0f7ec95b68bdd936b9e05f7d242e4050b01f79b7021108f59";
+ name = "kio-5.64.0.tar.xz";
};
};
kirigami2 = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kirigami2-5.62.0.tar.xz";
- sha256 = "b3cc36bddb5e52617075961b2cbaecbb94492523bcc6801a3ad29a35c43bd912";
- name = "kirigami2-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kirigami2-5.64.0.tar.xz";
+ sha256 = "c394360e2323c55cf654d09ec762a03c47db0027e6a992646ea32d27ce8b228e";
+ name = "kirigami2-5.64.0.tar.xz";
};
};
kitemmodels = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kitemmodels-5.62.0.tar.xz";
- sha256 = "4ed6c4081cf6493d6f40ab45deb61325346ab8577eadec7ba8af6a36d7a6485e";
- name = "kitemmodels-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kitemmodels-5.64.0.tar.xz";
+ sha256 = "1bae70e4c6a033eea649efc17f0a060aba89144f4c469f235fbf5023dba5abc4";
+ name = "kitemmodels-5.64.0.tar.xz";
};
};
kitemviews = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kitemviews-5.62.0.tar.xz";
- sha256 = "34881a269bdae7e3643ab73290931859437fde72042a066170e7467422408065";
- name = "kitemviews-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kitemviews-5.64.0.tar.xz";
+ sha256 = "0b3f8a0116c042ae187b67f35ffd40872352b91f5f236d19dd26ffad8db83fee";
+ name = "kitemviews-5.64.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kjobwidgets-5.62.0.tar.xz";
- sha256 = "e3607167361fdd6874a165881de523505bd00d8fabb755abf62114c017a39c93";
- name = "kjobwidgets-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kjobwidgets-5.64.0.tar.xz";
+ sha256 = "3b39fc5dfc0f1a9cc9bffed3d05b90ba46c52c63cbbeffa0666f5f09e7093ce0";
+ name = "kjobwidgets-5.64.0.tar.xz";
};
};
kjs = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/portingAids/kjs-5.62.0.tar.xz";
- sha256 = "aaff97d97e3163f890001b7d2e4c0329fdd9d9c53ce4924233246f3ef6cd5962";
- name = "kjs-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/portingAids/kjs-5.64.0.tar.xz";
+ sha256 = "93855cde810feb7208443a93f81c952bdb42f9886154959bc7a6509c9863e503";
+ name = "kjs-5.64.0.tar.xz";
};
};
kjsembed = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/portingAids/kjsembed-5.62.0.tar.xz";
- sha256 = "3763c5f67fa92803b5003a41c5b696524be3d0528018a3d5643abc25b161c23b";
- name = "kjsembed-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/portingAids/kjsembed-5.64.0.tar.xz";
+ sha256 = "939226116cb47fd66dc45a41baa3c0f45b7ab904ec7674088ced3df5c7bae62e";
+ name = "kjsembed-5.64.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/portingAids/kmediaplayer-5.62.0.tar.xz";
- sha256 = "2d7fa77c085ab0a48e3ce41ec5d6ffa16fbf7194f2d6ace43e37967c0ffb7880";
- name = "kmediaplayer-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/portingAids/kmediaplayer-5.64.0.tar.xz";
+ sha256 = "ce4816a14134c4968559ff5030895ab69b63b66e9b541b74595ce05e4fe68d1d";
+ name = "kmediaplayer-5.64.0.tar.xz";
};
};
knewstuff = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/knewstuff-5.62.0.tar.xz";
- sha256 = "5ec7806bf1c5d24a0f393fc48950afefc4bbd1b04b2ad1db59f5f05ecd8f0195";
- name = "knewstuff-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/knewstuff-5.64.0.tar.xz";
+ sha256 = "91334c95a1082ae402ee869da399e5bdbac986c8b30a85d0a899b30de1f3be72";
+ name = "knewstuff-5.64.0.tar.xz";
};
};
knotifications = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/knotifications-5.62.0.tar.xz";
- sha256 = "55ec35bc9ddccd12289d9501b11d453885eabb9caebd4b93199d7c662a147263";
- name = "knotifications-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/knotifications-5.64.0.tar.xz";
+ sha256 = "5f0c3b158ba253e8df81016c8921d689836ecac063a39766c0290352c9f71bc1";
+ name = "knotifications-5.64.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/knotifyconfig-5.62.0.tar.xz";
- sha256 = "bb51d1a3f69f9faf274ee381d6d267bf4a69edbbdfcfd9efcab76270db4f8e4d";
- name = "knotifyconfig-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/knotifyconfig-5.64.0.tar.xz";
+ sha256 = "f496ed0728e688347da360f7aad7f2666cb0310ab669c6006ce9661233218b27";
+ name = "knotifyconfig-5.64.0.tar.xz";
};
};
kpackage = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kpackage-5.62.0.tar.xz";
- sha256 = "588e6f7b0c066993dbd9b6a0fd2535cd2f1c58ea5bd7ebe1dc381049776bbf62";
- name = "kpackage-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kpackage-5.64.0.tar.xz";
+ sha256 = "c39c80317c75206ec347edf6d301cb66c2117489f37725374fcfe3b1459aaed6";
+ name = "kpackage-5.64.0.tar.xz";
};
};
kparts = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kparts-5.62.0.tar.xz";
- sha256 = "2249e70de0b57f13d8ee7a2840106b5a4aed05a6b73da9245101e0cbc9c846ef";
- name = "kparts-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kparts-5.64.0.tar.xz";
+ sha256 = "61338a37015c2df787b8e0fe49f0ef320474a82831b4f110fb5aefd1635b1d9f";
+ name = "kparts-5.64.0.tar.xz";
};
};
kpeople = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kpeople-5.62.0.tar.xz";
- sha256 = "e061991f08e6642e61531a630a81927ea0ccd7402f469806a6cfeecf9b5064a2";
- name = "kpeople-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kpeople-5.64.0.tar.xz";
+ sha256 = "b5bc8d037dab124ea65be1c480b25943e789a403176f8b31599383dcdec20a0e";
+ name = "kpeople-5.64.0.tar.xz";
};
};
kplotting = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kplotting-5.62.0.tar.xz";
- sha256 = "7472943518a4b0e2fe1877ce47b9f667e178822926985a0efc9c20361097b94e";
- name = "kplotting-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kplotting-5.64.0.tar.xz";
+ sha256 = "f38f65c97d199077c88213bce84c6162ba254c443f06ccfaf62088ff0e217f7b";
+ name = "kplotting-5.64.0.tar.xz";
};
};
kpty = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kpty-5.62.0.tar.xz";
- sha256 = "6efd3a3103f15ee825b220ac309bcce3bbce56e9b915e61a4277a2cb096bcb96";
- name = "kpty-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kpty-5.64.0.tar.xz";
+ sha256 = "c2ece8c6b336ee85973e005969f1228bbfac87cbace6853e9d01a7b5c5fe319e";
+ name = "kpty-5.64.0.tar.xz";
};
};
kross = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/portingAids/kross-5.62.0.tar.xz";
- sha256 = "38bf9a57f181d823974a00896d89ae7106488c2ccbd7179e295d297edb338563";
- name = "kross-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/portingAids/kross-5.64.0.tar.xz";
+ sha256 = "d8a7e9fbeba4d16d6288d13d72a5f7581aa8be5894b06f83dbc6068b04551ebd";
+ name = "kross-5.64.0.tar.xz";
};
};
krunner = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/krunner-5.62.0.tar.xz";
- sha256 = "21b9564d07395f0e1c5c09557ffc64eb1929dd8925914fdb581f5daa537b01fc";
- name = "krunner-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/krunner-5.64.0.tar.xz";
+ sha256 = "e056635f347eb4d8b2a1545de993b28ead1af4e8e4acc43f1dd1637b528fe0b2";
+ name = "krunner-5.64.0.tar.xz";
};
};
kservice = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kservice-5.62.0.tar.xz";
- sha256 = "a2e105ae8202fa0d9f443490c56e25083c0b9ee285aa82fa26bb8a14f9999db8";
- name = "kservice-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kservice-5.64.0.tar.xz";
+ sha256 = "60e0c111485158f89211a62403697714dfe141e3539c1c7e1bf04550db74f02f";
+ name = "kservice-5.64.0.tar.xz";
};
};
ktexteditor = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/ktexteditor-5.62.0.tar.xz";
- sha256 = "e02d54035367071d44a1499a7f6c482491116c5676fa8ceb57b1e9f564975092";
- name = "ktexteditor-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/ktexteditor-5.64.0.tar.xz";
+ sha256 = "0fe12c57a7428d78c46d3367bdae47a0b9fbbd762be4f57f0c52dcd76e309ed5";
+ name = "ktexteditor-5.64.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/ktextwidgets-5.62.0.tar.xz";
- sha256 = "ec34931658cbe3a7ad7419a6e588cd9f9981e9b5ab2400e8b6f2b79b29f83774";
- name = "ktextwidgets-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/ktextwidgets-5.64.0.tar.xz";
+ sha256 = "0e94c36c7d836450d4c52bd933c492235ea0071b15702c302aed003e8400bbfd";
+ name = "ktextwidgets-5.64.0.tar.xz";
};
};
kunitconversion = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kunitconversion-5.62.0.tar.xz";
- sha256 = "e96ce3efcb6efe3afc0d5cf093971ea89fe2f20660da16349309cf6748446f41";
- name = "kunitconversion-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kunitconversion-5.64.0.tar.xz";
+ sha256 = "6783d6180b132a80dce2a4cc6c793dae0f5859b0709207c5fc6f4501ef53a822";
+ name = "kunitconversion-5.64.0.tar.xz";
};
};
kwallet = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kwallet-5.62.0.tar.xz";
- sha256 = "911d1f3320e7e3d25243e134ba0e42cd5e3ed2ee6c846dbb13777b1a4b338a5b";
- name = "kwallet-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kwallet-5.64.0.tar.xz";
+ sha256 = "16ff5bb5724105c3d59404f292232c03c6003f6229b483509e395e1171ccabde";
+ name = "kwallet-5.64.0.tar.xz";
};
};
kwayland = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kwayland-5.62.0.tar.xz";
- sha256 = "c9f513008c91e70b09f5acb76dde332491afde0e94948066c2f1e621bc368eb6";
- name = "kwayland-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kwayland-5.64.0.tar.xz";
+ sha256 = "1540d4ff62afd0bff234e08618fc77d2c54b5cd69bf9c478c45a08a6e69349d3";
+ name = "kwayland-5.64.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kwidgetsaddons-5.62.0.tar.xz";
- sha256 = "3a8e75d544783a1f567016f2669c3cfdbf2809b0a3d25afd03d38af62a493671";
- name = "kwidgetsaddons-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kwidgetsaddons-5.64.0.tar.xz";
+ sha256 = "a2d4a47489621d095c4979ea25d5d8304cf4004b10a892a2b314d74cd30cb5da";
+ name = "kwidgetsaddons-5.64.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kwindowsystem-5.62.0.tar.xz";
- sha256 = "116d75216ea001b2fc8688a72bcc6105b0b0966a2c5a084497f3aef80d158a67";
- name = "kwindowsystem-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kwindowsystem-5.64.0.tar.xz";
+ sha256 = "77c2e6b0032a79547f80bcd36682aa72c0e901e3b5acc83a58f69d644ce03dab";
+ name = "kwindowsystem-5.64.0.tar.xz";
};
};
kxmlgui = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kxmlgui-5.62.0.tar.xz";
- sha256 = "bc4321b4d44b0af1c2808814b89231a8c9e86de22ca1c0b080a769819ebc5d50";
- name = "kxmlgui-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kxmlgui-5.64.0.tar.xz";
+ sha256 = "faa95b92b3b03130022841a6797d5beb3efb6a0d757afaefe038889af76a1dd1";
+ name = "kxmlgui-5.64.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/kxmlrpcclient-5.62.0.tar.xz";
- sha256 = "c284c3e5962d2ed6d0737e5814b85fa4d7926131b7799272cb56c464a12c4530";
- name = "kxmlrpcclient-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/kxmlrpcclient-5.64.0.tar.xz";
+ sha256 = "8c36472cb69a2d5eeb88c437907f7b0b46703ef34d04df7b45a8c90eb95fd6b0";
+ name = "kxmlrpcclient-5.64.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/modemmanager-qt-5.62.0.tar.xz";
- sha256 = "b2a6517377b53aca895efd657d553dc5b057a673c07ccb10786031240b11adf5";
- name = "modemmanager-qt-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/modemmanager-qt-5.64.0.tar.xz";
+ sha256 = "a9d8554b3720cf46aaaa70da87c79688afc5baa155ffd19ea00e4cae2a1caa21";
+ name = "modemmanager-qt-5.64.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/networkmanager-qt-5.62.0.tar.xz";
- sha256 = "08f73ced96866b9dfded574a87c9e887dc907fc510d2764a4aa09315511cedf9";
- name = "networkmanager-qt-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/networkmanager-qt-5.64.0.tar.xz";
+ sha256 = "369d0391e199d059dd2faa554324cbd45334f7864ccfc462699b06c89af04bbf";
+ name = "networkmanager-qt-5.64.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/oxygen-icons5-5.62.0.tar.xz";
- sha256 = "c066bc96fd45f3553e3c344c7cef34afda3180c95bf67af6cf20e964fd5c1a00";
- name = "oxygen-icons5-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/oxygen-icons5-5.64.0.tar.xz";
+ sha256 = "41d415b4bd9cca0d9abc43b187059d833ce92b3fff3da66eb8ff4004215e91ef";
+ name = "oxygen-icons5-5.64.0.tar.xz";
};
};
plasma-framework = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/plasma-framework-5.62.0.tar.xz";
- sha256 = "324bf14078459954c355bb6f146b927f6cbf915109365cdc58c1d81c8495bdb4";
- name = "plasma-framework-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/plasma-framework-5.64.0.tar.xz";
+ sha256 = "3f1311a48826ab0a76f47d05b02f9a9486f821cc1ad757b895b570e371acfd09";
+ name = "plasma-framework-5.64.0.tar.xz";
};
};
prison = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/prison-5.62.0.tar.xz";
- sha256 = "d7a024881119e2e91fe2ef98ec982f33e87d3f5584c3e4438638e23cf0106fb0";
- name = "prison-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/prison-5.64.0.tar.xz";
+ sha256 = "31e136dd33940f32fdb87699b113c57aab566112bb9649f20a057c4eee20db2e";
+ name = "prison-5.64.0.tar.xz";
};
};
purpose = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/purpose-5.62.0.tar.xz";
- sha256 = "ed0bdc72b1b95fe988fb2ceba5cc1bd36b5bf00d30c098e9de50fdc36d3b3492";
- name = "purpose-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/purpose-5.64.0.tar.xz";
+ sha256 = "004794dfa2d0bcef316d582f37e5691e3980c99240ef570313a98a8d44235b0d";
+ name = "purpose-5.64.0.tar.xz";
};
};
qqc2-desktop-style = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/qqc2-desktop-style-5.62.0.tar.xz";
- sha256 = "97234e956a7fc09bef0665e9a759d6f370419bd3cd2bbbd700849e4cbe549bfa";
- name = "qqc2-desktop-style-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/qqc2-desktop-style-5.64.0.tar.xz";
+ sha256 = "b0e6ad1ccbd01b6974c3222c6098b6c1ae1fe594c26fe0e2817c35dd90b6013a";
+ name = "qqc2-desktop-style-5.64.0.tar.xz";
};
};
solid = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/solid-5.62.0.tar.xz";
- sha256 = "24a01a7e89b2c1e39cb9ebc477f80f5ab966d35fce00f63682b159a15de64cc3";
- name = "solid-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/solid-5.64.0.tar.xz";
+ sha256 = "fcbbfd124759854bde2da74e1768da818361f61f2839877b4efbcd38b825da6b";
+ name = "solid-5.64.0.tar.xz";
};
};
sonnet = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/sonnet-5.62.0.tar.xz";
- sha256 = "a1a2d3500d7fc51d94fd6f9d951c83be86436284aeda8416963fc5213956a69a";
- name = "sonnet-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/sonnet-5.64.0.tar.xz";
+ sha256 = "3af364858f76c0206136ae8f3c03da5442ea5e42d2560877f5e00f33850c84dc";
+ name = "sonnet-5.64.0.tar.xz";
};
};
syndication = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/syndication-5.62.0.tar.xz";
- sha256 = "d315a5a5e691925df44ce30abbd5208b764a72eb42d38dc5b5ca134d71c05462";
- name = "syndication-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/syndication-5.64.0.tar.xz";
+ sha256 = "bffcd673a70646c8cb683ed7b26f6ef251a2ffe439fc78123ccee4332b567b57";
+ name = "syndication-5.64.0.tar.xz";
};
};
syntax-highlighting = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/syntax-highlighting-5.62.0.tar.xz";
- sha256 = "897fac9ec2e5112d629da464d47223129e547c314369e1518a12c5c94ff2a6fd";
- name = "syntax-highlighting-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/syntax-highlighting-5.64.0.tar.xz";
+ sha256 = "9655fa79d99fb7d585ae1a11c03d204c83263fe19391e7610575fb0436052b5f";
+ name = "syntax-highlighting-5.64.0.tar.xz";
};
};
threadweaver = {
- version = "5.62.0";
+ version = "5.64.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.62/threadweaver-5.62.0.tar.xz";
- sha256 = "aa1704c20c6d38fde4f9988e13cb97356e1c69c7a9d0401870b1515a2814294a";
- name = "threadweaver-5.62.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.64/threadweaver-5.64.0.tar.xz";
+ sha256 = "4a3ec0b2b45a5997b24d60059d95006fca5fd86f5d619d8fb1fd30d7510f5a02";
+ name = "threadweaver-5.64.0.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
new file mode 100644
index 000000000000..a57b103b0d91
--- /dev/null
+++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, opencl-clhpp, cmake, withTracing ? false }:
+
+stdenv.mkDerivation rec {
+ name = "khronos-ocl-icd-loader-${version}";
+ version = "6c03f8b";
+
+ src = fetchFromGitHub {
+ owner = "KhronosGroup";
+ repo = "OpenCL-ICD-Loader";
+ rev = "6c03f8b58fafd9dd693eaac826749a5cfad515f8";
+ sha256 = "00icrlc00dpc87prbd2j1350igi9pbgkz27hc3rf73s5994yn86a";
+ };
+
+ patches = stdenv.lib.lists.optional withTracing ./tracing.patch;
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ opencl-clhpp ];
+
+ meta = with stdenv.lib; {
+ description = "Offical Khronos OpenCL ICD Loader";
+ homepage = https://github.com/KhronosGroup/OpenCL-ICD-Loader;
+ license = licenses.asl20;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ davidtwco ];
+ };
+}
diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch
new file mode 100644
index 000000000000..415a1b1dfe49
--- /dev/null
+++ b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch
@@ -0,0 +1,13 @@
+diff --git a/loader/icd.h b/loader/icd.h
+index a1b6969..cf4e272 100644
+--- a/loader/icd.h
++++ b/loader/icd.h
+@@ -122,7 +122,7 @@ void khrIcdContextPropertiesGetPlatform(
+ cl_platform_id *outPlatform);
+
+ // internal tracing macros
+-#if 0
++#if 1
+ #include
+ #define KHR_ICD_TRACE(...) \
+ do \
diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 1aa208c2044f..74ac59fef283 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -1,29 +1,14 @@
-{ stdenv, fetchurl, fetchpatch, openssl, perl, which, dns-root-data }:
+{ stdenv, fetchurl, openssl, perl, which, dns-root-data }:
stdenv.mkDerivation rec {
pname = "ldns";
- version = "1.7.0";
+ version = "1.7.1";
src = fetchurl {
url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz";
- sha256 = "1k56jw4hz8njspfxcfw0czf1smg0n48ylia89ziwyx5k9wdmp7y1";
+ sha256 = "0ac242n7996fswq1a3nlh1bbbhrsdwsq4mx7xq8ffq6aplb4rj4a";
};
- patches = [
- (fetchpatch {
- name = "CVE-2017-1000231.patch";
- url = "https://git.nlnetlabs.nl/ldns/patch/?id=c8391790";
- sha256 = "1rprfh0y1c28dqiy3vgwvwdhn7b5rsylfzzblx5xdhwfqgdw8vn0";
- excludes = [ "Changelog" ];
- })
- (fetchpatch {
- name = "CVE-2017-1000232.patch";
- url = "https://git.nlnetlabs.nl/ldns/patch/?id=3bdeed02";
- sha256 = "0bv0s5jjp0sswfg8da47d346iwp9yjhj9w7fa3bxh174br0zj07r";
- excludes = [ "Changelog" ];
- })
- ];
-
postPatch = ''
patchShebangs doc/doxyparse.pl
'';
@@ -38,6 +23,7 @@ stdenv.mkDerivation rec {
"--with-trust-anchor=${dns-root-data}/root.key"
"--with-drill"
"--disable-gost"
+ "--with-examples"
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes"
@@ -47,16 +33,11 @@ stdenv.mkDerivation rec {
doCheck = false; # fails. missing some files
postInstall = ''
+ # Only 'drill' stays in $out
+ # the rest are examples:
+ moveToOutput "bin/ldns*" "$examples"
+ # with exception of ldns-config, which goes to $dev:
moveToOutput "bin/ldns-config" "$dev"
-
- pushd examples
- configureFlagsArray+=( "--bindir=$examples/bin" )
- configurePhase
- make
- make install
- popd
-
- sed -i "$out/lib/libldns.la" -e "s,-L${openssl.dev},-L${openssl.out},g"
'';
meta = with stdenv.lib; {
@@ -64,6 +45,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
homepage = http://www.nlnetlabs.nl/projects/ldns/;
platforms = platforms.unix;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ dtzWill ];
};
}
diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index 7f7d34199be1..44c393baf8e8 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "leatherman";
- version = "1.9.0";
+ version = "1.9.1";
src = fetchFromGitHub {
- sha256 = "029n16rsvj2abii6d1d4q01fygkicw8n3ja0iaribk4b4h5mc7vc";
+ sha256 = "1aij0prpf7rvxx25qjf1krf0szb922hq9m6q58p90f5bjgymfzwh";
rev = version;
repo = "leatherman";
owner = "puppetlabs";
diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix
index 62c01e4f3560..e26f4f6022aa 100644
--- a/pkgs/development/libraries/leptonica/default.nix
+++ b/pkgs/development/libraries/leptonica/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
checkInputs = [ which gnuplot ];
- doCheck = !stdenv.isDarwin;
+
+ # Fails on pngio_reg for unknown reason
+ doCheck = false; # !stdenv.isDarwin;
meta = {
description = "Image processing and analysis library";
diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix
index 11b31d62b5d6..87eeac4b4f5f 100644
--- a/pkgs/development/libraries/libaal/default.nix
+++ b/pkgs/development/libraries/libaal/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
homepage = http://www.namesys.com/;
description = "Support library for Reiser4";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix
index 630b17121587..c0a43efc27ea 100644
--- a/pkgs/development/libraries/libagar/default.nix
+++ b/pkgs/development/libraries/libagar/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc
-, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU_combined
+, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU, libGL
, libsndfile, portaudio, libmysqlclient, fontconfig
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
"--enable-nls=yes"
"--with-gettext=${gettext}"
"--with-jpeg=${libjpeg.dev}"
- "--with-gl=${libGLU_combined}"
+ "--with-gl=${libGL}"
"--with-mysql=${libmysqlclient}"
"--with-manpages=yes"
];
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig libtool gettext ];
buildInputs = [
- bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined libmysqlclient mandoc
+ bsdbuild perl xlibsWrapper libXinerama SDL libGL libmysqlclient mandoc
freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile
];
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index f67b3cee607b..2d7edee4041c 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://xiph.org/ao/;
license = licenses.gpl2;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = with platforms; unix;
};
}
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index 46cc30a8944f..e9fccaf28abf 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -1,19 +1,18 @@
# TODO: Resolve the issues with the Mono bindings.
-{ stdenv, fetchurl, lib, file
-, pkgconfig, autoconf
+{ stdenv, fetchurl, fetchpatch, lib
+, pkgconfig, autoreconfHook
, glib, dbus-glib, gtkVersion ? "3"
, gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
, gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
-, python2Packages, gobject-introspection, vala
+, vala, gobject-introspection
, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
}:
with lib;
-let
- inherit (python2Packages) python pygobject2 pygtk;
-in stdenv.mkDerivation rec {
+
+stdenv.mkDerivation rec {
name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}";
in "libappindicator-${postfix}-${version}";
version = "${versionMajor}.${versionMinor}";
@@ -25,7 +24,7 @@ in stdenv.mkDerivation rec {
sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m";
};
- nativeBuildInputs = [ pkgconfig autoconf ];
+ nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection ];
propagatedBuildInputs =
if gtkVersion == "2"
@@ -34,20 +33,18 @@ in stdenv.mkDerivation rec {
buildInputs = [
glib dbus-glib
- python pygobject2 pygtk gobject-introspection vala
] ++ (if gtkVersion == "2"
then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
else [ libindicator-gtk3 ]);
- postPatch = ''
- substituteInPlace configure.ac \
- --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0'
- autoconf
- for f in {configure,ltmain.sh,m4/libtool.m4}; do
- substituteInPlace $f \
- --replace /usr/bin/file ${file}/bin/file
- done
- '';
+ patches = [
+ # Remove python2 from libappindicator.
+ (fetchpatch {
+ name = "no-python.patch";
+ url = "https://src.fedoraproject.org/rpms/libappindicator/raw/8508f7a52437679fd95a79b4630373f08315f189/f/nopython.patch";
+ sha256 = "18b1xzvwsbhhfpbzf5zragij4g79pa04y1dk6v5ci1wsjvii725s";
+ })
+ ];
configureFlags = [
"CFLAGS=-Wno-error"
@@ -56,15 +53,10 @@ in stdenv.mkDerivation rec {
"--with-gtk=${gtkVersion}"
];
- postConfigure = ''
- substituteInPlace configure \
- --replace /usr/bin/file ${file}/bin/file
- '';
-
doCheck = false; # generates shebangs in check phase, too lazy to fix
installFlags = [
- "sysconfdir=\${out}/etc"
+ "sysconfdir=${placeholder "out"}/etc"
"localstatedir=\${TMPDIR}"
];
diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix
index c48818972b58..df7e93de063c 100644
--- a/pkgs/development/libraries/libcdaudio/default.nix
+++ b/pkgs/development/libraries/libcdaudio/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation {
};
meta = {
+ description = "A portable library for controlling audio CDs";
+ homepage = "http://libcdaudio.sourceforge.net";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl2;
};
diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index 2688881e66d3..070cb58149c4 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }:
+{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }:
let version = "4.0.4"; in
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ cmake udev libcec_platform ];
+ buildInputs = [ cmake udev libcec_platform ] ++
+ stdenv.lib.optional (libraspberrypi != null) libraspberrypi;
cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ];
diff --git a/pkgs/development/libraries/libcerf/default.nix b/pkgs/development/libraries/libcerf/default.nix
index fd5ee8dcaaf9..0ffb20859677 100644
--- a/pkgs/development/libraries/libcerf/default.nix
+++ b/pkgs/development/libraries/libcerf/default.nix
@@ -1,16 +1,19 @@
-{ stdenv, lib, fetchurl }:
+{ stdenv, lib, fetchurl, cmake, perl }:
-stdenv.mkDerivation {
- name = "libcerf-1.5";
+stdenv.mkDerivation rec {
+ pname = "libcerf";
+ version = "1.13";
src = fetchurl {
- url = "http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.5.tgz";
- sha256 = "11jwr8ql4a9kmv04ycgwk4dsqnlv4l65a8aa0x1i3y7zwx3w2vg3";
+ url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz";
+ sha256 = "01d3fr4qa0080xdgp66mjbsa884qivn9y83p7rdyz2l3my0rysg4";
};
+ nativeBuildInputs = [ cmake perl ];
+
meta = with lib; {
description = "Complex error (erf), Dawson, Faddeeva, and Voigt function library";
- homepage = http://apps.jcns.fz-juelich.de/doku/sc/libcerf;
+ homepage = https://jugit.fz-juelich.de/mlz/libcerf;
license = licenses.mit;
maintainers = with maintainers; [ orivej ];
platforms = platforms.all;
diff --git a/pkgs/development/libraries/libco-canonical/default.nix b/pkgs/development/libraries/libco-canonical/default.nix
index 09c27ae7c9cf..56974fcca7b6 100644
--- a/pkgs/development/libraries/libco-canonical/default.nix
+++ b/pkgs/development/libraries/libco-canonical/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libco-canonical";
- version = "19.1";
+ version = "20";
src = fetchFromGitHub {
owner = "canonical";
repo = "libco";
rev = "v${version}";
- sha256 = "03a0fq8f8gc4hjzcf0zsjib4mzag47rxrrg9b5r6bx53vj5rhj78";
+ sha256 = "0r5b1r0sxngx349s5a3zkkvfw5by9y492kr34b25gjspzvjchlxq";
};
nativeBuildInputs = [ pkgconfig ];
@@ -19,6 +19,17 @@ stdenv.mkDerivation rec {
outputs = [ "dev" "out" ];
+ patchPhase = ''
+ # upstream project assumes all build products will go into single directory
+ # `$prefix` but we need `includedir` to point to "dev", not "out"
+ #
+ # pkgs/build-support/setup-hooks/multiple-outputs.sh would normally patch
+ # this automatically, but it fails here due to use of absolute paths
+
+ substituteInPlace Makefile \
+ --replace "@includedir@|\$(PREFIX)" "@includedir@|${placeholder "dev"}"
+ '';
+
meta = {
description = "A cooperative multithreading library written in C89";
homepage = "https://github.com/canonical/libco";
diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix
index fc12096ef5be..c4a351739b61 100644
--- a/pkgs/development/libraries/libdigidocpp/default.nix
+++ b/pkgs/development/libraries/libdigidocpp/default.nix
@@ -2,12 +2,12 @@
, xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }:
stdenv.mkDerivation rec {
- version = "3.14.0";
+ version = "3.14.1";
pname = "libdigidocpp";
src = fetchurl {
url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
- sha256 = "0klbr881d56661d1lqlv4ivxhxcv2q16ivlz7r0rb901wilq5jyl";
+ sha256 = "0yrcfw5i1jddz7x3j9zzlcwjlzdbi10wns7kbblbp03nx7vk2vqy";
};
nativeBuildInputs = [ cmake pkgconfig xxd ];
diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix
index 2d15e419a764..591ad72e4ecc 100644
--- a/pkgs/development/libraries/libebml/default.nix
+++ b/pkgs/development/libraries/libebml/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libebml";
- version = "1.3.9";
+ version = "1.3.10";
src = fetchFromGitHub {
owner = "Matroska-Org";
repo = "libebml";
rev = "release-${version}";
- sha256 = "0q2xfabaymrf0xkhwc9akx6m04lgra2b53wcn9mnh5dqiiazizi7";
+ sha256 = "1vn0g4hsygrm29qvnzhrblpwjcy2x6swf799ibxv3bzpi1j0gris";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix
index 5a8f5126680e..833ccf5dca5d 100644
--- a/pkgs/development/libraries/libexif/default.nix
+++ b/pkgs/development/libraries/libexif/default.nix
@@ -9,21 +9,32 @@ stdenv.mkDerivation rec {
};
patches = [
- (fetchpatch {
- name = "CVE-2017-7544.patch";
- url = https://sourceforge.net/p/libexif/bugs/_discuss/thread/fc394c4b/489a/attachment/xx.pat;
- sha256 = "1qgk8hgnxr8d63jsc4vljxz9yg33mbml280dq4a6050rmk9wq4la";
- })
+ (fetchpatch {
+ name = "CVE-2017-7544.patch";
+ url = "https://github.com/libexif/libexif/commit/c39acd1692023b26290778a02a9232c873f9d71a.patch";
+ sha256 = "0xgx6ly2i4q05shb61mfx6njwf1yp347jkznm0ka4m85i41xm6sd";
+ })
+ (fetchpatch {
+ name = "CVE-2018-20030-1.patch";
+ url = "https://github.com/libexif/libexif/commit/5d28011c40ec86cf52cffad541093d37c263898a.patch";
+ sha256 = "1wv8s962wmbn2m2xypgirf12g6msrbplpsmd5bh86irfwhkcppj3";
+ })
+ (fetchpatch {
+ name = "CVE-2018-20030-2.patch";
+ url = "https://github.com/libexif/libexif/commit/6aa11df549114ebda520dde4cdaea2f9357b2c89.patch";
+ sha256 = "01aqvz63glwq6wg0wr7ykqqghb4abgq77ghvhizbzadg1k4h7drx";
+ excludes = [ "NEWS" ];
+ })
];
- patchFlags = "-p0";
buildInputs = [ gettext ];
meta = {
- homepage = http://libexif.sourceforge.net/;
+ homepage = https://libexif.github.io/;
description = "A library to read and manipulate EXIF data in digital photographs";
license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.erictapen ];
};
}
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index 8fd01dbd506a..ea155440c8d1 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -22,6 +22,12 @@ stdenv.mkDerivation rec {
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/libextractor-exiv2-0.27.patch?h=packages/libextractor&id=4dc53f7fc69210ae571285dface108ed65d8ee53";
sha256 = "0w4gc1q1m1yxsd4hv105nblmif465nw3g5nxzldy0x2rl9mdncg6";
})
+ (fetchpatch {
+ name = "CVE-2019-15531.patch";
+ url = "https://git.gnunet.org/libextractor.git/patch/?id=d2b032452241708bee68d02aa02092cfbfba951a";
+ sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw";
+ excludes = [ "ChangeLog" ];
+ })
];
preConfigure =
diff --git a/pkgs/development/libraries/libffi/3.2.1-cygwin.patch b/pkgs/development/libraries/libffi/3.2.1-cygwin.patch
deleted file mode 100644
index f3b38dbd1c16..000000000000
--- a/pkgs/development/libraries/libffi/3.2.1-cygwin.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libffi-3.2.1/src/closures.c 2014-11-08 13:47:24.000000000 +0100
-+++ libffi-3.2.1/src/closures.c 2015-05-19 10:15:50.059325900 +0200
-@@ -212,6 +212,7 @@
- #include
-
- /* Cygwin is Linux-like, but not quite that Linux-like. */
-+#define is_emutramp_enabled() 0
- #define is_selinux_enabled() 0
-
- #endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 2918276ef211..cc080e7c6388 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -7,45 +7,17 @@
}:
stdenv.mkDerivation rec {
- name = "libffi-3.2.1";
+ name = "libffi-3.3";
src = fetchurl {
url = "https://sourceware.org/pub/libffi/${name}.tar.gz";
- sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
+ sha256 = "0mi0cpf8aa40ljjmzxb7im6dbj45bb0kllcd09xgmp834y9agyvj";
};
- patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch
- ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
- url = https://src.fedoraproject.org/rpms/libffi/raw/ccffc1700abfadb0969495a6e51b964117fc03f6/f/libffi-aarch64-rhbz1174037.patch;
- sha256 = "1vpirrgny43hp0885rswgv3xski8hg7791vskpbg3wdjdpb20wbc";
- })
- ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
- name = "gnu-linux-define.patch";
- url = "https://git.alpinelinux.org/cgit/aports/plain/main/libffi/gnu-linux-define.patch?id=bb024fd8ec6f27a76d88396c9f7c5c4b5800d580";
- sha256 = "11pvy3xkhyvnjfyy293v51f1xjy3x0azrahv1nw9y9mw8bifa2j2";
- })
- ++ stdenv.lib.optional stdenv.hostPlatform.isRiscV (fetchpatch {
- name = "riscv-support.patch";
- url = https://github.com/sorear/libffi-riscv/commit/e46492e8bb1695a19bc1053ed869e6c2bab02ff2.patch;
- sha256 = "1vl1vbvdkigs617kckxvj8j4m2cwg62kxm1clav1w5rnw9afxg0y";
- })
- ++ stdenv.lib.optionals stdenv.isMips [
- (fetchpatch {
- name = "0001-mips-Use-compiler-internal-define-for-linux.patch";
- url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000";
- sha256 = "1gc53lw90p6hc0cmhj3csrwincfz7va5ss995ksw5gm0yrr9mrvb";
- })
- (fetchpatch {
- name = "0001-mips-fix-MIPS-softfloat-build-issue.patch";
- url = "http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch?id=318e33a708378652edcf61ce7d9d7f3a07743000";
- sha256 = "0l8xgdciqalg4z9rcwyk87h8fdxpfv4hfqxwsy2agpnpszl5jjdq";
- })
- ];
+ patches = [];
outputs = [ "out" "dev" "man" "info" ];
- nativeBuildInputs = stdenv.lib.optional stdenv.hostPlatform.isRiscV autoreconfHook;
-
configureFlags = [
"--with-gcc-arch=generic" # no detection of -march= or -mtune=
"--enable-pax_emutramp"
@@ -62,15 +34,6 @@ stdenv.mkDerivation rec {
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling.
- # Install headers and libs in the right places.
- postFixup = ''
- mkdir -p "$dev/"
- mv "$out/lib/${name}/include" "$dev/include"
- rmdir "$out/lib/${name}"
- substituteInPlace "$dev/lib/pkgconfig/libffi.pc" \
- --replace 'includedir=''${libdir}/libffi-3.2.1' "includedir=$dev"
- '';
-
meta = with stdenv.lib; {
description = "A foreign function call interface library";
longDescription = ''
@@ -88,9 +51,8 @@ stdenv.mkDerivation rec {
conversions for values passed between the two languages.
'';
homepage = http://sourceware.org/libffi/;
- # See https://github.com/atgreen/libffi/blob/master/LICENSE .
- license = licenses.free;
- maintainers = [ ];
+ license = licenses.mit;
+ maintainers = with maintainers; [ matthewbauer ];
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index 5fefdad08e76..a0f44a332205 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "libfido2";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchurl {
- url = "https://developers.yubico.com/libfido2/Releases/libfido2-${version}.tar.gz";
- sha256 = "1pbllhzcrzkgxad00bai7lna8dpkwiv8khx8p20miy661abv956v";
+ url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
+ sha256 = "1izyl3as9rn7zcxpsvgngjwr55gli5gy822ac3ajzm65qiqkcbhb";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 95954a120c8b..fd17267b615e 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "libfilezilla";
- version = "0.18.2";
+ version = "0.19.1";
src = fetchurl {
url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
- sha256 = "1j9da9xi2k4nw97m14mpp7h39rh03br0gmjj9ff819l6nhlnkn20";
+ sha256 = "0cjscv68nnqivzba94xapx1c970j1jbdbm0h3g2ym9i0hgnyyhha";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix
index 9a6db72ae058..6819ffba21c3 100644
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@@ -1,41 +1,27 @@
-{ thinkpad ? false
-, stdenv
-, fetchFromGitHub
+{ stdenv
, fetchurl
, pkgconfig
, meson
, ninja
-, libusb
+, gusb
, pixman
, glib
, nss
-, gtk3
+, gobject-introspection
, coreutils
, gtk-doc
, docbook_xsl
, docbook_xml_dtd_43
-, openssl ? null
}:
-assert thinkpad -> openssl != null;
-
stdenv.mkDerivation rec {
- pname = "libfprint" + stdenv.lib.optionalString thinkpad "-thinkpad";
- version = "1.0";
+ pname = "libfprint";
+ version = "1.90";
- src = {
- libfprint-thinkpad =
- fetchFromGitHub {
- owner = "3v1n0";
- repo = "libfprint";
- rev = "2e2e3821717e9042e93a995bdbd3d00f2df0be9c";
- sha256 = "1vps1wrp7hskf13f7jrv0dwry2fcid76x2w463wplngp63cj7b3b";
- };
- libfprint = fetchurl {
- url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/aff93e9921d1cff53d7c070944952ff9/libfprint-${version}.tar.xz";
- sha256 = "0v84pd12v016m8iimhq39fgzamlarqccsr7d98cvrrwrzrgcixrd";
- };
- }.${pname};
+ src = fetchurl {
+ url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/1bba17b5daa130aa548bc7ea96dc58c4/libfprint-1.90.0.tar.xz";
+ sha256 = "930f530df369ff874d7971f0b7c7bdb7c81597e91af4668694b98fe30b4b3371";
+ };
nativeBuildInputs = [
pkgconfig
@@ -44,17 +30,15 @@ stdenv.mkDerivation rec {
gtk-doc
docbook_xsl
docbook_xml_dtd_43
+ gobject-introspection
];
buildInputs = [
- libusb
+ gusb
pixman
glib
nss
- gtk3
- ]
- ++ stdenv.lib.optional thinkpad openssl
- ;
+ ];
mesonFlags = [
"-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d"
diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix
index 1b00ff4c0fbb..26002725d91b 100644
--- a/pkgs/development/libraries/libftdi/1.x.nix
+++ b/pkgs/development/libraries/libftdi/1.x.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pkgconfig, libusb1, libconfuse
, cppSupport ? true, boost ? null
-, pythonSupport ? true, python ? null, swig ? null
+, pythonSupport ? true, python3 ? null, swig ? null
, docSupport ? true, doxygen ? null
}:
assert cppSupport -> boost != null;
-assert pythonSupport -> python != null && swig != null;
+assert pythonSupport -> python3 != null && swig != null;
assert docSupport -> doxygen != null;
stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = with stdenv.lib; [ libconfuse ]
++ optionals cppSupport [ boost ]
- ++ optionals pythonSupport [ python swig ]
+ ++ optionals pythonSupport [ python3 swig ]
++ optionals docSupport [ doxygen ];
preBuild = stdenv.lib.optionalString docSupport ''
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index 75d8e6710e09..e7a9ec60a6d2 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isDarwin gettext
++ stdenv.lib.optional enableCapabilities libcap;
- configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ];
+ configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]
+ ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm";
# Make sure libraries are correct for .pc and .la files
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
index c7ff6d10da39..6830d47df74b 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/pkgs/development/libraries/libgdata/default.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
};
tests = {
- installedTests = nixosTests.libgdata;
+ installedTests = nixosTests.installed-tests.libgdata;
};
};
diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix
index 30b27d9329a5..5df1246a0eb4 100644
--- a/pkgs/development/libraries/libglvnd/default.nix
+++ b/pkgs/development/libraries/libglvnd/default.nix
@@ -14,6 +14,22 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig python2 addOpenGLRunpath ];
buildInputs = [ libX11 libXext xorgproto ];
+ # The following 3 patches should be removed once libglvnd >1.2.0 is released
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/NVIDIA/libglvnd/commit/6f52473dac08c44b081b792874b4ce73122096da.patch";
+ sha256 = "0rd9ihl8n33cm0rya5a7ki0hn31fh52r0gaj5d4w80jrsah2ayij";
+ })
+ (fetchpatch {
+ url = "https://github.com/NVIDIA/libglvnd/commit/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch";
+ sha256 = "1qx3nw8vq5xcrixmi7xw1vpy4gbf7kmx38rx8wg8x046g4mv8ijj";
+ })
+ (fetchpatch {
+ url = "https://github.com/NVIDIA/libglvnd/commit/5dfdc5a6dc60a3bdc63cd4510dabacba388da13a.patch";
+ sha256 = "0gmb3619yz3z7n22afjh8p2y13bmsky4r0z0csm14is3wvdi64ya";
+ })
+ ];
+
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace src/GLX/Makefile.am \
--replace "-Wl,-Bsymbolic " ""
diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix
index 0951ab1fe0c0..21523bf2e1a5 100644
--- a/pkgs/development/libraries/libgnomekbd/default.nix
+++ b/pkgs/development/libraries/libgnomekbd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }:
stdenv.mkDerivation rec {
pname = "libgnomekbd";
@@ -13,13 +13,19 @@ stdenv.mkDerivation rec {
updateScript = gnome3.updateScript { packageName = pname; };
};
- nativeBuildInputs = [ pkgconfig file intltool makeWrapper ];
- buildInputs = [ glib gtk3 libxklavier ];
+ nativeBuildInputs = [
+ file
+ intltool
+ pkgconfig
+ wrapGAppsHook
+ ];
- preFixup = ''
- wrapProgram $out/bin/gkbd-keyboard-display \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- '';
+ # Requires in libgnomekbd.pc
+ propagatedBuildInputs = [
+ gtk3
+ libxklavier
+ glib
+ ];
meta = with stdenv.lib; {
description = "Keyboard management library";
diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index 1736e97f4662..a1e8ef76394a 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "libgnurl";
- version = "7.66.0";
+ version = "7.67.0";
src = fetchurl {
url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
- sha256 = "03bkzcld384z7i3zh3k9k3pr0xpyqbcr8cxjqya1zqs5lk7i55x5";
+ sha256 = "0ima9hz5d54iyvvih51s8xn6dsfxd3qyzgnj9l7w9f1smia295rb";
};
nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A fork of libcurl used by GNUnet";
- homepage = https://gnunet.org/gnurl;
+ homepage = "https://gnunet.org/en/gnurl.html";
maintainers = with maintainers; [ falsifian vrthra ];
platforms = platforms.linux;
license = licenses.curl;
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index d7fb35897dc4..69c236d72209 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -78,6 +78,6 @@ in stdenv.mkDerivation (rec {
license = licenses.lgpl2Plus;
platforms = platforms.all;
- maintainers = [ maintainers.fuuzetsu maintainers.vrthra ];
+ maintainers = [ maintainers.vrthra ];
};
} // genPosixLockObjOnlyAttrs)
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index d561ebcd7afb..063588e9f1e5 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -1,18 +1,20 @@
-{stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
+{ stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib,
- libimobiledevice, pythonPackages, mutagen,
+ libimobiledevice, mutagen,
monoSupport ? false, mono, gtk-sharp-2_0
}:
-let
- inherit (pythonPackages) python pygobject2;
-in stdenv.mkDerivation rec {
+
+stdenv.mkDerivation rec {
name = "libgpod-0.8.3";
+
src = fetchurl {
url = "mirror://sourceforge/gtkpod/${name}.tar.bz2";
sha256 = "0pcmgv1ra0ymv73mlj4qxzgyir026z9jpl5s5bkg35afs1cpk2k3";
};
+ outputs = [ "out" "dev" ];
+
preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )";
configureFlags = [
@@ -23,7 +25,7 @@ in stdenv.mkDerivation rec {
dontStrip = true;
propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
- gdk-pixbuf taglib libimobiledevice python pygobject2 mutagen ];
+ gdk-pixbuf taglib libimobiledevice mutagen ];
nativeBuildInputs = [ gettext intltool pkgconfig ]
++ (with perlPackages; [ perl XMLParser ])
diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index b52a2b1e0fa9..8023acb75d28 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
+ description = "A library that provides GObject bindings for libudev";
homepage = https://wiki.gnome.org/Projects/libgudev;
maintainers = [ maintainers.eelco ] ++ gnome3.maintainers;
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix
index c4f353fb6d51..88736113ee53 100644
--- a/pkgs/development/libraries/libhandy/default.nix
+++ b/pkgs/development/libraries/libhandy/default.nix
@@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
pname = "libhandy";
- version = "0.0.11";
+ version = "0.0.12";
outputs = [ "out" "dev" "devdoc" "glade" ];
outputBin = "dev";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
owner = "Librem5";
repo = pname;
rev = "v${version}";
- sha256 = "0622zp5wrvn5bvgardijxd11y76g1i54fs32y03dw9nrar7i6vb0";
+ sha256 = "09wlknarzsbk9hr5ws6s7x5kibkhx9ayrbhshfqib4zkhq2f76hw";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix
index f69241ad552e..85174e9c3e69 100644
--- a/pkgs/development/libraries/libheif/default.nix
+++ b/pkgs/development/libraries/libheif/default.nix
@@ -2,13 +2,15 @@
stdenv.mkDerivation rec {
pname = "libheif";
- version = "1.5.1";
+ version = "1.6.0";
+
+ outputs = [ "bin" "out" "dev" "man" ];
src = fetchFromGitHub {
owner = "strukturag";
repo = "libheif";
rev = "v${version}";
- sha256 = "0x6207hiy15k2696476qx9jcbzs90fq8cfv4jw6hi14w4wzq89kr";
+ sha256 = "0im9k2pqghlsppj165kh3nc26c4wx1brckmncdmpy0mcj56jjmba";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 050cba5460d9..903a1a26eb71 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "libical";
- version = "3.0.5";
+ version = "3.0.6";
outputs = [ "out" "dev" ]; # "devdoc" ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "libical";
repo = "libical";
rev = "v${version}";
- sha256 = "03kjc4s1svmzkmzkr0irgczq37aslhj4bxnvjqav0jwa2zrynhra";
+ sha256 = "181lf07fj36fp0rbcjjmb53yzdvv9i4qxpnbpax8hayjhha8pjh3";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix
index 298d6124505c..27ec8b17c0d2 100644
--- a/pkgs/development/libraries/libicns/default.nix
+++ b/pkgs/development/libraries/libicns/default.nix
@@ -1,14 +1,24 @@
-{ stdenv, fetchurl, libpng, jasper }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, openjpeg }:
stdenv.mkDerivation rec {
- name = "libicns-0.8.1";
+ pname = "libicns";
+ version = "0.8.1";
src = fetchurl {
- url = "mirror://sourceforge/icns/${name}.tar.gz";
+ url = "mirror://sourceforge/icns/${pname}-${version}.tar.gz";
sha256 = "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk";
};
- buildInputs = [ libpng jasper ];
+ patches = [
+ (fetchpatch {
+ url = "https://sources.debian.org/data/main/libi/libicns/0.8.1-3.1/debian/patches/support-libopenjp2.patch";
+ sha256 = "0ss298lyzvydxvaxsadi6kbbjpwykd86jw3za76brcsg2dpssgas";
+ })
+ ];
+
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ libpng openjpeg ];
+ NIX_CFLAGS_COMPILE = [ "-I${openjpeg.dev}/include/${openjpeg.incDir}" ];
meta = with stdenv.lib; {
description = "Library for manipulation of the Mac OS icns resource format";
diff --git a/pkgs/development/libraries/libiconv/setup-hook.sh b/pkgs/development/libraries/libiconv/setup-hook.sh
index f89361a62998..120cf06c61b5 100644
--- a/pkgs/development/libraries/libiconv/setup-hook.sh
+++ b/pkgs/development/libraries/libiconv/setup-hook.sh
@@ -2,7 +2,7 @@
# it doesn't hurt to have it in Glibc either though
# See pkgs/build-support/setup-hooks/role.bash
-if [ -z "$dontAddExtraLibs" ]; then
+if [ -z "${dontAddExtraLibs-}" ]; then
getHostRole
export NIX_${role_pre}LDFLAGS+=" -liconv"
fi
diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix
index 674862d694c7..c6d430e10fc0 100644
--- a/pkgs/development/libraries/libid3tag/default.nix
+++ b/pkgs/development/libraries/libid3tag/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
description = "ID3 tag manipulation library";
homepage = http://mad.sourceforge.net/;
license = licenses.gpl2;
- maintainers = [ maintainers.fuuzetsu ];
+ maintainers = [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 7e7b691e3c19..c1363d7a9284 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libidn2";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchurl {
url = "mirror://gnu/gnu/libidn/${pname}-${version}.tar.gz";
- sha256 = "1zl1cc2xgxw31pdhvhr5ij36x4vvpy16jq667rspin06nlr4fwzw";
+ sha256 = "1ddqr80kmz4l8g3r3gf7bmf2v29fgivlc2bgxfiscjg2sarivjz1";
};
outputs = [ "bin" "dev" "out" "info" "devdoc" ];
diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix
deleted file mode 100644
index f6dc85b629dd..000000000000
--- a/pkgs/development/libraries/libindicate/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-# TODO: Resolve the issues with the Mono bindings.
-
-{ stdenv, fetchurl, lib, file
-, pkgconfig, autoconf
-, glib, dbus-glib, libdbusmenu
-, gtkVersion ? "3", gtk2 ? null, gtk3 ? null
-, pythonPackages, gobject-introspection, vala, gnome-doc-utils
-, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
- }:
-
-with lib;
-
-let
- inherit (pythonPackages) python pygobject2 pygtk;
-in stdenv.mkDerivation rec {
- name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}";
- in "libindicate-${postfix}-${version}";
- version = "${versionMajor}.${versionMinor}";
- versionMajor = "12.10";
- versionMinor = "1";
-
- src = fetchurl {
- url = "${meta.homepage}/${versionMajor}/${version}/+download/libindicate-${version}.tar.gz";
- sha256 = "10am0ymajx633b33anf6b79j37k61z30v9vaf5f9fwk1x5cw1q21";
- };
-
- nativeBuildInputs = [ pkgconfig autoconf gobject-introspection vala gnome-doc-utils ];
-
- buildInputs = [
- glib dbus-glib libdbusmenu
- python pygobject2 pygtk
- ] ++ (if gtkVersion == "2"
- then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ]
- else [ gtk3 ]);
-
- postPatch = ''
- substituteInPlace configure.ac \
- --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0' \
- --replace 'pyglib-2.0-python$PYTHON_VERSION' 'pyglib-2.0-python'
- autoconf
- for f in {configure,ltmain.sh,m4/libtool.m4}; do
- substituteInPlace $f \
- --replace /usr/bin/file ${file}/bin/file
- done
- '';
-
- configureFlags = [
- "CFLAGS=-Wno-error"
- "--sysconfdir=/etc"
- "--localstatedir=/var"
- "--with-gtk=${gtkVersion}"
- ];
-
- installFlags = [
- "sysconfdir=\${out}/etc"
- "localstatedir=\${TMPDIR}"
- ];
-
- meta = {
- description = "Library for raising indicators via DBus";
- homepage = https://launchpad.net/libindicate;
- license = with licenses; [ lgpl21 lgpl3 ];
- platforms = platforms.linux;
- maintainers = [ maintainers.msteen ];
- };
-}
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 044ef2dd6a79..8d48082e1d9c 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -27,11 +27,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libinput";
- version = "1.14.1";
+ version = "1.14.3";
src = fetchurl {
url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
- sha256 = "0w7fas37mp2k06f12i3lnj717lw73asziknj6z51kh1m50ja6cz3";
+ sha256 = "1dy58j8dvr7ri34bx0lppmh5638m956azgwk501w373hi42kmsqg";
};
outputs = [ "bin" "out" "dev" ];
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
(mkFlag documentationSupport "documentation")
(mkFlag eventGUISupport "debug-gui")
(mkFlag testsSupport "tests")
+ "--sysconfdir=/etc"
"--libexecdir=${placeholder "bin"}/libexec"
];
diff --git a/pkgs/development/libraries/libisds/default.nix b/pkgs/development/libraries/libisds/default.nix
new file mode 100644
index 000000000000..4ed5a8309644
--- /dev/null
+++ b/pkgs/development/libraries/libisds/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchurl
+, expat
+, gpgme
+, libgcrypt
+, libxml2
+, libxslt
+, curl
+, docbook_xsl
+}:
+
+stdenv.mkDerivation rec {
+ pname = "libisds";
+ version = "0.11";
+
+ src = fetchurl {
+ url = "http://xpisar.wz.cz/${pname}/dist/${pname}-${version}.tar.xz";
+ sha256 = "1cy161l7rl25xji2xpb9vjpvg02bc7mwd4fpp2sx9zhpifn5dfbr";
+ };
+
+ configureFlags = [
+ "--with-docbook-xsl-stylesheets=${docbook_xsl}/xml/xsl/docbook"
+ ];
+
+ buildInputs = [ expat gpgme libgcrypt libxml2 libxslt curl docbook_xsl ];
+
+ meta = with stdenv.lib; {
+ description = "Client library for accessing SOAP services of Czech government-provided Databox infomation system";
+ homepage = "http://xpisar.wz.cz/libisds/";
+ license = licenses.lgpl3;
+ maintainers = [ maintainers.mmahut ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix
index cefce19d4659..633f19cef798 100644
--- a/pkgs/development/libraries/libisoburn/default.nix
+++ b/pkgs/development/libraries/libisoburn/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libisoburn";
- version = "1.5.0";
+ version = "1.5.2";
src = fetchurl {
url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz";
- sha256 = "1r8xbhw21bmcp3jhfmvadivh0fa7f4k6larv8lvg4ka0kiigbhfs";
+ sha256 = "1v4hanapr02wf2i6rncc62z8cyc18078nb2y6q4hp3hxa74hnwnc";
};
buildInputs = [ attr zlib libburn libisofs ];
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index 0f73be7ebcea..932edd20e9a6 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "liblouis";
- version = "3.11.0";
+ version = "3.12.0";
src = fetchFromGitHub {
owner = "liblouis";
repo = "liblouis";
rev = "v${version}";
- sha256 = "1y0pypgxchxczdnjkblibbvvy4gdk2pf8dzpqmbf824c7zpy8z5r";
+ sha256 = "0sw7iwb9158z7jslxj9jwh2vqbg0q8wq6fbmk9iz7sfkjqhi80hv";
};
outputs = [ "out" "dev" "man" "info" "doc" ];
diff --git a/pkgs/development/libraries/libmad/001-mips_removal_h_constraint.patch b/pkgs/development/libraries/libmad/001-mips_removal_h_constraint.patch
deleted file mode 100644
index 1d8b385e0c57..000000000000
--- a/pkgs/development/libraries/libmad/001-mips_removal_h_constraint.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Taken from openwrt:
-https://dev.openwrt.org/browser/packages/libs/libmad/patches/001-mips_removal_h_constraint.patch?rev=18548
-
-diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h
---- libmad-0.15.1b-orig/fixed.h 2004-02-17 12:32:03.000000000 +1030
-+++ libmad-0.15.1b/fixed.h 2009-08-05 10:46:30.000000000 +0930
-@@ -299,6 +299,23 @@
-
- # elif defined(FPM_MIPS)
-
-+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
-+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
-+#define __GNUC_PREREQ(maj, min) \
-+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-+#else
-+#define __GNUC_PREREQ(maj, min) 0
-+#endif
-+
-+#if __GNUC_PREREQ(4,4)
-+ typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
-+# define MAD_F_MLX(hi, lo, x, y) \
-+ do { \
-+ u64_di_t __ll = (u64_di_t) (x) * (y); \
-+ hi = __ll >> 32; \
-+ lo = __ll; \
-+ } while (0)
-+#else
- /*
- * This MIPS version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
-@@ -328,6 +345,7 @@
- : "%r" ((x) >> 12), "r" ((y) >> 16))
- # define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo))
- # endif
-+#endif /* __GNU_PREREQ(4,4) */
-
- # if defined(OPT_SPEED)
- # define mad_f_scale64(hi, lo) \
-diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h
---- libmad-0.15.1b-orig/mad.h 2004-02-17 13:25:44.000000000 +1030
-+++ libmad-0.15.1b/mad.h 2009-08-05 10:42:40.000000000 +0930
-@@ -344,6 +344,23 @@
-
- # elif defined(FPM_MIPS)
-
-+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
-+#if defined (__GNUC__) && defined (__GNUC_MINOR__)
-+#define __GNUC_PREREQ(maj, min) \
-+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-+#else
-+#define __GNUC_PREREQ(maj, min) 0
-+#endif
-+
-+#if __GNUC_PREREQ(4,4)
-+ typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
-+# define MAD_F_MLX(hi, lo, x, y) \
-+ do { \
-+ u64_di_t __ll = (u64_di_t) (x) * (y); \
-+ hi = __ll >> 32; \
-+ lo = __ll; \
-+ } while (0)
-+#else
- /*
- * This MIPS version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
-@@ -373,6 +390,7 @@
- : "%r" ((x) >> 12), "r" ((y) >> 16))
- # define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo))
- # endif
-+#endif /* __GNU_PREREQ(4,4) */
-
- # if defined(OPT_SPEED)
- # define mad_f_scale64(hi, lo) \
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index f6df090e8b5d..9d935daddadb 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -1,27 +1,57 @@
-{stdenv, fetchurl, autoconf}:
+{ stdenv, fetchurl, fetchpatch, autoconf }:
stdenv.mkDerivation rec {
- name = "libmad-0.15.1b";
-
+ pname = "libmad";
+ version = "0.15.1b";
+
src = fetchurl {
- url = "mirror://sourceforge/mad/${name}.tar.gz";
- sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690";
+ url = "mirror://sourceforge/mad/${pname}-${version}.tar.gz";
+ sha256 = "14460zhacxhswnzb36qfpd1f2wbk10qvksvm6wyq5hpvdgnw7ymv";
};
- patches = [ ./001-mips_removal_h_constraint.patch ./pkgconfig.patch ]
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/001-mips_removal_h_constraint.patch";
+ sha256 = "0layswr6qg6axf4vyz6xrv73jwga34mkma3ifk9w9vrk41454hr5";
+ })
+ (fetchpatch {
+ url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/libmad.patch";
+ sha256 = "0rysq0sn3dfdz6pa6bfqkmk4ymc4rzk5ym7p16dyk37sldg1pbzs";
+ })
+ (fetchpatch {
+ url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/amd64-64bit.diff";
+ sha256 = "0mx56dmkbvw3zxnqd2hjng48q0d7q7473pns4n0ksdam29b0c5ar";
+ })
+ (fetchpatch {
+ name = "CVE-2017-8372-CVE-2017-8373.patch";
+ url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/102-CVE-2017-8373-CVE-2017-8372-md-size.patch";
+ sha256 = "0p6mkpn66h1ds8jvww28q4vlr58jwm58m9vb7pkvvyvy764agqnk";
+ })
+ (fetchpatch {
+ name = "CVE-2017-8374.patch";
+ url = "https://github.com/openwrt/packages/raw/openwrt-19.07/libs/libmad/patches/101-CVE-2017-8374-length-check.patch";
+ sha256 = "1j1ssxwmx9nfahzl62frbzck93xrjc2v3w30c12vmk29iflf1890";
+ })
+ ]
# optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad
# It is included here in order to fix a build failure in Clang
# But it may be useful to fix other, currently unknown problems as well
- ++ stdenv.lib.optional stdenv.cc.isClang [ ./optimize.diff ];
+ ++ stdenv.lib.optionals stdenv.cc.isClang [
+ (fetchpatch {
+ url = "https://github.com/KaOSx/main/raw/1270b8080f37fb6cca562829a521991800b0a497/libmad/optimize.diff";
+ sha256 = "1wp60ywzk6nmxc3kq3v6i8b7s4cibvf5cjir859zv10y5aa1d0pk";
+ })
+ ];
+
+ # The -fforce-mem flag has been removed in GCC 4.3.
+ postPatch = ''
+ substituteInPlace configure.ac --replace "-fforce-mem" ""
+ substituteInPlace configure.ac --replace "arch=\"-march=i486\"" ""
+ '';
nativeBuildInputs = [ autoconf ];
- # The -fforce-mem flag has been removed in GCC 4.3.
- preConfigure = ''
- autoconf
- substituteInPlace configure --replace "-fforce-mem" ""
- substituteInPlace configure --replace "arch=\"-march=i486\"" ""
- '';
+ preConfigure = "autoconf";
meta = with stdenv.lib; {
homepage = https://sourceforge.net/projects/mad/;
diff --git a/pkgs/development/libraries/libmad/optimize.diff b/pkgs/development/libraries/libmad/optimize.diff
deleted file mode 100644
index 1418dc927073..000000000000
--- a/pkgs/development/libraries/libmad/optimize.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: libmad-0.15.1b/configure.ac
-===================================================================
---- libmad-0.15.1b.orig/configure.ac 2008-03-07 20:31:23.000000000 +0000
-+++ libmad-0.15.1b/configure.ac 2008-03-07 20:34:26.000000000 +0000
-@@ -124,71 +124,7 @@
-
- if test "$GCC" = yes
- then
-- if test -z "$arch"
-- then
-- case "$host" in
-- i386-*) ;;
-- i?86-*) arch="-march=i486" ;;
-- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;;
-- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;;
-- powerpc-*) ;;
-- mips*-agenda-*) arch="-mcpu=vr4100" ;;
-- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
-- esac
-- fi
--
-- case "$optimize" in
-- -O|"-O "*)
-- optimize="-O"
-- optimize="$optimize -fforce-mem"
-- optimize="$optimize -fforce-addr"
-- : #x optimize="$optimize -finline-functions"
-- : #- optimize="$optimize -fstrength-reduce"
-- optimize="$optimize -fthread-jumps"
-- optimize="$optimize -fcse-follow-jumps"
-- optimize="$optimize -fcse-skip-blocks"
-- : #x optimize="$optimize -frerun-cse-after-loop"
-- : #x optimize="$optimize -frerun-loop-opt"
-- : #x optimize="$optimize -fgcse"
-- optimize="$optimize -fexpensive-optimizations"
-- optimize="$optimize -fregmove"
-- : #* optimize="$optimize -fdelayed-branch"
-- : #x optimize="$optimize -fschedule-insns"
-- optimize="$optimize -fschedule-insns2"
-- : #? optimize="$optimize -ffunction-sections"
-- : #? optimize="$optimize -fcaller-saves"
-- : #> optimize="$optimize -funroll-loops"
-- : #> optimize="$optimize -funroll-all-loops"
-- : #x optimize="$optimize -fmove-all-movables"
-- : #x optimize="$optimize -freduce-all-givs"
-- : #? optimize="$optimize -fstrict-aliasing"
-- : #* optimize="$optimize -fstructure-noalias"
--
-- case "$host" in
-- arm*-*)
-- optimize="$optimize -fstrength-reduce"
-- ;;
-- mips*-*)
-- optimize="$optimize -fstrength-reduce"
-- optimize="$optimize -finline-functions"
-- ;;
-- i?86-*)
-- optimize="$optimize -fstrength-reduce"
-- ;;
-- powerpc-apple-*)
-- # this triggers an internal compiler error with gcc2
-- : #optimize="$optimize -fstrength-reduce"
--
-- # this is really only beneficial with gcc3
-- : #optimize="$optimize -finline-functions"
-- ;;
-- *)
-- # this sometimes provokes bugs in gcc 2.95.2
-- : #optimize="$optimize -fstrength-reduce"
-- ;;
-- esac
-- ;;
-- esac
-+ optimize="-O2"
- fi
-
- case "$host" in
diff --git a/pkgs/development/libraries/libmad/pkgconfig.patch b/pkgs/development/libraries/libmad/pkgconfig.patch
deleted file mode 100644
index 0ac88acb8415..000000000000
--- a/pkgs/development/libraries/libmad/pkgconfig.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -ruN libmad-0.15.1b.orig/Makefile.am libmad-0.15.1b/Makefile.am
---- libmad-0.15.1b.orig/Makefile.am 2004-02-17 02:02:03.000000000 +0000
-+++ libmad-0.15.1b/Makefile.am 2005-08-25 12:08:04.000000000 +0000
-@@ -33,9 +33,12 @@
- minimad_INCLUDES =
- minimad_LDADD = libmad.la
-
--EXTRA_DIST = mad.h.sed \
-+EXTRA_DIST = mad.h.sed mad.pc.in \
- CHANGES COPYRIGHT CREDITS README TODO VERSION
-
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA= mad.pc
-+
- exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \
- synth.h decoder.h
-
-diff -ruN libmad-0.15.1b.orig/Makefile.in libmad-0.15.1b/Makefile.in
---- libmad-0.15.1b.orig/Makefile.in 2004-02-17 02:33:23.000000000 +0000
-+++ libmad-0.15.1b/Makefile.in 2005-08-25 12:09:34.000000000 +0000
-@@ -14,6 +14,8 @@
-
- @SET_MAKE@
-
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = mad.pc
-
- SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) $(minimad_SOURCES)
-
-@@ -43,7 +45,7 @@
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(srcdir)/libmad.list.in \
- $(top_srcdir)/configure COPYING INSTALL TODO config.guess \
-- config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-+ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs mad.pc.in
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-@@ -53,7 +55,7 @@
- configure.lineno configure.status.lineno
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
--CONFIG_CLEAN_FILES = libmad.list
-+CONFIG_CLEAN_FILES = libmad.list mad.pc
- am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -218,7 +220,7 @@
- minimad_SOURCES = minimad.c
- minimad_INCLUDES =
- minimad_LDADD = libmad.la
--EXTRA_DIST = mad.h.sed \
-+EXTRA_DIST = mad.h.sed mad.pc.in \
- CHANGES COPYRIGHT CREDITS README TODO VERSION
-
- exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \
-@@ -298,6 +300,28 @@
- rm -f stamp-h1
- touch $@
-
-+mad.pc: $(top_builddir)/config.status mad.pc.in
-+ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+install-pkgconfigDATA: $(pkgconfig_DATA)
-+ @$(NORMAL_INSTALL)
-+ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
-+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
-+ if test -f $(srcdir)/$$p; then \
-+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
-+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \
-+ else if test -f $$p; then \
-+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
-+ $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \
-+ fi; fi; \
-+ done
-+
-+uninstall-pkgconfigDATA:
-+ @$(NORMAL_UNINSTALL)
-+ list='$(pkgconfig_DATA)'; for p in $$list; do \
-+ rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \
-+ done
-+
- distclean-hdr:
- -rm -f config.h stamp-h1
- libmad.list: $(top_builddir)/config.status $(srcdir)/libmad.list.in
-@@ -726,7 +750,7 @@
-
- info-am:
-
--install-data-am: install-includeHEADERS
-+install-data-am: install-includeHEADERS install-pkgconfigDATA
-
- install-exec-am: install-libLTLIBRARIES
-
-@@ -757,7 +781,7 @@
- ps-am:
-
- uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-- uninstall-libLTLIBRARIES
-+ uninstall-libLTLIBRARIES install-pkgconfigDATA
-
- uninstall-info: uninstall-info-recursive
-
-diff -ruN libmad-0.15.1b.orig/mad.pc.in libmad-0.15.1b/mad.pc.in
---- libmad-0.15.1b.orig/mad.pc.in 1970-01-01 00:00:00.000000000 +0000
-+++ libmad-0.15.1b/mad.pc.in 2005-08-25 12:08:04.000000000 +0000
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: MAD
-+Description: libmad - MPEG audio decoder library
-+Version: @VERSION@
-+Libs: -L${libdir} -lmad
-+Cflags:
diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix
index 2fa162b7e8b3..5cf12ea46ba0 100644
--- a/pkgs/development/libraries/libmaxminddb/default.nix
+++ b/pkgs/development/libraries/libmaxminddb/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libmaxminddb";
- version = "1.3.2";
+ version = "1.4.2";
src = fetchurl {
url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz";
- sha256 = "1w60yq26x3yr3abxk7fwqqaggw8dc98595jdliaa3kyqdfm83y76";
+ sha256 = "0mnimbaxnnarlw7g1rh8lpxsyf7xnmzwcczcc3lxw8xyf6ljln6x";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
index 2d026452e6f1..46255e276f5b 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libmbim";
- version = "1.20.0";
+ version = "1.20.2";
src = fetchurl {
url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz";
- sha256 = "0rm8j4zh9gnb3yi324cnxy91gdimc1vg5gv1kxc2m5lymb3wdxrc";
+ sha256 = "16q550sy84izi5ic3sbbhjnnka2fwhj8vvdrirpn9xspbsgbc3sm";
};
outputs = [ "out" "dev" "man" ];
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 866edcc437cf..c83406269354 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libmicrohttpd";
- version = "0.9.67";
+ version = "0.9.68";
src = fetchurl {
url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz";
- sha256 = "1584lv2miq7sp7yjd58lcbddh3yh5p8f9gbygn1d96fh4ckqa7vy";
+ sha256 = "0q8bc4hrxn6llml7w2vam6n833x8injs39wgdkhwkawr50m6wwf5";
};
outputs = [ "out" "dev" "devdoc" "info" ];
diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix
index aea7a5959fac..53b6af40b512 100644
--- a/pkgs/development/libraries/libminc/default.nix
+++ b/pkgs/development/libraries/libminc/default.nix
@@ -1,17 +1,16 @@
{ stdenv, fetchFromGitHub, cmake, zlib, netcdf, nifticlib, hdf5 }:
stdenv.mkDerivation rec {
- pname = "libminc";
- name = "${pname}-2018-01-17";
+ pname = "libminc";
+ version = "2.4.03";
owner = "BIC-MNI";
- # current master is significantly ahead of most recent release, so use Git version:
src = fetchFromGitHub {
inherit owner;
repo = pname;
- rev = "a9cbe1353eae9791b7d5b03af16e0f86922ce40b";
- sha256 = "0mn4n3ihzcr1jw2g1vy6c8p4lkc88jwljk04argmj7k4djrgpxpa";
+ rev = "release-${version}";
+ sha256 = "0kpmqs9df836ywsqj749qbsfavf5bnldblxrmnmxqq9pywc8yfrm";
};
postPatch = ''
@@ -27,7 +26,7 @@ stdenv.mkDerivation rec {
"-DLIBMINC_USE_SYSTEM_NIFTI=ON"
];
- doCheck = true;
+ doCheck = !stdenv.isDarwin;
checkPhase = ''
export LD_LIBRARY_PATH="$(pwd)" # see #22060
ctest -E 'ezminc_rw_test|minc_conversion' --output-on-failure
diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix
index bcd20c3b4076..26b81d4d4129 100644
--- a/pkgs/development/libraries/libmodule/default.nix
+++ b/pkgs/development/libraries/libmodule/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libmodule";
- version = "4.2.0";
+ version = "5.0.0";
src = fetchFromGitHub {
owner = "FedeDP";
repo = "libmodule";
rev = version;
- sha256 = "1qn54pysdm0q7v1gnisd43i5i4ylf8s8an77jk6jd8qimysv08mx";
+ sha256 = "1cf81sl33xmfn5g150iqcdrjn0lpjlgp53mganwi6x7jda2qk7r6";
};
nativeBuildInputs = [
diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix
index 4c886078aa8b..321204a0c4fd 100644
--- a/pkgs/development/libraries/libmpeg2/default.nix
+++ b/pkgs/development/libraries/libmpeg2/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
homepage = http://libmpeg2.sourceforge.net/;
description = "A free library for decoding mpeg-2 and mpeg-1 video streams";
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; unix;
};
}
diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index 91e0b5ef0722..c36633edfff3 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -7,7 +7,7 @@
, json_c
, libtool
, pkgconfig
-, python2
+, python3
}:
stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
intltool
libtool
pkgconfig
- python2
+ python3
];
buildInputs = [
@@ -43,6 +43,10 @@ stdenv.mkDerivation rec {
doCheck = true;
+ postPatch = ''
+ sed 's|python2|python|' -i autogen.sh
+ '';
+
preConfigure = "./autogen.sh";
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix
index bfff0c845225..613103db69f2 100644
--- a/pkgs/development/libraries/libndctl/default.nix
+++ b/pkgs/development/libraries/libndctl/default.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "libndctl";
- version = "66";
+ version = "67";
src = fetchFromGitHub {
owner = "pmem";
repo = "ndctl";
rev = "v${version}";
- sha256 = "1pq1ss6b1lnyfnvdfhpi0x70jjrnm567fcyvkgvhmp2ndzsn393f";
+ sha256 = "076jgw1g2aafqgnq705in0wnabysqk46dq5yxdv1qzgjmyhka39n";
};
outputs = [ "out" "lib" "man" "dev" ];
diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
index 815ed3a6bd40..a4f98eed4177 100644
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/pkgs/development/libraries/libnftnl/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libmnl }:
stdenv.mkDerivation rec {
- version = "1.1.4";
+ version = "1.1.5";
pname = "libnftnl";
src = fetchurl {
url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2";
- sha256 = "087dfc2n4saf2k68hyi4byvgz5grwpw5kfjvmkpn3wmd8y1riiy8";
+ sha256 = "1wqlxf76bkqf3qhka9sw32qhb2ni20q1k6rn3iril2kw482lvpk6";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
index d9b2df6148aa..ffecfcb61d09 100644
--- a/pkgs/development/libraries/libngspice/default.nix
+++ b/pkgs/development/libraries/libngspice/default.nix
@@ -4,11 +4,11 @@
# the ngspice derivation.
stdenv.mkDerivation rec {
pname = "libngspice";
- version = "30";
+ version = "31";
src = fetchurl {
url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
- sha256 = "15v0jdfy2a2zxp8dmy04fdp7w7a4vwvffcwa688r81b86wphxzh8";
+ sha256 = "10n2lnfrpsv4vyrirkphr4jwjjhy7i617g6za78dwirfjq63npw4";
};
nativeBuildInputs = [ flex bison ];
diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index f4ce1f6eea03..90bdb06bb7f6 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@@ -1,4 +1,19 @@
-{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, python3, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp-igd, gst_all_1, gnutls }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, meson
+, ninja
+, pkgconfig
+, python3
+, gobject-introspection
+, gtk-doc
+, docbook_xsl
+, docbook_xml_dtd_412
+, glib
+, gupnp-igd
+, gst_all_1
+, gnutls
+}:
stdenv.mkDerivation rec {
name = "libnice-0.1.16";
@@ -21,27 +36,40 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [
- meson ninja pkgconfig python3 gobject-introspection
+ meson
+ ninja
+ pkgconfig
+ python3
+ gobject-introspection
+
+ # documentation
gtk-doc
- # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install`
- docbook_xsl docbook_xml_dtd_412
+ docbook_xsl
+ docbook_xml_dtd_412
+ ];
+
+ buildInputs = [
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+ gnutls
+ gupnp-igd
+ ];
+
+ propagatedBuildInputs = [
+ glib
];
- buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ];
- propagatedBuildInputs = [ glib gupnp-igd ];
mesonFlags = [
- # Enables all features, so that we know when new dependencies are necessary.
- "-Dauto_features=enabled"
"-Dgtk_doc=enabled" # Disabled by default as of libnice-0.1.15
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users
];
- # TODO; see #53293 etc.
- #doCheck = true;
+ # Tests are flaky
+ # see https://github.com/NixOS/nixpkgs/pull/53293#issuecomment-453739295
+ doCheck = false;
meta = with stdenv.lib; {
- homepage = https://nice.freedesktop.org/wiki/;
- description = "The GLib ICE implementation";
+ description = "GLib ICE implementation";
longDescription = ''
Libnice is an implementation of the IETF's Interactice Connectivity
Establishment (ICE) standard (RFC 5245) and the Session Traversal
@@ -49,6 +77,7 @@ stdenv.mkDerivation rec {
It provides a GLib-based library, libnice and a Glib-free library,
libstun as well as GStreamer elements.'';
+ homepage = "https://nice.freedesktop.org/wiki/";
platforms = platforms.linux;
license = with licenses; [ lgpl21 mpl11 ];
};
diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
index d4ac3ae8dc9e..59039aadb895 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -1,5 +1,14 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, fetchpatch
-, glib, gdk-pixbuf, gobject-introspection, gnome3 }:
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, fetchpatch
+, glib
+, gdk-pixbuf
+, gobject-introspection
+, gnome3
+}:
stdenv.mkDerivation rec {
pname = "libnotify";
@@ -26,8 +35,17 @@ stdenv.mkDerivation rec {
"-Dgtk_doc=false"
];
- nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
- buildInputs = [ glib gdk-pixbuf ];
+ nativeBuildInputs = [
+ gobject-introspection
+ meson
+ ninja
+ pkgconfig
+ ];
+
+ propagatedBuildInputs = [
+ gdk-pixbuf
+ glib
+ ];
passthru = {
updateScript = gnome3.updateScript {
@@ -40,6 +58,7 @@ stdenv.mkDerivation rec {
homepage = https://developer.gnome.org/notification-spec/;
description = "A library that sends desktop notifications to a notification daemon";
platforms = platforms.unix;
+ maintainers = gnome3.maintainers;
license = licenses.lgpl21;
};
}
diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix
index 6723c08f0822..76276f0ce0fc 100644
--- a/pkgs/development/libraries/libofx/default.nix
+++ b/pkgs/development/libraries/libofx/default.nix
@@ -1,23 +1,27 @@
-{ stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }:
-
-stdenv.mkDerivation rec {
- name = "libofx-0.9.14";
+{ stdenv, fetchFromGitHub, opensp, pkgconfig, libxml2, curl
+, autoconf, automake, libtool, gengetopt, libiconv }:
- src = fetchurl {
- url = "mirror://sourceforge/libofx/${name}.tar.gz";
- sha256 = "02i9zxkp66yxjpjay5dscfh53bz5vxy03zcxncpw09svl6zmf9xq";
+stdenv.mkDerivation rec {
+ pname = "libofx";
+ version = "0.9.15";
+
+ src = fetchFromGitHub {
+ owner = "LibOFX";
+ repo = pname;
+ rev = version;
+ sha256 = "1jx56ma351p8af8dvavygjwf6ipa7qbgq7bpdsymwj27apdnixfy";
};
+ preConfigure = "./autogen.sh";
configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ];
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ opensp libxml2 curl ];
+ nativeBuildInputs = [ pkgconfig libtool autoconf automake gengetopt ];
+ buildInputs = [ opensp libxml2 curl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
meta = {
description = "Opensource implementation of the Open Financial eXchange specification";
homepage = http://libofx.sourceforge.net/;
license = "LGPL";
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
maintainers = [ ];
};
}
-
diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix
index 8005fb9dbbe1..e6abe620aaf0 100644
--- a/pkgs/development/libraries/libosmium/default.nix
+++ b/pkgs/development/libraries/libosmium/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libosmium";
- version = "2.15.3";
+ version = "2.15.4";
src = fetchFromGitHub {
owner = "osmcode";
repo = "libosmium";
rev = "v${version}";
- sha256 = "14xpzac93f8pqjkz1r0ckqv8h691z5p6pd06wn8ib1aryzc7ps97";
+ sha256 = "0mlcvqrhp40bzj5r5j9nfc5vbis8hmzcq9xi8jylkciyydaynhz4";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix
index 8c0094a3152b..4f1a5f8a1798 100644
--- a/pkgs/development/libraries/libowfat/default.nix
+++ b/pkgs/development/libraries/libowfat/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
+ description = "A GPL reimplementation of libdjb";
homepage = https://www.fefe.de/libowfat/;
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix
index eaa11d1a864b..cee6d3f1845b 100644
--- a/pkgs/development/libraries/libplacebo/default.nix
+++ b/pkgs/development/libraries/libplacebo/default.nix
@@ -12,16 +12,18 @@
stdenv.mkDerivation rec {
pname = "libplacebo";
- version = "1.21.0";
+ version = "1.29.1";
src = fetchFromGitLab {
domain = "code.videolan.org";
owner = "videolan";
repo = pname;
rev = "v${version}";
- sha256 = "099qwla0yl76qw16lzdx33svyhx84p5gsa50ksy4828b18fy3bgb";
+ sha256 = "1ly5bwy0pwgvqigpaak8hnig5hksjwf0pzvj3mdv3j2f6f7ya2zz";
};
+ postPatch = "substituteInPlace meson.build --replace 1.29.0 1.29.1";
+
nativeBuildInputs = [
meson
ninja
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 6f59c94a56b5..14ae1156087b 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html;
license = licenses.libpng;
- maintainers = [ maintainers.fuuzetsu ];
+ maintainers = [ ];
branch = "1.2";
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 849f7d29ef6d..95ef62013464 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -34,6 +34,6 @@ in stdenv.mkDerivation rec {
homepage = http://www.libpng.org/pub/png/libpng.html;
license = licenses.libpng2;
platforms = platforms.all;
- maintainers = [ maintainers.vcunat maintainers.fuuzetsu ];
+ maintainers = [ maintainers.vcunat ];
};
}
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index 15aa7c9e22d1..d2012760dcf6 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -1,5 +1,16 @@
-{ stdenv, fetchurl, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, gtk-doc, lzip
-, libidn2, libunistring, libxslt, pkgconfig, python3, valgrind
+{ stdenv
+, fetchurl
+, autoreconfHook
+, docbook_xsl
+, docbook_xml_dtd_43
+, gtk-doc
+, lzip
+, libidn2
+, libunistring
+, libxslt
+, pkgconfig
+, python3
+, valgrind
, publicsuffix-list
}:
@@ -12,9 +23,26 @@ stdenv.mkDerivation rec {
sha256 = "183hadbira0d2zvv8272lspy31dgm9x26z35c61s5axcd5wd9g9i";
};
- nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_43 gtk-doc lzip pkgconfig python3 valgrind ];
- buildInputs = [ libidn2 libunistring libxslt ];
- propagatedBuildInputs = [ publicsuffix-list ];
+ nativeBuildInputs = [
+ autoreconfHook
+ docbook_xsl
+ docbook_xml_dtd_43
+ gtk-doc
+ lzip
+ pkgconfig
+ python3
+ valgrind
+ ];
+
+ buildInputs = [
+ libidn2
+ libunistring
+ libxslt
+ ];
+
+ propagatedBuildInputs = [
+ publicsuffix-list
+ ];
postPatch = ''
patchShebangs src/psl-make-dafsa
@@ -25,7 +53,7 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
-# "--enable-gtk-doc"
+ # "--enable-gtk-doc"
"--enable-man"
"--enable-valgrind-tests"
"--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
@@ -35,7 +63,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- doCheck = true;
+ doCheck = !stdenv.isDarwin;
meta = with stdenv.lib; {
description = "C library for the Publix Suffix List";
diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index df3595adc012..b0d5513ca0ff 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "libpwquality";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "libpwquality";
repo = "libpwquality";
rev = "${pname}-${version}";
- sha256 = "150gk1d0gq9cig3ylyns7fgihgm3qb1basncahgyh1kzxplrdqm7";
+ sha256 = "0n4pjhm7wfivk0wizggaxq4y4mcxic876wcarjabkp5z9k14y36h";
};
nativeBuildInputs = [ autoreconfHook perl ];
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 4ba976a9fb89..d369eebd88fd 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "libqalculate";
- version = "3.5.0";
+ version = "3.6.0";
src = fetchFromGitHub {
owner = "qalculate";
repo = "libqalculate";
rev = "v${version}";
- sha256 = "0jfi9h8wsj7h5z3dxdijq6ddxiygik9j86pjxl3hza4v2ilsbwy3";
+ sha256 = "0qfdgxb46c18cp43z67n986xhj6x0sa95hryq42spf1p5ymbylqy";
};
outputs = [ "out" "dev" "doc" ];
diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix
new file mode 100644
index 000000000000..ec31a29d0538
--- /dev/null
+++ b/pkgs/development/libraries/libraspberrypi/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, cmake, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "libraspberrypi";
+ version = "2019-10-22";
+ src = fetchFromGitHub {
+ owner = "raspberrypi";
+ repo = "userland";
+ rev = "5070cb7fc150fc98f1ed64a7739c3356970d9f76";
+ sha256 = "08yfzwn9s7lhrblcsxyag9p5lj5vk3n66b1pv3f7r3hah7qcggyq";
+ };
+
+ cmakeFlags = if (stdenv.targetPlatform.system == "aarch64-linux")
+ then "-DARM64=ON"
+ else "-DARM64=OFF";
+ preConfigure = ''cmakeFlags="$cmakeFlags -DVMCS_INSTALL_PREFIX=$out"'';
+ nativeBuildInputs = [ cmake ];
+ meta = with stdenv.lib; {
+ description = "Userland libraries for interfacing with Raspberry Pi hardware";
+ homepage = https://github.com/raspberrypi/userland;
+ license = licenses.bsd3;
+ platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
+ maintainers = with maintainers; [ tkerber ];
+ };
+}
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 62fa8c1a675b..00288e359dfb 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, lcms2, jasper, pkgconfig }:
+{ stdenv, fetchurl, lcms2, pkgconfig
+, jasper ? null, withJpeg2k ? false
+# disable JPEG2000 support by default as jasper has many CVE
+}:
stdenv.mkDerivation rec {
pname = "libraw";
@@ -11,7 +14,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" "doc" ];
- buildInputs = [ jasper ];
+ buildInputs = stdenv.lib.optionals withJpeg2k [ jasper ];
propagatedBuildInputs = [ lcms2 ];
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index e365ec7a01ac..433597cde6f5 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
;
meta = {
- homepage = http://www.creytiv.com/re.html;
+ description = "A library for real-time communications with async IO support and a complete SIP stack";
+ homepage = "http://www.creytiv.com/re.html";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [raskin];
license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 468bcfb0a18f..91c093c991ac 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchFromGitHub, cmake, libusb, ninja, pkgconfig}:
+{ stdenv, fetchFromGitHub, cmake, libusb1, ninja, pkgconfig }:
stdenv.mkDerivation rec {
pname = "librealsense";
- version = "2.25.0";
+ version = "2.29.0";
+
+ outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "IntelRealSense";
- repo = "librealsense";
+ repo = pname;
rev = "v${version}";
- sha256 = "029qps0bbck0m2xj0mb5g3pgkk7a1zq8wcilfkvpx72sn7039xvw";
+ sha256 = "0wrg1c4fcd5ky96hmnczg9izfgd0yxls8ghxxzrdvgdlg269f443";
};
buildInputs = [
- libusb
+ libusb1
];
nativeBuildInputs = [
@@ -25,9 +27,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)";
- homepage = https://github.com/IntelRealSense/librealsense;
+ homepage = "https://github.com/IntelRealSense/librealsense";
license = licenses.asl20;
maintainers = with maintainers; [ brian-dawn ];
- platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"];
+ platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
};
}
diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index aeda663342e4..012ac2a46a74 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}"
;
meta = {
- homepage = http://www.creytiv.com/rem.html;
+ description = " A library for real-time audio and video processing";
+ homepage = "http://www.creytiv.com/rem.html";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [raskin];
license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index e54098b44598..11c7f3fed84e 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -4,14 +4,14 @@
let
pname = "librsvg";
- version = "2.46.1";
+ version = "2.46.4";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "0hvnqrgfi8c2xh94gxs6xwwg1m2z3l0lblqs2anlx8k3g9ag589d";
+ sha256 = "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl";
};
outputs = [ "out" "dev" "installedTests" ];
diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix
index b2a799674771..9bf246f556d3 100644
--- a/pkgs/development/libraries/libsearpc/default.nix
+++ b/pkgs/development/libraries/libsearpc/default.nix
@@ -1,14 +1,14 @@
{stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, libtool, python2Packages, glib, jansson}:
stdenv.mkDerivation rec {
- version = "3.1.0";
+ version = "3.2.0";
pname = "libsearpc";
src = fetchFromGitHub {
owner = "haiwen";
repo = "libsearpc";
rev = "v${version}";
- sha256 = "1zf8xxsl95wdx0372kl8s153hd8q3lhwwvwr2k96ia8scbn2ylkp";
+ sha256 = "18i5zvrp6dv6vygxx5nc93mai2p2x786n5lnf5avrin6xiz2j6hd";
};
patches = [ ./libsearpc.pc.patch ];
diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 8c9c6ac107ce..08c276c4d558 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libseccomp";
- version = "2.4.1";
+ version = "2.4.2";
src = fetchurl {
url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
- sha256 = "1s06h2cgk0xxwmhwj72z33bllafc1xqnxzk2yyra2rmg959778qw";
+ sha256 = "0nsq81acrbkdr8zairxbwa33bj2a6126npp76b4srjl472sjfkxm";
};
outputs = [ "out" "lib" "dev" "man" ];
diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 0a3c110bbbd8..ca2449adefd5 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, glib, pkgconfig, gettext, libxslt, python3, docbook_xsl, docbook_xml_dtd_42
-, libgcrypt, gobject-introspection, vala, gtk-doc, gnome3, libintl, dbus, xvfb_run }:
+, libgcrypt, gobject-introspection, vala, gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }:
stdenv.mkDerivation rec {
pname = "libsecret";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- installCheckInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gnome3.gjs ];
+ installCheckInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gjs ];
# needs to run after install because typelibs point to absolute paths
doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib
diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix
deleted file mode 100644
index cb22d9f97bc7..000000000000
--- a/pkgs/development/libraries/libsexy/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig
-, glib, gtk2, libxml2, pango
-}:
-
-stdenv.mkDerivation {
- name = "libsexy-0.1.11";
-
- src = fetchurl {
- url = http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.11.tar.gz;
- sha256 = "8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e";
- };
-
- nativeBuildInputs = [ pkgconfig ];
-
- buildInputs = [ glib gtk2 libxml2 pango ];
-
- meta = with stdenv.lib; {
- description = "A collection of GTK widgets";
- homepage = https://blog.chipx86.com/tag/libsexy/;
- license = licenses.lgpl21;
- maintainers = with maintainers; [ ];
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index 84f6656d0b8b..c3fe1ad619af 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec {
- version = "0.7.7";
+ version = "0.7.9";
pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
- sha256 = "0f6r5j5d4fbzx9ihbbwrqylayw90qac8kapkhmfcvsh7f8whr623";
+ sha256 = "1ijb4nywc3hx142194d85x7db0j5g2n0i750665fal30qrw2x43y";
};
cmakeFlags = [
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A free package dependency solver";
+ homepage = "https://github.com/openSUSE/libsolv";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ copumpkin ];
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 7c4772c9cf1a..2d2f2da6a399 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "libsoup";
- version = "2.68.2";
+ version = "2.68.3";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0crr9qprmacr626fx83cx81ggk85zsgxr4mn577kpzj6m40k1bai";
+ sha256 = "1yxs0ax4rq3g0lgkbv7mz497rqj16iyyizddyc13gzxh6n7b0jsk";
};
postPatch = ''
diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix
new file mode 100644
index 000000000000..c09a45abf594
--- /dev/null
+++ b/pkgs/development/libraries/libspectrum/default.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchurl, perl, pkgconfig, audiofile, bzip2, glib, libgcrypt, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "libspectrum-1.4.4";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/fuse-emulator/${name}.tar.gz";
+ sha256 = "1cc0jx617sym6qj1f9fm115q44cq5azsxplqq2cgrg0pmlmjpyzx";
+ };
+
+ nativeBuildInputs = [ perl pkgconfig ];
+
+ buildInputs = [ audiofile bzip2 glib libgcrypt zlib ];
+
+ enableParallelBuilding = true;
+
+ meta = with lib; {
+ homepage = http://fuse-emulator.sourceforge.net/libspectrum.php;
+ description = "ZX Spectrum input and output support library";
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ orivej ];
+ };
+}
diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix
index 6d95d81e5d9c..5a7fb3395ebe 100644
--- a/pkgs/development/libraries/libtcod/default.nix
+++ b/pkgs/development/libraries/libtcod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU_combined, upx, zlib }:
+{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU, libGL, upx, zlib }:
stdenv.mkDerivation {
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
cmakeFlags="-DLIBTCOD_SAMPLES=OFF";
- buildInputs = [ cmake SDL libGLU_combined upx zlib ];
+ buildInputs = [ cmake SDL libGLU libGL upx zlib ];
meta = {
description = "API for roguelike games";
diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix
index a30d32354112..989d26b64e1b 100644
--- a/pkgs/development/libraries/libtermkey/default.nix
+++ b/pkgs/development/libraries/libtermkey/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, libtool, pkgconfig, ncurses }:
+{ stdenv, lib, fetchzip, libtool, pkgconfig, ncurses, unibilium }:
stdenv.mkDerivation rec {
pname = "libtermkey";
@@ -13,11 +13,12 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ]
++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libtool ncurses ];
+ nativeBuildInputs = [ libtool pkgconfig ];
+ buildInputs = [ ncurses unibilium ];
meta = with lib; {
description = "Terminal keypress reading library";
+ homepage = http://www.leonerd.org.uk/code/libtermkey;
license = licenses.mit;
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/libtiff/CVE-2019-14973.patch b/pkgs/development/libraries/libtiff/CVE-2019-14973.patch
deleted file mode 100644
index 1dc75246902e..000000000000
--- a/pkgs/development/libraries/libtiff/CVE-2019-14973.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-diff -ru tiff-4.0.10-orig/libtiff/tif_aux.c tiff-4.0.10/libtiff/tif_aux.c
---- tiff-4.0.10-orig/libtiff/tif_aux.c 2017-12-02 16:21:47.305709555 +0100
-+++ tiff-4.0.10/libtiff/tif_aux.c 2019-10-02 22:35:17.392184463 +0200
-@@ -57,18 +57,57 @@
- return bytes;
- }
-
-+tmsize_t
-+_TIFFMultiplySSize(TIFF* tif, tmsize_t first, tmsize_t second, const char* where)
-+{
-+ if( first <= 0 || second <= 0 )
-+ {
-+ if( tif != NULL && where != NULL )
-+ {
-+ TIFFErrorExt(tif->tif_clientdata, where,
-+ "Invalid argument to _TIFFMultiplySSize() in %s", where);
-+ }
-+ return 0;
-+ }
-+
-+ if( first > TIFF_TMSIZE_T_MAX / second )
-+ {
-+ if( tif != NULL && where != NULL )
-+ {
-+ TIFFErrorExt(tif->tif_clientdata, where,
-+ "Integer overflow in %s", where);
-+ }
-+ return 0;
-+ }
-+ return first * second;
-+}
-+
-+tmsize_t _TIFFCastUInt64ToSSize(TIFF* tif, uint64 val, const char* module)
-+{
-+ if( val > (uint64)TIFF_TMSIZE_T_MAX )
-+ {
-+ if( tif != NULL && module != NULL )
-+ {
-+ TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-+ }
-+ return 0;
-+ }
-+ return (tmsize_t)val;
-+}
-+
- void*
- _TIFFCheckRealloc(TIFF* tif, void* buffer,
- tmsize_t nmemb, tmsize_t elem_size, const char* what)
- {
- void* cp = NULL;
-- tmsize_t bytes = nmemb * elem_size;
--
-+ tmsize_t count = _TIFFMultiplySSize(tif, nmemb, elem_size, NULL);
- /*
-- * XXX: Check for integer overflow.
-+ * Check for integer overflow.
- */
-- if (nmemb && elem_size && bytes / elem_size == nmemb)
-- cp = _TIFFrealloc(buffer, bytes);
-+ if (count != 0)
-+ {
-+ cp = _TIFFrealloc(buffer, count);
-+ }
-
- if (cp == NULL) {
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
-diff -ru tiff-4.0.10-orig/libtiff/tiffiop.h tiff-4.0.10/libtiff/tiffiop.h
---- tiff-4.0.10-orig/libtiff/tiffiop.h 2018-11-03 15:28:37.748910968 +0100
-+++ tiff-4.0.10/libtiff/tiffiop.h 2019-10-02 22:35:17.396184535 +0200
-@@ -77,6 +77,9 @@
- #define FALSE 0
- #endif
-
-+#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
-+#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
-+
- typedef struct client_info {
- struct client_info *next;
- void *data;
-@@ -258,7 +261,7 @@
- #define TIFFhowmany8_64(x) (((x)&0x07)?((uint64)(x)>>3)+1:(uint64)(x)>>3)
- #define TIFFroundup_64(x, y) (TIFFhowmany_64(x,y)*(y))
-
--/* Safe multiply which returns zero if there is an integer overflow */
-+/* Safe multiply which returns zero if there is an *unsigned* integer overflow. This macro is not safe for *signed* integer types */
- #define TIFFSafeMultiply(t,v,m) ((((t)(m) != (t)0) && (((t)(((v)*(m))/(m))) == (t)(v))) ? (t)((v)*(m)) : (t)0)
-
- #define TIFFmax(A,B) ((A)>(B)?(A):(B))
-@@ -368,6 +371,8 @@
-
- extern uint32 _TIFFMultiply32(TIFF*, uint32, uint32, const char*);
- extern uint64 _TIFFMultiply64(TIFF*, uint64, uint64, const char*);
-+extern tmsize_t _TIFFMultiplySSize(TIFF*, tmsize_t, tmsize_t, const char*);
-+extern tmsize_t _TIFFCastUInt64ToSSize(TIFF*, uint64, const char*);
- extern void* _TIFFCheckMalloc(TIFF*, tmsize_t, tmsize_t, const char*);
- extern void* _TIFFCheckRealloc(TIFF*, void*, tmsize_t, tmsize_t, const char*);
-
-diff -ru tiff-4.0.10-orig/libtiff/tif_getimage.c tiff-4.0.10/libtiff/tif_getimage.c
---- tiff-4.0.10-orig/libtiff/tif_getimage.c 2017-12-02 16:21:47.654716127 +0100
-+++ tiff-4.0.10/libtiff/tif_getimage.c 2019-10-02 22:35:17.393184481 +0200
-@@ -755,9 +755,8 @@
- uint32 leftmost_tw;
-
- tilesize = TIFFTileSize(tif);
-- bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,tilesize);
-+ bufsize = _TIFFMultiplySSize(tif, alpha?4:3,tilesize, "gtTileSeparate");
- if (bufsize == 0) {
-- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtTileSeparate");
- return (0);
- }
-
-@@ -1019,9 +1018,8 @@
- uint16 colorchannels;
-
- stripsize = TIFFStripSize(tif);
-- bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,stripsize);
-+ bufsize = _TIFFMultiplySSize(tif,alpha?4:3,stripsize, "gtStripSeparate");
- if (bufsize == 0) {
-- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtStripSeparate");
- return (0);
- }
-
-diff -ru tiff-4.0.10-orig/libtiff/tif_luv.c tiff-4.0.10/libtiff/tif_luv.c
---- tiff-4.0.10-orig/libtiff/tif_luv.c 2018-05-05 15:50:35.884596907 +0200
-+++ tiff-4.0.10/libtiff/tif_luv.c 2019-10-02 22:35:17.393184481 +0200
-@@ -1264,16 +1264,10 @@
- return (SGILOGDATAFMT_UNKNOWN);
- }
-
--
--#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
--#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
--
- static tmsize_t
- multiply_ms(tmsize_t m1, tmsize_t m2)
- {
-- if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
-- return 0;
-- return m1 * m2;
-+ return _TIFFMultiplySSize(NULL, m1, m2, NULL);
- }
-
- static int
-diff -ru tiff-4.0.10-orig/libtiff/tif_pixarlog.c tiff-4.0.10/libtiff/tif_pixarlog.c
---- tiff-4.0.10-orig/libtiff/tif_pixarlog.c 2017-12-02 16:21:47.841162432 +0100
-+++ tiff-4.0.10/libtiff/tif_pixarlog.c 2019-10-02 22:36:01.223970118 +0200
-@@ -634,15 +634,10 @@
- return guess;
- }
-
--#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
--#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
--
- static tmsize_t
- multiply_ms(tmsize_t m1, tmsize_t m2)
- {
-- if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
-- return 0;
-- return m1 * m2;
-+ return _TIFFMultiplySSize(NULL, m1, m2, NULL);
- }
-
- static tmsize_t
-diff -ru tiff-4.0.10-orig/libtiff/tif_read.c tiff-4.0.10/libtiff/tif_read.c
---- tiff-4.0.10-orig/libtiff/tif_read.c 2018-10-14 21:15:27.551093695 +0200
-+++ tiff-4.0.10/libtiff/tif_read.c 2019-10-02 22:41:09.387290927 +0200
-@@ -29,9 +29,6 @@
- #include "tiffiop.h"
- #include
-
--#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
--#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
--
- int TIFFFillStrip(TIFF* tif, uint32 strip);
- int TIFFFillTile(TIFF* tif, uint32 tile);
- static int TIFFStartStrip(TIFF* tif, uint32 strip);
-@@ -49,6 +46,8 @@
- #define THRESHOLD_MULTIPLIER 10
- #define MAX_THRESHOLD (THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * INITIAL_THRESHOLD)
-
-+#define TIFF_INT64_MAX ((((int64)0x7FFFFFFF) << 32) | 0xFFFFFFFF)
-+
- /* Read 'size' bytes in tif_rawdata buffer starting at offset 'rawdata_offset'
- * Returns 1 in case of success, 0 otherwise. */
- static int TIFFReadAndRealloc( TIFF* tif, tmsize_t size,
-@@ -734,23 +733,8 @@
- return ((tmsize_t)(-1));
- }
- bytecount = td->td_stripbytecount[strip];
-- if ((int64)bytecount <= 0) {
--#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
-- TIFFErrorExt(tif->tif_clientdata, module,
-- "%I64u: Invalid strip byte count, strip %lu",
-- (unsigned __int64) bytecount,
-- (unsigned long) strip);
--#else
-- TIFFErrorExt(tif->tif_clientdata, module,
-- "%llu: Invalid strip byte count, strip %lu",
-- (unsigned long long) bytecount,
-- (unsigned long) strip);
--#endif
-- return ((tmsize_t)(-1));
-- }
-- bytecountm = (tmsize_t)bytecount;
-- if ((uint64)bytecountm!=bytecount) {
-- TIFFErrorExt(tif->tif_clientdata, module, "Integer overflow");
-+ bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount, module);
-+ if (bytecountm == 0) {
- return ((tmsize_t)(-1));
- }
- if (size != (tmsize_t)(-1) && size < bytecountm)
-@@ -774,7 +758,7 @@
- if ((tif->tif_flags&TIFF_NOREADRAW)==0)
- {
- uint64 bytecount = td->td_stripbytecount[strip];
-- if ((int64)bytecount <= 0) {
-+ if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) {
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- TIFFErrorExt(tif->tif_clientdata, module,
- "Invalid strip byte count %I64u, strip %lu",
-@@ -801,7 +785,7 @@
- (bytecount - 4096) / 10 > (uint64)stripsize )
- {
- uint64 newbytecount = (uint64)stripsize * 10 + 4096;
-- if( (int64)newbytecount >= 0 )
-+ if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX )
- {
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- TIFFWarningExt(tif->tif_clientdata, module,
-@@ -1196,10 +1180,8 @@
- bytecount64 = td->td_stripbytecount[tile];
- if (size != (tmsize_t)(-1) && (uint64)size < bytecount64)
- bytecount64 = (uint64)size;
-- bytecountm = (tmsize_t)bytecount64;
-- if ((uint64)bytecountm!=bytecount64)
-- {
-- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-+ bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount64, module);
-+ if( bytecountm == 0 ) {
- return ((tmsize_t)(-1));
- }
- return (TIFFReadRawTile1(tif, tile, buf, bytecountm, module));
-@@ -1221,7 +1203,7 @@
- if ((tif->tif_flags&TIFF_NOREADRAW)==0)
- {
- uint64 bytecount = td->td_stripbytecount[tile];
-- if ((int64)bytecount <= 0) {
-+ if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) {
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- TIFFErrorExt(tif->tif_clientdata, module,
- "%I64u: Invalid tile byte count, tile %lu",
-@@ -1248,7 +1230,7 @@
- (bytecount - 4096) / 10 > (uint64)stripsize )
- {
- uint64 newbytecount = (uint64)stripsize * 10 + 4096;
-- if( (int64)newbytecount >= 0 )
-+ if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX )
- {
- #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
- TIFFWarningExt(tif->tif_clientdata, module,
-diff -ru tiff-4.0.10-orig/libtiff/tif_strip.c tiff-4.0.10/libtiff/tif_strip.c
---- tiff-4.0.10-orig/libtiff/tif_strip.c 2017-12-02 16:21:47.947867167 +0100
-+++ tiff-4.0.10/libtiff/tif_strip.c 2019-10-02 22:35:17.395184517 +0200
-@@ -129,15 +129,8 @@
- {
- static const char module[] = "TIFFVStripSize";
- uint64 m;
-- tmsize_t n;
- m=TIFFVStripSize64(tif,nrows);
-- n=(tmsize_t)m;
-- if ((uint64)n!=m)
-- {
-- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-- n=0;
-- }
-- return(n);
-+ return _TIFFCastUInt64ToSSize(tif, m, module);
- }
-
- /*
-@@ -211,15 +204,8 @@
- {
- static const char module[] = "TIFFStripSize";
- uint64 m;
-- tmsize_t n;
- m=TIFFStripSize64(tif);
-- n=(tmsize_t)m;
-- if ((uint64)n!=m)
-- {
-- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-- n=0;
-- }
-- return(n);
-+ return _TIFFCastUInt64ToSSize(tif, m, module);
- }
-
- /*
-@@ -330,14 +316,8 @@
- {
- static const char module[] = "TIFFScanlineSize";
- uint64 m;
-- tmsize_t n;
- m=TIFFScanlineSize64(tif);
-- n=(tmsize_t)m;
-- if ((uint64)n!=m) {
-- TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow");
-- n=0;
-- }
-- return(n);
-+ return _TIFFCastUInt64ToSSize(tif, m, module);
- }
-
- /*
-@@ -366,15 +346,8 @@
- {
- static const char module[] = "TIFFRasterScanlineSize";
- uint64 m;
-- tmsize_t n;
- m=TIFFRasterScanlineSize64(tif);
-- n=(tmsize_t)m;
-- if ((uint64)n!=m)
-- {
-- TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow");
-- n=0;
-- }
-- return(n);
-+ return _TIFFCastUInt64ToSSize(tif, m, module);
- }
-
- /* vim: set ts=8 sts=8 sw=8 noet: */
-diff -ru tiff-4.0.10-orig/libtiff/tif_tile.c tiff-4.0.10/libtiff/tif_tile.c
---- tiff-4.0.10-orig/libtiff/tif_tile.c 2017-12-02 16:21:47.993972977 +0100
-+++ tiff-4.0.10/libtiff/tif_tile.c 2019-10-02 22:35:17.395184517 +0200
-@@ -181,15 +181,8 @@
- {
- static const char module[] = "TIFFTileRowSize";
- uint64 m;
-- tmsize_t n;
- m=TIFFTileRowSize64(tif);
-- n=(tmsize_t)m;
-- if ((uint64)n!=m)
-- {
-- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-- n=0;
-- }
-- return(n);
-+ return _TIFFCastUInt64ToSSize(tif, m, module);
- }
-
- /*
-@@ -248,15 +241,8 @@
- {
- static const char module[] = "TIFFVTileSize";
- uint64 m;
-- tmsize_t n;
- m=TIFFVTileSize64(tif,nrows);
-- n=(tmsize_t)m;
-- if ((uint64)n!=m)
-- {
-- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-- n=0;
-- }
-- return(n);
-+ return _TIFFCastUInt64ToSSize(tif, m, module);
- }
-
- /*
-@@ -272,15 +258,8 @@
- {
- static const char module[] = "TIFFTileSize";
- uint64 m;
-- tmsize_t n;
- m=TIFFTileSize64(tif);
-- n=(tmsize_t)m;
-- if ((uint64)n!=m)
-- {
-- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
-- n=0;
-- }
-- return(n);
-+ return _TIFFCastUInt64ToSSize(tif, m, module);
- }
-
- /*
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index c35923071b0b..795ed439093b 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -9,24 +9,14 @@
}:
stdenv.mkDerivation rec {
- version = "4.0.10";
+ version = "4.1.0";
pname = "libtiff";
src = fetchurl {
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
- sha256 = "1r4np635gr6zlc0bic38dzvxia6iqzcrary4n1ylarzpr8fd2lic";
+ sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax";
};
- patches = [
- (fetchurl {
- url = "https://gitlab.com/libtiff/libtiff/commit/0c74a9f49b8d7a36b17b54a7428b3526d20f88a8.patch";
- name = "CVE-2019-6128.patch";
- sha256 = "03yvsfq6dxjd3v8ypfwz6cpz2iymqwcbawqqlmkh40dayi7fgizr";
- })
- # Manual backport of https://gitlab.com/libtiff/libtiff/commit/1b5e3b6a23827c33acf19ad50ce5ce78f12b3773.patch
- ./CVE-2019-14973.patch
- ];
-
outputs = [ "bin" "dev" "out" "man" "doc" ];
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix
index 8ce82bcf07c7..0fde422b9aab 100644
--- a/pkgs/development/libraries/libtommath/default.nix
+++ b/pkgs/development/libraries/libtommath/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libtommath";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchurl {
url = "https://github.com/libtom/libtommath/releases/download/v${version}/ltm-${version}.tar.xz";
- sha256 = "1bbyagqzfdbg37k1n08nsqzdf44z8zsnjjinqbsyj7rxg246qilh";
+ sha256 = "1c8q1qy88cjhdjlk3g24mra94h34c1ldvkjz0n2988c0yvn5xixp";
};
nativeBuildInputs = [ libtool ];
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index e9267df5047b..76362f8f8835 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -33,6 +33,12 @@ let
doCheck = false; # hangs, tries to access the net?
checkInputs = [ check ];
+ postFixup =''
+ sed -i $out/lib/pkgconfig/*.pc \
+ -e "s|^libdir=.*|libdir=$out/lib|" \
+ -e "s|^includedir=.*|includedir=$out/include|"
+ '';
+
meta = with stdenv.lib; {
description = "P2P FOSS instant messaging application aimed to replace Skype";
homepage = https://tox.chat;
diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix
index 5ac456a60f61..600b1fb510ad 100644
--- a/pkgs/development/libraries/libtxc_dxtn/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, libGLU_combined }:
+{ stdenv, fetchurl, autoreconfHook, libGL, libGLU }:
let version = "1.0.1"; in
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ libGLU_combined ];
+ buildInputs = [ libGL libGLU ];
meta = with stdenv.lib; {
homepage = http://dri.freedesktop.org/wiki/S3TC;
diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
index 4959674f0ad2..f9f44f5a6531 100644
--- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
+++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, libGLU_combined }:
+{ stdenv, fetchurl, autoreconfHook, libGL, libGLU }:
let version = "1.0"; in
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ libGLU_combined ];
+ buildInputs = [ libGL libGLU ];
meta = {
description = "A patent-free S3TC compatible implementation";
diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix
index ad8c08b3cce0..386354b48e4d 100644
--- a/pkgs/development/libraries/liburing/default.nix
+++ b/pkgs/development/libraries/liburing/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Userspace library for the Linux io_uring API";
- homepage = http://git.kernel.dk/cgit/liburing/;
+ homepage = https://git.kernel.dk/cgit/liburing/;
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice ];
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 9a08a7756c84..9d90304042c8 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -28,13 +28,8 @@ stdenv.mkDerivation (rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
- configureFlags =
- # We use `isLinux` here only to avoid mass rebuilds for Darwin, where
- # disabling udev happens automatically. Remove `isLinux` at next big change!
- stdenv.lib.optional (stdenv.isLinux && !enableSystemd) "--disable-udev";
-
- preFixup = stdenv.lib.optionalString enableSystemd ''
- sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
+ preFixup = stdenv.lib.optionalString stdenv.isLinux ''
+ sed 's,-ludev,-L${stdenv.lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index f9b49a46ebf2..524896b8bfd2 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec {
- version = "1.32.0";
+ version = "1.34.0";
pname = "libuv";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
- sha256 = "1ifazxr5ssw2ay6j66acaxgfwq0x8130fvsyjs1wxvf2r9g4ds9w";
+ sha256 = "0vcrrqf0zqgsfmgbyl45qhajyab98kxqq66l0w4lkj5say86aln8";
};
postPatch = let
diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix
index 1803ce1dc20a..7dd874ebc836 100644
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@@ -3,13 +3,13 @@
}:
stdenv.mkDerivation rec {
- name = "libvirt-glib-2.0.0";
+ name = "libvirt-glib-3.0.0";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://libvirt.org/sources/glib/${name}.tar.gz";
- sha256 = "0six9ckmvlwwyavyjkgc262qkpvfqgi8rjij7cyk00bmqq8c9s4l";
+ sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz";
};
nativeBuildInputs = [ pkgconfig intltool vala gobject-introspection ];
diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix
index 0a7819743e03..c9adad6f6454 100644
--- a/pkgs/development/libraries/libvncserver/default.nix
+++ b/pkgs/development/libraries/libvncserver/default.nix
@@ -1,41 +1,43 @@
-{stdenv, fetchurl, fetchpatch,
- libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng,
- systemd
+{ stdenv, fetchzip, fetchpatch, cmake
+, libjpeg, openssl, zlib, libgcrypt, libpng
+, systemd
}:
let
s = # Generated upstream information
rec {
- baseName="libvncserver";
- version="0.9.11";
- name="${baseName}-${version}";
- url="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz";
- sha256="15189n09r1pg2nqrpgxqrcvad89cdcrca9gx6qhm6akjf81n6g8r";
+ pname = "libvncserver";
+ version = "0.9.12";
+ url = "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${version}.tar.gz";
+ sha256 = "1226hb179l914919f5nm2mlf8rhaarqbf48aa649p4rwmghyx9vm"; # unpacked archive checksum
};
in
stdenv.mkDerivation {
- inherit (s) name version;
- src = fetchurl {
+ inherit (s) pname version;
+ src = fetchzip {
inherit (s) url sha256;
};
patches = [
- # CVE-2018-7225. Remove with the next release
(fetchpatch {
- url = https://salsa.debian.org/debian/libvncserver/raw/master/debian/patches/CVE-2018-7225.patch;
- sha256 = "1hj1lzxsrdmzzl061vg0ncdpvfmvvkrpk8q12mp70qvszcqa7ja3";
+ name = "CVE-2018-20750.patch";
+ url = "https://github.com/LibVNC/libvncserver/commit/09e8fc02f59f16e2583b34fe1a270c238bd9ffec.patch";
+ sha256 = "004h50786nvjl3y3yazpsi2b767vc9gqrwm1ralj3zgy47kwfhqm";
+ })
+ (fetchpatch {
+ name = "CVE-2019-15681.patch";
+ url = "https://github.com/LibVNC/libvncserver/commit/d01e1bb4246323ba6fcee3b82ef1faa9b1dac82a.patch";
+ sha256 = "0hf0ss7all2m50z2kan4mck51ws44yim4ymn8p0d991y465y6l9s";
})
];
- preConfigure = ''
- sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure
- '';
- nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ nativeBuildInputs = [ cmake ];
buildInputs = [
- libtool libjpeg openssl libgcrypt libpng
+ libjpeg openssl libgcrypt libpng
] ++ stdenv.lib.optional stdenv.isLinux systemd;
propagatedBuildInputs = [ zlib ];
meta = {
inherit (s) version;
- description = "VNC server library";
+ description = "VNC server library";
+ homepage = "https://libvnc.github.io/";
license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 5457b1075a3e..263fa0a5216d 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
+ description = "Vorbis audio compression reference implementation";
homepage = https://xiph.org/vorbis/;
license = licenses.bsd3;
maintainers = [ maintainers.ehmry ];
diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix
index 231b426e6a7d..50ee7e4d3873 100644
--- a/pkgs/development/libraries/libvterm-neovim/default.nix
+++ b/pkgs/development/libraries/libvterm-neovim/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation {
pname = "libvterm-neovim";
- version = "2019-08-28";
+ version = "2019-10-08";
src = fetchFromGitHub {
owner = "neovim";
repo = "libvterm";
- rev = "1aa95e24d8f07a396aa80b7cd52f93e2b5bcca79";
- sha256 = "0vjd397lqrfv4kc79i5izva4bynbymx3gllkg281fnk0b15vxfif";
+ rev = "7c72294d84ce20da4c27362dbd7fa4b08cfc91da";
+ sha256 = "111qyxq33x74dwdnqcnzlv9j0n8hxyribd6ppwcsxmyrniyw9qrk";
};
buildInputs = [ perl ];
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index fc9932567cfa..56c3f638d52d 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl
, threadingSupport ? true # multi-threading
-, openglSupport ? false, freeglut ? null, libGLU_combined ? null # OpenGL (required for vwebp)
+, openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp)
, pngSupport ? true, libpng ? null # PNG image format
, jpegSupport ? true, libjpeg ? null # JPEG image format
, tiffSupport ? true, libtiff ? null # TIFF image format
@@ -14,7 +14,7 @@
, libwebpdecoderSupport ? true # Build libwebpdecoder
}:
-assert openglSupport -> ((freeglut != null) && (libGLU_combined != null));
+assert openglSupport -> freeglut != null && libGL != null && libGLU != null;
assert pngSupport -> (libpng != null);
assert jpegSupport -> (libjpeg != null);
assert tiffSupport -> (libtiff != null);
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [ ]
- ++ optionals openglSupport [ freeglut libGLU_combined ]
+ ++ optionals openglSupport [ freeglut libGL libGLU ]
++ optional pngSupport libpng
++ optional jpegSupport libjpeg
++ optional tiffSupport libtiff
diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix
index e7aa5f7ecc9f..5c684c7fd778 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/pkgs/development/libraries/libwmf/default.nix
@@ -6,6 +6,8 @@ stdenv.mkDerivation rec {
pname = "libwmf";
version = "0.2.12";
+ outputs = [ "out" "dev" ];
+
src = fetchFromGitHub {
owner = "caolanm";
repo = pname;
diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix
index 8153fb883cac..8618fc80a525 100644
--- a/pkgs/development/libraries/libxl/default.nix
+++ b/pkgs/development/libraries/libxl/default.nix
@@ -2,14 +2,15 @@
stdenv.mkDerivation rec {
pname = "libxl";
- version = "3.8.5";
+ version = "3.8.7";
src = fetchurl {
url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz";
- sha256 = "15n8gxyznk1nm2kgp86hd36rnivjsby9ccl12lyabv6q3fab6fsx";
+ sha256 = "0mfi2mlsgqjw9ki3c5bsb6nr2aqym7s1priw70f69r12azzxfqw3";
};
- phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+ dontConfigure = true;
+ dontBuild = true;
installPhase = ''
mkdir $out
@@ -18,7 +19,8 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "A lbrary for parsing excel files";
+ description = "A library for parsing Excel files";
+ homepage = "http://www.libxl.com/";
license = licenses.unfree;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 04954f3e1f5f..f5dcb3357f7c 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,22 +1,33 @@
{ stdenv, lib, fetchurl
-, zlib, xz, python2, ncurses, findXMLCatalogs
+, zlib, xz, python, ncurses, findXMLCatalogs
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
, icuSupport ? false, icu ? null
, enableShared ? stdenv.hostPlatform.libc != "msvcrt"
, enableStatic ? !enableShared,
}:
-let
- python = python2;
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
pname = "libxml2";
- version = "2.9.9";
+ version = "2.9.10";
src = fetchurl {
url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
- sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl";
+ sha256 = "07xynh8hcxb2yb1fs051xrgszjvj37wnxvxgsj10rzmqzy9y3zma";
};
+ patches = [
+ # Upstream bugs:
+ # https://bugzilla.gnome.org/show_bug.cgi?id=789714
+ # https://gitlab.gnome.org/GNOME/libxml2/issues/64
+ # Patch from https://bugzilla.opensuse.org/show_bug.cgi?id=1065270 ,
+ # but only the UTF-8 part.
+ # Can also be mitigated by fixing malformed XML inputs, such as in
+ # https://gitlab.gnome.org/GNOME/gnumeric/merge_requests/3 .
+ # Other discussion:
+ # https://github.com/itstool/itstool/issues/22
+ # https://github.com/NixOS/nixpkgs/pull/63174
+ # https://github.com/NixOS/nixpkgs/pull/72342
+ ./utf8-xmlErrorFuncHandler.patch
+ ];
outputs = [ "bin" "dev" "out" "man" "doc" ]
++ lib.optional pythonSupport "py"
@@ -42,6 +53,12 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ # disable test that's problematic with newer pythons: see
+ # https://mail.gnome.org/archives/xml/2017-August/msg00014.html
+ preCheck = lib.optionalString (pythonSupport && !(python?pythonOlder && python.pythonOlder "3.5")) ''
+ echo "" > python/tests/tstLastError.py
+ '';
+
doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin &&
stdenv.hostPlatform.libc != "musl";
diff --git a/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch b/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch
new file mode 100644
index 000000000000..9f4c99b09341
--- /dev/null
+++ b/pkgs/development/libraries/libxml2/utf8-xmlErrorFuncHandler.patch
@@ -0,0 +1,30 @@
+Index: libxml2-2.9.5/python/libxml.c
+===================================================================
+--- libxml2-2.9.5.orig/python/libxml.c
++++ libxml2-2.9.5/python/libxml.c
+@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ PyObject *message;
+ PyObject *result;
+ char str[1000];
++ unsigned char *ptr = (unsigned char *)str;
+
+ #ifdef DEBUG_ERROR
+ printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
+@@ -1636,10 +1637,16 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
+ str[999] = 0;
+ va_end(ap);
+
++#if PY_MAJOR_VERSION >= 3
++ /* Ensure the error string doesn't start at UTF8 continuation. */
++ while (*ptr && (*ptr & 0xc0) == 0x80)
++ ptr++;
++#endif
++
+ list = PyTuple_New(2);
+ PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
+ Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
+- message = libxml_charPtrConstWrap(str);
++ message = libxml_charPtrConstWrap(ptr);
+ PyTuple_SetItem(list, 1, message);
+ result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
+ Py_XDECREF(list);
diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix
index 0469cf13b0cd..75fffa83d24b 100644
--- a/pkgs/development/libraries/libxmlb/default.nix
+++ b/pkgs/development/libraries/libxmlb/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
passthru = {
tests = {
- installed-tests = nixosTests.libxmlb;
+ installed-tests = nixosTests.installed-tests.libxmlb;
};
};
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 1a3efee176a0..6d12329a7f51 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,44 +1,26 @@
-{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2, libgcrypt
+{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python, libgcrypt
, cryptoSupport ? false
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
}:
-assert pythonSupport -> python2 != null;
+assert pythonSupport -> python != null;
assert pythonSupport -> libxml2.pythonSupport;
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "libxslt";
- version = "1.1.33";
+ version = "1.1.34";
src = fetchurl {
url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz";
- sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf";
+ sha256 = "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq";
};
- patches = [
- (fetchpatch {
- name = "CVE-2019-11068.patch";
- url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch";
- sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8";
- })
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/libxslt/commit/c5eb6cf3aba0af048596106ed839b4ae17ecbcb1.patch";
- name = "CVE-2019-13117.patch";
- sha256 = "0ynfq8y5h623cypj1426iiz7796n3mqbjqa24ndvh2am6rl5lw15";
- })
- (fetchpatch {
- url = "https://gitlab.gnome.org/GNOME/libxslt/commit/6ce8de69330783977dd14f6569419489875fb71b.patch";
- name = "CVE-2019-13118.patch";
- sha256 = "0bglz9m9sh2vi50qxcm06iqrazw3h45ycgxnp15iankq95z283iq";
- })
- ];
-
outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
buildInputs = [ libxml2.dev ]
- ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ]
+ ++ stdenv.lib.optionals pythonSupport [ libxml2.py python ]
++ stdenv.lib.optionals cryptoSupport [ libgcrypt ];
propagatedBuildInputs = [ findXMLCatalogs ];
@@ -48,7 +30,7 @@ stdenv.mkDerivation rec {
"--without-debug"
"--without-mem-debug"
"--without-debugger"
- ] ++ optional pythonSupport "--with-python=${python2}"
+ ] ++ optional pythonSupport "--with-python=${python}"
++ optional (!cryptoSupport) "--without-crypto";
postFixup = ''
@@ -58,7 +40,7 @@ stdenv.mkDerivation rec {
'' + optionalString pythonSupport ''
mkdir -p $py/nix-support
echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
- moveToOutput lib/python2.7 "$py"
+ moveToOutput ${python.libPrefix} "$py"
'';
passthru = {
diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index 43a5f7dc8413..9f9331b90dd4 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -1,37 +1,31 @@
-{ stdenv, fetchurl, perl, zlib }:
+{ stdenv, fetchurl, cmake, perl, zlib }:
stdenv.mkDerivation rec {
pname = "libzip";
- version = "1.3.0";
+ version = "1.5.2";
src = fetchurl {
url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz";
- sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9";
+ sha256 = "05ay8cbm882br0ir2cmzrvdq8q5mr1bnf53l4305xzigpd54lsdy";
};
+ # Fix pkgconfig file paths
postPatch = ''
- patchShebangs test-driver
- patchShebangs man/handle_links
+ sed -i CMakeLists.txt \
+ -e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \
+ -e 's#\\''${prefix}/''${CMAKE_INSTALL_INCLUDEDIR}#''${CMAKE_INSTALL_FULL_INCLUDEDIR}#'
'';
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ perl ];
+ nativeBuildInputs = [ cmake perl ];
propagatedBuildInputs = [ zlib ];
preCheck = ''
- # regress/runtests is a generated file
+ # regress/runtest is a generated file
patchShebangs regress
'';
- # At least mysqlWorkbench cannot find zipconf.h; I think also openoffice
- # had this same problem. This links it somewhere that mysqlworkbench looks.
- postInstall = ''
- mkdir -p $dev/lib
- mv $out/lib/libzip $dev/lib/libzip
- ( cd $dev/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h )
- '';
-
meta = with stdenv.lib; {
homepage = https://www.nih.at/libzip;
description = "A C library for reading, creating and modifying zip archives";
diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index 7f82d49462c5..7fba3f3baa66 100644
--- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -1,44 +1,35 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, cmake, zlib
-, opentracing-cpp, enableGrpc ? false
+{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake
+, opentracing-cpp, protobuf, zlib
+, enableGrpc ? false, grpc ? null, openssl ? null, c-ares ? null
}:
-let
- # be sure to use the right revision based on the submodule!
- common =
- fetchFromGitHub {
- owner = "lightstep";
- repo = "lightstep-tracer-common";
- rev = "5fe3bf885bcece14c3c65df06c86c826ba45ad69";
- sha256 = "1q39a0zaqbnqyhl2hza2xzc44235p65bbkfkzs2981niscmggq8w";
- };
-
-in
+assert enableGrpc -> grpc != null;
+assert enableGrpc -> openssl != null;
+assert enableGrpc -> c-ares != null;
stdenv.mkDerivation rec {
pname = "lightstep-tracer-cpp";
- version = "0.8.1";
+ version = "0.11.0";
src = fetchFromGitHub {
owner = "lightstep";
- repo = "lightstep-tracer-cpp";
+ repo = pname;
rev = "v${version}";
- sha256 = "1m4kl70lhvy1bsmkdh6bf2fddz5v1ikb27vgi99i2akpq40g4fvf";
+ sha256 = "1x7n3b5i9a0481azy3ymfybjfvr5z0i8wm17d964hsv7ryvnapj0";
};
- postUnpack = ''
- cp -r ${common}/* $sourceRoot/lightstep-tracer-common
- '';
-
- cmakeFlags = ["-DOPENTRACING_INCLUDE_DIR=${opentracing-cpp}/include" "-DOPENTRACING_LIBRARY=${opentracing-cpp}/lib/libopentracing.so"] ++ lib.optional (!enableGrpc) [ "-DWITH_GRPC=OFF" ];
-
nativeBuildInputs = [
- pkgconfig cmake
+ cmake pkgconfig
];
buildInputs = [
- protobuf zlib
+ opentracing-cpp protobuf zlib
+ ] ++ lib.optionals enableGrpc [
+ grpc openssl c-ares c-ares.cmake-config
];
+ cmakeFlags = lib.optionals (!enableGrpc) [ "-DWITH_GRPC=OFF" ];
+
meta = with lib; {
description = "Distributed tracing system built on top of the OpenTracing standard";
homepage = "https://lightstep.com/";
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index 70320ead5d11..709a237aed9b 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.timokau];
platforms = stdenv.lib.platforms.unix;
- homepage = http://linalg.org/;
+ homepage = https://linalg.org/;
};
}
diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix
index 2df7ef94cf36..74952456e642 100644
--- a/pkgs/development/libraries/liquidfun/default.nix
+++ b/pkgs/development/libraries/liquidfun/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, cmake, libGLU_combined, libX11, libXi }:
+{ stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }:
let
sourceInfo = rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
};
inherit (sourceInfo) name version;
- buildInputs = [ cmake libGLU_combined libX11 libXi ];
+ buildInputs = [ cmake libGLU libGL libX11 libXi ];
sourceRoot = "liquidfun/Box2D/";
diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index dbebe0af80f6..84907a428605 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -3,14 +3,14 @@
# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
stdenv.mkDerivation rec {
pname = "live555";
- version = "2019.10.20";
+ version = "2019.11.22";
src = fetchurl { # the upstream doesn't provide a stable URL
urls = [
"mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
"https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
];
- sha256 = "085csq31s4kak0sym5y170f82wp542bg1ff3kycanvs8w4d4n9j4";
+ sha256 = "144y2wsfpaclkj7srx85f3y3parzn7vbjmzc2afc62wdsb9gn46d";
};
postPatch = ''
diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 1feea915c025..53c4594f535b 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An open source toolkit for developing mapping applications";
- homepage = http://mapnik.org;
+ homepage = https://mapnik.org;
maintainers = with maintainers; [ hrdinka ];
license = licenses.lgpl21;
platforms = platforms.all;
diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix
deleted file mode 100644
index 8b8d8cd0be80..000000000000
--- a/pkgs/development/libraries/mbedtls/1.3.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, perl }:
-
-stdenv.mkDerivation rec {
- name = "mbedtls-1.3.22";
-
- src = fetchurl {
- url = "https://tls.mbed.org/download/${name}-gpl.tgz";
- sha256 = "0ms4s41z88mz7b6gsnp7jslms4v0115k7gw51i6kx6ng9am43l6y";
- };
-
- nativeBuildInputs = [ perl ];
-
- postPatch = ''
- patchShebangs .
- '';
-
- makeFlags = [
- "SHARED=1"
- ];
-
- installFlags = [
- "DESTDIR=\${out}"
- ];
-
- doCheck = true;
-
- meta = with stdenv.lib; {
- homepage = https://tls.mbed.org/;
- description = "Portable cryptographic and SSL/TLS library, aka polarssl";
- license = licenses.gpl3;
- platforms = platforms.all;
- maintainers = with maintainers; [ fpletz ];
- };
-}
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index b482176ff29d..ca62391e7815 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -1,17 +1,16 @@
{ stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
-, libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp
+, libopus, ffmpeg, libX11, libXv, libGLU, libGL, glew, libtheora, libvpx, SDL, libupnp
, ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen
-, python, libXext, libmatroska, openssl, fetchpatch
+, python, libXext, libmatroska, fetchpatch
}:
stdenv.mkDerivation rec {
- baseName = "mediastreamer2";
+ pname = "mediastreamer2";
version = "2.16.1";
- name = "${baseName}-${version}";
src = fetchFromGitHub {
owner = "BelledonneCommunications";
- repo = baseName;
+ repo = pname;
rev = version;
sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j";
};
@@ -29,23 +28,22 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [
alsaLib libpulseaudio speex gsm libopus
- ffmpeg libX11 libXv libGLU_combined glew libtheora libvpx SDL libupnp
+ ffmpeg libX11 libXv libGLU libGL glew libtheora libvpx SDL libupnp
ortp libv4l libpcap srtp bctoolbox libXext libmatroska
- openssl
];
NIX_CFLAGS_COMPILE = [
- "-DGIT_VERSION=\"v2.14.0\""
+ "-DGIT_VERSION=\"v${version}\""
"-Wno-error=deprecated-declarations"
"-Wno-error=cast-function-type"
"-Wno-error=stringop-truncation"
"-Wno-error=stringop-overflow"
];
- NIX_LDFLAGS = "-lXext -lssl";
+ NIX_LDFLAGS = "-lXext";
meta = with stdenv.lib; {
description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications";
- homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview;
+ homepage = http://www.linphone.org/technical-corner/mediastreamer2;
license = licenses.gpl2;
platforms = platforms.linux;
};
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
index 38261bd1e53a..f1e9fc301510 100644
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -1,23 +1,30 @@
{ stdenv, autoreconfHook, pkgconfig, mediastreamer, openh264
-, fetchgit, cmake
+, fetchurl, fetchpatch, cmake
}:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "mediastreamer-openh264";
- version = "0.0pre20160801";
+ version = "1.2.1";
- src = fetchgit {
- url = "git://git.linphone.org/msopenh264.git";
- rev = "4cb4b134bf0f1538fd0c2c928eee2d5388115abc";
- sha256 = "001km4xy1ifwbg1c19ncc75h867fzfcxy9pxvl4pxqb64169xc1k";
+ src = fetchurl {
+ url = "https://www.linphone.org/releases/sources/plugins/msopenh264/msopenh264-${version}.tar.gz";
+ sha256 = "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8";
};
+ patches = [
+ (fetchpatch {
+ name = "msopenh264-build-with-openh264-v2.patch";
+ url = "https://git.pld-linux.org/?p=packages/mediastreamer-plugin-msopenh264.git;a=blob_plain;f=mediastreamer-plugin-msopenh264-openh264.patch;hb=344b8af379701a7e58b4ffb3cbac1517eff079fd";
+ sha256 = "10c24b0afchx78q28176pd8iz7i1nlf57f6v6lyqxpz60fm5nrcc";
+ })
+ ];
+
nativeBuildInputs = [ autoreconfHook cmake pkgconfig ];
buildInputs = [ mediastreamer openh264 ];
meta = with stdenv.lib; {
description = "H.264 encoder/decoder plugin for mediastreamer2";
- homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview;
+ homepage = "https://www.linphone.org/technical-corner/mediastreamer2";
license = licenses.gpl2;
platforms = platforms.linux;
};
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index caeb8dba8a63..9582e1bf1bfb 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -27,7 +27,7 @@
with stdenv.lib;
let
- version = "19.2.1";
+ version = "19.2.7";
branch = versions.major version;
in
@@ -42,7 +42,7 @@ 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 = "4cc53ca1a8d12c6ff0e5ea44a5213c05c88447ab50d7e28bb350cd29199f01e9";
+ sha256 = "17jp8ghipgz62vqqz5llskxypkcmgf8gnlgnj0pyvnbgi6vryyg3";
};
prePatch = "patchShebangs .";
diff --git a/pkgs/development/libraries/mesa/stubs.nix b/pkgs/development/libraries/mesa/stubs.nix
index 5cb6ac3d4d13..a53f2dc28e77 100644
--- a/pkgs/development/libraries/mesa/stubs.nix
+++ b/pkgs/development/libraries/mesa/stubs.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
ln -s ${libglvnd.out}/lib $out/lib
mkdir -p $dev/{,lib/pkgconfig,nix-support}
- echo "$out" > $dev/nix-support/propagated-build-inputs
+ echo "$out ${libglvnd} ${libglvnd.dev}" > $dev/nix-support/propagated-build-inputs
ln -s ${mesa.dev}/include $dev/include
genPkgConfig() {
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
Description: $lib library
Version: ${mesa.version}
Libs: -L${libglvnd.out}/lib -l$lib
- Cflags: -I${mesa.dev}/include
+ Cflags: -I${mesa.dev}/include -I${libglvnd.dev}/include
EOF
}
diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix
index 460be100b166..b3f63ec7e9b9 100644
--- a/pkgs/development/libraries/mimalloc/default.nix
+++ b/pkgs/development/libraries/mimalloc/default.nix
@@ -1,37 +1,45 @@
-{ stdenv, fetchFromGitHub, cmake
-, secureBuild ? true
+{ stdenv, fetchFromGitHub, cmake, ninja
+, secureBuild ? false
}:
let
soext = stdenv.hostPlatform.extensions.sharedLibrary;
in
stdenv.mkDerivation rec {
- name = "mimalloc-${version}";
+ pname = "mimalloc";
version = "1.1.0";
src = fetchFromGitHub {
owner = "microsoft";
- repo = "mimalloc";
+ repo = pname;
rev = "refs/tags/v${version}";
sha256 = "1i8pwzpcmbf7dxncb984xrnczn1737xqhf1jaizlyw0k1hpiam4v";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake ninja ];
enableParallelBuilding = true;
-
cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ];
postInstall = ''
+ # first, install headers, that's easy
mkdir -p $dev
mv $out/lib/*/include $dev/include
- rm -f $out/lib/libmimalloc*${soext} # weird duplicate
+ # move .a and .o files into place
+ mv $out/lib/mimalloc-1.0/libmimalloc*.a $out/lib/libmimalloc.a
+ mv $out/lib/mimalloc-1.0/mimalloc*.o $out/lib/mimalloc.o
- mv $out/lib/*/libmimalloc*${soext} $out/lib/libmimalloc${soext}
- mv $out/lib/*/libmimalloc*.a $out/lib/libmimalloc.a
- mv $out/lib/*/mimalloc*.o $out/lib/mimalloc.o
-
- rm -rf $out/lib/mimalloc-*
+ '' + (if secureBuild then ''
+ mv $out/lib/mimalloc-1.0/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc-secure${soext}.1.0
+ ln -sfv $out/lib/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc-secure${soext}
+ ln -sfv $out/lib/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc${soext}
+ '' else ''
+ mv $out/lib/mimalloc-1.0/libmimalloc${soext}.1.0 $out/lib/libmimalloc${soext}.1.0
+ ln -sfv $out/lib/libmimalloc${soext}.1.0 $out/lib/libmimalloc${soext}
+ '') + ''
+ # remote duplicate dir. FIXME: try to fix the .cmake file distribution
+ # so we can re-use it for dependencies...
+ rm -rf $out/lib/mimalloc-1.0
'';
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix
index c88a978574a7..5ee1f38ca8b5 100644
--- a/pkgs/development/libraries/minizip/default.nix
+++ b/pkgs/development/libraries/minizip/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation {
sourceRoot = "zlib-${zlib.version}/contrib/minizip";
meta = {
+ description = "Compression library implementing the deflate compression method found in gzip and PKZIP";
inherit (zlib.meta) license homepage;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index 2232bfb9a38b..21803de5e062 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "mpich";
- version = "3.3.1";
+ version = "3.3.2";
src = fetchurl {
url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
- sha256 = "1raism1r4jsx4cybc9ddyr1xkccbxm0l8j3ryrw8kslfkkr1wmgy";
+ sha256 = "1farz5zfx4cd0c3a0wb9pgfypzw0xxql1j1294z1sxslga1ziyjb";
};
configureFlags = [
diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix
index d058322660cf..4d3fe41dff82 100644
--- a/pkgs/development/libraries/muparser/default.nix
+++ b/pkgs/development/libraries/muparser/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{stdenv, fetchurl, unzip, setfile}:
stdenv.mkDerivation rec {
pname = "muparser";
@@ -10,12 +10,14 @@ stdenv.mkDerivation rec {
sha256 = "00l92k231yb49wijzkspa2l58mapn6vh2dlxnlg0pawjjfv33s6z";
};
- buildInputs = [ unzip ];
+ buildInputs = [
+ unzip
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [setfile];
meta = {
homepage = http://muparser.sourceforge.net;
description = "An extensible high performance math expression parser library written in C++";
license = stdenv.lib.licenses.mit;
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix
index 0907f0174c99..c277b7934b9b 100644
--- a/pkgs/development/libraries/mygui/default.nix
+++ b/pkgs/development/libraries/mygui/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid,
- boost, pkgconfig, withOgre ? false, ogre ? null, libGLU_combined ? null } :
+ boost, pkgconfig, withOgre ? false, ogre ? null, libGL, libGLU ? null } :
let
renderSystem = if withOgre then "3" else "4";
@@ -17,7 +17,8 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libX11 unzip cmake ois freetype libuuid boost (if withOgre then ogre else libGLU_combined) ];
+ buildInputs = [ libX11 unzip cmake ois freetype libuuid boost ]
+ ++ (if withOgre then [ ogre ] else [libGL libGLU]);
# Tools are disabled due to compilation failures.
cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ];
diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix
index 5c0238fe41ea..8480cc868c1f 100644
--- a/pkgs/development/libraries/nanoflann/default.nix
+++ b/pkgs/development/libraries/nanoflann/default.nix
@@ -1,24 +1,28 @@
{stdenv, fetchFromGitHub, cmake}:
stdenv.mkDerivation rec {
- version = "1.3.0";
+ version = "1.3.1";
pname = "nanoflann";
src = fetchFromGitHub {
owner = "jlblancoc";
repo = "nanoflann";
rev = "v${version}";
- sha256 = "1bwdmrz1qygp9qy2nzrp1axa1i4nvm0ljkn6mnhlcvbfsyvhzigv";
+ sha256 = "07vi3yn5y9zk9acdbxy954ghdml15wnyqfizzqwsw8zmc9bf30ih";
};
buildInputs = [ cmake ];
+ cmakeFlags = [
+ "-DBUILD_EXAMPLES=OFF"
+ ];
+
doCheck = true;
checkTarget = "test";
meta = {
- homepage = https://github.com/jlblancoc/nanoflann;
- license = stdenv.lib.licenses.bsd3;
+ homepage = "https://github.com/jlblancoc/nanoflann";
+ license = stdenv.lib.licenses.bsd2;
description = "Header only C++ library for approximate nearest neighbor search";
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix
index c842eac4311e..7b03c32ada58 100644
--- a/pkgs/development/libraries/nco/default.nix
+++ b/pkgs/development/libraries/nco/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchurl, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex }:
+{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex }:
stdenv.mkDerivation rec {
- version = "4.8.1";
+ version = "4.9.1";
pname = "nco";
- buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr which curl flex ];
+ nativeBuildInputs = [ flex which ];
+ buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl ];
- src = fetchurl {
+ src = fetchzip {
url = "https://github.com/nco/nco/archive/${version}.tar.gz";
- sha256 = "0s1ww78p4cb2d9qkr4zs439x4xk3ndq6lv8ps677jrn28vnkzbnx";
+ sha256 = "14r44wi9ina8h8gh5cmkcddxl5ziwv42mv60sp4l5wfmjz5xwa4x";
};
meta = {
description = "NetCDF Operator toolkit";
longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5";
- homepage = http://nco.sourceforge.net/;
+ homepage = "http://nco.sourceforge.net/";
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.bzizou ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 708ba46b42eb..540ea71abfb8 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -141,6 +141,7 @@ stdenv.mkDerivation rec {
moveToOutput "bin/tset" "$out"
moveToOutput "bin/captoinfo" "$out"
moveToOutput "bin/infotocap" "$out"
+ moveToOutput "bin/infocmp" "$out"
'';
preFixup = lib.optionalString (!stdenv.hostPlatform.isCygwin && !enableStatic) ''
diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix
new file mode 100644
index 000000000000..fcf9457c691c
--- /dev/null
+++ b/pkgs/development/libraries/ndi/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, requireFile, avahi }:
+
+stdenv.mkDerivation rec {
+ pname = "ndi";
+ version = "4";
+
+ src = requireFile rec {
+ name = "InstallNDISDK_v${version}_Linux.tar.gz";
+ sha256 = "1hac5npyg8nifs9ipj34pkn0zjyx8774x3i3h8znhmijx2j2982p";
+ message = ''
+ In order to use the NDI SDK, you need to comply with NewTek's license and
+ download the Linux version ${version} tarball from:
+
+ ${meta.homepage}
+
+ Once you have downloaded the file, please use the following command and
+ re-run the installation:
+
+ nix-prefetch-url file://\$PWD/${name}
+ '';
+ };
+
+ buildInputs = [ avahi ];
+
+ unpackPhase = ''
+ unpackFile ${src}
+ echo y | ./InstallNDISDK_v4_Linux.sh
+ sourceRoot="NDI SDK for Linux";
+ '';
+
+ installPhase = ''
+ mkdir $out
+ mv bin/x86_64-linux-gnu $out/bin
+ for i in $out/bin/*; do
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"
+ done
+ patchelf --set-rpath "${avahi}/lib:${stdenv.cc.libc}/lib" $out/bin/ndi-record
+ mv lib/x86_64-linux-gnu $out/lib
+ for i in $out/lib/*; do
+ if [ -L "$i" ]; then continue; fi
+ patchelf --set-rpath "${avahi}/lib:${stdenv.cc.libc}/lib" "$i"
+ done
+ mv include examples $out/
+ mkdir -p $out/share/doc/${pname}-${version}
+ mv licenses $out/share/doc/${pname}-${version}/licenses
+ mv logos $out/share/doc/${pname}-${version}/logos
+ mv documentation/* $out/share/doc/${pname}-${version}/
+ '';
+
+ # Stripping breaks ndi-record.
+ dontStrip = true;
+
+ meta = with stdenv.lib; {
+ homepage = "https://ndi.tv/sdk/";
+ description = "NDI Software Developer Kit";
+ platforms = ["x86_64-linux"];
+ hydraPlatforms = [];
+ license = licenses.unfree;
+ };
+}
diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index 0c597fc4b335..1436fb021271 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -9,11 +9,12 @@ let
mpiSupport = hdf5.mpiSupport;
mpi = hdf5.mpi;
in stdenv.mkDerivation rec {
- name = "netcdf-4.6.1";
+ pname = "netcdf";
+ version = "4.7.3";
src = fetchurl {
- url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz";
- sha256 = "0hi61cdihwwvz5jz1l7yq712j7ca1cj4bhr8x0x7c2vlb1s9biw9";
+ url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz";
+ sha256 = "12s4w2s96p51hlsa81lw92w56rdx8i3mk21pz2ydwcamw579z34f";
};
postPatch = ''
@@ -37,10 +38,14 @@ in stdenv.mkDerivation rec {
"--enable-netcdf-4"
"--enable-dap"
"--enable-shared"
+ "--disable-dap-remote-tests"
]
++ (stdenv.lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]);
+ doCheck = !mpiSupport;
+
meta = {
+ description = "Libraries for the Unidata network Common Data Format";
platforms = stdenv.lib.platforms.unix;
homepage = https://www.unidata.ucar.edu/software/netcdf/;
license = {
diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index d02247196b1a..57ed58912751 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -1,7 +1,9 @@
{ stdenv, fetchurl, pkgconfig
# Optional Dependencies
-, openssl ? null, libev ? null, zlib ? null, c-ares ? null
+, openssl ? null, zlib ? null
+, enableLibEv ? !stdenv.hostPlatform.isWindows, libev ? null
+, enableCAres ? !stdenv.hostPlatform.isWindows, c-ares ? null
, enableHpack ? false, jansson ? null
, enableAsioLib ? false, boost ? null
, enableGetAssets ? false, libxml2 ? null
@@ -18,17 +20,20 @@ let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec {
pname = "nghttp2";
- version = "1.39.2";
+ version = "1.40.0";
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
- sha256 = "1l51q8xqg7d7y9413z8l0scxgbbl1qkwgq4f09jqb31j492kx8lj";
+ sha256 = "0kyrgd4s2pq51ps5z385kw1hn62m8qp7c4h6im0g4ibrf89qwxc2";
};
outputs = [ "bin" "out" "dev" "lib" ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ openssl libev zlib c-ares ]
+ buildInputs = [ openssl ]
+ ++ optional enableLibEv libev
+ ++ [ zlib ]
+ ++ optional enableCAres c-ares
++ optional enableHpack jansson
++ optional enableAsioLib boost
++ optional enableGetAssets libxml2
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index 3a51c2ec72b3..43a7cf15c15b 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "nlohmann_json";
- version = "3.7.0";
+ version = "3.7.3";
src = fetchFromGitHub {
owner = "nlohmann";
repo = "json";
rev = "v${version}";
- sha256 = "0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap";
+ sha256 = "04rry1xzis71z5gj1ylcj8b4li5q18zxhcwaviwvi3hx0frzxl9w";
};
nativeBuildInputs = [ cmake ];
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
"-DJSON_MultipleHeaders=ON"
];
- doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+ # A test cause the build to timeout https://github.com/nlohmann/json/issues/1816
+ #doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+ doCheck = false;
postInstall = "rm -rf $out/lib64";
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index f5e4843a826e..44195ce325ba 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -2,7 +2,7 @@
, CoreServices ? null
, buildPackages }:
-let version = "4.22"; in
+let version = "4.24"; in
stdenv.mkDerivation {
pname = "nspr";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
- sha256 = "0c6ljv3bdqhc169srbpjy0cs52xk715p04zy08rcjvl54k6bdr69";
+ sha256 = "1l0ksiny032jijgk0g76wf0kiq673i01izj7jrs2h5d1yq6rm9ch";
};
patches = [
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index ff72d87f3c39..7499750c1f0c 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,7 +5,7 @@ let
url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
- version = "3.46.1";
+ version = "3.47.1";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
- sha256 = "0l9ns44rlkp1bpblplspfbqmyhb8rhvc89y56kqh725rgpny1xrv";
+ sha256 = "1yx68a1ks63s8914zmiz9h1nh0261aqzcblgg1cb4ig33p5x3qqs";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
@@ -27,7 +27,8 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ nspr ];
prePatch = ''
- xz -d < ${nssPEM} | patch -p1
+ # strip the trailing whitespace from the patch line…
+ xz -d < ${nssPEM} | sed -e '/^-DIRS = builtins $/ s/ $//' | patch -p1
'';
patches =
diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix
index 79eb4d1e10e4..40ee4f890d49 100644
--- a/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/pkgs/development/libraries/nss_wrapper/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, pkgconfig }:
stdenv.mkDerivation rec {
- name = "nss_wrapper-1.1.6";
+ name = "nss_wrapper-1.1.7";
src = fetchurl {
url = "mirror://samba/cwrap/${name}.tar.gz";
- sha256 = "1hijnwabj4nh0m0a913pq07iqq0bw8qb2zxcv73zbnsaay7pa55h";
+ sha256 = "1pa7gakprkxblxdqbcy2242lk924gvzdgfr5648wb7cslksm7hbq";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index efb307507a38..10e59c5117c0 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null;
stdenv.mkDerivation rec {
pname = "ntl";
- version = "11.3.4";
+ version = "11.4.1";
src = fetchurl {
url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
- sha256 = "0fdy63x6iglp20ypqhkpjj6wqjzpxlyl2wfw2dqlgiy6l6ibm4rd";
+ sha256 = "03k2hb6yn49d1f9cdig2ci7h5ga0x3nb3li60hh19wdqzg28f1m3";
};
buildInputs = [
diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix
index db542ec93a92..c1f354a1ac98 100644
--- a/pkgs/development/libraries/nuspell/default.nix
+++ b/pkgs/development/libraries/nuspell/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nuspell";
- version = "2.3.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "nuspell";
repo = "nuspell";
rev = "v${version}";
- sha256 = "0n5cajrp1fhk8p54ch3akkd9nl8b9c6wwf25980dhagcdys3vab3";
+ sha256 = "1cyvvf5f92a777qgh00ja43z43j5nhc9dw5l3wvw9j6j9bqc4i8p";
};
nativeBuildInputs = [ cmake pkgconfig ronn ];
diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix
index d847f447048d..b66759524faf 100644
--- a/pkgs/development/libraries/ogre/1.10.x.nix
+++ b/pkgs/development/libraries/ogre/1.10.x.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, lib
-, cmake, libGLU_combined
+, cmake, libGLU, libGL
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkgconfig
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
buildInputs =
- [ cmake libGLU_combined
+ [ cmake libGLU libGL
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM pkgconfig
diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix
index 2855d1139c3d..ced015801859 100644
--- a/pkgs/development/libraries/ogre/1.9.x.nix
+++ b/pkgs/development/libraries/ogre/1.9.x.nix
@@ -1,5 +1,5 @@
{ fetchFromGitHub, stdenv, lib
-, cmake, libGLU_combined
+, cmake, libGLU, libGL
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkgconfig
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs =
- [ cmake libGLU_combined
+ [ cmake libGLU libGL
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM pkgconfig
diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix
index dc3bf8cf0097..235da872392d 100644
--- a/pkgs/development/libraries/ogre/default.nix
+++ b/pkgs/development/libraries/ogre/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, lib
-, cmake, libGLU_combined
+, cmake, libGLU, libGL
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkgconfig
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildInputs =
- [ cmake libGLU_combined
+ [ cmake libGLU libGL
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM pkgconfig
diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index dd3f83a0130d..224c01e2c50a 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -2,18 +2,11 @@
stdenv.mkDerivation rec {
pname = "olm";
- version = "3.0.0";
-
- meta = {
- description = "Implements double cryptographic ratchet and Megolm ratchet";
- license = stdenv.lib.licenses.asl20;
- homepage = https://matrix.org/git/olm/about;
- platforms = with stdenv.lib.platforms; darwin ++ linux;
- };
+ version = "3.1.4";
src = fetchurl {
- url = "https://matrix.org/git/olm/snapshot/${pname}-${version}.tar.gz";
- sha256 = "1iivxjk458v9lhqgzp0c4k5azligsh9k3rk6irf9ssj29wzgjm2c";
+ url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz";
+ sha256 = "0f7azjxc77n4ib9nj3cwyk3vhk8r2dsyf7id6nvqyxqxwxn95a8w";
};
doCheck = true;
@@ -25,4 +18,11 @@ stdenv.mkDerivation rec {
makeFlags = if stdenv.cc.isClang then [ "CC=cc" ] else null;
installFlags = "PREFIX=$(out)";
+
+ meta = {
+ description = "Implements double cryptographic ratchet and Megolm ratchet";
+ license = stdenv.lib.licenses.asl20;
+ homepage = https://matrix.org/git/olm/about;
+ platforms = with stdenv.lib.platforms; darwin ++ linux;
+ };
}
diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index 8a1e1d37c1d5..e9041993657e 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/kkos/oniguruma;
description = "Regular expressions library";
license = licenses.bsd2;
- maintainers = with maintainers; [ fuuzetsu ];
+ maintainers = with maintainers; [ ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix
index b5549c6735fe..33bc4c6e82c2 100644
--- a/pkgs/development/libraries/onnxruntime/default.nix
+++ b/pkgs/development/libraries/onnxruntime/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "onnxruntime";
- version = "0.5.0";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "microsoft";
repo = "onnxruntime";
rev = "v${version}";
- sha256 = "0s8ylc5xr55490hbz7zn3hnp9dnyp92d320ln8xw5hqkw3mgyr3p";
+ sha256 = "1d28lzrjnq69yl8j9ncxlsxl0bniacn3hnsr9van10zgp527436v";
# TODO: use nix-versions of grpc, onnx, eigen, googletest, etc.
# submodules increase src size and compile times significantly
# not currently feasible due to how integrated cmake build is with git
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
rm -r $out/bin # ctest runner
'';
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Cross-platform, high performance scoring engine for ML models";
longDescription = ''
@@ -55,6 +57,9 @@ stdenv.mkDerivation rec {
compatibility.
'';
homepage = "https://github.com/microsoft/onnxruntime";
+ changelog = "https://github.com/microsoft/onnxruntime/releases";
+ # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures
+ platforms = platforms.unix;
license = licenses.mit;
maintainers = with maintainers; [ jonringer ];
};
diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index 89ac85b752b7..76f2861428d6 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -20,6 +20,14 @@ stdenv.mkDerivation rec {
sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi";
};
+ # this will make it find its own data files (e.g. HRTF profiles)
+ # without any other configuration
+ patches = [ ./search-out.patch ];
+ postPatch = ''
+ substituteInPlace Alc/helpers.c \
+ --replace "@OUT@" $out
+ '';
+
nativeBuildInputs = [ cmake ];
buildInputs = []
diff --git a/pkgs/development/libraries/openal-soft/search-out.patch b/pkgs/development/libraries/openal-soft/search-out.patch
new file mode 100644
index 000000000000..0f9c2abad3c3
--- /dev/null
+++ b/pkgs/development/libraries/openal-soft/search-out.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/Alc/helpers.c b/Alc/helpers.c
+--- a/Alc/helpers.c 1970-01-01 00:00:01.000000000 +0000
++++ b/Alc/helpers.c 1970-01-01 00:00:02.000000000 +0000
+@@ -951,6 +951,8 @@
+ }
+ }
+
++ DirectorySearch("@OUT@/share", ext, &results);
++
+ alstr_reset(&path);
+ }
+
diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix
index 26bcf3d20ff6..3838e1103ba3 100644
--- a/pkgs/development/libraries/openbabel/default.nix
+++ b/pkgs/development/libraries/openbabel/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
meta = {
+ description = "A toolbox designed to speak the many languages of chemical data";
+ homepage = "http://openbabel.org";
platforms = stdenv.lib.platforms.all;
maintainers = [ ];
license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix
index 25e7267b3c9f..269b0138091b 100644
--- a/pkgs/development/libraries/openbsm/default.nix
+++ b/pkgs/development/libraries/openbsm/default.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "ac_cv_file__usr_include_mach_audit_triggers_defs=no" ];
meta = {
- homepage = http://www.openbsm.org/;
+ description = "An implementation of Sun's Basic Security Module (BSM) security audit API and file format";
+ homepage = "http://www.openbsm.org/";
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ matthewbauer ];
license = lib.licenses.bsd2;
diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix
index cbd05848173a..06eff9d17f36 100644
--- a/pkgs/development/libraries/opencolorio/default.nix
+++ b/pkgs/development/libraries/opencolorio/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://opencolorio.org;
+ homepage = https://opencolorio.org;
description = "A color management framework for visual effects and animation";
license = licenses.bsd3;
maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix
index 724c0d7c7641..cf46077a56cd 100644
--- a/pkgs/development/libraries/opencsg/default.nix
+++ b/pkgs/development/libraries/opencsg/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libGLU_combined, freeglut, glew, libXmu, libXext, libX11
+{stdenv, fetchurl, libGLU, libGL, freeglut, glew, libXmu, libXext, libX11
, qmake, GLUT, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ glew ]
- ++ stdenv.lib.optionals stdenv.isLinux [ libGLU_combined freeglut libXmu libXext libX11 ]
+ ++ stdenv.lib.optionals stdenv.isLinux [ libGLU libGL freeglut libXmu libXext libX11 ]
++ stdenv.lib.optional stdenv.isDarwin GLUT;
doCheck = false;
diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index d8946dae095b..97df84637ef7 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -9,7 +9,7 @@
, enableTIFF ? true, libtiff
, enableWebP ? true, libwebp
, enableEXR ? !stdenv.isDarwin, openexr, ilmbase
-, enableJPEG2K ? true, jasper
+, enableJPEG2K ? false, jasper # disable jasper by default (many CVE)
, enableEigen ? true, eigen
, enableOpenblas ? true, openblas
, enableContrib ? true
@@ -36,20 +36,20 @@
}:
let
- version = "3.4.7";
+ version = "3.4.8";
src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = version;
- sha256 = "0r5rrcnqx2lsnr1ja5ij2chb7yk9kkamr4p0ik52sqxydwkv3z50";
+ sha256 = "1dnz3gfj70lm1gbrk8pz28apinlqi2x6nvd6xcy5hs08505nqnjp";
};
contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
rev = version;
- sha256 = "1ik6acsmgrx66awf19r2y3ijqvv9xg43gaphwszbiyi0jq3r43yw";
+ sha256 = "0psaa1yx36n34l09zd1y8jxgf8q4jzxd3vn06fqmzwzy85hcqn8i";
};
# Contrib must be built in order to enable Tesseract support:
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index a5eb1029ad91..408368b89c40 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -9,7 +9,7 @@
, enableTIFF ? true, libtiff
, enableWebP ? true, libwebp
, enableEXR ? !stdenv.isDarwin, openexr, ilmbase
-, enableJPEG2K ? true, jasper
+, enableJPEG2K ? false, jasper # disable jasper by default (many CVE)
, enableEigen ? true, eigen
, enableOpenblas ? true, openblas
, enableContrib ? true
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index b91a1489eb69..db8a5e5a41bb 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -6,7 +6,7 @@
, enablePNG ? true, libpng
, enableTIFF ? true, libtiff
, enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
-, enableJPEG2K ? true, jasper
+, enableJPEG2K ? false, jasper # disable jasper by default (many CVE)
, enableFfmpeg ? false, ffmpeg
, enableGStreamer ? false, gst_all_1
, enableEigen ? true, eigen
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 9eef138c532e..328bce35357f 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, libtool, pkgconfig, zlib, ilmbase, }:
+{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, libtool, pkgconfig,
+ zlib, ilmbase, fetchpatch }:
let
# Doesn't really do anything when not crosscompiling
@@ -16,6 +17,12 @@ stdenv.mkDerivation rec {
patches = [
./bootstrap.patch
+ (fetchpatch {
+ name = "CVE-2018-18444.patch";
+ url = "https://github.com/openexr/openexr/commit/1b0f1e5d7dcf2e9d6cbb4e005e803808b010b1e0.patch";
+ sha256 = "0f5m4wdwqqg8wfg7azzsz5yfpdrvws314rd4sqfc74j1g6wrcnqj";
+ stripLen = 1;
+ })
];
outputs = [ "bin" "dev" "out" "doc" ];
@@ -48,7 +55,8 @@ stdenv.mkDerivation rec {
doCheck = false; # fails 1 of 1 tests
meta = with stdenv.lib; {
- homepage = https://www.openexr.com/;
+ description = "A high dynamic-range (HDR) image file format";
+ homepage = "https://www.openexr.com/";
license = licenses.bsd3;
platforms = platforms.all;
};
diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix
index b8a3c4a81e00..92cd343cf6a1 100644
--- a/pkgs/development/libraries/openexrid-unstable/default.nix
+++ b/pkgs/development/libraries/openexrid-unstable/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU_combined, openexr }:
+{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:
stdenv.mkDerivation {
pname = "openexrid-unstable";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
-I${openfx.dev}/include/OpenFX
'';
- buildInputs = [ unzip re2 openfx zlib ilmbase libGLU_combined openexr ];
+ buildInputs = [ unzip re2 openfx zlib ilmbase libGLU libGL openexr ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
index cd91a1325978..fe46d25421a1 100644
--- a/pkgs/development/libraries/openh264/default.nix
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -2,25 +2,23 @@
stdenv.mkDerivation rec {
pname = "openh264";
- version = "1.8.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "cisco";
- repo = "openh264";
+ repo = pname;
rev = "v${version}";
- sha256 = "1pl7hpk25nh7lcx1lbbv984gvnim0d6hxf4qfmrjjfjf6w37sjw4";
+ sha256 = "0sa4n4xshmiiv6h767jjq9qxapxxjwwwm3bpcignkxv5xn5sls5r";
};
- buildInputs = [ nasm ];
+ nativeBuildInputs = [ nasm ];
- installPhase = ''
- make PREFIX=$out install
- '';
+ makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with stdenv.lib; {
description = "A codec library which supports H.264 encoding and decoding";
- homepage = http://www.openh264.org;
- license = stdenv.lib.licenses.bsd2;
+ homepage = "https://www.openh264.org";
+ license = licenses.bsd2;
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index 1398e829dd5c..b12ca67655b9 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen,
- libX11, libXinerama, libXrandr, libGLU_combined,
+ libX11, libXinerama, libXrandr, libGLU, libGL,
glib, ilmbase, libxml2, pcre, zlib,
jpegSupport ? true, libjpeg,
- jasperSupport ? true, jasper,
+ jasperSupport ? false, jasper, # disable jasper by default (many CVE)
exrSupport ? false, openexr,
gifSupport ? true, giflib,
pngSupport ? true, libpng,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake doxygen ];
buildInputs = [
- libX11 libXinerama libXrandr libGLU_combined
+ libX11 libXinerama libXrandr libGLU libGL
glib ilmbase libxml2 pcre zlib
] ++ lib.optional jpegSupport libjpeg
++ lib.optional jasperSupport jasper
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 8510e897332e..68e890e33682 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,13 +1,12 @@
{ stdenv, cmake, fetchFromGitHub, bctoolbox }:
stdenv.mkDerivation rec {
- baseName = "ortp";
+ pname = "ortp";
version = "1.0.2";
- name = "${baseName}-${version}";
src = fetchFromGitHub {
owner = "BelledonneCommunications";
- repo = baseName;
+ repo = pname;
rev = version;
sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv";
};
@@ -19,8 +18,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A Real-Time Transport Protocol (RFC3550) stack";
- homepage = http://www.linphone.org/index.php/eng/code_review/ortp;
- license = licenses.lgpl21;
+ homepage = https://linphone.org/technical-corner/ortp;
+ license = licenses.gpl2Plus;
platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 9ca329c67613..f13ae141a816 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "p11-kit";
- version = "0.23.16.1";
+ version = "0.23.18.1";
src = fetchFromGitHub {
owner = "p11-glue";
repo = pname;
rev = version;
- sha256 = "0jr62qkbqxp3iawgksk1qc3gp8p6x09sg5v7xac80ghyfxil15wy";
+ sha256 = "0l4ndipcbikblfjz729zkscvni5lzdzvbvsar2538pylw556rx73";
};
outputs = [ "out" "dev"];
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 9f1e7d5c2fcf..ecb0f16c72c5 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -9,13 +9,13 @@ with stdenv.lib;
let
pname = "pango";
- version = "1.43.0";
+ version = "1.44.7";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1lnxldmv1a12dq5h0dlq5jyzl4w75k76dp8cn360x2ijlm9w5h6j";
+ sha256 = "07qvxa2sk90chp1l12han6vxvy098mc37sdqcznyywyv2g6bd9b6";
};
# FIXME: docs fail on darwin
@@ -26,31 +26,18 @@ in stdenv.mkDerivation rec {
pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43
];
buildInputs = [
- harfbuzz fribidi
+ fribidi
] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
ApplicationServices
Carbon
CoreGraphics
CoreText
]);
- propagatedBuildInputs = [ cairo glib libintl ] ++
+ propagatedBuildInputs = [ cairo glib libintl harfbuzz ] ++
optional x11Support libXft;
- patches = [
- (fetchpatch {
- # Add gobject-2 to .pc file
- url = "https://gitlab.gnome.org/GNOME/pango/commit/546f4c242d6f4fe312de3b7c918a848e5172e18d.patch";
- sha256 = "1cqhy4xbwx3ad7z5d1ks7smf038b9as8c6qy84rml44h0fgiq4m2";
- })
- (fetchpatch {
- # Fixes CVE-2019-1010238
- url = "https://gitlab.gnome.org/GNOME/pango/commit/490f8979a260c16b1df055eab386345da18a2d54.diff";
- sha256 = "1s0qclbaknkx3dkc3n6mlmx3fnhlr2pkncqjkywprpvahmmypr7k";
- })
- ];
-
mesonFlags = [
- "-Denable_docs=${if stdenv.isDarwin then "false" else "true"}"
+ "-Dgtk_doc=${if stdenv.isDarwin then "false" else "true"}"
];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/pangox-compat/default.nix b/pkgs/development/libraries/pangox-compat/default.nix
deleted file mode 100644
index 1ae2f1b81321..000000000000
--- a/pkgs/development/libraries/pangox-compat/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, pango, libX11 }:
-
-stdenv.mkDerivation rec {
- pname = "pangox-compat";
- version = "0.0.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
- sha256 = "0ip0ziys6mrqqmz4n71ays0kf5cs1xflj1gfpvs4fgy2nsrr482m";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ glib pango libX11 ];
-
- meta = {
- description = "A compatibility library for pango>1.30.*";
- homepage = "https://gitlab.gnome.org/Archive/pangox-compat";
- license = stdenv.lib.licenses.lgpl2Plus;
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix
index b08936dd34de..ba042562320b 100644
--- a/pkgs/development/libraries/partio/default.nix
+++ b/pkgs/development/libraries/partio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU_combined, zlib, swig, python, doxygen, xorg }:
+{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU, libGL, zlib, swig, python, doxygen, xorg }:
stdenv.mkDerivation {
pname = "partio";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
outputs = [ "dev" "out" "lib" ];
nativeBuildInputs = [ unzip cmake doxygen ];
- buildInputs = [ freeglut libGLU_combined zlib swig python xorg.libXi xorg.libXmu ];
+ buildInputs = [ freeglut libGLU libGL zlib swig python xorg.libXi xorg.libXmu ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix
index 5a02229cb0e2..1831d9692493 100644
--- a/pkgs/development/libraries/pcaudiolib/default.nix
+++ b/pkgs/development/libraries/pcaudiolib/default.nix
@@ -3,15 +3,15 @@
, portaudio, alsaLib
, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
pname = "pcaudiolib";
- version = "2016-07-19";
+ version = "1.1";
src = fetchFromGitHub {
owner = "rhdunn";
repo = "pcaudiolib";
- rev = "4f836ea909bdaa8a6e0e89c587efc745b546b459";
- sha256 = "0z99nh4ibb9md2cd21762n1dmv6jk988785s1cxd8lsy4hp4pwfa";
+ rev = "${version}";
+ sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0";
};
nativeBuildInputs = [ autoconf automake which libtool pkgconfig ];
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 2e111240758d..cf08f9893697 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -29,8 +29,6 @@ in stdenv.mkDerivation {
]
++ optional (variant != null) "--enable-${variant}";
- buildInputs = optional (stdenv.hostPlatform.libc == "msvcrt") windows.mingw_w64_pthreads;
-
# https://bugs.exim.org/show_bug.cgi?id=2173
patches = [ ./stacksize-detection.patch ];
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index e27c71314d97..b988c4ea02cc 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "pcre2";
- version = "10.33";
+ version = "10.34";
src = fetchurl {
url = "https://ftp.pcre.org/pub/pcre/${pname}-${version}.tar.bz2";
- sha256 = "1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m";
+ sha256 = "1jlqnzcz2yi70dm40wyfa9w8is9z2kh4dl8zjnv3vqd9mgzp7i3l";
};
configureFlags = [
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index ef7633dadaf3..d9267827e779 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -1,21 +1,13 @@
{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig
-, extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null
-, withQt5 ? false
+, extra-cmake-modules, qttools, qtbase, qtx11extras
, debug ? false
}:
with lib;
-let
- v = "4.9.0";
+stdenv.mkDerivation rec {
pname = "phonon-backend-gstreamer";
-in
-
-assert withQt5 -> qtbase != null;
-assert withQt5 -> qtx11extras != null;
-
-stdenv.mkDerivation {
- name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}";
+ version = "4.10.0";
meta = with stdenv.lib; {
homepage = https://phonon.kde.org/;
@@ -26,8 +18,8 @@ stdenv.mkDerivation {
};
src = fetchurl {
- url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz";
- sha256 = "1wc5p1rqglf0n1avp55s50k7fjdzdrhg0gind15k8796w7nfbhyf";
+ url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz";
+ sha256 = "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5";
};
# Hardcode paths to useful plugins so the backend doesn't depend
@@ -52,17 +44,26 @@ stdenv.mkDerivation {
''-DGST_PLUGIN_PATH_1_0="${gstPluginPaths}"''
];
- buildInputs = with gst_all_1;
- [ gstreamer gst-plugins-base phonon ]
- ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]);
+ buildInputs = with gst_all_1; [
+ gstreamer
+ gst-plugins-base
+ phonon
+ qtbase
+ qtx11extras
+ ];
# cleanup: the build system creates (empty) $out/$out/share/icons (double prefix)
# if DESTDIR is unset
DESTDIR="/";
- nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ extra-cmake-modules
+ qttools
+ ];
- cmakeFlags =
- [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]
- ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
+ cmakeFlags = [
+ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}"
+ ];
}
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index 98c6be85672c..9ed137e4f450 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -1,22 +1,13 @@
{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc
-, extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null
-, withQt4 ? false
+, extra-cmake-modules, qttools, qtbase, qtx11extras
, debug ? false
}:
with lib;
-let
- v = "0.10.2";
+stdenv.mkDerivation rec {
pname = "phonon-backend-vlc";
-in
-
-assert withQt4 -> qt4 != null;
-assert !withQt4 -> qtbase != null;
-assert !withQt4 -> qtx11extras != null;
-
-stdenv.mkDerivation {
- name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}";
+ version = "0.11.1";
meta = with stdenv.lib; {
homepage = https://phonon.kde.org/;
@@ -26,17 +17,25 @@ stdenv.mkDerivation {
};
src = fetchurl {
- url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz";
- sha256 = "163jqq5p9n0yfw2fqk0cqn3c6mqycxsvc4956zhkw5345g81a2a9";
+ url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz";
+ sha256 = "1vp52i5996khpxs233an7mlrzdji50gcs58ig8nrwfwlgyb1xnfc";
};
- buildInputs =
- [ phonon vlc ]
- ++ (if withQt4 then [ qt4 ] else [ qtbase qtx11extras ]);
+ buildInputs = [
+ phonon
+ vlc
+ qtbase
+ qtx11extras
+ ];
- nativeBuildInputs = [ cmake pkgconfig ] ++ optional (!withQt4) extra-cmake-modules;
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ qttools
+ extra-cmake-modules
+ ];
- cmakeFlags =
- [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]
- ++ optional (!withQt4) "-DPHONON_BUILD_PHONON4QT5=ON";
+ cmakeFlags = [
+ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}"
+ ];
}
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index dc32c4ebfb05..86e3caaa1486 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, lib, fetchurl, cmake, libGLU_combined, pkgconfig, libpulseaudio
-, qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qttools ? null
-, withQt5 ? false
-, debug ? false }:
+{ stdenv
+, lib
+, fetchurl
+, cmake
+, libGLU
+, libGL
+, pkgconfig
+, libpulseaudio
+, extra-cmake-modules
+, qtbase
+, qttools
+, debug ? false
+}:
with lib;
let
- v = "4.10.3";
-
- soname = if withQt5 then "phonon4qt5" else "phonon";
+ soname = "phonon4qt5";
buildsystemdir = "share/cmake/${soname}";
in
-assert withQt5 -> qtbase != null;
-assert withQt5 -> qttools != null;
-
-stdenv.mkDerivation {
- name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}";
+stdenv.mkDerivation rec {
+ pname = "phonon";
+ version = "4.11.1";
meta = {
homepage = https://phonon.kde.org/;
@@ -27,25 +32,31 @@ stdenv.mkDerivation {
};
src = fetchurl {
- url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz";
- sha256 = "15f2vndpqfcivifzl1s07r0wkavpfrjln1p46cwfk85gd5b192rf";
+ url = "mirror://kde/stable/phonon/${version}/phonon-${version}.tar.xz";
+ sha256 = "0bfy8iqmjhlg3ma3iqd3kxjc2zkzpjgashbpf5x17y0dc2i1whxl";
};
- buildInputs =
- [ libGLU_combined libpulseaudio ]
- ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]);
+ buildInputs = [
+ libGLU
+ libGL
+ libpulseaudio
+ qtbase
+ qttools
+ ];
- nativeBuildInputs =
- [ cmake pkgconfig ]
- ++ optional withQt5 extra-cmake-modules;
+ nativeBuildInputs = [
+ cmake
+ pkgconfig
+ extra-cmake-modules
+ ];
outputs = [ "out" "dev" ];
NIX_CFLAGS_COMPILE = "-fPIC";
- cmakeFlags =
- [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]
- ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
+ cmakeFlags = [
+ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}"
+ ];
preConfigure = ''
cmakeFlags+=" -DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs"
@@ -63,10 +74,8 @@ stdenv.mkDerivation {
sed -i cmake/FindPhononInternal.cmake \
-e "/set(INCLUDE_INSTALL_DIR/ c set(INCLUDE_INSTALL_DIR \"''${!outputDev}/include\")"
- ${optionalString withQt5 ''
sed -i cmake/FindPhononInternal.cmake \
-e "/set(PLUGIN_INSTALL_DIR/ c set(PLUGIN_INSTALL_DIR \"$qtPluginPrefix/..\")"
- ''}
sed -i CMakeLists.txt \
-e "/set(BUILDSYSTEM_INSTALL_DIR/ c set(BUILDSYSTEM_INSTALL_DIR \"''${!outputDev}/${buildsystemdir}\")"
diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix
index 5302ad21258a..4ebfd6fbfa37 100644
--- a/pkgs/development/libraries/physics/apfel/default.nix
+++ b/pkgs/development/libraries/physics/apfel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2 }:
+{ stdenv, fetchFromGitHub, gfortran, lhapdf, python2, zlib }:
stdenv.mkDerivation rec {
pname = "apfel";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "13n5ygbqvskg3qq5n4sff1nbii0li0zf1vqissai7x0hynxgy7p6";
};
- buildInputs = [ gfortran lhapdf python2 ];
+ buildInputs = [ gfortran lhapdf python2 zlib ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix
index edda5148068a..3e2a53d81dd8 100644
--- a/pkgs/development/libraries/physics/applgrid/default.nix
+++ b/pkgs/development/libraries/physics/applgrid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }:
+{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }:
stdenv.mkDerivation rec {
pname = "applgrid";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p";
};
- buildInputs = [ gfortran hoppet lhapdf root5 ];
+ # For some reason zlib was only needed after bump to gfortran8
+ buildInputs = [ gfortran hoppet lhapdf root5 zlib ];
patches = [
./bad_code.patch
diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix
new file mode 100644
index 000000000000..2bc5b12dfb77
--- /dev/null
+++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, fastjet }:
+
+stdenv.mkDerivation rec {
+ pname = "fastjet-contrib";
+ version = "1.042";
+
+ src = fetchurl {
+ url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz";
+ sha256 = "0cc8dn6g7adj2pgs8hvczg68i3xhlk6978m4gxamgibilf9jw1av";
+ };
+
+ buildInputs = [ fastjet ];
+
+ postPatch = ''
+ for f in Makefile.in */Makefile; do
+ substituteInPlace "$f" --replace "CXX=g++" ""
+ done
+ patchShebangs ./configure ./utils/check.sh ./utils/install-sh
+ '';
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ postBuild = ''
+ make fragile-shared
+ '';
+
+ postInstall = ''
+ make fragile-shared-install
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Third party extensions for FastJet";
+ homepage = "http://fastjet.fr/";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ veprbl ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 96715882c231..007e4ad0c32f 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -30,7 +30,7 @@
, libXpm
# For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
-, libGLU_combined
+, libGLU, libGL
, xlibsWrapper
, libXmu
}:
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ cmake ];
- buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ]
+ buildInputs = [ clhep expat zlib libGLU libGL xlibsWrapper libXmu ]
++ stdenv.lib.optionals enableGDML [ xercesc ]
++ stdenv.lib.optionals enableXM [ motif ]
++ stdenv.lib.optionals enableQT [ qtbase ]
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index d252e62286b0..d52f92d96394 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
pname = "herwig";
- version = "7.1.5";
+ version = "7.2.0";
src = fetchurl {
url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
- sha256 = "0jnrv59zfa41gc37pqr3vaiz5jkh7w0k0alcax37b3mlbsnacr9r";
+ sha256 = "0r5iyai2j99pk9p36g4rp98bxm55zd1ik9kgm2zf5zgpvxfm8csr";
};
nativeBuildInputs = [ autoconf automake libtool ];
buildInputs = [ boost fastjet gfortran gsl thepeg zlib ]
- # There is a bug that requires for MMHT PDF's to be presend during the build
- ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]);
+ # There is a bug that requires for default PDF's to be present during the build
+ ++ (with lhapdf.pdf_sets; [ CT14lo CT14nlo ]);
postPatch = ''
patchShebangs ./
@@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
description = "A multi-purpose particle physics event generator";
- license = stdenv.lib.licenses.gpl2;
- homepage = https://herwig.hepforge.org/;
- platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ veprbl ];
- broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen...
+ homepage = https://herwig.hepforge.org/;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ veprbl ];
+ platforms = platforms.unix;
+ broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen...
};
}
diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix
index 0398175a9a28..c37d4b9d2f1a 100644
--- a/pkgs/development/libraries/physics/pythia/default.nix
+++ b/pkgs/development/libraries/physics/pythia/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "pythia";
- version = "8.243";
+ version = "8.244";
src = fetchurl {
url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
- sha256 = "0y8w5gdaczg8vdw63rkgjr1dcvqs2clqkdia34p30xcwgm1jgv7q";
+ sha256 = "1jlj9hgmk2gcm5p0zqsiz0dpv9vvj8ip261si7frrwfsk7wq0j73";
};
buildInputs = [ boost fastjet hepmc2 zlib rsync lhapdf ];
diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix
index ad5f994620ff..8b002ce81957 100644
--- a/pkgs/development/libraries/physics/qcdnum/default.nix
+++ b/pkgs/development/libraries/physics/qcdnum/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran }:
+{ stdenv, fetchurl, gfortran, zlib }:
stdenv.mkDerivation rec {
pname = "QCDNUM";
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ gfortran ];
+ buildInputs = [ zlib ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix
index 914eee5c286b..95e44f2364cb 100644
--- a/pkgs/development/libraries/physics/rivet/default.nix
+++ b/pkgs/development/libraries/physics/rivet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }:
+{ stdenv, fetchurl, fetchpatch, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }:
stdenv.mkDerivation rec {
pname = "rivet";
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
patches = [
./darwin.patch # configure relies on impure sw_vers to -Dunix
+ (fetchpatch {
+ url = "https://phab-files.hepforge.org/file/data/j3ja4jirrdyrovrmnbuh/PHID-FILE-6vnor4aoz3s2ejruisrg/file";
+ sha256 = "0flxv08wcd0m5di75s2zvm015k2k70nqgpcgcbq7m604z26pd6ab";
+ })
];
latex = texlive.combine { inherit (texlive)
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
index fa293eab3500..15c94668581d 100644
--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "thepeg";
- version = "2.1.5";
+ version = "2.2.0";
src = fetchurl {
url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
- sha256 = "1rmmwhk9abn9mc9j3127axjwpvymv21ld4wcivwz01pldkxh06n6";
+ sha256 = "1y7vwsc4zk629np4rpjh7a8qzvyqc2fixnwq98dgdndp2544gqfk";
};
buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ];
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = {
+ meta = with stdenv.lib; {
description = "Toolkit for High Energy Physics Event Generation";
- license = stdenv.lib.licenses.gpl2;
- homepage = https://herwig.hepforge.org/;
- platforms = stdenv.lib.platforms.unix;
- maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ homepage = https://herwig.hepforge.org/;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ veprbl ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix
index c9e8c632c7f1..bbc5eb21c276 100644
--- a/pkgs/development/libraries/plib/default.nix
+++ b/pkgs/development/libraries/plib/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, fetchpatch, stdenv, libGLU_combined, freeglut, SDL
+{ fetchurl, fetchpatch, stdenv, libGLU, libGL, freeglut, SDL
, libXi, libSM, libXmu, libXext, libX11 }:
stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
propagatedBuildInputs = [
- libGLU_combined freeglut SDL
+ libGLU libGL freeglut SDL
# The following libs ought to be propagated build inputs of Mesa.
libXi libSM libXmu libXext libX11
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 9fdf53a13724..17163c2206cd 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -2,7 +2,7 @@
, intltool, spidermonkey_60 , gobject-introspection, libxslt, docbook_xsl, dbus
, docbook_xml_dtd_412, gtk-doc, coreutils
, useSystemd ? (stdenv.isLinux && !stdenv.hostPlatform.isMusl), systemd, elogind
-, withGnome ? true
+, withIntrospection ? true
# A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault).
# Not yet investigated; it may be due to the "Make netgroup support optional"
# patch not updating the tests correctly yet, or doing something wrong,
@@ -28,8 +28,9 @@ stdenv.mkDerivation rec {
patches = [
# Don't use etc/dbus-1/system.d
+ # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/11
(fetchpatch {
- url = "https://gitlab.freedesktop.org/polkit/polkit/merge_requests/11.patch";
+ url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5dd4e22efd05d55833c4634b56e473812b5acbf2.patch";
sha256 = "17lv7xj5ksa27iv4zpm4zwd4iy8zbwjj4ximslfq3sasiz9kxhlp";
})
] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
@@ -54,8 +55,9 @@ stdenv.mkDerivation rec {
++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
buildInputs =
[ expat pam spidermonkey_60 ]
- ++ (if useSystemd then [systemd] else [elogind])
- ++ stdenv.lib.optional withGnome gobject-introspection;
+ # On Linux, fall back to elogind when systemd support is off.
+ ++ stdenv.lib.optional stdenv.isLinux (if useSystemd then systemd else elogind)
+ ++ stdenv.lib.optional withIntrospection gobject-introspection;
propagatedBuildInputs = [
glib # in .pc Requires
@@ -84,7 +86,7 @@ stdenv.mkDerivation rec {
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
"--with-polkitd-user=polkituser" #TODO? config.ids.uids.polkituser
"--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS
- (if withGnome then "--enable-introspection" else "--disable-introspection")
+ (if withIntrospection then "--enable-introspection" else "--disable-introspection")
] ++ stdenv.lib.optional (!doCheck) "--disable-test";
makeFlags = [
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 523e372996bc..eb1e9ec732ff 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -7,28 +7,20 @@
, minimal ? false, suffix ? "glib"
}:
-let # beware: updates often break cups-filters build
- version = "0.74.0";
+let
mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
in
stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}";
+ version = "0.83.0"; # beware: updates often break cups-filters build
src = fetchurl {
url = "${meta.homepage}/poppler-${version}.tar.xz";
- sha256 = "0bvb0yq9zsl2b811j4l4x0vf8g5lgmqbndkb2hvgsrr5639rzq4j";
+ sha256 = "16vr1g5qsqwyxfnyikqw37i04x9zpp45far2x90c7qbijw6nap38";
};
outputs = [ "out" "dev" ];
- patches = [
- (fetchpatch {
- name = "CVE-2019-9959.patch";
- url = "https://gitlab.freedesktop.org/poppler/poppler/commit/68ef84e5968a4249c2162b839ca6d7975048a557.patch";
- sha256 = "17a3qs74fnnrhjys23f4aw5y7yfsk5d507jcj4hh1bndqv6dpwg1";
- })
- ];
-
buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data;
# TODO: reduce propagation to necessary libs
diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix
new file mode 100644
index 000000000000..cdce346fe792
--- /dev/null
+++ b/pkgs/development/libraries/precice/default.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python2, python2Packages }:
+
+stdenv.mkDerivation rec {
+ pname = "precice";
+ version = "1.6.1";
+
+ src = fetchFromGitHub {
+ owner = "precice";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "00631zw6cpm67j35cwad04nwgfcvlxa8p660fwz30pgj2hzdx3d2";
+ };
+
+ preConfigure = ''
+ cmakeFlags="-DBUILD_SHARED_LIBS=ON -DPETSC=off"
+ '';
+
+ nativeBuildInputs = [ cmake gcc ];
+ buildInputs = [ boost eigen libxml2 openmpi python2 python2Packages.numpy ];
+ installPhase = ''
+ mkdir -p $out/lib
+ cp libprecice.so libprecice.so.1.6.1 $out/lib/
+ '';
+
+ meta = {
+ description = "preCICE stands for Precise Code Interaction Coupling Environment";
+ license = with lib.licenses; [ gpl3 ];
+ homepage = "https://www.precice.org/";
+ platforms = lib.platforms.linux;
+ maintainers = with lib.maintainers; [ Scriptkiddi ];
+ };
+}
+
diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix
index 6f49db4d206f..b047322c35e6 100644
--- a/pkgs/development/libraries/prometheus-cpp/default.nix
+++ b/pkgs/development/libraries/prometheus-cpp/default.nix
@@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "prometheus-cpp";
- version = "0.7.0";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "jupp0r";
repo = pname;
rev = "v${version}";
- sha256 = "15bda1q1jbvixbx1qf41ykcdmsywhhwmi4xgsha12r5m9fh8jzxj";
+ sha256 = "0j12ir8skw3y2q8n743zql4ddp7v1j4h030pjcsqn0xqrqw7m5hg";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/protobuf/3.11.nix b/pkgs/development/libraries/protobuf/3.11.nix
new file mode 100644
index 000000000000..7e89463aad6c
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.11.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... }:
+
+callPackage ./generic-v3.nix {
+ version = "3.11.1";
+ sha256 = "1mq8dp94mlp72ri27bgvc2i370r8kfig87wfai7vxjdnh3vng0y1";
+}
diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix
index a36e9e0fd0da..f1eb3ae51f32 100644
--- a/pkgs/development/libraries/protolock/default.nix
+++ b/pkgs/development/libraries/protolock/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "protolock";
- version = "0.14.1";
+ version = "0.15.0";
src = fetchFromGitHub {
owner = "nilslice";
repo = "protolock";
rev = "v${version}";
- sha256 = "0assk7hp9s3m7zm5i1v0pggz00a54yf2w3y0b8mlq5v51y2h8h2z";
+ sha256 = "0qg26vcqdhgy91p6wiv16dq73ay0fymran3d8ylca9264zwi2vxw";
};
- modSha256 = "079hbv0f8k5lljrb1cr9568wq8sb9yry9smgbrji19yavd9fzcmh";
+ modSha256 = "1q755ipqsfpr41s5fxzmx50lwcdqc5a7akwx6mzn789w2z07x8lg";
postInstall = ''
rm $out/bin/plugin*
diff --git a/pkgs/development/libraries/pybind11/default.nix b/pkgs/development/libraries/pybind11/default.nix
deleted file mode 100644
index 7dfbdc4d64a0..000000000000
--- a/pkgs/development/libraries/pybind11/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, fetchFromGitHub, cmake, catch, python, eigen }:
-
-stdenv.mkDerivation rec {
- pname = "pybind";
- version = "2.2.4";
-
- src = fetchFromGitHub {
- owner = "pybind";
- repo = "pybind11";
- rev = "v${version}";
- sha256 = "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv";
- };
-
- nativeBuildInputs = [ cmake ];
- checkInputs = with python.pkgs; [ catch eigen pytest numpy scipy ];
-
- # Disable test_cmake_build test, as it fails in sandbox
- # https://github.com/pybind/pybind11/issues/1355
- patches = [
- ./no_test_cmake_build.patch
- (fetchurl { # Remove on bump to v2.2.5
- name = "pytest_namespace_to_configure.patch";
- url = "https://github.com/pybind/pybind11/commit/e7ef34f23f194cfa40bdbf967c6d34712261a4ee.patch";
- sha256 = "1dhv6p0b5fxzxc8j3sfy8kvfmdshczk22xfxh6bk0cfnfdy9iqrq";
- })
- ];
-
- doCheck = true;
-
- cmakeFlags = [
- "-DPYTHON_EXECUTABLE=${python.interpreter}"
- "-DPYBIND11_TEST=${if doCheck then "ON" else "OFF"}"
- ];
-
- meta = {
- homepage = https://github.com/pybind/pybind11;
- description = "Seamless operability between C++11 and Python";
- longDescription = ''
- Pybind11 is a lightweight header-only library that exposes
- C++ types in Python and vice versa, mainly to create Python
- bindings of existing C++ code.
- '';
- platforms = with stdenv.lib.platforms; unix;
- license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
- };
-}
diff --git a/pkgs/development/libraries/pybind11/no_test_cmake_build.patch b/pkgs/development/libraries/pybind11/no_test_cmake_build.patch
deleted file mode 100644
index c5d6ecc4481e..000000000000
--- a/pkgs/development/libraries/pybind11/no_test_cmake_build.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/tests/CMakeLists.txt 2019-01-28 14:13:55.822119328 +0100
-+++ b/tests/CMakeLists.txt 2019-01-28 14:14:06.741161928 +0100
-@@ -233,4 +233,3 @@
- add_subdirectory(test_embed)
-
- # Test CMake build using functions and targets from subdirectory or installed location
--add_subdirectory(test_cmake_build)
diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
index 94c69a4a14b3..3626e15cfc75 100644
--- a/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -1,14 +1,14 @@
-{ mkDerivation, lib, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }:
+{ mkDerivation, lib, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake, qtx11extras, pantheon }:
mkDerivation rec {
pname = "qgnomeplatform";
- version = "0.5";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "FedoraQt";
repo = "QGnomePlatform";
rev = version;
- sha256 = "01ncj21cxd5p7pch6p3zbhv5wp0dgn9vy5hrw54g49fmqnbb1ymz";
+ sha256 = "0fb1mzs6sx76bl7f0z2xhc0jq6y1c55jrw1v3na8577is6g5ji0a";
};
nativeBuildInputs = [
@@ -19,14 +19,23 @@ mkDerivation rec {
buildInputs = [
gtk3
qtbase
+ qtx11extras
];
postPatch = ''
# Fix plugin dir
- substituteInPlace qgnomeplatform.pro \
+ substituteInPlace decoration/decoration.pro \
+ --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
+ substituteInPlace theme/theme.pro \
--replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
'';
+ passthru = {
+ updateScript = pantheon.updateScript {
+ attrPath = pname;
+ };
+ };
+
meta = with lib; {
description = "QPlatformTheme for a better Qt application inclusion in GNOME";
homepage = https://github.com/FedoraQt/QGnomePlatform;
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 5cdde468416d..68362be596b6 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libjpeg, zlib, perl }:
-let version = "9.0.2";
+let version = "9.1.0";
in
stdenv.mkDerivation rec {
pname = "qpdf";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/qpdf/qpdf/${version}/${pname}-${version}.tar.gz";
- sha256 = "0b6jhhsifgiwrznxxi3h7hqm7bi91wph65jjbvs4g2860vcm296h";
+ sha256 = "0ygd80wxcmh613n04x2kmf8wlsl0drxyd5wwdcrm1rzj0xwvpfrs";
};
nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index a46dcec03128..98519ae294a4 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -8,7 +8,7 @@
, mysqlSupport ? false, libmysqlclient ? null
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
, openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, libGLU_combined ? null, libXmu ? null
+, libGL ? null, libGLU ? null, libXmu ? null
, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which
}:
@@ -17,7 +17,7 @@ assert xrenderSupport -> xftSupport && libXrender != null;
assert xrandrSupport -> libXrandr != null;
assert cursorSupport -> libXcursor != null;
assert mysqlSupport -> libmysqlclient != null;
-assert openglSupport -> libGLU_combined != null && libXmu != null;
+assert openglSupport -> libGL != null && libGLU != null && libXmu != null;
stdenv.mkDerivation {
name = "qt-3.3.8";
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
(mk xftSupport "xft")
] ++ stdenv.lib.optionals openglSupport [
"-dlopen-opengl"
- "-L${libGLU_combined}/lib" "-I${libGLU_combined}/include"
+ "-L${libGL}/lib" "-I${libGLU}/include"
"-L${libXmu.out}/lib" "-I${libXmu.dev}/include"
] ++ stdenv.lib.optionals xrenderSupport [
"-L${libXrender.out}/lib" "-I${libXrender.dev}/include"
diff --git a/pkgs/development/libraries/qt-5/5.11/fetch.sh b/pkgs/development/libraries/qt-5/5.11/fetch.sh
deleted file mode 100644
index 2ab3dd71c24f..000000000000
--- a/pkgs/development/libraries/qt-5/5.11/fetch.sh
+++ /dev/null
@@ -1 +0,0 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ )
diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch b/pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch
deleted file mode 100644
index 8b46d432812a..000000000000
--- a/pkgs/development/libraries/qt-5/5.11/qtbase-fixguicmake.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 0bbc871..3673634 100644
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
- set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
-- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
-+ set(imported_location \"${PLUGIN_LOCATION}\")
- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
- set_target_properties(Qt5::${Plugin} PROPERTIES
- \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-index 5baf0fd..3583745 100644
---- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-@@ -2,10 +2,10 @@
- add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
-
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
- !!ENDIF
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
- !!ENDIF
-
- list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.11/qtbase.patch b/pkgs/development/libraries/qt-5/5.11/qtbase.patch
deleted file mode 100644
index 7d8407f6daf8..000000000000
--- a/pkgs/development/libraries/qt-5/5.11/qtbase.patch
+++ /dev/null
@@ -1,1106 +0,0 @@
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/common/mac.conf qtbase-everywhere-src-5.11.3/mkspecs/common/mac.conf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/common/mac.conf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/common/mac.conf 2019-01-31 00:42:55.843577249 +0100
-@@ -23,7 +23,7 @@
-
- QMAKE_FIX_RPATH = install_name_tool -id
-
--QMAKE_LFLAGS_RPATH = -Wl,-rpath,
-+QMAKE_LFLAGS_RPATH =
- QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip
-
- QMAKE_LFLAGS_REL_RPATH =
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.11.3/mkspecs/features/create_cmake.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/create_cmake.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/create_cmake.prf 2019-01-31 00:42:55.843577249 +0100
-@@ -21,7 +21,7 @@
- # at cmake time whether package has been found via a symlink, and correct
- # that to an absolute path. This is only done for installations to
- # the /usr or / prefix.
--CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS])
-+CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/)
- contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
-
- CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
-@@ -51,45 +51,20 @@
- $$cmake_extra_source_includes.output
- }
-
--CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX])
--contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") {
-- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/
-- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
--}
-+CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/
-+CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
-
--CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
--contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
-- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
-- CMAKE_LIB_DIR_IS_ABSOLUTE = True
--} else {
-- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])
-- # We need to go up another two levels because the CMake files are
-- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME}
-- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"
--}
-+CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/
-+CMAKE_BIN_DIR_IS_ABSOLUTE = True
-
--CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX])
--contains(CMAKE_BIN_DIR, "^\\.\\./.*") {
-- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/
-- CMAKE_BIN_DIR_IS_ABSOLUTE = True
--}
-+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/
-+CMAKE_LIB_DIR_IS_ABSOLUTE = True
-
--CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX])
--contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") {
-- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/
-- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
--}
--
--win32:!static:!staticlib {
-- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX])
-- contains(CMAKE_DLL_DIR, "^\\.\\./.*") {
-- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/
-- CMAKE_DLL_DIR_IS_ABSOLUTE = True
-- }
--} else {
-- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR
-- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE
--}
-+CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/
-+CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True
-+
-+CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/
-+CMAKE_DLL_DIR_IS_ABSOLUTE = True
-
- static|staticlib:CMAKE_STATIC_TYPE = true
-
-@@ -169,7 +144,7 @@
- cmake_target_file
-
- cmake_qt5_plugin_file.files = $$cmake_target_file.output
-- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
-+ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME}
- INSTALLS += cmake_qt5_plugin_file
-
- return()
-@@ -316,7 +291,7 @@
- cmake_qt5_module_files.files += $$cmake_macros_file.output
- }
-
--cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME}
-+cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME}
-
- # We are generating cmake files. Most developers of Qt are not aware of cmake,
- # so we require automatic tests to be available. The only module which should
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in qtbase-everywhere-src-5.11.3/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2019-01-31 00:42:55.843577249 +0100
-@@ -3,30 +3,6 @@
- message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\")
- endif()
-
--!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
--!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ELSE
--get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH)
--# Use original install prefix when loaded through a
--# cross-prefix symbolic link such as /lib -> /usr/lib.
--get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
--get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH)
--if(_realCurr STREQUAL _realOrig)
-- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
--else()
-- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--endif()
--unset(_realOrig)
--unset(_realCurr)
--unset(_IMPORT_PREFIX)
--!!ENDIF
--!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
--get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
--!!ELSE
--set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
--!!ENDIF
--
- !!IF !equals(TEMPLATE, aux)
- # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead.
- set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)")
-@@ -52,11 +28,7 @@
- macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
--!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
--!!ELSE
- set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
--!!ENDIF
- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
- \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
-@@ -69,11 +41,7 @@
- )
-
- !!IF !isEmpty(CMAKE_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ELSE
- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
--!!ENDIF
- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib})
- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\")
- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-@@ -89,24 +57,13 @@
- !!IF !no_module_headers
- !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
-+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\"
-+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
- )
- !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
-- )
--!!ELSE
-- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
--!!ENDIF
--!!ELSE
--!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
-- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\")
--!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
-- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\"
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\"
-+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\"
-+ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\"
- )
- !!ELSE
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
-@@ -122,7 +79,6 @@
- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\")
- !!ENDIF
- !!ENDIF
--!!ENDIF
- !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS)
- include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL)
- !!ENDIF
-@@ -269,25 +225,13 @@
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_DEBUG_TYPE)
- !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" )
- !!ELSE // CMAKE_STATIC_WINDOWS_BUILD
- if (EXISTS
--!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
--!!ELSE
- \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
--!!ENDIF
- AND EXISTS
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ELSE
- \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
--!!ENDIF
- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" )
- !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
- endif()
-@@ -306,25 +250,13 @@
- !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD)
- !!IF isEmpty(CMAKE_RELEASE_TYPE)
- !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD)
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE
- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE
- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" )
- !!ELSE // CMAKE_STATIC_WINDOWS_BUILD
- if (EXISTS
--!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
--!!ELSE
- \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
--!!ENDIF
- AND EXISTS
--!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ELSE
- \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
--!!ENDIF
- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
- !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD
- endif()
-@@ -343,11 +275,7 @@
- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
- set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
--!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
--!!ELSE
- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
--!!ENDIF
- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
- set_target_properties(Qt5::${Plugin} PROPERTIES
- \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_post.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_post.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_post.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_post.prf 2019-01-31 00:45:14.585621324 +0100
-@@ -62,199 +62,3 @@
- }
- }
- }
--
--# Add the same default rpaths as Xcode does for new projects.
--# This is especially important for iOS/tvOS/watchOS where no other option is possible.
--!no_default_rpath {
-- QMAKE_RPATHDIR += @executable_path/Frameworks
-- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks
--}
--
--# Don't pass -headerpad_max_install_names when using Bitcode.
--# In that case the linker emits a warning stating that the flag is ignored when
--# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962).
--# Using this flag is also unnecessary in practice on UIKit platforms since they
--# are sandboxed, and only UIKit platforms support bitcode to begin with.
--!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD
--
--app_extension_api_only {
-- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
-- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
-- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
-- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION
--}
--
--macx-xcode {
-- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO
-- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \
-- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO
-- else: \
-- qmake_pkginfo_typeinfo.value = "????"
-- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo
--
-- !isEmpty(VERSION) {
-- l = $$split(VERSION, '.') 0 0 # make sure there are at least three
-- VER_MAJ = $$member(l, 0, 0)
-- VER_MIN = $$member(l, 1, 1)
-- VER_PAT = $$member(l, 2, 2)
-- unset(l)
--
-- qmake_full_version.name = QMAKE_FULL_VERSION
-- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
-- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version
--
-- qmake_short_version.name = QMAKE_SHORT_VERSION
-- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN}
-- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version
-- }
--
-- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {
-- debug_information_format.name = DEBUG_INFORMATION_FORMAT
-- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT
-- debug_information_format.build = debug
-- QMAKE_MAC_XCODE_SETTINGS += debug_information_format
-- }
--
-- QMAKE_XCODE_ARCHS =
--
-- arch_device.name = "ARCHS[sdk=$${device.sdk}*]"
-- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS
-- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS
-- QMAKE_MAC_XCODE_SETTINGS += arch_device
--
-- simulator {
-- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]"
-- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS
-- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS
-- QMAKE_MAC_XCODE_SETTINGS += arch_simulator
-- }
--
-- only_active_arch.name = ONLY_ACTIVE_ARCH
-- only_active_arch.value = YES
-- only_active_arch.build = debug
-- QMAKE_MAC_XCODE_SETTINGS += only_active_arch
--} else {
-- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS
-- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS
-- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS
--
-- isEmpty(VALID_ARCHS): \
-- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture")
--
-- single_arch: VALID_ARCHS = $$first(VALID_ARCHS)
--
-- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS))
-- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch))
--
-- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS
--
-- arch_flags = $(EXPORT_ARCH_ARGS)
--
-- QMAKE_CFLAGS += $$arch_flags
-- QMAKE_CXXFLAGS += $$arch_flags
-- QMAKE_LFLAGS += $$arch_flags
--
-- QMAKE_PCH_ARCHS = $$VALID_ARCHS
--
-- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET
-- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET
-- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET
-- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET
--
-- # If we're doing a simulator and device build, device and simulator
-- # architectures use different paths and flags for the sysroot and
-- # deployment target switch, so we must multiplex them across multiple
-- # architectures using -Xarch. Otherwise we fall back to the simple path.
-- # This is not strictly necessary, but results in cleaner command lines
-- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit
-- # individual rules to a different set of architecture(s) from the overall
-- # build (such as machtest in QtCore).
-- simulator:device {
-- QMAKE_XARCH_CFLAGS =
-- QMAKE_XARCH_LFLAGS =
-- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS
--
-- for (arch, VALID_ARCHS) {
-- contains(VALID_SIMULATOR_ARCHS, $$arch) {
-- sdk = $$simulator.sdk
-- version_identifier = $$simulator.deployment_identifier
-- } else {
-- sdk = $$device.sdk
-- version_identifier = $$device.deployment_identifier
-- }
--
-- version_min_flags = \
-- -Xarch_$${arch} \
-- -m$${version_identifier}-version-min=$$deployment_target
-- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \
-- -Xarch_$${arch} \
-- -isysroot$$xcodeSDKInfo(Path, $$sdk)
-- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \
-- -Xarch_$${arch} \
-- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk)
--
-- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch})
-- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch})
--
-- QMAKE_EXTRA_VARIABLES += \
-- QMAKE_XARCH_CFLAGS_$${arch} \
-- QMAKE_XARCH_LFLAGS_$${arch}
-- }
--
-- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS)
-- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS)
-- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS)
-- } else {
-- simulator: \
-- version_identifier = $$simulator.deployment_identifier
-- else: \
-- version_identifier = $$device.deployment_identifier
-- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
-- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
-- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
-- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag
-- }
--
-- # Enable precompiled headers for multiple architectures
-- QMAKE_CFLAGS_USE_PRECOMPILE =
-- for (arch, VALID_ARCHS) {
-- icc_pch_style: \
-- use_flag = "-pch-use "
-- else: \
-- use_flag = -include
--
-- # Only use Xarch with multi-arch, as the option confuses ccache
-- count(VALID_ARCHS, 1, greaterThan): \
-- QMAKE_CFLAGS_USE_PRECOMPILE += \
-- -Xarch_$${arch}
--
-- QMAKE_CFLAGS_USE_PRECOMPILE += \
-- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}}
-- }
-- icc_pch_style {
-- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT}
-- QMAKE_CFLAGS_USE_PRECOMPILE =
-- } else {
-- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
-- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
-- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
-- }
--
-- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT}
--}
--
--cache(QMAKE_XCODE_DEVELOPER_PATH, stash)
--!isEmpty(QMAKE_XCODE_VERSION): \
-- cache(QMAKE_XCODE_VERSION, stash)
--
--QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()
--
--xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER
--xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX
--isEmpty(xcode_product_bundle_identifier_setting.value): \
-- xcode_product_bundle_identifier_setting.value = "com.yourcompany"
--xcode_product_bundle_target = $$QMAKE_BUNDLE
--isEmpty(xcode_product_bundle_target): \
-- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier}
--xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}"
--QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
-Only in qtbase-everywhere-src-5.11.3/mkspecs/features/mac: default_post.prf.orig
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_pre.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_pre.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/default_pre.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/default_pre.prf 2019-01-31 00:42:55.843577249 +0100
-@@ -1,60 +1,2 @@
- CONFIG = asset_catalogs rez $$CONFIG
- load(default_pre)
--
--isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
-- # Get path of Xcode's Developer directory
-- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null")
-- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \
-- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.")
--
-- # Make sure Xcode path is valid
-- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \
-- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
--}
--
--isEmpty(QMAKE_XCODEBUILD_PATH): \
-- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null")
--
--!isEmpty(QMAKE_XCODEBUILD_PATH) {
-- # Make sure Xcode is set up properly
-- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \
-- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.")
--
-- isEmpty(QMAKE_XCODE_VERSION) {
-- # Extract Xcode version using xcodebuild
-- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version")
-- QMAKE_XCODE_VERSION = $$member(xcode_version, 1)
-- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")
-- unset(xcode_version)
-- }
--}
--
--isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) {
-- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist
-- exists($$QMAKE_XCODE_PREFERENCES_FILE): \
-- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null")
--
-- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \
-- cache(QMAKE_TARGET_BUNDLE_PREFIX)
--}
--
--QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon
--
--# Make the default debug info format for static debug builds
--# DWARF instead of DWARF with dSYM. This cuts down build times
--# for application debug builds significantly, as Xcode doesn't
--# have to pull out all the DWARF info from the Qt static libs
--# and put it into a dSYM file. We don't need that dSYM file in
--# the first place, since the information is available in the
--# object files inside the archives (static libraries).
--macx-xcode:qtConfig(static): \
-- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf
--
--# This variable is used by the xcode_dynamic_library_suffix
--# feature, which allows Xcode to choose the Qt libraries to link to
--# at build time, depending on the current Xcode SDK and configuration.
--QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX
--
--xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP
--xcode_copy_phase_strip_setting.value = NO
--QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/sdk.prf qtbase-everywhere-src-5.11.3/mkspecs/features/mac/sdk.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/mac/sdk.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/mac/sdk.prf 2019-01-31 00:42:55.843577249 +0100
-@@ -1,58 +1 @@
-
--isEmpty(QMAKE_MAC_SDK): \
-- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
--
--contains(QMAKE_MAC_SDK, .*/.*): \
-- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)")
--
--defineReplace(xcodeSDKInfo) {
-- info = $$1
-- equals(info, "Path"): \
-- infoarg = --show-sdk-path
-- equals(info, "PlatformPath"): \
-- infoarg = --show-sdk-platform-path
-- equals(info, "SDKVersion"): \
-- infoarg = --show-sdk-version
-- sdk = $$2
-- isEmpty(sdk): \
-- sdk = $$QMAKE_MAC_SDK
--
-- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
-- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null")
-- # --show-sdk-platform-path won't work for Command Line Tools; this is fine
-- # only used by the XCTest backend to testlib
-- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \
-- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg")
-- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
-- }
--
-- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info}))
--}
--
--QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path)
--QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath)
--QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)
--
--sysrootified =
--for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val
--QMAKE_INCDIR_OPENGL = $$sysrootified
--
--QMAKESPEC_NAME = $$basename(QMAKESPEC)
--
--# Resolve SDK version of various tools
--for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) {
-- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool}
-- !isEmpty($$tool_variable) {
-- $$tool = $$eval($$tool_variable)
-- next()
-- }
--
-- value = $$eval($$tool)
-- isEmpty(value): next()
--
-- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null")
-- isEmpty(sysrooted): next()
--
-- $$tool = $$sysrooted $$member(value, 1, -1)
-- cache($$tool_variable, set stash, $$tool)
--}
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_module.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qml_module.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_module.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qml_module.prf 2019-01-31 00:42:55.843577249 +0100
-@@ -23,13 +23,8 @@
-
- load(qt_build_paths)
-
--qml1_target {
-- DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH
-- instbase = $$[QT_INSTALL_IMPORTS]
--} else {
-- DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
-- instbase = $$[QT_INSTALL_QML]
--}
-+DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
-+instbase = $$NIX_OUTPUT_QML
-
- !qml1_target:static: CONFIG += builtin_resources
-
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_plugin.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qml_plugin.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qml_plugin.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qml_plugin.prf 2019-01-31 00:42:55.844577264 +0100
-@@ -48,13 +48,8 @@
-
- load(qt_build_paths)
-
--qml1_target {
-- DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH
-- instbase = $$[QT_INSTALL_IMPORTS]
--} else {
-- DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
-- instbase = $$[QT_INSTALL_QML]
--}
-+DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH
-+instbase = $$NIX_OUTPUT_QML
-
- target.path = $$instbase/$$TARGETPATH
- INSTALLS += target
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_app.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_app.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_app.prf 2019-01-31 00:42:55.844577264 +0100
-@@ -33,7 +33,7 @@
- target.path = $$[QT_HOST_BINS]
- } else {
- !build_pass:qtConfig(debug_and_release): CONFIG += release
-- target.path = $$[QT_INSTALL_BINS]
-+ target.path = $$NIX_OUTPUT_BIN/bin
- CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable
- }
- INSTALLS += target
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_build_paths.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_build_paths.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_build_paths.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_build_paths.prf 2019-01-31 00:42:55.844577264 +0100
-@@ -24,6 +24,6 @@
- !force_independent {
- # If the module is not built independently, everything ends up in qtbase.
- # This is the case in non-prefix builds, except for selected modules.
-- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX]
-- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX]
-+ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT
-+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT
- }
-Only in qtbase-everywhere-src-5.11.3/mkspecs/features: qt_build_paths.prf.orig
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_common.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_common.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_common.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_common.prf 2019-01-31 00:42:55.844577264 +0100
-@@ -32,8 +32,8 @@
- qqt_libdir = \$\$\$\$[QT_HOST_LIBS]
- qt_libdir = $$[QT_HOST_LIBS]
- } else {
-- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS]
-- qt_libdir = $$[QT_INSTALL_LIBS]
-+ qqt_libdir = \$\$\$\$NIX_OUTPUT_OUT/lib
-+ qt_libdir = $$NIX_OUTPUT_OUT/lib
- }
- contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {
- lib_replace.match = "[^ ']*$$rplbase/lib"
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_docs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_docs.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_docs.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_docs.prf 2019-01-31 00:42:55.844577264 +0100
-@@ -45,7 +45,7 @@
-
- QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR)
- !build_online_docs: \
-- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS])
-+ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC)
- PREP_DOC_INDEXES =
- DOC_INDEXES =
- !isEmpty(QTREPOS) {
-@@ -64,8 +64,8 @@
- DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc)
- } else {
- prepare_docs: \
-- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get])
-- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get])
-+ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC)
-+ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC)
- }
-
- qtattributionsscanner.target = qtattributionsscanner
-@@ -88,12 +88,12 @@
- qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch)
-
- inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR
-- inst_html_docs.path = $$[QT_INSTALL_DOCS]
-+ inst_html_docs.path = $$NIX_OUTPUT_DOC
- inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build
- INSTALLS += inst_html_docs
-
- inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch
-- inst_qch_docs.path = $$[QT_INSTALL_DOCS]
-+ inst_qch_docs.path = $$NIX_OUTPUT_DOC
- inst_qch_docs.CONFIG += no_check_exist no_default_install no_build
- INSTALLS += inst_qch_docs
-
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_example_installs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_example_installs.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_example_installs.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_example_installs.prf 2019-01-31 00:42:55.844577264 +0100
-@@ -88,7 +88,7 @@
- $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
- $$DBUS_ADAPTORS $$DBUS_INTERFACES
- addInstallFiles(sources.files, $$sourcefiles)
--sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase
-+sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase
- INSTALLS += sources
-
- check_examples {
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_functions.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_functions.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_functions.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_functions.prf 2019-01-31 00:42:55.844577264 +0100
-@@ -69,7 +69,7 @@
- defineTest(qtPrepareTool) {
- cmd = $$eval(QT_TOOL.$${2}.binary)
- isEmpty(cmd) {
-- cmd = $$[QT_HOST_BINS]/$$2
-+ cmd = $$system("command -v $$2")
- exists($${cmd}.pl) {
- $${1}_EXE = $${cmd}.pl
- cmd = perl -w $$system_path($${cmd}.pl)
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_installs.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_installs.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_installs.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_installs.prf 2019-01-31 00:42:55.844577264 +0100
-@@ -12,16 +12,10 @@
- #library
- !qt_no_install_library {
- win32 {
-- host_build: \
-- dlltarget.path = $$[QT_HOST_BINS]
-- else: \
-- dlltarget.path = $$[QT_INSTALL_BINS]
-+ dlltarget.path = $$NIX_OUTPUT_BIN/bin
- INSTALLS += dlltarget
- }
-- host_build: \
-- target.path = $$[QT_HOST_LIBS]
-- else: \
-- target.path = $$[QT_INSTALL_LIBS]
-+ target.path = $$NIX_OUTPUT_OUT/lib
- !static: target.CONFIG = no_dll
- INSTALLS += target
- }
-@@ -29,33 +23,33 @@
- #headers
- qt_install_headers {
- gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES
-- gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
-+ gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME
- INSTALLS += gen_headers
-
- targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES
-- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
-+ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME
- INSTALLS += targ_headers
-
- private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES
-- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
-+ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
- INSTALLS += private_headers
-
- qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES
-- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa
-+ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa
- INSTALLS += qpa_headers
- }
-
- #module
- qt_install_module {
- !isEmpty(MODULE_PRI) {
-- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules
-+ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules
- pritarget.files = $$MODULE_PRI
- INSTALLS += pritarget
- } else: isEmpty(MODULE_PRIVATE_PRI) {
- warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.")
- }
- !isEmpty(MODULE_PRIVATE_PRI) {
-- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules
-+ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules
- privpritarget.files = $$MODULE_PRIVATE_PRI
- INSTALLS += privpritarget
- }
-diff -ur qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_plugin.prf qtbase-everywhere-src-5.11.3/mkspecs/features/qt_plugin.prf
---- qtbase-everywhere-src-5.11.3-orig/mkspecs/features/qt_plugin.prf 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/mkspecs/features/qt_plugin.prf 2019-01-31 00:42:55.844577264 +0100
-@@ -88,7 +88,7 @@
- }
- }
-
--target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE
-+target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE
- INSTALLS += target
-
- TARGET = $$qt5LibraryTarget($$TARGET)
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/kernel/qcoreapplication.cpp qtbase-everywhere-src-5.11.3/src/corelib/kernel/qcoreapplication.cpp
---- qtbase-everywhere-src-5.11.3-orig/src/corelib/kernel/qcoreapplication.cpp 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/corelib/kernel/qcoreapplication.cpp 2019-01-31 00:42:55.845577279 +0100
-@@ -2612,6 +2612,15 @@
- QStringList *app_libpaths = new QStringList;
- coreappdata()->app_libpaths.reset(app_libpaths);
-
-+ // Add library paths derived from PATH
-+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
-+ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX);
-+ for (const QString &path: paths) {
-+ if (!path.isEmpty()) {
-+ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir));
-+ }
-+ }
-+
- const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
- if (!libPathEnv.isEmpty()) {
- QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
-Only in qtbase-everywhere-src-5.11.3/src/corelib/kernel: qcoreapplication.cpp.orig
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtras.cmake.in
---- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtras.cmake.in 2019-01-31 00:42:55.844577264 +0100
-@@ -3,7 +3,7 @@
- add_executable(Qt5::qmake IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -18,7 +18,7 @@
- add_executable(Qt5::moc IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -35,7 +35,7 @@
- add_executable(Qt5::rcc IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
-@@ -116,7 +116,7 @@
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
- set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
-+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ELSE
- set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")
- !!ENDIF
-@@ -130,7 +130,7 @@
- set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
-
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
-+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ELSE
- set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
- !!ENDIF
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
---- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in 2019-01-31 00:42:55.844577264 +0100
-@@ -1,6 +1,6 @@
-
- !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
---- qtbase-everywhere-src-5.11.3-orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in 2019-01-31 00:42:55.844577264 +0100
-@@ -1,6 +1,6 @@
-
- !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
--set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
-+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\")
- !!ELSE
- set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
- !!ENDIF
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/corelib/tools/qtimezoneprivate_tz.cpp qtbase-everywhere-src-5.11.3/src/corelib/tools/qtimezoneprivate_tz.cpp
---- qtbase-everywhere-src-5.11.3-orig/src/corelib/tools/qtimezoneprivate_tz.cpp 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/corelib/tools/qtimezoneprivate_tz.cpp 2019-01-31 00:42:55.845577279 +0100
-@@ -70,7 +70,11 @@
- // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
- static QTzTimeZoneHash loadTzTimeZones()
- {
-- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-+ // Try TZDIR first, in case we're running on NixOS.
-+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab");
-+ // Fallback to traditional paths in case we are not on NixOS.
-+ if (!QFile::exists(path))
-+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
- if (!QFile::exists(path))
- path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
-
-@@ -644,12 +648,16 @@
- if (!tzif.open(QIODevice::ReadOnly))
- return;
- } else {
-- // Open named tz, try modern path first, if fails try legacy path
-- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+ // Try TZDIR first, in case we're running on NixOS
-+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId));
- if (!tzif.open(QIODevice::ReadOnly)) {
-- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-- if (!tzif.open(QIODevice::ReadOnly))
-- return;
-+ // Open named tz, try modern path first, if fails try legacy path
-+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+ if (!tzif.open(QIODevice::ReadOnly)) {
-+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+ if (!tzif.open(QIODevice::ReadOnly))
-+ return;
-+ }
- }
- }
-
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/dbus/Qt5DBusConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/dbus/Qt5DBusConfigExtras.cmake.in
---- qtbase-everywhere-src-5.11.3-orig/src/dbus/Qt5DBusConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/dbus/Qt5DBusConfigExtras.cmake.in 2019-01-31 00:42:55.845577279 +0100
-@@ -2,11 +2,7 @@
- if (NOT TARGET Qt5::qdbuscpp2xml)
- add_executable(Qt5::qdbuscpp2xml IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
--!!ELSE
-- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
- _qt5_DBus_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::qdbuscpp2xml PROPERTIES
-@@ -17,11 +13,7 @@
- if (NOT TARGET Qt5::qdbusxml2cpp)
- add_executable(Qt5::qdbusxml2cpp IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
--!!ELSE
-- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
- _qt5_DBus_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::qdbusxml2cpp PROPERTIES
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/gui/Qt5GuiConfigExtras.cmake.in
---- qtbase-everywhere-src-5.11.3-orig/src/gui/Qt5GuiConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/gui/Qt5GuiConfigExtras.cmake.in 2019-01-31 00:42:55.845577279 +0100
-@@ -2,7 +2,7 @@
- !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
-
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ELSE
- set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
- !!ENDIF
-@@ -17,13 +17,13 @@
- set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
- !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
-+ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ELSE
- set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
- !!ENDIF
-
- !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
-+ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ELSE
- set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
- !!ENDIF
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
---- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp 2019-01-31 00:42:55.845577279 +0100
-@@ -265,12 +265,9 @@
- m_possibleLocations.reserve(7);
- if (qEnvironmentVariableIsSet("QTCOMPOSE"))
- m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
-- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
-- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
-- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
-- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
- m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
- m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
-+ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE));
- }
-
- QString TableGenerator::findComposeFile()
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
---- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp 2019-01-31 00:42:55.845577279 +0100
-@@ -650,9 +650,14 @@
- #if QT_CONFIG(library)
- extern const QString qt_gl_library_name();
- // QLibrary lib(qt_gl_library_name());
-+ // Check system library paths first
- QLibrary lib(QLatin1String("GL"));
-- if (!lib.load())
-- lib.setFileNameAndVersion(QLatin1String("GL"), 1);
-+#ifdef NIXPKGS_MESA_GL
-+ if (!lib.load()) {
-+ // Fallback to Mesa driver
-+ lib.setFileName(QLatin1String(NIXPKGS_MESA_GL));
-+ }
-+#endif // NIXPKGS_MESA_GL
- glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
- #endif
- }
-Only in qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/gl_integrations/xcb_glx: qglxintegration.cpp.orig
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/qxcbcursor.cpp qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/qxcbcursor.cpp
---- qtbase-everywhere-src-5.11.3-orig/src/plugins/platforms/xcb/qxcbcursor.cpp 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/plugins/platforms/xcb/qxcbcursor.cpp 2019-01-31 00:42:55.846577295 +0100
-@@ -316,10 +316,10 @@
- #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library)
- static bool function_ptrs_not_initialized = true;
- if (function_ptrs_not_initialized) {
-- QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
-+ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1);
- bool xcursorFound = xcursorLib.load();
- if (!xcursorFound) { // try without the version number
-- xcursorLib.setFileName(QLatin1String("Xcursor"));
-+ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR));
- xcursorFound = xcursorLib.load();
- }
- if (xcursorFound) {
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/plugins/platformthemes/gtk3/main.cpp qtbase-everywhere-src-5.11.3/src/plugins/platformthemes/gtk3/main.cpp
---- qtbase-everywhere-src-5.11.3-orig/src/plugins/platformthemes/gtk3/main.cpp 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/plugins/platformthemes/gtk3/main.cpp 2019-01-31 00:42:55.846577295 +0100
-@@ -39,6 +39,7 @@
-
- #include
- #include "qgtk3theme.h"
-+#include
-
- QT_BEGIN_NAMESPACE
-
-@@ -54,8 +55,22 @@
- QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms)
- {
- Q_UNUSED(params);
-- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive))
-+ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) {
-+
-+#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS
-+ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':');
-+ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS);
-+ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':')));
-+#endif
-+
-+#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES
-+ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':');
-+ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES);
-+ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':')));
-+#endif
-+
- return new QGtk3Theme;
-+ }
-
- return 0;
- }
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/testlib/qtestassert.h qtbase-everywhere-src-5.11.3/src/testlib/qtestassert.h
---- qtbase-everywhere-src-5.11.3-orig/src/testlib/qtestassert.h 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/testlib/qtestassert.h 2019-01-31 00:42:55.846577295 +0100
-@@ -44,10 +44,13 @@
-
- QT_BEGIN_NAMESPACE
-
--
-+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS)
-+#define QTEST_ASSERT(cond) do { } while ((false) && (cond))
-+#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond))
-+#else
- #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false)
--
- #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false)
-+#endif
-
- QT_END_NAMESPACE
-
-diff -ur qtbase-everywhere-src-5.11.3-orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in qtbase-everywhere-src-5.11.3/src/widgets/Qt5WidgetsConfigExtras.cmake.in
---- qtbase-everywhere-src-5.11.3-orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2018-11-25 13:51:11.000000000 +0100
-+++ qtbase-everywhere-src-5.11.3/src/widgets/Qt5WidgetsConfigExtras.cmake.in 2019-01-31 00:42:55.846577295 +0100
-@@ -3,7 +3,7 @@
- add_executable(Qt5::uic IMPORTED)
-
- !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
-+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
- !!ENDIF
diff --git a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch
deleted file mode 100644
index cfa68eb8102c..000000000000
--- a/pkgs/development/libraries/qt-5/5.11/qtdeclarative.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
-index 005db4248..685c5b1b2 100644
---- a/src/qml/qml/qqmlimport.cpp
-+++ b/src/qml/qml/qqmlimport.cpp
-@@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
- QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
- addImportPath(installImportsPath);
-
-+ // Add import paths derived from PATH
-+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
-+ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX);
-+ for (const QString &path: paths) {
-+ if (!path.isEmpty()) {
-+ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir));
-+ }
-+ }
-+
- // env import paths
- if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
- const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH");
-diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake
-index 56cb3fb55..74509d601 100644
---- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake
-+++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake
-@@ -17,7 +17,7 @@ function(QTQUICK_COMPILER_ADD_RESOURCES outfiles)
-
- find_package(Qt5 COMPONENTS Qml Core)
-
-- set(compiler_path "${_qt5Core_install_prefix}/bin/qmlcachegen")
-+ set(compiler_path "qmlcachegen")
-
- get_target_property(rcc_path ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION)
-
-diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf
-index 537eaf62e..e21de58f6 100644
---- a/tools/qmlcachegen/qmlcache.prf
-+++ b/tools/qmlcachegen/qmlcache.prf
-@@ -26,7 +26,7 @@ defineReplace(qmlCacheOutputFileName) {
- }
-
- qmlcacheinst.base = $$QMLCACHE_DESTDIR
--qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH
-+qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH
- qmlcacheinst.CONFIG = no_check_exist
-
- qmlcachegen.input = CACHEGEN_FILES
diff --git a/pkgs/development/libraries/qt-5/5.11/qtscript.patch b/pkgs/development/libraries/qt-5/5.11/qtscript.patch
deleted file mode 100644
index 5508dec1280e..000000000000
--- a/pkgs/development/libraries/qt-5/5.11/qtscript.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-index 1f6d25e..087c3fb 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-@@ -81,7 +81,7 @@
- #include
- #elif PLATFORM(GTK)
- #include
--typedef struct _GMutex GMutex;
-+typedef union _GMutex GMutex;
- typedef struct _GCond GCond;
- #endif
-
diff --git a/pkgs/development/libraries/qt-5/5.11/qtserialport.patch b/pkgs/development/libraries/qt-5/5.11/qtserialport.patch
deleted file mode 100644
index f25524e80bcf..000000000000
--- a/pkgs/development/libraries/qt-5/5.11/qtserialport.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
-index af2dab2..8e17f64 100644
---- a/src/serialport/qtudev_p.h
-+++ b/src/serialport/qtudev_p.h
-@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
- inline bool resolveSymbols(QLibrary *udevLibrary)
- {
- if (!udevLibrary->isLoaded()) {
-+#ifdef NIXPKGS_LIBUDEV
-+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1);
-+#else
- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
-+#endif
- if (!udevLibrary->load()) {
-+#ifdef NIXPKGS_LIBUDEV
-+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0);
-+#else
- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
-+#endif
- if (!udevLibrary->load()) {
- qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
- return false;
diff --git a/pkgs/development/libraries/qt-5/5.11/qttools.patch b/pkgs/development/libraries/qt-5/5.11/qttools.patch
deleted file mode 100644
index 622efc35b6b6..000000000000
--- a/pkgs/development/libraries/qt-5/5.11/qttools.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in
-index 3b97923a..63336bd5 100644
---- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in
-+++ b/src/assistant/help/Qt5HelpConfigExtras.cmake.in
-@@ -2,11 +2,10 @@
- if (NOT TARGET Qt5::qcollectiongenerator)
- add_executable(Qt5::qcollectiongenerator IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
--!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
-+ if(NOT EXISTS \"${imported_location}\")
-+ set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
-+ endif()
- _qt5_Help_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::qcollectiongenerator PROPERTIES
-@@ -17,11 +16,7 @@ endif()
- if (NOT TARGET Qt5::qhelpgenerator)
- add_executable(Qt5::qhelpgenerator IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
--!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
- _qt5_Help_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::qhelpgenerator PROPERTIES
-diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in
-index 4318b16f..d60db4ff 100644
---- a/src/linguist/Qt5LinguistToolsConfig.cmake.in
-+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in
-@@ -44,11 +44,7 @@ endmacro()
- if (NOT TARGET Qt5::lrelease)
- add_executable(Qt5::lrelease IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
--!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
- _qt5_LinguistTools_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::lrelease PROPERTIES
-@@ -59,11 +55,7 @@ endif()
- if (NOT TARGET Qt5::lupdate)
- add_executable(Qt5::lupdate IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
--!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
- _qt5_LinguistTools_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::lupdate PROPERTIES
-@@ -74,11 +66,7 @@ endif()
- if (NOT TARGET Qt5::lconvert)
- add_executable(Qt5::lconvert IMPORTED)
-
--!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
-- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
--!!ELSE
- set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
--!!ENDIF
- _qt5_LinguistTools_check_file_exists(${imported_location})
-
- set_target_properties(Qt5::lconvert PROPERTIES
---- a/src/macdeployqt/shared/shared.cpp
-+++ b/src/macdeployqt/shared/shared.cpp
-@@ -1241,6 +1241,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
- if (!QFile(qmlImportScannerPath).exists())
- qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner";
-
-+#ifdef NIXPKGS_QMLIMPORTSCANNER
-+ // Fallback: Nixpkgs hardcoded path
-+ if (!QFile(qmlImportScannerPath).exists())
-+ qmlImportScannerPath = NIXPKGS_QMLIMPORTSCANNER;
-+#endif
-+
- // Verify that we found a qmlimportscanner binary
- if (!QFile(qmlImportScannerPath).exists()) {
- LogError() << "qmlimportscanner not found at" << qmlImportScannerPath;
diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch
deleted file mode 100644
index 3e1a8762b361..000000000000
--- a/pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-no-platform-check.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
---- a/mkspecs/features/platform.prf
-+++ b/mkspecs/features/platform.prf
-@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) {
- return(false)
- }
- } else:osx {
-- !isMinXcodeVersion(7, 3) {
-- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 7.3 is required to build Qt WebEngine.")
-- return(false)
-- }
- !clang|intel_icc {
- skipBuild("Qt WebEngine on macOS requires Clang.")
- return(false)
-@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) {
- skipBuild("Building Qt WebEngine requires macOS version 10.11 or newer.")
- return(false)
- }
-- !isMinOSXSDKVersion(10, 10): {
-- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.11 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
-- return(false)
-- }
- } else {
- skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
- return(false)
-diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
---- a/src/core/config/mac_osx.pri
-+++ b/src/core/config/mac_osx.pri
-@@ -5,8 +5,6 @@ load(functions)
- # otherwise query for it.
- QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
- isEmpty(QMAKE_MAC_SDK_VERSION) {
-- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null")
-- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
- }
-
- QMAKE_CLANG_DIR = "/usr"
diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch
deleted file mode 100644
index f332d5e1bb2b..000000000000
--- a/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/qtwebengine.pro b/qtwebengine.pro
---- a/qtwebengine.pro
-+++ b/qtwebengine.pro
-@@ -5,7 +5,7 @@ runConfigure()
-
- !isEmpty(skipBuildReason) {
- SUBDIRS =
-- log($${skipBuildReason}$${EOL})
-+ error($${skipBuildReason}$${EOL})
- log(QtWebEngine will not be built.$${EOL})
- }
-
diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch
deleted file mode 100644
index b94a4b76cbab..000000000000
--- a/pkgs/development/libraries/qt-5/5.11/qtwebkit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake
---- a/Source/WebKit2/PlatformQt.cmake
-+++ b/Source/WebKit2/PlatformQt.cmake
-@@ -261,6 +261,7 @@
- list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
- ${GLIB_INCLUDE_DIRS}
- ${GSTREAMER_INCLUDE_DIRS}
-+ ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
- ${Qt5Quick_INCLUDE_DIRS}
- ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
- ${SQLITE_INCLUDE_DIR}
-
diff --git a/pkgs/development/libraries/qt-5/5.11/srcs.nix b/pkgs/development/libraries/qt-5/5.11/srcs.nix
deleted file mode 100644
index cff49b180337..000000000000
--- a/pkgs/development/libraries/qt-5/5.11/srcs.nix
+++ /dev/null
@@ -1,325 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
-{ fetchurl, mirror }:
-
-{
- qt3d = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qt3d-everywhere-src-5.11.3.tar.xz";
- sha256 = "1awyv40jgbb30yp5zxf6j9wq96nmk8zyhbh4fpn9gn35ychmr984";
- name = "qt3d-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtactiveqt = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtactiveqt-everywhere-src-5.11.3.tar.xz";
- sha256 = "0g35yhp01c34m91fp5vzzq0d2kzz0yswpjjk5cg36j0ddnfcsh4d";
- name = "qtactiveqt-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtandroidextras = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtandroidextras-everywhere-src-5.11.3.tar.xz";
- sha256 = "0clqz10ry70f0v8hbw37fhlwrsr5jddg99yjsk9db250dwbqzq27";
- name = "qtandroidextras-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtbase = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz";
- sha256 = "071yc9iz14qs4s8yvrwllyfdzp5yjxsdpvbjxdrf0g5q69vqigy6";
- name = "qtbase-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtcanvas3d = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtcanvas3d-everywhere-src-5.11.3.tar.xz";
- sha256 = "0f110z7cmkzns9k00aa5zhzq2fpybfxkd7gdlwzcbhc8hn20986m";
- name = "qtcanvas3d-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtcharts = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtcharts-everywhere-src-5.11.3.tar.xz";
- sha256 = "1p4m1nkbbxlkwmbmasx5r83skzssmlcgfzyvj30x2dyrqkmz7627";
- name = "qtcharts-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtconnectivity = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtconnectivity-everywhere-src-5.11.3.tar.xz";
- sha256 = "0amks3qad31i7cha85kvcaxvlmmgkc3gm4jdkw2p02ixxfygr30l";
- name = "qtconnectivity-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtdatavis3d = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdatavis3d-everywhere-src-5.11.3.tar.xz";
- sha256 = "1kqwr3avcvcyy4i28vjgxk1bsjj9011zr668hsk1zrjxnnwjwdl3";
- name = "qtdatavis3d-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtdeclarative = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdeclarative-everywhere-src-5.11.3.tar.xz";
- sha256 = "1rhsf9bma2zwwpixk2fsg31x7c1pmsk144npypgc9w86swhkc9lf";
- name = "qtdeclarative-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtdoc = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdoc-everywhere-src-5.11.3.tar.xz";
- sha256 = "06nl8lzrilj8yify5qy4fm9la6dh71aamg19jhvvi657cshiclsq";
- name = "qtdoc-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtgamepad = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtgamepad-everywhere-src-5.11.3.tar.xz";
- sha256 = "1k222cx18zq48sfna91hmy427qzk2n2xz3dlyz59iyz72k6915g9";
- name = "qtgamepad-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtgraphicaleffects = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtgraphicaleffects-everywhere-src-5.11.3.tar.xz";
- sha256 = "1qjpdzkamf27cg5n1wsf0zk939lcgppgydfjzap9s4fxzj1nkn0l";
- name = "qtgraphicaleffects-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtimageformats = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtimageformats-everywhere-src-5.11.3.tar.xz";
- sha256 = "0zq8igsjyyhxsjr43vpaasrqjw3x0g6rwqf8kaz7y9vs7ny63ch4";
- name = "qtimageformats-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtlocation = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz";
- sha256 = "1sq0f41jwmsimv9a1wl2nk5nifjppm5j92rr4n4s7qwnnjjrir2q";
- name = "qtlocation-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtmacextras = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtmacextras-everywhere-src-5.11.3.tar.xz";
- sha256 = "1j9sqmcwswr8v9z8mcbm10bj7nz8nv9mir0xsc5123ik1gw2c3lk";
- name = "qtmacextras-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtmultimedia = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtmultimedia-everywhere-src-5.11.3.tar.xz";
- sha256 = "0h9wx86zj20n4xc3qnml0i360x2dc1yd2z2af1flj8fwyzppi03j";
- name = "qtmultimedia-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtnetworkauth = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtnetworkauth-everywhere-src-5.11.3.tar.xz";
- sha256 = "0dd35698wzg89975vi2ijl2lym495fjizsl03mjixsjnvb1x0q50";
- name = "qtnetworkauth-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtpurchasing = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtpurchasing-everywhere-src-5.11.3.tar.xz";
- sha256 = "1fd0gxdj5mrh81iwimq1243i3n47sqv9ik8nslahfh0q3dsx7k8n";
- name = "qtpurchasing-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtquickcontrols = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols-everywhere-src-5.11.3.tar.xz";
- sha256 = "0dvmy31qbl76yy0j5y8m7mvnmqyg2c01fmlkn0snvc5h5ah5skjf";
- name = "qtquickcontrols-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtquickcontrols2 = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols2-everywhere-src-5.11.3.tar.xz";
- sha256 = "11nhpb0xckv5jjkqj5szr94c2rvyjwr89ch58hh64nsqaav30mpl";
- name = "qtquickcontrols2-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtremoteobjects = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtremoteobjects-everywhere-src-5.11.3.tar.xz";
- sha256 = "1d3jzsxfyjhgb6wj9iv1388bv7j6pi08346nmkm1c1a4iykhc0zp";
- name = "qtremoteobjects-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtscript = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtscript-everywhere-src-5.11.3.tar.xz";
- sha256 = "027cvggbcvwyz76cn1bl1zvqg0nq7iica1b7yx7xyy0hb36g715v";
- name = "qtscript-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtscxml = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtscxml-everywhere-src-5.11.3.tar.xz";
- sha256 = "1mv8mz36v34dckrzy5r41mq3sqznbalrhndk3avz2154xmkjf5qk";
- name = "qtscxml-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtsensors = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtsensors-everywhere-src-5.11.3.tar.xz";
- sha256 = "0n88c8xi9pbyh7q1pcqv4yjv6nx62abflj8qgfr4qzb0sp8m6mx7";
- name = "qtsensors-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtserialbus = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtserialbus-everywhere-src-5.11.3.tar.xz";
- sha256 = "0vf12jk1ma0v0dlpliw1x9i04iaik1kjkiaby7gaxm2abprxwr2n";
- name = "qtserialbus-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtserialport = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtserialport-everywhere-src-5.11.3.tar.xz";
- sha256 = "1nkbfsxzgicwns3k11hhzjxy2hgrigj8xcw2by0jc1j71mnmxi4n";
- name = "qtserialport-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtspeech = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtspeech-everywhere-src-5.11.3.tar.xz";
- sha256 = "158p7zqd0vg55gf88jzc3d4f7649ihh80k0m1q46m2yp6fpdjbxr";
- name = "qtspeech-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtsvg = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtsvg-everywhere-src-5.11.3.tar.xz";
- sha256 = "14a4rprbj9f9rhixbk7143xdz34d7d39xh9v2sc1w43q9sf2rsi1";
- name = "qtsvg-everywhere-src-5.11.3.tar.xz";
- };
- };
- qttools = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz";
- sha256 = "13lzdxxi02yhvx4mflhisl6aqv2fiss5m804cqccd1wvp8dyh1f2";
- name = "qttools-everywhere-src-5.11.3.tar.xz";
- };
- };
- qttranslations = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qttranslations-everywhere-src-5.11.3.tar.xz";
- sha256 = "0j8i2kabz22vqb0qj41pkjv848zblqxs71sydc3xcd5av22b517s";
- name = "qttranslations-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtvirtualkeyboard = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz";
- sha256 = "17jb7cbfy5c19fr9frql6q22in3ra3a4fbff0kjykllxb8j40p4c";
- name = "qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtwayland = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwayland-everywhere-src-5.11.3.tar.xz";
- sha256 = "1chz4wchgkzd45h143i5hkqg0whcgdbj37gkg7j4kj31whllzjb2";
- name = "qtwayland-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtwebchannel = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebchannel-everywhere-src-5.11.3.tar.xz";
- sha256 = "1wrdawlqvcw84h8q52mvbjhp1vkd6fhz6c8ijlg9rw0s3fj4y99w";
- name = "qtwebchannel-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtwebengine = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebengine-everywhere-src-5.11.3.tar.xz";
- sha256 = "1zmqsdais85cdfh2jh8h4a5jcamp1mzdk3vgqm6xnldqf6nrxd2v";
- name = "qtwebengine-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtwebglplugin = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebglplugin-everywhere-src-5.11.3.tar.xz";
- sha256 = "0wqz8lycmi7pffzy0pz5960w109lbk4mkbw0l1lh64avl6clq7b9";
- name = "qtwebglplugin-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtwebsockets = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebsockets-everywhere-src-5.11.3.tar.xz";
- sha256 = "1ffmapfy68xwwbxbg19ng6b5h8v42cf78s21j7rgq49gm70r0402";
- name = "qtwebsockets-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtwebview = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebview-everywhere-src-5.11.3.tar.xz";
- sha256 = "1njmn1n03dp4md8cz58cq2z6bsxd8nwlw0238zmavh7px3jzc9kh";
- name = "qtwebview-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtwinextras = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwinextras-everywhere-src-5.11.3.tar.xz";
- sha256 = "1xf9gc0wqk9jz2ayx29vx0vmm72x9h4qxp2fvgpclns621wyhw72";
- name = "qtwinextras-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtx11extras = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtx11extras-everywhere-src-5.11.3.tar.xz";
- sha256 = "11fd2mc20qmnyv1vqhaqad2q6m0i4lmkr432rmqvpkgphpkfp7pr";
- name = "qtx11extras-everywhere-src-5.11.3.tar.xz";
- };
- };
- qtxmlpatterns = {
- version = "5.11.3";
- src = fetchurl {
- url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtxmlpatterns-everywhere-src-5.11.3.tar.xz";
- sha256 = "1vhfvgi39miqsx3iq7c9sii2sykq0yfng69b70i0smr20zihpl4b";
- name = "qtxmlpatterns-everywhere-src-5.11.3.tar.xz";
- };
- };
-}
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index 2800f2d77978..8d27f3a0d4ba 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -54,6 +54,7 @@ let
optionals stdenv.isDarwin [
./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
./qtbase.patch.d/0002-qtbase-mac.patch
+ ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
]
++ [
./qtbase.patch.d/0003-qtbase-mkspecs.patch
diff --git a/pkgs/development/libraries/qt-5/5.12/fetch.sh b/pkgs/development/libraries/qt-5/5.12/fetch.sh
index 575115c9bdf4..9f99879511e6 100644
--- a/pkgs/development/libraries/qt-5/5.12/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.12/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/ )
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.6/submodules/ )
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
index ae5d016c99f3..bb535b8a0c0e 100644
--- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
@@ -5,11 +5,11 @@ Subject: [PATCH 01/12] qtbase-mkspecs-mac
---
mkspecs/common/mac.conf | 2 +-
- mkspecs/features/mac/default_post.prf | 201 --------------------------
- mkspecs/features/mac/default_pre.prf | 58 --------
- mkspecs/features/mac/sdk.mk | 25 ----
- mkspecs/features/mac/sdk.prf | 61 --------
- 5 files changed, 1 insertion(+), 346 deletions(-)
+ mkspecs/features/mac/default_post.prf | 202 ----------------------------------
+ mkspecs/features/mac/default_pre.prf | 58 ----------
+ mkspecs/features/mac/sdk.mk | 25 -----
+ mkspecs/features/mac/sdk.prf | 61 ----------
+ 5 files changed, 1 insertion(+), 347 deletions(-)
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index b77494ec9b..470c38e772 100644
@@ -25,10 +25,10 @@ index b77494ec9b..470c38e772 100644
QMAKE_LFLAGS_REL_RPATH =
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
-index 26bd3e2e98..b80ec1e801 100644
+index 993f4d56a9..b80ec1e801 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
-@@ -68,207 +68,6 @@ qt {
+@@ -68,208 +68,6 @@ qt {
}
}
@@ -61,21 +61,22 @@ index 26bd3e2e98..b80ec1e801 100644
- qmake_pkginfo_typeinfo.value = "????"
- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo
-
-- !isEmpty(VERSION) {
-- l = $$split(VERSION, '.') 0 0 # make sure there are at least three
-- VER_MAJ = $$member(l, 0, 0)
-- VER_MIN = $$member(l, 1, 1)
-- VER_PAT = $$member(l, 2, 2)
-- unset(l)
+- bundle_version = $$VERSION
+- isEmpty(bundle_version): bundle_version = 1.0.0
-
-- qmake_full_version.name = QMAKE_FULL_VERSION
-- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
-- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version
+- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three
+- VER_MAJ = $$member(l, 0, 0)
+- VER_MIN = $$member(l, 1, 1)
+- VER_PAT = $$member(l, 2, 2)
+- unset(l)
-
-- qmake_short_version.name = QMAKE_SHORT_VERSION
-- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN}
-- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version
-- }
+- qmake_full_version.name = QMAKE_FULL_VERSION
+- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version
+-
+- qmake_short_version.name = QMAKE_SHORT_VERSION
+- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN}
+- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version
-
- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {
- debug_information_format.name = DEBUG_INFORMATION_FORMAT
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
new file mode 100644
index 000000000000..a43a46d8a69b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0013-define-kiosurfacesuccess.patch
@@ -0,0 +1,16 @@
+diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
+index a367487e..c3aeca1d 100644
+--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
+@@ -49,6 +49,11 @@
+ // but was only added in the 10.14 SDK, so declare it just in case.
+ extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space);
+
++// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html
++#if !defined(kIOSurfaceSuccess)
++#define kIOSurfaceSuccess KERN_SUCCESS
++#endif
++
+ QT_BEGIN_NAMESPACE
+
+ Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface");
diff --git a/pkgs/development/libraries/qt-5/5.12/srcs.nix b/pkgs/development/libraries/qt-5/5.12/srcs.nix
index 3b4d761c16cd..b4494593fd0b 100644
--- a/pkgs/development/libraries/qt-5/5.12/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.12/srcs.nix
@@ -3,323 +3,323 @@
{
qt3d = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qt3d-everywhere-src-5.12.5.tar.xz";
- sha256 = "2a35b144768c7ad8a9265d16a04f038d9bc51016bd2c4b2b516e374f81ff29c4";
- name = "qt3d-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qt3d-everywhere-src-5.12.6.tar.xz";
+ sha256 = "cf34ce99a2592270abbf32a13fa824d99c76412fc493a3f1c37e37892b198baf";
+ name = "qt3d-everywhere-src-5.12.6.tar.xz";
};
};
qtactiveqt = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtactiveqt-everywhere-src-5.12.5.tar.xz";
- sha256 = "d673a1269dd900c78dbfe88eb16e086e36d236571722712a64401cdec7b73a40";
- name = "qtactiveqt-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtactiveqt-everywhere-src-5.12.6.tar.xz";
+ sha256 = "c50f082588bf7dad2091a5b67c426791bf36d7d1503c56dc79b9e26444931f09";
+ name = "qtactiveqt-everywhere-src-5.12.6.tar.xz";
};
};
qtandroidextras = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtandroidextras-everywhere-src-5.12.5.tar.xz";
- sha256 = "f115ccef1e808da7c5d0348f3e245952a2973966f34d18b935f9e3eb16062eab";
- name = "qtandroidextras-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtandroidextras-everywhere-src-5.12.6.tar.xz";
+ sha256 = "a0f15a4ba29abe90de2b2c221efd22ecfb6793590ff9610f85e6e6b6562784fe";
+ name = "qtandroidextras-everywhere-src-5.12.6.tar.xz";
};
};
qtbase = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtbase-everywhere-src-5.12.5.tar.xz";
- sha256 = "fc8abffbbda9da3e593d8d62b56bc17dbaab13ff71b72915ddda11dabde4d625";
- name = "qtbase-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtbase-everywhere-src-5.12.6.tar.xz";
+ sha256 = "6ab52649d74d7c1728cf4a6cf335d1142b3bf617d476e2857eb7961ef43f9f27";
+ name = "qtbase-everywhere-src-5.12.6.tar.xz";
};
};
qtcanvas3d = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtcanvas3d-everywhere-src-5.12.5.tar.xz";
- sha256 = "1553e06ce3cc5afb36aed3698b85c00e734eac07f7f41895426bebd84216d80c";
- name = "qtcanvas3d-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtcanvas3d-everywhere-src-5.12.6.tar.xz";
+ sha256 = "2d33e6c944e5a2eed7528fdfe9deadfb1b7a0fcf17bab1f8b83988b1327d9d08";
+ name = "qtcanvas3d-everywhere-src-5.12.6.tar.xz";
};
};
qtcharts = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtcharts-everywhere-src-5.12.5.tar.xz";
- sha256 = "4c7c30a916ba0100a1635b89f48bc5a8af4cdedac79c3fc18456af54dc0a6608";
- name = "qtcharts-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtcharts-everywhere-src-5.12.6.tar.xz";
+ sha256 = "14dbdb5bb18d774e3b7ac3042a3f349080ab42c2588527ff04123df1c9ccaa3d";
+ name = "qtcharts-everywhere-src-5.12.6.tar.xz";
};
};
qtconnectivity = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtconnectivity-everywhere-src-5.12.5.tar.xz";
- sha256 = "bdf62c72d689f47c4d17ecdde934d9f85a1164091e58fce02873de259e8de88b";
- name = "qtconnectivity-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtconnectivity-everywhere-src-5.12.6.tar.xz";
+ sha256 = "10f1c6727aedc375a1bfab4bb33fd2111bf2c1dfc19049e361c0f58608ea22da";
+ name = "qtconnectivity-everywhere-src-5.12.6.tar.xz";
};
};
qtdatavis3d = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtdatavis3d-everywhere-src-5.12.5.tar.xz";
- sha256 = "1de165bf5330c7fb18c6fbb8c0e5cda47fa19c2eaba657b3792fd75e653444f3";
- name = "qtdatavis3d-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtdatavis3d-everywhere-src-5.12.6.tar.xz";
+ sha256 = "414d91aae5e7d3404a0b526f944961871b1abf1fda51f0861d19cb28a2eba4fe";
+ name = "qtdatavis3d-everywhere-src-5.12.6.tar.xz";
};
};
qtdeclarative = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtdeclarative-everywhere-src-5.12.5.tar.xz";
- sha256 = "22c5323d4b01259e6e352eef1b54129d6dfee00a406f0312905fa7db322b9190";
- name = "qtdeclarative-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtdeclarative-everywhere-src-5.12.6.tar.xz";
+ sha256 = "34b1d1ae5562f1d433e22c255ac1a37a2fb030ef05bf6123d4b9496644b686d3";
+ name = "qtdeclarative-everywhere-src-5.12.6.tar.xz";
};
};
qtdoc = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtdoc-everywhere-src-5.12.5.tar.xz";
- sha256 = "f1de30227b8854c284e9c23e9c0c44d9fe768880aef826b0f880a44dd7c7538d";
- name = "qtdoc-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtdoc-everywhere-src-5.12.6.tar.xz";
+ sha256 = "82549278120236ece0e02f9bab351319e4469c242ce97b05f269964aee924aac";
+ name = "qtdoc-everywhere-src-5.12.6.tar.xz";
};
};
qtgamepad = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtgamepad-everywhere-src-5.12.5.tar.xz";
- sha256 = "de88f01d47f7cc5d54a1af783c5fae9f2b0101948ff33b8290f71b2657aded33";
- name = "qtgamepad-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtgamepad-everywhere-src-5.12.6.tar.xz";
+ sha256 = "e1ebc5f3593c5234724663106790fbf1831d4ac8ea50a9d9805d2dd0a1c5b3b3";
+ name = "qtgamepad-everywhere-src-5.12.6.tar.xz";
};
};
qtgraphicaleffects = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtgraphicaleffects-everywhere-src-5.12.5.tar.xz";
- sha256 = "bdbddba7e0e0d041809a98d97c07da8be8936ec48537335cbaea9b0049c646ad";
- name = "qtgraphicaleffects-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtgraphicaleffects-everywhere-src-5.12.6.tar.xz";
+ sha256 = "ded0327624a13bf7fab07e5fe762473194ed898b0442ef9325498e41c8c077ef";
+ name = "qtgraphicaleffects-everywhere-src-5.12.6.tar.xz";
};
};
qtimageformats = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtimageformats-everywhere-src-5.12.5.tar.xz";
- sha256 = "9f19394830542fb9e6bde6806b6216b7207f96bff674b91e8e8a8f89699e1f0a";
- name = "qtimageformats-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtimageformats-everywhere-src-5.12.6.tar.xz";
+ sha256 = "330d1c29a135c44bb36b5ffc2ba4f8915dbc446d5d75563523ebcfd373617858";
+ name = "qtimageformats-everywhere-src-5.12.6.tar.xz";
};
};
qtlocation = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtlocation-everywhere-src-5.12.5.tar.xz";
- sha256 = "12c8b59755abc4ca56e135e8ae3db7c6ba1bd95c779060f10a01393ae1040122";
- name = "qtlocation-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtlocation-everywhere-src-5.12.6.tar.xz";
+ sha256 = "7ae231ca4de3c0915e92bb95440b0ddc7113790b1acb536c9394472e8dde2278";
+ name = "qtlocation-everywhere-src-5.12.6.tar.xz";
};
};
qtmacextras = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtmacextras-everywhere-src-5.12.5.tar.xz";
- sha256 = "984c3c95834aaa6fd85234ab1987a79662911c510e419611ce88fb4756313194";
- name = "qtmacextras-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtmacextras-everywhere-src-5.12.6.tar.xz";
+ sha256 = "eae25b8858fef348667b938f5c88a014ee78945c419e4e6d856d4a6adc5e43a3";
+ name = "qtmacextras-everywhere-src-5.12.6.tar.xz";
};
};
qtmultimedia = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtmultimedia-everywhere-src-5.12.5.tar.xz";
- sha256 = "d5a0a4fddc5ef14d641160a1fc0011b190ff8d9f19009498d586516b8ee3479c";
- name = "qtmultimedia-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtmultimedia-everywhere-src-5.12.6.tar.xz";
+ sha256 = "9f580e8962ca6a09608570e77b38d7c3f71d344ff6de1c39bc6905226b679570";
+ name = "qtmultimedia-everywhere-src-5.12.6.tar.xz";
};
};
qtnetworkauth = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtnetworkauth-everywhere-src-5.12.5.tar.xz";
- sha256 = "0933475a2d30550c70ce4026c72678cbfdac73211593c78d442e038ef531a9f1";
- name = "qtnetworkauth-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtnetworkauth-everywhere-src-5.12.6.tar.xz";
+ sha256 = "ea122d86a960863bbe0e0f4b5a12f0a376455beed3c26f1b61926e065b366abd";
+ name = "qtnetworkauth-everywhere-src-5.12.6.tar.xz";
};
};
qtpurchasing = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtpurchasing-everywhere-src-5.12.5.tar.xz";
- sha256 = "7bcebc4985d387f3fa4ffcc19eada1f4f0f000ed0fd3e1d1dc37eb1db0be615b";
- name = "qtpurchasing-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtpurchasing-everywhere-src-5.12.6.tar.xz";
+ sha256 = "1fa0b7e3da4755b64559177f507718320c1aa9e66ec49e17595e04c3f3af70cd";
+ name = "qtpurchasing-everywhere-src-5.12.6.tar.xz";
};
};
qtquickcontrols = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtquickcontrols-everywhere-src-5.12.5.tar.xz";
- sha256 = "46deaefbdac3daa576c748e807956f5f82b2318923b1a36e434a3ff32d1d2559";
- name = "qtquickcontrols-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtquickcontrols-everywhere-src-5.12.6.tar.xz";
+ sha256 = "c48d96a187ff924f1ae4b4abe9cc073adeb06a6c2b07c4191aa595ad22df2c99";
+ name = "qtquickcontrols-everywhere-src-5.12.6.tar.xz";
};
};
qtquickcontrols2 = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtquickcontrols2-everywhere-src-5.12.5.tar.xz";
- sha256 = "d744bdc492486db6cb521b1d4891e2358719399825ca1cf2a50968a80f6acb8f";
- name = "qtquickcontrols2-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtquickcontrols2-everywhere-src-5.12.6.tar.xz";
+ sha256 = "5cab0712f946405db269851b96cca02ef8ba98f3ee2c4fa9c0877dba3808a970";
+ name = "qtquickcontrols2-everywhere-src-5.12.6.tar.xz";
};
};
qtremoteobjects = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtremoteobjects-everywhere-src-5.12.5.tar.xz";
- sha256 = "acf131af93dd1fefbf30c7e03e29b8a1da3180e00c49f95c14a1cb6158cfeacd";
- name = "qtremoteobjects-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtremoteobjects-everywhere-src-5.12.6.tar.xz";
+ sha256 = "49b5353d020fb6ab9bdf90c941a4b3acc6b036266f6c68a42fc44a7ac151d699";
+ name = "qtremoteobjects-everywhere-src-5.12.6.tar.xz";
};
};
qtscript = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtscript-everywhere-src-5.12.5.tar.xz";
- sha256 = "0083734ae827840334b774decb15de37f1b4ea5c88e442e2f485c530f24f1df4";
- name = "qtscript-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtscript-everywhere-src-5.12.6.tar.xz";
+ sha256 = "a18082ad338e2378cccab932045804ad3077ec924fed2efc59d4b726d622777c";
+ name = "qtscript-everywhere-src-5.12.6.tar.xz";
};
};
qtscxml = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtscxml-everywhere-src-5.12.5.tar.xz";
- sha256 = "6f1ec74100cdb2e7dfc3535e09d356fc53ba42e61b32fc3b93d5a7efed49960c";
- name = "qtscxml-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtscxml-everywhere-src-5.12.6.tar.xz";
+ sha256 = "53d7837c8b5b1f9beb26cb64ea4334211218533e0126167e4e7e75238f7ac68b";
+ name = "qtscxml-everywhere-src-5.12.6.tar.xz";
};
};
qtsensors = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtsensors-everywhere-src-5.12.5.tar.xz";
- sha256 = "e3a86a706f475bb23fc874de56026482de223ebd24f8cb4e94a28d1985ca0b85";
- name = "qtsensors-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtsensors-everywhere-src-5.12.6.tar.xz";
+ sha256 = "59dba4c0bc72846d938e0862f14d8064fb664d893f270a41d3abf4e871290ef5";
+ name = "qtsensors-everywhere-src-5.12.6.tar.xz";
};
};
qtserialbus = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtserialbus-everywhere-src-5.12.5.tar.xz";
- sha256 = "8474ae61a703c56e327ae0755c27643f2eafe0d915e8c6afb21728548dc02c22";
- name = "qtserialbus-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtserialbus-everywhere-src-5.12.6.tar.xz";
+ sha256 = "071b421282118c507a996e3cee4070f2c545335dfd891a44bf54100935cff5de";
+ name = "qtserialbus-everywhere-src-5.12.6.tar.xz";
};
};
qtserialport = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtserialport-everywhere-src-5.12.5.tar.xz";
- sha256 = "f8ef0321a59ecfe2c72adc2ee220e0047403439a3c7b9efb719b1476af1fb862";
- name = "qtserialport-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtserialport-everywhere-src-5.12.6.tar.xz";
+ sha256 = "77d0def93078fb5d9de6faa9ccff05cce5b934899e856b04bcf7f721a4e190be";
+ name = "qtserialport-everywhere-src-5.12.6.tar.xz";
};
};
qtspeech = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtspeech-everywhere-src-5.12.5.tar.xz";
- sha256 = "f94c0cd7236d1a20d97d314d2c17c45c967cd7f24b869c43f5f46253f436f25b";
- name = "qtspeech-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtspeech-everywhere-src-5.12.6.tar.xz";
+ sha256 = "27ae7b2c7073377a617f32b0f4adfc1807774f02d13469ed4bcd282799cf878a";
+ name = "qtspeech-everywhere-src-5.12.6.tar.xz";
};
};
qtsvg = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtsvg-everywhere-src-5.12.5.tar.xz";
- sha256 = "75a791cf749f671d7ea9090b403ca513f745795018db512e7eecbf418b679840";
- name = "qtsvg-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtsvg-everywhere-src-5.12.6.tar.xz";
+ sha256 = "46243e6c425827ab4e91fbe31567f683ff14cb01d12f9f7543a83a571228ef8f";
+ name = "qtsvg-everywhere-src-5.12.6.tar.xz";
};
};
qttools = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qttools-everywhere-src-5.12.5.tar.xz";
- sha256 = "28e095047b4985437dd66120cbcb49ac091bf4f12576ecad7ebc781b7dd44025";
- name = "qttools-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qttools-everywhere-src-5.12.6.tar.xz";
+ sha256 = "e94991c7885c2650cefd71189873e45b1d64d6042e439a0a0d9652c191d3c777";
+ name = "qttools-everywhere-src-5.12.6.tar.xz";
};
};
qttranslations = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qttranslations-everywhere-src-5.12.5.tar.xz";
- sha256 = "72eb6317190fdcc3f8de37996adc646ab8772988766bacaab60a5bcc7d6a3f2a";
- name = "qttranslations-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qttranslations-everywhere-src-5.12.6.tar.xz";
+ sha256 = "798ac44414206898d0192653118de3f115c59016e2bf82ad0c659f9f8c864768";
+ name = "qttranslations-everywhere-src-5.12.6.tar.xz";
};
};
qtvirtualkeyboard = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtvirtualkeyboard-everywhere-src-5.12.5.tar.xz";
- sha256 = "786d745b34b1f145073488d492325e98bcde81b07ab984032ea5eb2fb52e6e5e";
- name = "qtvirtualkeyboard-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtvirtualkeyboard-everywhere-src-5.12.6.tar.xz";
+ sha256 = "04699888d6e1e8e04db8043a37212fa3b1fcb1b23aef41c2f3ae7a4278e34d2c";
+ name = "qtvirtualkeyboard-everywhere-src-5.12.6.tar.xz";
};
};
qtwayland = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwayland-everywhere-src-5.12.5.tar.xz";
- sha256 = "29fd31267149451f93faa15f031e0a14506e704086033f70d51479522c6f3846";
- name = "qtwayland-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwayland-everywhere-src-5.12.6.tar.xz";
+ sha256 = "fa9c6aa84ddc0334b44f0f47d69569e496e5d9f3a1ed67aab42214854d2351c4";
+ name = "qtwayland-everywhere-src-5.12.6.tar.xz";
};
};
qtwebchannel = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebchannel-everywhere-src-5.12.5.tar.xz";
- sha256 = "9f1d1ac20722ee053ecf071d4ec0070a45a765cb67b6e31add61004fb4b3c5e8";
- name = "qtwebchannel-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebchannel-everywhere-src-5.12.6.tar.xz";
+ sha256 = "2745d1703de1a749405727a74786184c950ba7465dc5d02e2f39f51635dbc8d7";
+ name = "qtwebchannel-everywhere-src-5.12.6.tar.xz";
};
};
qtwebengine = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebengine-everywhere-src-5.12.5.tar.xz";
- sha256 = "31881130e69eb8336e9480f9f33cd5a93e86de8d7323c0ae1893e1a72ce70743";
- name = "qtwebengine-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebengine-everywhere-src-5.12.6.tar.xz";
+ sha256 = "caa5f257c3bc33c1d2fcb9b7cd414fd5c46e8eee8a103231ab28d592a0058621";
+ name = "qtwebengine-everywhere-src-5.12.6.tar.xz";
};
};
qtwebglplugin = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebglplugin-everywhere-src-5.12.5.tar.xz";
- sha256 = "aac3b2b2e5b6f26dd7abba6eab616777fecbb4d06de05ddab68c1296652bc4f7";
- name = "qtwebglplugin-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebglplugin-everywhere-src-5.12.6.tar.xz";
+ sha256 = "21d88852f69f0f06c5899e61fe76b2cefc2b65be4ed3c334ec01431ba16f50dd";
+ name = "qtwebglplugin-everywhere-src-5.12.6.tar.xz";
};
};
qtwebsockets = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebsockets-everywhere-src-5.12.5.tar.xz";
- sha256 = "5d58e697c49c0ea19a8299deba84b5360dca8c336a1636d38de0351757293262";
- name = "qtwebsockets-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebsockets-everywhere-src-5.12.6.tar.xz";
+ sha256 = "f00bfbaa73e60a4c3371e729167d7acb465cbb2db32535d745982cab21fed61e";
+ name = "qtwebsockets-everywhere-src-5.12.6.tar.xz";
};
};
qtwebview = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwebview-everywhere-src-5.12.5.tar.xz";
- sha256 = "a6d4d8c335cd6838f4638874fcd67655e80db569ed567a774a84f6bf7d332f26";
- name = "qtwebview-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwebview-everywhere-src-5.12.6.tar.xz";
+ sha256 = "42c0623c1c066620ab1afc3736a4a5f42115f9c190dafdf643e16ccec6e7727a";
+ name = "qtwebview-everywhere-src-5.12.6.tar.xz";
};
};
qtwinextras = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtwinextras-everywhere-src-5.12.5.tar.xz";
- sha256 = "7ee2fc73bc95c5e36e8ed2d02fc89822d56c406c540fbfa52bb0e3929ff2f93d";
- name = "qtwinextras-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtwinextras-everywhere-src-5.12.6.tar.xz";
+ sha256 = "02c2b2393073a22498a5645faed34040428ace9cf09f18e2f12e75e31be54bea";
+ name = "qtwinextras-everywhere-src-5.12.6.tar.xz";
};
};
qtx11extras = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtx11extras-everywhere-src-5.12.5.tar.xz";
- sha256 = "89425af3e48b040878c6a64ace58c17a83b87c9330e6366b09a41d6797062a68";
- name = "qtx11extras-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtx11extras-everywhere-src-5.12.6.tar.xz";
+ sha256 = "5f3991f557116034731ed059895e73b5d34e1b22e85536a8eb6e92350b3a1d6b";
+ name = "qtx11extras-everywhere-src-5.12.6.tar.xz";
};
};
qtxmlpatterns = {
- version = "5.12.5";
+ version = "5.12.6";
src = fetchurl {
- url = "${mirror}/official_releases/qt/5.12/5.12.5/submodules/qtxmlpatterns-everywhere-src-5.12.5.tar.xz";
- sha256 = "b905d9107f87798ef0f142942fc45c0f63fc113522ab041e791d3cb744a8babd";
- name = "qtxmlpatterns-everywhere-src-5.12.5.tar.xz";
+ url = "${mirror}/official_releases/qt/5.12/5.12.6/submodules/qtxmlpatterns-everywhere-src-5.12.6.tar.xz";
+ sha256 = "76977bc834e6c6118ae2bab31e68ae54843358936b03e432d919ad15cd2184d0";
+ name = "qtxmlpatterns-everywhere-src-5.12.6.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix
deleted file mode 100644
index 8854ed547001..000000000000
--- a/pkgs/development/libraries/qt-5/5.9/default.nix
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-
-# Updates
-
-Before a major version update, make a copy of this directory. (We like to
-keep the old version around for a short time after major updates.) Add a
-top-level attribute to `top-level/all-packages.nix`.
-
-1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
-2. From the top of the Nixpkgs tree, run
- `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
-3. Check that the new packages build correctly.
-4. Commit the changes and open a pull request.
-
-*/
-
-{
- newScope,
- stdenv, fetchurl, fetchpatch, makeSetupHook, makeWrapper,
- bison, cups ? null, harfbuzz, libGL, perl,
- gstreamer, gst-plugins-base, gtk3, dconf,
-
- # options
- developerBuild ? false,
- decryptSslTraffic ? false,
- debug ? false,
-}:
-
-with stdenv.lib;
-
-let
-
- qtCompatVersion = srcs.qtbase.version;
-
- mirror = "http://download.qt.io";
- srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
-
- patches = {
- qtbase = [
- ./qtbase.patch
- ./qtbase-fixguicmake.patch
- ./qtbase-openssl_1_1.patch
- ];
- qtdeclarative = [ ./qtdeclarative.patch ];
- qtscript = [
- ./qtscript.patch
- # needed due to changes in gcc 8.3, see https://bugreports.qt.io/browse/QTBUG-74196
- # fixed in qtscript 5.12.2
- (fetchpatch {
- url = "https://github.com/qt/qtscript/commit/97ec1d1882a83c23c91f0f7daea48e05858d8c32.diff";
- sha256 = "0khrapq13xzvxckzc9l7gqyjwibyd98vyqy6gmyhvsbm2kq8n6wi";
- })
- ];
- qtserialport = [ ./qtserialport.patch ];
- qttools = [ ./qttools.patch ];
- qtwebengine = [
- ./qtwebengine-no-build-skip.patch
- # https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707
- # https://bugreports.qt.io/browse/QTBUG-77037
- (fetchpatch {
- name = "fix-build-with-pulseaudio-13.0.patch";
- url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951";
- sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
- })
- ] ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch
- ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
-
- qtwebkit = [ ./qtwebkit.patch ];
- qtvirtualkeyboard = [
- (fetchpatch {
- name = "CVE-2018-19865-A.patch";
- url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=61780a113f02b3c62fb14516fe8ea47d91f9ed9a";
- sha256 = "0jd4nzaz9ndm9ryvrkav7kjs437l661288diklhbmgh249f8gki0";
- })
- (fetchpatch {
- name = "CVE-2018-19865-B.patch";
- url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=c0ac7a4c684e2fed60a72ceee53da89eea3f95a7";
- sha256 = "0yvxrx5vx6845vgnq8ml3q93y61py5j0bvhqj7nqvpbmyj1wy1p3";
-
- })
- (fetchpatch {
- name = "CVE-2018-19865-C.patch";
- url = "https://codereview.qt-project.org/gitweb?p=qt/qtvirtualkeyboard.git;a=patch;h=a2e7b8412f56841e12ed20a39f4a38e32d3c1e30";
- sha256 = "1yijysa9gy5xbxndx5ri0dkfrjqja0d1bsx52qz4mhzi4pkbib02";
- })
- ];
-
- };
-
- qtModule =
- import ../qtModule.nix
- {
- inherit perl;
- inherit (stdenv) lib;
- # Use a variant of mkDerivation that does not include wrapQtApplications
- # to avoid cyclic dependencies between Qt modules.
- mkDerivation =
- import ../mkDerivation.nix
- { inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; }
- stdenv.mkDerivation;
- }
- { inherit self srcs patches; };
-
- addPackages = self: with self;
- let
- callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
- in {
-
- mkDerivationWith =
- import ../mkDerivation.nix
- { inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; };
-
- mkDerivation = mkDerivationWith stdenv.mkDerivation;
-
- qtbase = callPackage ../modules/qtbase.nix {
- inherit (srcs.qtbase) src version;
- patches = patches.qtbase;
- inherit bison cups harfbuzz libGL;
- withGtk3 = true; inherit dconf gtk3;
- inherit developerBuild decryptSslTraffic;
- };
-
- qtcharts = callPackage ../modules/qtcharts.nix {};
- qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
- qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
- qtdoc = callPackage ../modules/qtdoc.nix {};
- qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
- qtimageformats = callPackage ../modules/qtimageformats.nix {};
- qtlocation = callPackage ../modules/qtlocation.nix {};
- qtmacextras = callPackage ../modules/qtmacextras.nix {};
- qtmultimedia = callPackage ../modules/qtmultimedia.nix {
- inherit gstreamer gst-plugins-base;
- };
- qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {};
- qtquick1 = null;
- qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
- qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
- qtscript = callPackage ../modules/qtscript.nix {};
- qtsensors = callPackage ../modules/qtsensors.nix {};
- qtserialport = callPackage ../modules/qtserialport.nix {};
- qtsvg = callPackage ../modules/qtsvg.nix {};
- qttools = callPackage ../modules/qttools.nix {};
- qttranslations = callPackage ../modules/qttranslations.nix {};
- qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {};
- qtwayland = callPackage ../modules/qtwayland.nix {};
- qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
- qtwebengine = callPackage ../modules/qtwebengine.nix {};
- qtwebkit = callPackage ../modules/qtwebkit.nix {};
- qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
- qtx11extras = callPackage ../modules/qtx11extras.nix {};
- qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
-
- env = callPackage ../qt-env.nix {};
- full = env "qt-full-${qtbase.version}" ([
- qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
- qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
- qtscript qtsensors qtserialport qtsvg qttools qttranslations
- qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
- qtx11extras qtxmlpatterns
- ] ++ optional (!stdenv.isDarwin) qtwayland
- ++ optional (stdenv.isDarwin) qtmacextras);
-
- qmake = makeSetupHook {
- deps = [ self.qtbase.dev ];
- substitutions = {
- fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh;
- };
- } ../hooks/qmake-hook.sh;
-
- wrapQtAppsHook = makeSetupHook {
- deps =
- [ self.qtbase.dev makeWrapper ]
- ++ optional stdenv.isLinux self.qtwayland.dev;
- } ../hooks/wrap-qt-apps-hook.sh;
- };
-
- self = makeScope newScope addPackages;
-
-in self
diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh
deleted file mode 100644
index 17ebe1e532df..000000000000
--- a/pkgs/development/libraries/qt-5/5.9/fetch.sh
+++ /dev/null
@@ -1 +0,0 @@
-WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.7/submodules/ )
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch
deleted file mode 100644
index 8b46d432812a..000000000000
--- a/pkgs/development/libraries/qt-5/5.9/qtbase-fixguicmake.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 0bbc871..3673634 100644
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
- set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
-
-- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
-+ set(imported_location \"${PLUGIN_LOCATION}\")
- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
- set_target_properties(Qt5::${Plugin} PROPERTIES
- \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
-diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-index 5baf0fd..3583745 100644
---- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-@@ -2,10 +2,10 @@
- add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
-
- !!IF !isEmpty(CMAKE_RELEASE_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
- !!ENDIF
- !!IF !isEmpty(CMAKE_DEBUG_TYPE)
--_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
- !!ENDIF
-
- list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase-openssl_1_1.patch b/pkgs/development/libraries/qt-5/5.9/qtbase-openssl_1_1.patch
deleted file mode 100644
index d5f4d7527cb4..000000000000
--- a/pkgs/development/libraries/qt-5/5.9/qtbase-openssl_1_1.patch
+++ /dev/null
@@ -1,3985 +0,0 @@
-commit 2d88fc0ce4ac76924a65ffd797183de9422ba672
-Author: Andreas Rammhold
-Date: Wed Mar 6 00:18:51 2019 +0100
-
- openssl1.1 compat
-
-diff --git a/config.tests/openssl/openssl.cpp b/config.tests/openssl/openssl.cpp
-index 6c8a9e8f19..d33b62389c 100644
---- a/config.tests/openssl/openssl.cpp
-+++ b/config.tests/openssl/openssl.cpp
-@@ -39,8 +39,8 @@
-
- #include
-
--#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x0090700fL || OPENSSL_VERSION_NUMBER-0 >= 0x10100000L
--# error "OpenSSL >= 0.9.7, and < 1.1.0 is required"
-+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x0090700fL
-+# error "OpenSSL >= 0.9.7 is required"
- #endif
-
- #include
-diff --git a/config.tests/openssl11/openssl.cpp b/config.tests/openssl11/openssl.cpp
-new file mode 100644
-index 0000000000..c20cc59deb
---- /dev/null
-+++ b/config.tests/openssl11/openssl.cpp
-@@ -0,0 +1,48 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2017 The Qt Company Ltd.
-+** Contact: https://www.qt.io/licensing/
-+**
-+** This file is part of the config.tests of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see https://www.qt.io/terms-conditions. For further
-+** information use the contact form at https://www.qt.io/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 3 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL3 included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 3 requirements
-+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 2.0 or (at your option) the GNU General
-+** Public license version 3 or any later version approved by the KDE Free
-+** Qt Foundation. The licenses are as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-+** included in the packaging of this file. Please review the following
-+** information to ensure the GNU General Public License requirements will
-+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-+** https://www.gnu.org/licenses/gpl-3.0.html.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include
-+
-+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L
-+# error "OpenSSL >= 1.1 is required"
-+#endif
-+
-+int main()
-+{
-+}
-diff --git a/config.tests/openssl11/openssl11.pro b/config.tests/openssl11/openssl11.pro
-new file mode 100644
-index 0000000000..a023aee4aa
---- /dev/null
-+++ b/config.tests/openssl11/openssl11.pro
-@@ -0,0 +1,2 @@
-+SOURCES = openssl.cpp
-+CONFIG -= x11 qt
-diff --git a/src/network/configure.json b/src/network/configure.json
-index 2cf90ed94b..a021c0734b 100644
---- a/src/network/configure.json
-+++ b/src/network/configure.json
-@@ -77,6 +77,17 @@
- },
- { "libs": "-lssl -lcrypto", "condition": "!config.win32" }
- ]
-+ },
-+ "openssl11": {
-+ "label": "OpenSSL v. 1.1 support",
-+ "type": "compile",
-+ "test": "openssl11",
-+ "sources": [
-+ {
-+ "comment": "placeholder for OPENSSL_PATH",
-+ "libs": ""
-+ }
-+ ]
- }
- },
-
-@@ -182,7 +193,7 @@
- "enable": "input.openssl == 'yes' || input.openssl == 'linked' || input.openssl == 'runtime'",
- "disable": "input.openssl == 'no' || input.ssl == 'no'",
- "autoDetect": "!config.winrt",
-- "condition": "!features.securetransport && (features.openssl-linked || libs.openssl_headers)",
-+ "condition": "!features.securetransport && (features.openssl-linked || libs.openssl_headers || feature.opensslv11)",
- "output": [
- "privateFeature",
- { "type": "publicQtConfig", "condition": "!features.openssl-linked" },
-@@ -193,7 +204,7 @@
- "label": " Qt directly linked to OpenSSL",
- "enable": "input.openssl == 'linked'",
- "disable": "input.openssl != 'linked'",
-- "condition": "!features.securetransport && libs.openssl",
-+ "condition": "!features.securetransport && (libs.openssl || feature.opensslv11)",
- "output": [
- "privateFeature",
- { "type": "define", "name": "QT_LINKED_OPENSSL" }
-@@ -213,6 +224,11 @@
- "condition": "config.winrt || features.securetransport || features.openssl",
- "output": [ "publicFeature", "feature" ]
- },
-+ "opensslv11": {
-+ "label": "OpenSSL v. 1.1",
-+ "condition": "libs.openssl11",
-+ "output": ["publicFeature", "feature"]
-+ },
- "sctp": {
- "label": "SCTP",
- "autoDetect": false,
-diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp
-index 28b7eda54a..71e514a025 100644
---- a/src/network/ssl/qsslcertificate_openssl.cpp
-+++ b/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -1,6 +1,7 @@
- /****************************************************************************
- **
--** Copyright (C) 2016 The Qt Company Ltd.
-+** Copyright (C) 2017 The Qt Company Ltd.
-+** Copyright (C) 2016 Richard J. Moore
- ** Contact: https://www.qt.io/licensing/
- **
- ** This file is part of the QtNetwork module of the Qt Toolkit.
-@@ -64,12 +65,14 @@ bool QSslCertificate::operator==(const QSslCertificate &other) const
- uint qHash(const QSslCertificate &key, uint seed) Q_DECL_NOTHROW
- {
- if (X509 * const x509 = key.d->x509) {
-- (void)q_X509_cmp(x509, x509); // populate x509->sha1_hash
-- // (if someone knows a better way...)
-- return qHashBits(x509->sha1_hash, SHA_DIGEST_LENGTH, seed);
-- } else {
-- return seed;
-+ const EVP_MD *sha1 = q_EVP_sha1();
-+ unsigned int len = 0;
-+ unsigned char md[EVP_MAX_MD_SIZE];
-+ q_X509_digest(x509, sha1, md, &len);
-+ return qHashBits(md, len, seed);
- }
-+
-+ return seed;
- }
-
- bool QSslCertificate::isNull() const
-@@ -89,8 +92,7 @@ QByteArray QSslCertificate::version() const
- {
- QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
- if (d->versionString.isEmpty() && d->x509)
-- d->versionString =
-- QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1);
-+ d->versionString = QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1);
-
- return d->versionString;
- }
-@@ -99,7 +101,7 @@ QByteArray QSslCertificate::serialNumber() const
- {
- QMutexLocker lock(QMutexPool::globalInstanceGet(d.data()));
- if (d->serialNumberString.isEmpty() && d->x509) {
-- ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber;
-+ ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509);
- QByteArray hexString;
- hexString.reserve(serialNumber->length * 3);
- for (int a = 0; a < serialNumber->length; ++a) {
-@@ -199,14 +201,15 @@ QMultiMap QSslCertificate::subjectAlter
- continue;
- }
-
-- const char *altNameStr = reinterpret_cast(q_ASN1_STRING_data(genName->d.ia5));
-+ const char *altNameStr = reinterpret_cast(q_ASN1_STRING_get0_data(genName->d.ia5));
- const QString altName = QString::fromLatin1(altNameStr, len);
- if (genName->type == GEN_DNS)
- result.insert(QSsl::DnsEntry, altName);
- else if (genName->type == GEN_EMAIL)
- result.insert(QSsl::EmailEntry, altName);
- }
-- q_sk_pop_free((STACK*)altNames, reinterpret_cast(q_sk_free));
-+
-+ q_OPENSSL_sk_pop_free((OPENSSL_STACK*)altNames, reinterpret_cast(q_OPENSSL_sk_free));
- }
-
- return result;
-@@ -235,25 +238,26 @@ QSslKey QSslCertificate::publicKey() const
- QSslKey key;
-
- key.d->type = QSsl::PublicKey;
-- X509_PUBKEY *xkey = d->x509->cert_info->key;
-- EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey);
-+
-+ EVP_PKEY *pkey = q_X509_get_pubkey(d->x509);
- Q_ASSERT(pkey);
-+ const int keyType = q_EVP_PKEY_type(q_EVP_PKEY_base_id(pkey));
-
-- if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) {
-+ if (keyType == EVP_PKEY_RSA) {
- key.d->rsa = q_EVP_PKEY_get1_RSA(pkey);
- key.d->algorithm = QSsl::Rsa;
- key.d->isNull = false;
-- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) {
-+ } else if (keyType == EVP_PKEY_DSA) {
- key.d->dsa = q_EVP_PKEY_get1_DSA(pkey);
- key.d->algorithm = QSsl::Dsa;
- key.d->isNull = false;
- #ifndef OPENSSL_NO_EC
-- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_EC) {
-+ } else if (keyType == EVP_PKEY_EC) {
- key.d->ec = q_EVP_PKEY_get1_EC_KEY(pkey);
- key.d->algorithm = QSsl::Ec;
- key.d->isNull = false;
- #endif
-- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DH) {
-+ } else if (keyType == EVP_PKEY_DH) {
- // DH unsupported
- } else {
- // error?
-@@ -275,7 +279,7 @@ static QVariant x509UnknownExtensionToValue(X509_EXTENSION *ext)
- X509V3_EXT_METHOD *meth = const_cast(q_X509V3_EXT_get(ext));
- if (!meth) {
- ASN1_OCTET_STRING *value = q_X509_EXTENSION_get_data(ext);
-- QByteArray result( reinterpret_cast(q_ASN1_STRING_data(value)),
-+ QByteArray result( reinterpret_cast(q_ASN1_STRING_get0_data(value)),
- q_ASN1_STRING_length(value));
- return result;
- }
-@@ -371,7 +375,7 @@ static QVariant x509ExtensionToValue(X509_EXTENSION *ext)
- continue;
- }
-
-- const char *uriStr = reinterpret_cast(q_ASN1_STRING_data(name->d.uniformResourceIdentifier));
-+ const char *uriStr = reinterpret_cast(q_ASN1_STRING_get0_data(name->d.uniformResourceIdentifier));
- const QString uri = QString::fromUtf8(uriStr, len);
-
- result[QString::fromUtf8(QSslCertificatePrivate::asn1ObjectName(ad->method))] = uri;
-@@ -380,11 +384,7 @@ static QVariant x509ExtensionToValue(X509_EXTENSION *ext)
- }
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-- q_sk_pop_free((_STACK*)info, reinterpret_cast(q_sk_free));
--#else
-- q_sk_pop_free((STACK*)info, reinterpret_cast(q_sk_free));
--#endif
-+ q_OPENSSL_sk_pop_free((OPENSSL_STACK*)info, reinterpret_cast(q_OPENSSL_sk_free));
- return result;
- }
- break;
-@@ -607,7 +607,11 @@ static QMap _q_mapFromX509Name(X509_NAME *name)
- unsigned char *data = 0;
- int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
- info.insertMulti(name, QString::fromUtf8((char*)data, size));
-+#if QT_CONFIG(opensslv11)
-+ q_CRYPTO_free(data, 0, 0);
-+#else
- q_CRYPTO_free(data);
-+#endif
- }
-
- return info;
-@@ -619,8 +623,9 @@ QSslCertificate QSslCertificatePrivate::QSslCertificate_from_X509(X509 *x509)
- if (!x509 || !QSslSocket::supportsSsl())
- return certificate;
-
-- ASN1_TIME *nbef = q_X509_get_notBefore(x509);
-- ASN1_TIME *naft = q_X509_get_notAfter(x509);
-+ ASN1_TIME *nbef = q_X509_getm_notBefore(x509);
-+ ASN1_TIME *naft = q_X509_getm_notAfter(x509);
-+
- certificate.d->notValidBefore = q_getTimeFromASN1(nbef);
- certificate.d->notValidAfter = q_getTimeFromASN1(naft);
- certificate.d->null = false;
-diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp
-index c92d8fc3f8..cef503710c 100644
---- a/src/network/ssl/qsslcontext_openssl.cpp
-+++ b/src/network/ssl/qsslcontext_openssl.cpp
-@@ -1,6 +1,6 @@
- /****************************************************************************
- **
--** Copyright (C) 2016 The Qt Company Ltd.
-+** Copyright (C) 2017 The Qt Company Ltd.
- ** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
- ** Copyright (C) 2014 Governikus GmbH & Co. KG.
- ** Contact: https://www.qt.io/licensing/
-@@ -41,22 +41,14 @@
-
-
- #include
--#include
--#include
-
- #include "private/qssl_p.h"
- #include "private/qsslcontext_openssl_p.h"
--#include "private/qsslsocket_p.h"
- #include "private/qsslsocket_openssl_p.h"
- #include "private/qsslsocket_openssl_symbols_p.h"
--#include "private/qssldiffiehellmanparameters_p.h"
-
- QT_BEGIN_NAMESPACE
-
--// defined in qsslsocket_openssl.cpp:
--extern int q_X509Callback(int ok, X509_STORE_CTX *ctx);
--extern QString getErrorsFromOpenSsl();
--
- QSslContext::QSslContext()
- : ctx(0),
- pkey(0),
-@@ -78,301 +70,6 @@ QSslContext::~QSslContext()
- q_SSL_SESSION_free(session);
- }
-
--static inline QString msgErrorSettingEllipticCurves(const QString &why)
--{
-- return QSslSocket::tr("Error when setting the elliptic curves (%1)").arg(why);
--}
--
--// static
--void QSslContext::initSslContext(QSslContext *sslContext, QSslSocket::SslMode mode, const QSslConfiguration &configuration, bool allowRootCertOnDemandLoading)
--{
-- sslContext->sslConfiguration = configuration;
-- sslContext->errorCode = QSslError::NoError;
--
-- bool client = (mode == QSslSocket::SslClientMode);
--
-- bool reinitialized = false;
-- bool unsupportedProtocol = false;
--init_context:
-- switch (sslContext->sslConfiguration.protocol()) {
-- case QSsl::SslV2:
--#ifndef OPENSSL_NO_SSL2
-- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv2_client_method() : q_SSLv2_server_method());
--#else
-- // SSL 2 not supported by the system, but chosen deliberately -> error
-- sslContext->ctx = 0;
-- unsupportedProtocol = true;
--#endif
-- break;
-- case QSsl::SslV3:
--#ifndef OPENSSL_NO_SSL3_METHOD
-- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
--#else
-- // SSL 3 not supported by the system, but chosen deliberately -> error
-- sslContext->ctx = 0;
-- unsupportedProtocol = true;
--#endif
-- break;
-- case QSsl::SecureProtocols:
-- // SSLv2 and SSLv3 will be disabled by SSL options
-- // But we need q_SSLv23_server_method() otherwise AnyProtocol will be unable to connect on Win32.
-- case QSsl::TlsV1SslV3:
-- // SSLv2 will will be disabled by SSL options
-- case QSsl::AnyProtocol:
-- default:
-- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method());
-- break;
-- case QSsl::TlsV1_0:
-- sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method());
-- break;
-- case QSsl::TlsV1_1:
--#if OPENSSL_VERSION_NUMBER >= 0x10001000L
-- sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_1_client_method() : q_TLSv1_1_server_method());
--#else
-- // TLS 1.1 not supported by the system, but chosen deliberately -> error
-- sslContext->ctx = 0;
-- unsupportedProtocol = true;
--#endif
-- break;
-- case QSsl::TlsV1_2:
--#if OPENSSL_VERSION_NUMBER >= 0x10001000L
-- sslContext->ctx = q_SSL_CTX_new(client ? q_TLSv1_2_client_method() : q_TLSv1_2_server_method());
--#else
-- // TLS 1.2 not supported by the system, but chosen deliberately -> error
-- sslContext->ctx = 0;
-- unsupportedProtocol = true;
--#endif
-- break;
-- case QSsl::TlsV1_0OrLater:
-- // Specific protocols will be specified via SSL options.
-- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method());
-- break;
-- case QSsl::TlsV1_1OrLater:
-- case QSsl::TlsV1_2OrLater:
--#if OPENSSL_VERSION_NUMBER >= 0x10001000L
-- // Specific protocols will be specified via SSL options.
-- sslContext->ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method());
--#else
-- // TLS 1.1/1.2 not supported by the system, but chosen deliberately -> error
-- sslContext->ctx = 0;
-- unsupportedProtocol = true;
--#endif
-- break;
-- }
--
-- if (!sslContext->ctx) {
-- // After stopping Flash 10 the SSL library looses its ciphers. Try re-adding them
-- // by re-initializing the library.
-- if (!reinitialized) {
-- reinitialized = true;
-- if (q_SSL_library_init() == 1)
-- goto init_context;
-- }
--
-- sslContext->errorStr = QSslSocket::tr("Error creating SSL context (%1)").arg(
-- unsupportedProtocol ? QSslSocket::tr("unsupported protocol") : QSslSocketBackendPrivate::getErrorsFromOpenSsl()
-- );
-- sslContext->errorCode = QSslError::UnspecifiedError;
-- return;
-- }
--
-- // Enable bug workarounds.
-- long options = QSslSocketBackendPrivate::setupOpenSslOptions(configuration.protocol(), configuration.d->sslOptions);
-- q_SSL_CTX_set_options(sslContext->ctx, options);
--
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-- // Tell OpenSSL to release memory early
-- // http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html
-- if (q_SSLeay() >= 0x10000000L)
-- q_SSL_CTX_set_mode(sslContext->ctx, SSL_MODE_RELEASE_BUFFERS);
--#endif
--
-- // Initialize ciphers
-- QByteArray cipherString;
-- bool first = true;
-- QList ciphers = sslContext->sslConfiguration.ciphers();
-- if (ciphers.isEmpty())
-- ciphers = QSslSocketPrivate::defaultCiphers();
-- for (const QSslCipher &cipher : qAsConst(ciphers)) {
-- if (first)
-- first = false;
-- else
-- cipherString.append(':');
-- cipherString.append(cipher.name().toLatin1());
-- }
--
-- if (!q_SSL_CTX_set_cipher_list(sslContext->ctx, cipherString.data())) {
-- sslContext->errorStr = QSslSocket::tr("Invalid or empty cipher list (%1)").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
-- sslContext->errorCode = QSslError::UnspecifiedError;
-- return;
-- }
--
-- const QDateTime now = QDateTime::currentDateTimeUtc();
--
-- // Add all our CAs to this store.
-- const auto caCertificates = sslContext->sslConfiguration.caCertificates();
-- for (const QSslCertificate &caCertificate : caCertificates) {
-- // From https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html:
-- //
-- // If several CA certificates matching the name, key identifier, and
-- // serial number condition are available, only the first one will be
-- // examined. This may lead to unexpected results if the same CA
-- // certificate is available with different expiration dates. If a
-- // ``certificate expired'' verification error occurs, no other
-- // certificate will be searched. Make sure to not have expired
-- // certificates mixed with valid ones.
-- //
-- // See also: QSslSocketBackendPrivate::verify()
-- if (caCertificate.expiryDate() >= now) {
-- q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(sslContext->ctx), (X509 *)caCertificate.handle());
-- }
-- }
--
-- if (QSslSocketPrivate::s_loadRootCertsOnDemand && allowRootCertOnDemandLoading) {
-- // tell OpenSSL the directories where to look up the root certs on demand
-- const QList unixDirs = QSslSocketPrivate::unixRootCertDirectories();
-- for (const QByteArray &unixDir : unixDirs)
-- q_SSL_CTX_load_verify_locations(sslContext->ctx, 0, unixDir.constData());
-- }
--
-- if (!sslContext->sslConfiguration.localCertificate().isNull()) {
-- // Require a private key as well.
-- if (sslContext->sslConfiguration.privateKey().isNull()) {
-- sslContext->errorStr = QSslSocket::tr("Cannot provide a certificate with no key, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
-- sslContext->errorCode = QSslError::UnspecifiedError;
-- return;
-- }
--
-- // Load certificate
-- if (!q_SSL_CTX_use_certificate(sslContext->ctx, (X509 *)sslContext->sslConfiguration.localCertificate().handle())) {
-- sslContext->errorStr = QSslSocket::tr("Error loading local certificate, %1").arg(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
-- sslContext->errorCode = QSslError::UnspecifiedError;
-- return;
-- }
--
-- if (configuration.d->privateKey.algorithm() == QSsl::Opaque) {
-- sslContext->pkey = reinterpret_cast